Merge branch 'master' into feature/dynamic-modal

Author: hunterliu1003

README.md

@@ -235,7 +235,7 @@ export default {
 
 ## **Slots**
 
-If you open a modal though API `show(name, params)`, You can using scoped-slot to get `params` in template:
+If you open a modal though API `show(name, params)`, You can use scoped-slot to get `params` in template:
 
 ```html
 <template v-slot="{ params }">

dist/VueFinalModal.esm.js

@@ -11,7 +11,7 @@
   "dependencies": {
     "@nuxt/content-theme-docs": "^0.8.2",
     "nuxt": "^2.14.12",
-    "vue-final-modal": "^0.21.5"
+    "vue-final-modal": "^0.21.7"
   },
   "devDependencies": {
     "@nuxtjs/google-analytics": "^2.4.0",

dist/VueFinalModal.esm.js.map

@@ -10619,10 +10619,10 @@ vue-client-only@^2.0.0:
   resolved "https://registry.yarnpkg.com/vue-client-only/-/vue-client-only-2.0.0.tgz#ddad8d675ee02c761a14229f0e440e219de1da1c"
   integrity sha512-arhk1wtWAfLsJyxGMoEYhoBowM87/i6HLSG2LH/03Yog6i2d9JEN1peMP0Ceis+/n9DxdenGYZZTxbPPJyHciA==
 
-vue-final-modal@^0.21.5:
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/vue-final-modal/-/vue-final-modal-0.21.5.tgz#e992a7f82a511d0c852fa84d83d9b6ca8578e41b"
-  integrity sha512-2Yby+hhy6qer0Yfk1QVT1p6XqaeoxqMJBuvcMHE8pHAIbVo9pfjJu1cehb5SVBH0QJzTeVPdhcKOBVXOjLl67A==
+vue-final-modal@^0.21.7:
+  version "0.21.7"
+  resolved "https://registry.yarnpkg.com/vue-final-modal/-/vue-final-modal-0.21.7.tgz#9bf2e7da77e06dbac6d6e1bc58b70c2eb0a5c0f7"
+  integrity sha512-T0jBkDX2gRqTMWzFQGqvcQhz0jNHo+AaRQ7IceIyVGj231/e3kvTRuNdWughkPenZyGzVHEHdWWlSl2AwD0n9g==
 
 vue-hot-reload-api@^2.3.0:
   version "2.3.4"

dist/VueFinalModal.umd.js

@@ -243,13 +243,15 @@ export default {
     },
     handleLockScroll() {
       if (this.value) {
-        if (this.lockScroll) {
-          disableBodyScroll(this.$refs.vfmContainer, {
-            reserveScrollBarGap: true
-          })
-        } else {
-          enableBodyScroll(this.$refs.vfmContainer)
-        }
+        this.$nextTick(() => {
+          if (this.lockScroll) {
+            disableBodyScroll(this.$refs.vfmContainer, {
+              reserveScrollBarGap: true
+            })
+          } else {
+            enableBodyScroll(this.$refs.vfmContainer)
+          }
+        })
       }
     },
     getAttachElement() {

dist/VueFinalModal.umd.js.map

@@ -1,6 +1,6 @@
 {
   "name": "vue-final-modal",
-  "version": "0.21.5",
+  "version": "0.21.7",
   "description": "Vue Final Modal is a renderless, stackable, detachable and lightweight modal component.",
   "private": false,
   "main": "dist/VueFinalModal.umd.js",

docs/package.json

@@ -6806,11 +6806,16 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.3, lodash@^4.17.4:
+lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.3:
   version "4.17.20"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
   integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
 
+lodash@^4.17.4:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+
 log-driver@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.7.tgz#63b95021f0702fedfa2c9bb0a24e7797d71871d8"
@@ -8534,9 +8539,9 @@ pug-attrs@^2.0.4:
     pug-runtime "^2.0.5"
 
 pug-code-gen@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/pug-code-gen/-/pug-code-gen-2.0.2.tgz#ad0967162aea077dcf787838d94ed14acb0217c2"
-  integrity sha512-kROFWv/AHx/9CRgoGJeRSm+4mLWchbgpRzTEn8XCiwwOy6Vh0gAClS8Vh5TEJ9DBjaP8wCjS3J6HKsEsYdvaCw==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/pug-code-gen/-/pug-code-gen-2.0.3.tgz#122eb9ada9b5bf601705fe15aaa0a7d26bc134ab"
+  integrity sha512-r9sezXdDuZJfW9J91TN/2LFbiqDhmltTFmGpHTsGdrNGp3p4SxAjjXEfnuK2e4ywYsRIVP0NeLbSAMHUcaX1EA==
   dependencies:
     constantinople "^3.1.2"
     doctypes "^1.1.0"