chore: build

dcloudio · Jan 16, 2025 · e77f74a · e77f74a
1 parent cead72c
commit e77f74a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 30 deletions.
diff --git a/packages/uni-h5/dist-x/uni-h5.cjs.js b/packages/uni-h5/dist-x/uni-h5.cjs.js
@@ -2784,14 +2784,9 @@ class UniPageImpl {
     this.vm = vm;
     this.$vm = vm;
   }
-  get innerWidth() {
+  get pageBody() {
     {
-      throw new Error("Not support innerWidth in non-browser environment");
-    }
-  }
-  get innerHeight() {
-    {
-      throw new Error("Not support innerHeight in non-browser environment");
+      throw new Error("Not support pageBody in non-browser environment");
     }
   }
   get safeAreaInsets() {

diff --git a/packages/uni-h5/dist-x/uni-h5.es.js b/packages/uni-h5/dist-x/uni-h5.es.js
@@ -8179,6 +8179,19 @@ const getSystemSafeAreaInsets = function() {
 let escBackPageNum = 0;
 const homeDialogPages = [];
 const homeSystemDialogPages = [];
+function getPageWrapperInfo() {
+  const pageWrapper = document.querySelector("uni-page-wrapper");
+  const pageWrapperRect = pageWrapper.getBoundingClientRect();
+  const bodyRect = document.body.getBoundingClientRect();
+  return {
+    top: pageWrapperRect.top,
+    left: pageWrapperRect.left,
+    right: bodyRect.right - pageWrapperRect.right,
+    bottom: bodyRect.bottom - pageWrapperRect.bottom,
+    width: pageWrapperRect.width,
+    height: pageWrapperRect.height
+  };
+}
 class UniPageImpl {
   constructor({
     route,
@@ -8191,39 +8204,20 @@ class UniPageImpl {
     this.vm = vm;
     this.$vm = vm;
   }
-  get innerWidth() {
+  get pageBody() {
     const currentPage = getCurrentPage();
     if (currentPage !== this) {
-      throw new Error("Can't get innerWidth of other page");
+      throw new Error("Can't get pageBody of other page");
     }
-    const pageWrapper = document.querySelector("uni-page-wrapper");
-    return pageWrapper.clientWidth;
-  }
-  get innerHeight() {
-    const currentPage = getCurrentPage();
-    if (currentPage !== this) {
-      throw new Error("Can't get innerHeight of other page");
-    }
-    const pageWrapper = document.querySelector("uni-page-wrapper");
-    return pageWrapper.clientHeight;
+    return getPageWrapperInfo();
   }
   get safeAreaInsets() {
     const currentPage = getCurrentPage();
     if (currentPage !== this) {
       throw new Error("Can't get safeAreaInsets of other page");
     }
-    const pageWrapper = document.querySelector(
-      "uni-page-wrapper"
-    );
-    const pageWrapperRect = pageWrapper.getBoundingClientRect();
+    const pageWrapperEdge = getPageWrapperInfo();
     const systemSafeAreaInsets = getSystemSafeAreaInsets();
-    const bodyRect = document.body.getBoundingClientRect();
-    const pageWrapperEdge = {
-      top: pageWrapperRect.top,
-      left: pageWrapperRect.left,
-      right: bodyRect.right - pageWrapperRect.right,
-      bottom: bodyRect.bottom - pageWrapperRect.bottom
-    };
     const computeEdge = (bodyEdge, nativeEdge) => {
       return Math.max(0, nativeEdge - bodyEdge);
     };