@mpxjs/api-proxy 2.10.4-beta.1 → 2.10.4-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.10.4-beta.1",
+  "version": "2.10.4-beta.3",
   "description": "convert miniprogram API at each end",
   "module": "src/index.js",
   "types": "@types/index.d.ts",

package/src/platform/api/create-intersection-observer/rnIntersectionObserver.js

@@ -95,21 +95,25 @@ class RNIntersectionObserver {
     const navigationLayout = navigation.layout || {
       x: 0,
       y: 0,
+      top: 0,
+      left: 0,
       width: screen.width,
       height: screen.height
     }
 
     const windowRect = {
-      top: navigationLayout.y - this.margins.top,
+      top: navigationLayout.top - this.margins.top,
       left: 0 - this.margins.left,
       right: navigationLayout.width + this.margins.right,
-      bottom: navigationLayout.y + navigationLayout.height + this.margins.bottom
+      bottom: navigationLayout.top + navigationLayout.height + this.margins.bottom
     }
     this.windowRect = windowRect
     return this.windowRect
   }
 
   _getReferenceRect (targetRef) {
+    const navigation = getFocusedNavigation() || {}
+    const layout = navigation.layout || {}
     const targetRefs = isArray(targetRef) ? targetRef : [targetRef]
     const targetPromiseQueue = []
     targetRefs.forEach((targetRefItem) => {
@@ -127,11 +131,12 @@ class RNIntersectionObserver {
       targetPromiseQueue.push(new Promise((resolve) => {
         target.measureInWindow(
           (x, y, width, height) => {
+            // 安卓measureInWindow的参考值在android下为statubar的左下角，因此top需要调整一下
             const boundingClientRect = {
               left: x,
-              top: y,
+              top: y + layout.statusBarHeight || 0,
               right: x + width,
-              bottom: y + height,
+              bottom: y + height + layout.statusBarHeight || 0,
               width: width,
               height: height
             }

package/src/platform/api/set-navigation-bar/index.ios.js

@@ -7,7 +7,9 @@ function setNavigationBarTitle (options = {}) {
     failHandle({ errMsg: 'setNavigationBarTitle:fail' }, fail, complete)
   } else {
     nextTick(() => {
-      navigation.setOptions({ title: title.trim() })
+      navigation.setPageConfig({
+        navigationBarTitleText: title.trim()
+      })
       successHandle({ errMsg: 'setNavigationBarTitle:ok' }, success, complete)
     })
   }
@@ -20,11 +22,9 @@ function setNavigationBarColor (options = {}) {
     failHandle({ errMsg: 'setNavigationBarColor:fail' }, fail, complete)
   } else {
     nextTick(() => {
-      navigation.setOptions({
-        headerStyle: {
-          backgroundColor: backgroundColor
-        },
-        headerTintColor: frontColor
+      navigation.setPageConfig({
+        navigationBarBackgroundColor: backgroundColor,
+        navigationBarTextStyle: frontColor
       })
       successHandle({ errMsg: 'setNavigationBarColor:ok' }, success, complete)
     })

package/src/platform/api/system/rnSystem.js

@@ -7,10 +7,9 @@ const getWindowInfo = function () {
   const navigation = getFocusedNavigation() || {}
   const initialWindowMetricsInset = initialWindowMetrics?.insets || {}
   const navigationInsets = navigation.insets || {}
-  const insets = Object.assign(initialWindowMetricsInset, navigationInsets)
+  const insets = Object.assign({}, initialWindowMetricsInset, navigationInsets)
   let safeArea = {}
   const { top = 0, bottom = 0, left = 0, right = 0 } = insets
-
   const screenHeight = __mpx_mode__ === 'ios' ? dimensionsScreen.height : dimensionsScreen.height - bottom // 解决安卓开启屏幕内三建导航安卓把安全区计算进去后产生的影响
   const screenWidth = __mpx_mode__ === 'ios' ? dimensionsScreen.width : dimensionsScreen.width - right
   const layout = navigation.layout || {}