Skip to content

Commit 627f5f2

Browse files
LeecasonLeecason
committed
fix: slots render
1 parent 156b297 commit 627f5f2

File tree

3 files changed

+81
-75
lines changed

3 files changed

+81
-75
lines changed

‎src/components/RoughNotation.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { defineComponent, h, isVue2 } from 'vue-demi';
1+
import { defineComponent, h } from 'vue-demi';
22
import { annotate } from 'rough-notation';
33
import { ADD_ANNOTATION, REMOVE_ANNOTATION } from '../constants';
44

@@ -158,7 +158,10 @@ export default (options) =>
158158
},
159159

160160
render() {
161-
const slot = isVue2 ? this.$slots.default : this.$slots.default();
161+
const slot =
162+
typeof this.$slots.default === 'function'
163+
? this.$slots.default()
164+
: this.$slots.default;
162165

163166
if (this.tag) {
164167
return h(this.tag, null, slot);

‎src/components/RoughNotationGroup.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { defineComponent, h, isVue2 } from 'vue-demi';
1+
import { defineComponent, h } from 'vue-demi';
22
import { annotationGroup } from 'rough-notation';
33
import mitt from 'mitt';
44
import { ADD_ANNOTATION, REMOVE_ANNOTATION } from '../constants';
@@ -105,7 +105,10 @@ export default defineComponent({
105105
},
106106

107107
render() {
108-
const slot = isVue2 ? this.$slots.default : this.$slots.default();
108+
const slot =
109+
typeof this.$slots.default === 'function'
110+
? this.$slots.default()
111+
: this.$slots.default;
109112

110113
if (this.tag) {
111114
return h(this.tag, null, slot);

‎yarn.lock

+71-71
Original file line numberDiff line numberDiff line change
@@ -258,9 +258,9 @@
258258
integrity sha512-AUTksaz3FqugBkbTZ1i+lDLG5qy8hIzCaAxEtttU6C0BtZZU9pkNZtWSVAht4EW9kl46YBiyTGMp9xTTGqViNg==
259259

260260
"@babel/parser@^7.16.4":
261-
version "7.16.10"
262-
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.10.tgz#aba1b1cb9696a24a19f59c41af9cf17d1c716a88"
263-
integrity sha512-Sm/S9Or6nN8uiFsQU1yodyDW3MWXQhFeqzMPM+t8MJjM+pLsnFVxFZzkpXKvUXh+Gz9cbMoYYs484+Jw/NTEFQ==
261+
version "7.16.12"
262+
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.12.tgz#9474794f9a650cf5e2f892444227f98e28cdf8b6"
263+
integrity sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A==
264264

265265
"@babel/plugin-proposal-async-generator-functions@^7.10.1":
266266
version "7.10.1"
@@ -1224,47 +1224,47 @@
12241224
semver "^6.1.0"
12251225
strip-ansi "^6.0.0"
12261226

1227-
"@vue/compiler-core@3.2.27":
1228-
version "3.2.27"
1229-
resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.27.tgz#01bd5e5071f58f43e4184ba7fa810226799a5383"
1230-
integrity sha512-JyxAglSM/pb9paG5ZNuKrf5IUpzLzQA3khjWGF9oESELCLQlt6O3YyPMR2A69wIpYWrf5mScZ8YY8TJKOI/1kQ==
1227+
"@vue/compiler-core@3.2.28":
1228+
version "3.2.28"
1229+
resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.28.tgz#7f6aa4b167f0ae0413f3c36e507c898db06e8fe8"
1230+
integrity sha512-mQpfEjmHVxmWKaup0HL6tLMv2HqjjJu7XT4/q0IoUXYXC4xKG8lIVn5YChJqxBTLPuQjzas7u7i9L4PAWJZRtA==
12311231
dependencies:
12321232
"@babel/parser" "^7.16.4"
1233-
"@vue/shared" "3.2.27"
1233+
"@vue/shared" "3.2.28"
12341234
estree-walker "^2.0.2"
12351235
source-map "^0.6.1"
12361236

1237-
"@vue/compiler-dom@3.2.27":
1238-
version "3.2.27"
1239-
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.27.tgz#a12163e3f3f1d5ff1969253eba4b4ea3e67bbd0f"
1240-
integrity sha512-NyQ7nEbopUBPUMHM4c3FPCbFbnQwptoPjW5Y5qfJ7hfiCNhOuhQsDNqi5JYKBxfpxiFNwjcN9F8t1AsnLrDloQ==
1237+
"@vue/compiler-dom@3.2.28":
1238+
version "3.2.28"
1239+
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.28.tgz#cc32a987fee50673f25430df35ea943f252c23e6"
1240+
integrity sha512-KA4yXceLteKC7VykvPnViUixemQw3A+oii+deSbZJOQKQKVh1HLosI10qxa8ImPCyun41+wG3uGR+tW7eu1W6Q==
12411241
dependencies:
1242-
"@vue/compiler-core" "3.2.27"
1243-
"@vue/shared" "3.2.27"
1242+
"@vue/compiler-core" "3.2.28"
1243+
"@vue/shared" "3.2.28"
12441244

1245-
"@vue/compiler-sfc@3.2.27":
1246-
version "3.2.27"
1247-
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.27.tgz#43bf23fe24feacba334636fa7a332f9d8a532c8c"
1248-
integrity sha512-WyecUhLN5UAQAr2QlmG2nA56OEnhZJaBnSw0G1tazb9rwDuK0V9tnbIXbQgmQlx+x4sJxgg61yWGcIXfilTl3A==
1245+
"@vue/compiler-sfc@3.2.28":
1246+
version "3.2.28"
1247+
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.28.tgz#0a576c09abc72d6a76b153133de6fd7599c182c3"
1248+
integrity sha512-zB0WznfEBb4CbGBHzhboHDKVO5nxbkbxxFo9iVlxObP7a9/qvA5kkZEuT7nXP52f3b3qEfmVTjIT23Lo1ndZdQ==
12491249
dependencies:
12501250
"@babel/parser" "^7.16.4"
1251-
"@vue/compiler-core" "3.2.27"
1252-
"@vue/compiler-dom" "3.2.27"
1253-
"@vue/compiler-ssr" "3.2.27"
1254-
"@vue/reactivity-transform" "3.2.27"
1255-
"@vue/shared" "3.2.27"
1251+
"@vue/compiler-core" "3.2.28"
1252+
"@vue/compiler-dom" "3.2.28"
1253+
"@vue/compiler-ssr" "3.2.28"
1254+
"@vue/reactivity-transform" "3.2.28"
1255+
"@vue/shared" "3.2.28"
12561256
estree-walker "^2.0.2"
12571257
magic-string "^0.25.7"
12581258
postcss "^8.1.10"
12591259
source-map "^0.6.1"
12601260

1261-
"@vue/compiler-ssr@3.2.27":
1262-
version "3.2.27"
1263-
resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.27.tgz#49aa3afd1602275aba3c3e331764984111a460bf"
1264-
integrity sha512-+l09t319iV7HVSrXfBw9OLwMZIPOFTXmHjZ61Bc5ZcwKqOYAR4uTurKpoXAfcSc5qs/q6WdE9jY3nrP0LUEMQQ==
1261+
"@vue/compiler-ssr@3.2.28":
1262+
version "3.2.28"
1263+
resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.28.tgz#411e8b3bdc3183b2acd35e6551734b34366d64e5"
1264+
integrity sha512-z8rck1PDTu20iLyip9lAvIhaO40DUJrw3Zv0mS4Apfh3PlfWpF5dhsO5g0dgt213wgYsQIYVIlU9cfrYapqRgg==
12651265
dependencies:
1266-
"@vue/compiler-dom" "3.2.27"
1267-
"@vue/shared" "3.2.27"
1266+
"@vue/compiler-dom" "3.2.28"
1267+
"@vue/shared" "3.2.28"
12681268

12691269
"@vue/component-compiler-utils@^3.1.0", "@vue/component-compiler-utils@^3.1.2":
12701270
version "3.1.2"
@@ -1287,53 +1287,53 @@
12871287
resolved "https://registry.yarnpkg.com/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.1.tgz#18723530d304f443021da2292d6ec9502826104a"
12881288
integrity sha512-8VCoJeeH8tCkzhkpfOkt+abALQkS11OIHhte5MBzYaKMTqK0A3ZAKEUVAffsOklhEv7t0yrQt696Opnu9oAx+w==
12891289

1290-
"@vue/reactivity-transform@3.2.27":
1291-
version "3.2.27"
1292-
resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.27.tgz#610b6df174cdceba6de1376f3218736c3b0e753d"
1293-
integrity sha512-67//61ObGxGnVrPhjygocb24eYUh+TFMhkm7szm8v5XdKXjkNl7qgIOflwGvUnwuIRJmr9nZ7+PvY0fL+H2upA==
1290+
"@vue/reactivity-transform@3.2.28":
1291+
version "3.2.28"
1292+
resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.28.tgz#e0abf86694f4d182f974fbac934fc3e23e0a6d9b"
1293+
integrity sha512-zE8idNkOPnBDd2tKSIk84hOQZ+jXKvSy5FoIIVlcNEJHnCFnQ3maqeSJ9KoB2Rf6EXUhFTiTDNRlYlXmT2uHbQ==
12941294
dependencies:
12951295
"@babel/parser" "^7.16.4"
1296-
"@vue/compiler-core" "3.2.27"
1297-
"@vue/shared" "3.2.27"
1296+
"@vue/compiler-core" "3.2.28"
1297+
"@vue/shared" "3.2.28"
12981298
estree-walker "^2.0.2"
12991299
magic-string "^0.25.7"
13001300

1301-
"@vue/reactivity@3.2.27":
1302-
version "3.2.27"
1303-
resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.27.tgz#db7c4eefded938a8974e768b7b8f9ff4fad34a62"
1304-
integrity sha512-QPfIQEJidRGIu/mPexhcB4csp1LEg2Nr+/QE72MnXs/OYDtFErhC9FxIyymkxp/xvAgL5wsnSOuDD6zWF42vRQ==
1301+
"@vue/reactivity@3.2.28":
1302+
version "3.2.28"
1303+
resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.28.tgz#1c3c7f434372edd867f937151897fca7efc4be18"
1304+
integrity sha512-WamM5LGv7JIarW+EYAzYFqYonZXjTnOjNW0sBO93jRE9I1ReAwfH8NvQXkPA3JZ3fuF6SGDdG8Y9/+dKjd/1Gw==
13051305
dependencies:
1306-
"@vue/shared" "3.2.27"
1306+
"@vue/shared" "3.2.28"
13071307

1308-
"@vue/runtime-core@3.2.27":
1309-
version "3.2.27"
1310-
resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.27.tgz#1ea8acd30071f44bcf3915b088ff5d993a9d3154"
1311-
integrity sha512-NJrjuViHJyrT4bwIocbE4XDaDlA1Pj61pQlneZZdFEvgdMLlhzCCiJ4WZnWcohYQeisUAZjEFKK8GjQieDPFbw==
1308+
"@vue/runtime-core@3.2.28":
1309+
version "3.2.28"
1310+
resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.28.tgz#69d8eede42957a1660b964004aa002982ae36a41"
1311+
integrity sha512-sVbBMFUt42JatTlXbdH6tVcLPw1eEOrrVQWI+j6/nJVzR852RURaT6DhdR0azdYscxq4xmmBctE0VQmlibBOFw==
13121312
dependencies:
1313-
"@vue/reactivity" "3.2.27"
1314-
"@vue/shared" "3.2.27"
1313+
"@vue/reactivity" "3.2.28"
1314+
"@vue/shared" "3.2.28"
13151315

1316-
"@vue/runtime-dom@3.2.27":
1317-
version "3.2.27"
1318-
resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.27.tgz#d13f9f5f27815041f5e9f493d77121955e3f7166"
1319-
integrity sha512-tlnKkvBSkV7MPUp/wRFsYcv67U1rUeZTPfpPzq5Kpmw5NNGkY6J075fFBH2k0MNxDucXS+qfStNrxAyGTUMkSA==
1316+
"@vue/runtime-dom@3.2.28":
1317+
version "3.2.28"
1318+
resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.28.tgz#b5a0cf38daed5534edbc95790f4eeac97dff2003"
1319+
integrity sha512-Jg7cxZanEXXGu1QnZILFLnDrM+MIFN8VAullmMZiJEZziHvhygRMpi0ahNy/8OqGwtTze1JNhLdHRBO+q2hbmg==
13201320
dependencies:
1321-
"@vue/runtime-core" "3.2.27"
1322-
"@vue/shared" "3.2.27"
1321+
"@vue/runtime-core" "3.2.28"
1322+
"@vue/shared" "3.2.28"
13231323
csstype "^2.6.8"
13241324

1325-
"@vue/server-renderer@3.2.27":
1326-
version "3.2.27"
1327-
resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.2.27.tgz#a0caee0f7571fa741e4efaa72951a1cd70d61551"
1328-
integrity sha512-dZnzkFCDe6A/GIe/F1LcG6lWpprHVh62DjTv8wubtkHwfJWOmOeHp+KvPDRrswL/L3ghsm+E31xY+pvkgM3pbQ==
1325+
"@vue/server-renderer@3.2.28":
1326+
version "3.2.28"
1327+
resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.2.28.tgz#235944dc4d969fadd387f62acc2eb8b8d50008a2"
1328+
integrity sha512-S+MhurgkPabRvhdDl8R6efKBmniJqBbbWIYTXADaJIKFLFLQCW4gcYUTbxuebzk6j3z485vpekhrHHymTF52Pg==
13291329
dependencies:
1330-
"@vue/compiler-ssr" "3.2.27"
1331-
"@vue/shared" "3.2.27"
1330+
"@vue/compiler-ssr" "3.2.28"
1331+
"@vue/shared" "3.2.28"
13321332

1333-
"@vue/shared@3.2.27":
1334-
version "3.2.27"
1335-
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.27.tgz#d5c6e574ee1afd55043470bf70b15772da4e19a2"
1336-
integrity sha512-rpAn9k6O08Lvo7ekBIAnkOukX/4EsEQLPrRJBKhIEasMsOI5eX0f6mq1sDUSY7cgAqWw2d7QtP74CWxdXoyKxA==
1333+
"@vue/shared@3.2.28":
1334+
version "3.2.28"
1335+
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.28.tgz#5b0b1840432031d0ea1adff633b356a503e87048"
1336+
integrity sha512-eMQ8s9j8FpbGHlgUAaj/coaG3Q8YtMsoWL/RIHTsE3Ex7PUTyr7V91vB5HqWB5Sn8m4RXTHGO22/skoTUYvp0A==
13371337

13381338
"@vue/web-component-wrapper@^1.2.0":
13391339
version "1.2.0"
@@ -7693,15 +7693,15 @@ vue@*:
76937693
integrity sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ==
76947694

76957695
vue@^3.2.27:
7696-
version "3.2.27"
7697-
resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.27.tgz#dc898b3cf7393a620ed5e4a91e5fa8c1ed1ba67a"
7698-
integrity sha512-p1cH8Q6eaPwvANCjFQj497a914cxXKKwOG3Lg9USddTOrn4/zFMKjn9dnovkx+L8VtFaNgbVqW8mLJS/eTA6xw==
7699-
dependencies:
7700-
"@vue/compiler-dom" "3.2.27"
7701-
"@vue/compiler-sfc" "3.2.27"
7702-
"@vue/runtime-dom" "3.2.27"
7703-
"@vue/server-renderer" "3.2.27"
7704-
"@vue/shared" "3.2.27"
7696+
version "3.2.28"
7697+
resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.28.tgz#840d193bf9713f57a365ef115c4b1286d43e0e5d"
7698+
integrity sha512-U+jBwVh3RQ9AgceLFdT7i2FFujoC+kYuGrKo5y8aLluWKZWPS40WgA2pyYHaiSX9ydCbEGr3rc/JzdqskzD95g==
7699+
dependencies:
7700+
"@vue/compiler-dom" "3.2.28"
7701+
"@vue/compiler-sfc" "3.2.28"
7702+
"@vue/runtime-dom" "3.2.28"
7703+
"@vue/server-renderer" "3.2.28"
7704+
"@vue/shared" "3.2.28"
77057705

77067706
watchpack-chokidar2@^2.0.0:
77077707
version "2.0.0"

0 commit comments

Comments
 (0)