fix(x-web): 修复 dialogPage 获取 pageBody safeAreaInsets 异常问题

dcloudio · Jan 21, 2025 · 444a2e3 · 444a2e3
1 parent a7c3f3c
commit 444a2e3
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 27 deletions.
diff --git a/packages/uni-h5/dist-x/uni-h5.es.js b/packages/uni-h5/dist-x/uni-h5.es.js
@@ -8212,11 +8212,13 @@ class UniPageImpl {
     const currentPage = getCurrentPage();
     let container = document;
     if (isDialogPageImpl(this)) {
-      const dialogPages = currentPage.getDialogPages();
-      if (dialogPages.indexOf(this) === -1) {
-        throw new Error("Can't get pageBody of other dialog page");
+      const dialogPage = document.querySelector(
+        `uni-page[data-page="${(_a = this.vm) == null ? void 0 : _a.route}"]`
+      );
+      if (!dialogPage) {
+        throw new Error("dialogPage not found");
       }
-      container = document.querySelector(`uni-page[data-page="${(_a = this.vm) == null ? void 0 : _a.route}"]`);
+      container = dialogPage;
     } else if (this !== currentPage) {
       throw new Error("Can't get pageBody of other page");
     }
@@ -8235,24 +8237,23 @@ class UniPageImpl {
     const currentPage = getCurrentPage();
     let container = document;
     if (isDialogPageImpl(this)) {
-      const dialogPages = currentPage.getDialogPages();
-      if (dialogPages.indexOf(this) === -1) {
-        throw new Error("Can't get safeAreaInsets of other dialog page");
+      const dialogPage = document.querySelector(
+        `uni-page[data-page="${(_a = this.vm) == null ? void 0 : _a.route}"]`
+      );
+      if (!dialogPage) {
+        throw new Error("dialogPage not found");
       }
-      container = document.querySelector(`uni-page[data-page="${(_a = this.vm) == null ? void 0 : _a.route}"]`);
+      container = dialogPage;
     } else if (this !== currentPage) {
       throw new Error("Can't get safeAreaInsets of other page");
     }
     const pageWrapperEdge = getPageWrapperInfo(container);
     const systemSafeAreaInsets = getSystemSafeAreaInsets();
-    const computeEdge = (bodyEdge, nativeEdge) => {
-      return Math.max(0, nativeEdge - bodyEdge);
-    };
     return {
-      top: computeEdge(pageWrapperEdge.top, systemSafeAreaInsets.top),
-      left: computeEdge(pageWrapperEdge.left, systemSafeAreaInsets.left),
-      right: computeEdge(pageWrapperEdge.right, systemSafeAreaInsets.right),
-      bottom: computeEdge(pageWrapperEdge.bottom, systemSafeAreaInsets.bottom)
+      top: Math.max(pageWrapperEdge.top, systemSafeAreaInsets.top),
+      left: Math.max(pageWrapperEdge.left, systemSafeAreaInsets.left),
+      right: Math.max(pageWrapperEdge.right, systemSafeAreaInsets.right),
+      bottom: Math.max(pageWrapperEdge.bottom, systemSafeAreaInsets.bottom)
     };
   }
   getPageStyle() {

diff --git a/packages/uni-h5/src/x/framework/setup/page.ts b/packages/uni-h5/src/x/framework/setup/page.ts
@@ -81,13 +81,13 @@ class UniPageImpl implements UniPage {
     const currentPage = getCurrentPage() as unknown as UniPage
     let container: Document | Element = document
     if (isDialogPageImpl(this)) {
-      const dialogPages = currentPage.getDialogPages()
-      if (dialogPages.indexOf(this) === -1) {
-        throw new Error("Can't get pageBody of other dialog page")
-      }
-      container = document.querySelector(
+      const dialogPage = document.querySelector(
         `uni-page[data-page="${this.vm?.route}"]`
-      )!
+      )
+      if (!dialogPage) {
+        throw new Error('dialogPage not found')
+      }
+      container = dialogPage
     } else if (this !== currentPage) {
       throw new Error("Can't get pageBody of other page")
     }
@@ -108,13 +108,13 @@ class UniPageImpl implements UniPage {
     const currentPage = getCurrentPage() as unknown as UniPage
     let container: Document | Element = document
     if (isDialogPageImpl(this)) {
-      const dialogPages = currentPage.getDialogPages()
-      if (dialogPages.indexOf(this) === -1) {
-        throw new Error("Can't get safeAreaInsets of other dialog page")
-      }
-      container = document.querySelector(
+      const dialogPage = document.querySelector(
         `uni-page[data-page="${this.vm?.route}"]`
-      )!
+      )
+      if (!dialogPage) {
+        throw new Error('dialogPage not found')
+      }
+      container = dialogPage
     } else if (this !== currentPage) {
       throw new Error("Can't get safeAreaInsets of other page")
     }