* modal: fix disable scrollbar not work with static modal.

easysoft · Nov 1, 2023 · 167a84c · 167a84c
1 parent 39b0559
commit 167a84c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/lib/modal/src/vanilla/modal-base.ts b/lib/modal/src/vanilla/modal-base.ts
@@ -86,6 +86,18 @@ export class ModalBase<T extends ModalBaseOptions = ModalBaseOptions> extends Co
         }
 
         this._observeResize();
+
+        this.on('hidden', () => {
+            if (!ModalBase.getAll().some((modal) => modal.shown)) {
+                $('html').enableScroll();
+            }
+        });
+        this.on('show', () => {
+            $('html').disableScroll();
+        });
+        if (this.shown) {
+            $('html').disableScroll();
+        }
     }
 
     destroy(): void {

diff --git a/lib/modal/src/vanilla/modal.tsx b/lib/modal/src/vanilla/modal.tsx
@@ -130,19 +130,15 @@ export class Modal<T extends ModalOptions = ModalOptions> extends ModalBase<T> {
 
     afterInit() {
         super.afterInit();
-        this.on('hidden', () => {
-            if (this.options.destoryOnHide) {
+        if (this.options.destoryOnHide) {
+            this.on('hidden', () => {
                 this.destroy();
-            }
-            if (!Modal.getAll().some((modal) => modal.shown)) {
-                $('html').enableScroll();
-            }
-        });
+            });
+        }
     }
 
     show(options?: Partial<T>) {
         if (super.show(options)) {
-            $('html').disableScroll();
             this.buildDialog();
             return true;
         }