@mpxjs/api-proxy 2.10.6 → 2.10.7-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.10.6",
+  "version": "2.10.7-beta.5",
   "description": "convert miniprogram API at each end",
   "module": "src/index.js",
   "types": "@types/index.d.ts",
@@ -37,7 +37,7 @@
   },
   "homepage": "https://github.com/didi/mpx#readme",
   "dependencies": {
-    "@mpxjs/utils": "^2.10.6",
+    "@mpxjs/utils": "^2.10.7 | ^2.10.7-beta.1",
     "axios": "^1.7.3"
   },
   "peerDependencies": {
@@ -67,6 +67,5 @@
     "react-native-haptic-feedback": {
       "optional": true
     }
-  },
-  "gitHead": "e28605bc2d8ab33f4dccf13ea98d9ca996f43ed6"
+  }
 }

package/src/common/js/utils.js

@@ -95,6 +95,30 @@ function getCurrentPageId () {
   return id
 }
 
+function resolvePath (relative, base) {
+  const firstChar = relative.charAt(0)
+  if (firstChar === '/') {
+    return relative
+  }
+  const stack = base.split('/')
+  stack.pop()
+  // resolve relative path
+  const segments = relative.replace(/^\//, '').split('/')
+  for (let i = 0; i < segments.length; i++) {
+    const segment = segments[i]
+    if (segment === '..') {
+      stack.pop()
+    } else if (segment !== '.') {
+      stack.push(segment)
+    }
+  }
+  // ensure leading slash
+  if (stack[0] !== '') {
+    stack.unshift('')
+  }
+  return stack.join('/')
+}
+
 const ENV_OBJ = getEnvObj()
 
 export {
@@ -110,5 +134,6 @@ export {
   successHandle,
   failHandle,
   getFocusedNavigation,
-  getCurrentPageId
+  getCurrentPageId,
+  resolvePath
 }

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

@@ -95,22 +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) => {
@@ -128,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
             }
@@ -153,19 +157,16 @@ class RNIntersectionObserver {
     return Math.min(Math.max(start, value), end)
   }
 
-  _isInsectedFn (intersectionRatio, previousIntersectionRatio, thresholds) {
-  // console.log('nowintersectionRatio, previousIntersectionRatio', [intersectionRatio, previousIntersectionRatio])
-    let nowIndex = -1
-    let previousIndex = -1
+  _getRatioIndex (ratio, thresholds = []) {
+    if (ratio === 0 && thresholds.includes(0)) return -1
+    if (ratio === 1 && thresholds.includes(1)) return thresholds.length
+    let returnIndex = -1
     thresholds.forEach((item, index) => {
-      if (intersectionRatio >= item) {
-        nowIndex = index
-      }
-      if (previousIntersectionRatio >= item) {
-        previousIndex = index
+      if (ratio >= item) {
+       returnIndex = index
       }
     })
-    return !(nowIndex === previousIndex)
+    return returnIndex
   }
 
   // 计算相交区域
@@ -180,10 +181,8 @@ class RNIntersectionObserver {
     const targetArea = (observeRect.bottom - observeRect.top) * (observeRect.right - observeRect.left)
     const visibleArea = (visibleRect.bottom - visibleRect.top) * (visibleRect.right - visibleRect.left)
     const intersectionRatio = targetArea ? visibleArea / targetArea : 0
-
-    const isInsected = isInit ? intersectionRatio > this.initialRatio : this._isInsectedFn(intersectionRatio, this.previousIntersectionRatio[observeIndex], this.thresholds)
+    const isInsected = isInit ? intersectionRatio > this.initialRatio : !(this._getRatioIndex(intersectionRatio, this.thresholds) === this._getRatioIndex(this.previousIntersectionRatio[observeIndex], this.thresholds))
     this.previousIntersectionRatio[observeIndex] = intersectionRatio
-
     return {
       intersectionRatio,
       intersectionRect: {
@@ -217,7 +216,6 @@ class RNIntersectionObserver {
           relativeRect,
           isInit
         })
-        // 初次调用的
         if (isInsected) {
           this.callback({
             // index: index,

package/src/platform/api/route/index.ios.js

@@ -1,6 +1,7 @@
-import { successHandle, failHandle } from '../../../common/js'
+import { successHandle, failHandle, resolvePath } from '../../../common/js'
 import { parseUrlQuery as parseUrl } from '@mpxjs/utils'
 import { nextTick } from '../next-tick'
+import { EventChannel } from '../event-channel'
 
 function getBasePath (navigation) {
   if (navigation) {
@@ -10,29 +11,6 @@ function getBasePath (navigation) {
   return '/'
 }
 
-function resolvePath (relative, base) {
-  const firstChar = relative.charAt(0)
-  if (firstChar === '/') {
-    return relative
-  }
-  const stack = base.split('/')
-  stack.pop()
-  // resolve relative path
-  const segments = relative.replace(/^\//, '').split('/')
-  for (let i = 0; i < segments.length; i++) {
-    const segment = segments[i]
-    if (segment === '..') {
-      stack.pop()
-    } else if (segment !== '.') {
-      stack.push(segment)
-    }
-  }
-  // ensure leading slash
-  if (stack[0] !== '') {
-    stack.unshift('')
-  }
-  return stack.join('/')
-}
 let timerId = null
 function isLock (navigationHelper, type, options) {
   if (navigationHelper.lastSuccessCallback && navigationHelper.lastFailCallback) {
@@ -57,12 +35,21 @@ function navigateTo (options = {}) {
   }
   const navigation = Object.values(global.__mpxPagesMap || {})[0]?.[1]
   if (navigation && navigationHelper) {
+    const eventChannel = new EventChannel()
+    if (options.events) {
+      eventChannel._addListeners(options.events)
+    }
     const { path, queryObj } = parseUrl(options.url)
     const basePath = getBasePath(navigation)
     const finalPath = resolvePath(path, basePath).slice(1)
+
+    global.__mpxEventChannel = {
+      route: finalPath,
+      eventChannel
+    }
     navigation.push(finalPath, queryObj)
     navigationHelper.lastSuccessCallback = () => {
-      const res = { errMsg: 'navigateTo:ok' }
+      const res = { errMsg: 'navigateTo:ok', eventChannel }
       successHandle(res, options.success, options.complete)
     }
     navigationHelper.lastFailCallback = (msg) => {

package/src/platform/api/route/index.web.js

@@ -1,4 +1,4 @@
-import { successHandle, failHandle, isTabBarPage, throwSSRWarning, isBrowser } from '../../../common/js'
+import { successHandle, failHandle, isTabBarPage, throwSSRWarning, isBrowser, resolvePath } from '../../../common/js'
 import { EventChannel } from '../event-channel'
 
 let routeCount = 0
@@ -46,9 +46,13 @@ function navigateTo (options = {}) {
       const res = { errMsg: 'navigateTo:fail can not navigateTo a tabBar page' }
       failHandle(res, options.fail, options.complete)
     }
+    const finalPath = resolvePath(options.url, router.currentRoute.path).slice(1)
     const eventChannel = new EventChannel()
     router.__mpxAction = {
-      type: 'to',
+      type: 'to'
+    }
+    global.__mpxEventChannel = {
+      route: finalPath,
       eventChannel
     }
     if (options.events) {

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 || {}

package/LICENSE

@@ -1,433 +0,0 @@
-                              Apache License
-
-                        Version 2.0, January 2004
-
-                     http://www.apache.org/licenses/
-
-
-
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-
-
-
-1. Definitions.
-
-
-
-
-   "License" shall mean the terms and conditions for use, reproduction,
-
-   and distribution as defined by Sections 1 through 9 of this document.
-
-
-
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-
-   the copyright owner that is granting the License.
-
-
-
-
-   "Legal Entity" shall mean the union of the acting entity and all
-
-   other entities that control, are controlled by, or are under common
-
-   control with that entity. For the purposes of this definition,
-
-   "control" means (i) the power, direct or indirect, to cause the
-
-   direction or management of such entity, whether by contract or
-
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-
-
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-
-   exercising permissions granted by this License.
-
-
-
-
-   "Source" form shall mean the preferred form for making modifications,
-
-   including but not limited to software source code, documentation
-
-   source, and configuration files.
-
-
-
-
-   "Object" form shall mean any form resulting from mechanical
-
-   transformation or translation of a Source form, including but
-
-   not limited to compiled object code, generated documentation,
-
-   and conversions to other media types.
-
-
-
-
-   "Work" shall mean the work of authorship, whether in Source or
-
-   Object form, made available under the License, as indicated by a
-
-   copyright notice that is included in or attached to the work
-
-   (an example is provided in the Appendix below).
-
-
-
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-
-   form, that is based on (or derived from) the Work and for which the
-
-   editorial revisions, annotations, elaborations, or other modifications
-
-   represent, as a whole, an original work of authorship. For the purposes
-
-   of this License, Derivative Works shall not include works that remain
-
-   separable from, or merely link (or bind by name) to the interfaces of,
-
-   the Work and Derivative Works thereof.
-
-
-
-
-   "Contribution" shall mean any work of authorship, including
-
-   the original version of the Work and any modifications or additions
-
-   to that Work or Derivative Works thereof, that is intentionally
-
-   submitted to Licensor for inclusion in the Work by the copyright owner
-
-   or by an individual or Legal Entity authorized to submit on behalf of
-
-   the copyright owner. For the purposes of this definition, "submitted"
-
-   means any form of electronic, verbal, or written communication sent
-
-   to the Licensor or its representatives, including but not limited to
-
-   communication on electronic mailing lists, source code control systems,
-
-   and issue tracking systems that are managed by, or on behalf of, the
-
-   Licensor for the purpose of discussing and improving the Work, but
-
-   excluding communication that is conspicuously marked or otherwise
-
-   designated in writing by the copyright owner as "Not a Contribution."
-
-
-
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-
-   on behalf of whom a Contribution has been received by Licensor and
-
-   subsequently incorporated within the Work.
-
-
-
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-
-   this License, each Contributor hereby grants to You a perpetual,
-
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-
-   copyright license to reproduce, prepare Derivative Works of,
-
-   publicly display, publicly perform, sublicense, and distribute the
-
-   Work and such Derivative Works in Source or Object form.
-
-
-
-
-3. Grant of Patent License. Subject to the terms and conditions of
-
-   this License, each Contributor hereby grants to You a perpetual,
-
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-
-   (except as stated in this section) patent license to make, have made,
-
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-
-   where such license applies only to those patent claims licensable
-
-   by such Contributor that are necessarily infringed by their
-
-   Contribution(s) alone or by combination of their Contribution(s)
-
-   with the Work to which such Contribution(s) was submitted. If You
-
-   institute patent litigation against any entity (including a
-
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-
-   or a Contribution incorporated within the Work constitutes direct
-
-   or contributory patent infringement, then any patent licenses
-
-   granted to You under this License for that Work shall terminate
-
-   as of the date such litigation is filed.
-
-
-
-
-4. Redistribution. You may reproduce and distribute copies of the
-
-   Work or Derivative Works thereof in any medium, with or without
-
-   modifications, and in Source or Object form, provided that You
-
-   meet the following conditions:
-
-
-
-
-   (a) You must give any other recipients of the Work or
-
-       Derivative Works a copy of this License; and
-
-
-
-
-   (b) You must cause any modified files to carry prominent notices
-
-       stating that You changed the files; and
-
-
-
-
-   (c) You must retain, in the Source form of any Derivative Works
-
-       that You distribute, all copyright, patent, trademark, and
-
-       attribution notices from the Source form of the Work,
-
-       excluding those notices that do not pertain to any part of
-
-       the Derivative Works; and
-
-
-
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-
-       distribution, then any Derivative Works that You distribute must
-
-       include a readable copy of the attribution notices contained
-
-       within such NOTICE file, excluding those notices that do not
-
-       pertain to any part of the Derivative Works, in at least one
-
-       of the following places: within a NOTICE text file distributed
-
-       as part of the Derivative Works; within the Source form or
-
-       documentation, if provided along with the Derivative Works; or,
-
-       within a display generated by the Derivative Works, if and
-
-       wherever such third-party notices normally appear. The contents
-
-       of the NOTICE file are for informational purposes only and
-
-       do not modify the License. You may add Your own attribution
-
-       notices within Derivative Works that You distribute, alongside
-
-       or as an addendum to the NOTICE text from the Work, provided
-
-       that such additional attribution notices cannot be construed
-
-       as modifying the License.
-
-
-
-
-   You may add Your own copyright statement to Your modifications and
-
-   may provide additional or different license terms and conditions
-
-   for use, reproduction, or distribution of Your modifications, or
-
-   for any such Derivative Works as a whole, provided Your use,
-
-   reproduction, and distribution of the Work otherwise complies with
-
-   the conditions stated in this License.
-
-
-
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-
-   any Contribution intentionally submitted for inclusion in the Work
-
-   by You to the Licensor shall be under the terms and conditions of
-
-   this License, without any additional terms or conditions.
-
-   Notwithstanding the above, nothing herein shall supersede or modify
-
-   the terms of any separate license agreement you may have executed
-
-   with Licensor regarding such Contributions.
-
-
-
-
-6. Trademarks. This License does not grant permission to use the trade
-
-   names, trademarks, service marks, or product names of the Licensor,
-
-   except as required for reasonable and customary use in describing the
-
-   origin of the Work and reproducing the content of the NOTICE file.
-
-
-
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-
-   agreed to in writing, Licensor provides the Work (and each
-
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-
-   implied, including, without limitation, any warranties or conditions
-
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-
-   appropriateness of using or redistributing the Work and assume any
-
-   risks associated with Your exercise of permissions under this License.
-
-
-
-
-8. Limitation of Liability. In no event and under no legal theory,
-
-   whether in tort (including negligence), contract, or otherwise,
-
-   unless required by applicable law (such as deliberate and grossly
-
-   negligent acts) or agreed to in writing, shall any Contributor be
-
-   liable to You for damages, including any direct, indirect, special,
-
-   incidental, or consequential damages of any character arising as a
-
-   result of this License or out of the use or inability to use the
-
-   Work (including but not limited to damages for loss of goodwill,
-
-   work stoppage, computer failure or malfunction, or any and all
-
-   other commercial damages or losses), even if such Contributor
-
-   has been advised of the possibility of such damages.
-
-
-
-
-9. Accepting Warranty or Additional Liability. While redistributing
-
-   the Work or Derivative Works thereof, You may choose to offer,
-
-   and charge a fee for, acceptance of support, warranty, indemnity,
-
-   or other liability obligations and/or rights consistent with this
-
-   License. However, in accepting such obligations, You may act only
-
-   on Your own behalf and on Your sole responsibility, not on behalf
-
-   of any other Contributor, and only if You agree to indemnify,
-
-   defend, and hold each Contributor harmless for any liability
-
-   incurred by, or claims asserted against, such Contributor by reason
-
-   of your accepting any such warranty or additional liability.
-
-
-
-
-END OF TERMS AND CONDITIONS
-
-
-
-
-APPENDIX: How to apply the Apache License to your work.
-
-
-
-
-   To apply the Apache License to your work, attach the following
-
-   boilerplate notice, with the fields enclosed by brackets "{}"
-
-   replaced with your own identifying information. (Don't include
-
-   the brackets!)  The text should be enclosed in the appropriate
-
-   comment syntax for the file format. We also recommend that a
-
-   file or class name and description of purpose be included on the
-
-   same "printed page" as the copyright notice for easier
-
-   identification within third-party archives.
-
-
-
-
-Copyright (C) 2017 Beijing Didi Infinity Technology and Development Co.,Ltd. All rights reserved.
-
-
-
-
-Licensed under the Apache License, Version 2.0 (the "License");
-
-you may not use this file except in compliance with the License.
-
-You may obtain a copy of the License at
-
-
-
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-
-
-
-Unless required by applicable law or agreed to in writing, software
-
-distributed under the License is distributed on an "AS IS" BASIS,
-
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-
-See the License for the specific language governing permissions and
-
-limitations under the License.