Merge branch 'dev' into feature/dynamic-modal

Author: hunterliu1003

dist/VueFinalModal.esm.js

@@ -502,7 +502,7 @@ Calculate `z-index` automatically with zIndexBase. If zIndex is set, `zIndexAuto
 
 Set specific `z-index` to root of the modal element. If zIndex is set, `zIndexAuto`, `zIndexBase` will be ignored.
 
-### `focusRemain`
+### `focusRetain`
 
 - Type: `Boolean`
 - Default: `true`

dist/VueFinalModal.esm.js.map

@@ -11,7 +11,7 @@
   "dependencies": {
     "@nuxt/content-theme-docs": "^0.6.1",
     "nuxt": "^2.14.8",
-    "vue-final-modal": "^0.21.1"
+    "vue-final-modal": "^0.21.3"
   },
   "devDependencies": {
     "@nuxtjs/google-analytics": "^2.4.0",

dist/VueFinalModal.umd.js

@@ -9948,10 +9948,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.1:
-  version "0.21.1"
-  resolved "https://registry.yarnpkg.com/vue-final-modal/-/vue-final-modal-0.21.1.tgz#ae869a06eeaf727cb6810b4c4c2ca806acba6a9b"
-  integrity sha512-BdvqIb7pHCLTOlf+ldP8VcUg3/rm9Sk1fXCa3fuR9buTceIT+rtKsVLoTPFSVwI7wYwVv9ZBwHNjDRiyj2ydCQ==
+vue-final-modal@^0.21.3:
+  version "0.21.3"
+  resolved "https://registry.yarnpkg.com/vue-final-modal/-/vue-final-modal-0.21.3.tgz#74a2ae88d6d0c7afc9f822c3bfbe7a99c4c8014d"
+  integrity sha512-8l1uMi+k8TSFtIJobtl1J3pYabD4AjgtavTxflDHckVI+XI7nwvMWotMbWCAs+rHQ83Hnz4QGq/Z1JefA/ZsqA==
 
 vue-hot-reload-api@^2.3.0:
   version "2.3.4"

dist/VueFinalModal.umd.js.map

@@ -61,9 +61,7 @@ function createVfm(Vue, options) {
         return this.modals.filter(modal => modal.name === name)
       },
       dynamicModals: [],
-      get openedModals() {
-        return this.modals.filter(modal => modal.value)
-      },
+      openedModals: [],
       modals: []
     }
     return Vue.observable(vfm)

docs/content/en/index.md

@@ -193,6 +193,13 @@ export default {
         if (target || this.attach === false) {
           this.attach !== false && target.appendChild(this.$el)
 
+          let index = this.api.openedModals.findIndex(vm => vm === this)
+          if (index !== -1) {
+            // if this is already exist in modalStack, delete it
+            this.api.openedModals.splice(index, 1)
+          }
+          this.api.openedModals.push(this)
+
           this.modalStackIndex = this.api.openedModals.length - 1
 
           this.handleLockScroll()
@@ -216,6 +223,11 @@ export default {
       }
     },
     close() {
+      let index = this.api.openedModals.findIndex(vm => vm === this)
+      if (index !== -1) {
+        // remove this in modalStack
+        this.api.openedModals.splice(index, 1)
+      }
       if (this.api.openedModals.length > 0) {
         // If there are still nested modals opened
         const $_vm = this.api.openedModals[this.api.openedModals.length - 1]

docs/package.json

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