fix: unable to prevent mask close for Modal and Drawer

vexip-ui · Jun 7, 2022 · 332f286 · 332f286
1 parent 3186024
commit 332f286
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/components/drawer/drawer.vue b/components/drawer/drawer.vue
@@ -217,9 +217,9 @@ export default defineComponent({
       return result
     }
 
-    async function handleMaskClose() {
+    function handleMaskClose() {
       if (props.maskClose) {
-        await handleClose()
+        return handleClose()
       }
     }
 

diff --git a/components/masker/masker.vue b/components/masker/masker.vue
@@ -107,7 +107,7 @@ export default defineComponent({
     async function handleClose() {
       if (!props.closable) return
 
-      let result = true
+      let result: unknown = true
 
       if (typeof props.onBeforeClose === 'function') {
         result = props.onBeforeClose()

diff --git a/components/modal/modal.vue b/components/modal/modal.vue
@@ -306,7 +306,7 @@ export default defineComponent({
       const currentHeight = wrapper.value.offsetHeight
 
       if (props.top === 'auto' && props.inner) {
-        let parentElement = wrapper.value.parentElement
+        let parentElement = wrapper.value.parentElement as HTMLElement
 
         while (parentElement && parentElement !== document.body) {
           if (getComputedStyle(parentElement).position !== 'static') {
@@ -315,7 +315,7 @@ export default defineComponent({
             break
           }
 
-          parentElement = parentElement.parentElement
+          parentElement = parentElement.parentElement as HTMLElement
         }
       } else {
         currentTop.value =
@@ -331,7 +331,7 @@ export default defineComponent({
       const currentWidth = wrapper.value.offsetWidth
 
       if (props.left === 'auto' && props.inner) {
-        let parentElement = wrapper.value.parentElement
+        let parentElement = wrapper.value.parentElement as HTMLElement
 
         while (parentElement && parentElement !== document.body) {
           if (getComputedStyle(parentElement).position !== 'static') {
@@ -340,7 +340,7 @@ export default defineComponent({
             break
           }
 
-          parentElement = parentElement.parentElement
+          parentElement = parentElement.parentElement as HTMLElement
         }
       } else {
         currentLeft.value =
@@ -389,9 +389,9 @@ export default defineComponent({
       emit('hide')
     }
 
-    async function handleMaskClose() {
+    function handleMaskClose() {
       if (props.maskClose) {
-        await handleClose(false)
+        return handleClose(false)
       }
     }