Merge branch 'dev' into next

Author: hunterliu1003

dist/VueFinalModal.esm.js

@@ -586,6 +586,47 @@ Or get `params` on `@beforeOpen` event:
 
 <alert>`parmas` will be reset to `{}` automatically after `closed` event. You can avoid the modal to reset the `params` to empty object by calling `event.stop()`.</alert>
 
+## TypeScript
+
+### Vue
+Works out of the box in Vue, no other settings are required. But if you customized your access key, you must define the type yourself like below:
+
+```ts
+import Vue from 'vue'
+import VueFinalModal, { 
+  VfmOptions,
+  VueFinalModalProperty 
+} from 'vue-final-modal'
+
+Vue.use<VfmOptions>(VueFinalModal(), {
+  componentName: 'MyComponentName',
+  key: 'myKey',
+})
+
+// define the type of access key yourself
+declare module 'vue/types/vue' {
+  interface Vue {
+    myKey: VueFinalModalProperty;
+  }
+}
+```
+
+### Nuxt
+
+Add the types to your "types" array in tsconfig.json file
+
+```js
+{
+  "compilerOptions": {
+    "types": [
+      // other types
+      // ...
+      "vue-final-modal"
+    ]
+  }
+}
+```
+
 ## **Contribution**
 
 👋 Hi I'm Hunter, the author of `vue-final-modal`.

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.2"
   },
   "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.2:
+  version "0.21.2"
+  resolved "https://registry.yarnpkg.com/vue-final-modal/-/vue-final-modal-0.21.2.tgz#c471c9473727357306dce0f2b0f493cbb7424a42"
+  integrity sha512-cstJnbJ3sgyoih14J4zHbuxk+zPTRU745nIA80oMQXyf0uTneV2epxIuBPeQDr1DGDCDQNcE6aFHUQVQ7luyBA==
 
 vue-hot-reload-api@^2.3.0:
   version "2.3.4"

dist/VueFinalModal.umd.js.map

@@ -25,9 +25,7 @@ function createVfm() {
       get(name) {
         return this.modals.find(modal => modal.props.name === name)
       },
-      get openedModals() {
-        return this.modals.filter(modal => modal.props.modelValue)
-      },
+      openedModals: [],
       modals: []
     }
     return vfm

docs/content/en/index.md

@@ -227,6 +227,14 @@ export default {
         if (target || props.attach === false) {
           props.attach !== false && target.appendChild(root.value)
 
+          let index = $vfm.openedModals.findIndex(vm => vm.uid === uid)
+
+          if (index !== -1) {
+            // if this is already exist in modalStack, delete it
+            $vfm.openedModals.splice(index, 1)
+          }
+          $vfm.openedModals.push(getModalInfo())
+
           modalStackIndex.value = $vfm.openedModals.length - 1
 
           handleLockScroll()
@@ -251,6 +259,11 @@ export default {
       }
     }
     function close() {
+      let index = $vfm.openedModals.findIndex(vm => vm.uid === uid)
+      if (index !== -1) {
+        // remove this in modalStack
+        $vfm.openedModals.splice(index, 1)
+      }
       if ($vfm.openedModals.length > 0) {
         // If there are still nested modals opened
         const $_vm = $vfm.openedModals[$vfm.openedModals.length - 1]

docs/package.json

@@ -12,7 +12,7 @@
   "files": [
     "lib",
     "dist",
-    "types/index.d.ts",
+    "types",
     "vetur"
   ],
   "scripts": {