@mpxjs/core 2.9.69-beta.7 → 2.9.69-beta.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.9.69-beta.7",
+  "version": "2.9.69-beta.9",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",

package/src/platform/builtInMixins/refsMixin.ios.js

@@ -26,21 +26,31 @@ export default function getRefsMixin () {
           })
         })
       },
-      __getRefVal (type, selectorsConf) {
-        return (instance) => {
-          if (instance) {
+      __getRefVal (type, selectorsConf, refFnId) {
+        const target = this
+        if (!this[refFnId]) {
+          this[refFnId] = function (instance) {
             selectorsConf.forEach((item = []) => {
               const [prefix, selectors = ''] = item
               if (selectors) {
                 selectors.trim().split(/\s+/).forEach(selector => {
                   const refKey = prefix + selector
-                  this.__refs[refKey] = this.__refs[refKey] || []
-                  this.__refs[refKey].push({ type, instance })
+                  const refVal = { type, instance, refFnId }
+                  target.__refs[refKey] = target.__refs[refKey] || []
+                  if (instance) { // mount
+                    target.__refs[refKey].push(refVal)
+                  } else { // unmount
+                    const index = target.__refs[refKey].findIndex(item => item.refFnId === refFnId)
+                    if (index > -1) {
+                      target.__refs[refKey].splice(index, 1)
+                    }
+                  }
                 })
               }
             })
           }
         }
+        return this[refFnId]
       },
       __selectRef (selector, refType, all = false) {
         const splitedSelector = selector.match(/(#|\.)?[^.#]+/g) || []

package/src/platform/createApp.ios.js

@@ -178,18 +178,23 @@ export default function createApp (options) {
 
     const { initialRouteName, initialParams } = initialRouteRef.current
     const headerBackImageProps = Mpx.config.rnConfig.headerBackImageProps || null
+    const headerBackImageSource = Mpx.config.rnConfig.headerBackImageSource || null
     const navScreenOpts = {
       // 7.x替换headerBackTitleVisible
       // headerBackButtonDisplayMode: 'minimal',
       headerBackTitleVisible: false,
       // 安卓上会出现初始化时闪现导航条的问题
-      headerShown: false
+      headerShown: false,
+      headerShadowVisible: false
     }
     if (headerBackImageProps) {
       navScreenOpts.headerBackImage = () => {
         return createElement(Image, headerBackImageProps)
       }
     }
+    if (headerBackImageSource) {
+      navScreenOpts.headerBackImageSource = headerBackImageSource
+    }
     return createElement(SafeAreaProvider,
       null,
       createElement(NavigationContainer,

package/src/platform/patch/getDefaultOptions.ios.js

@@ -115,7 +115,6 @@ const instanceProto = {
     return createIntersectionObserver(this, opt, this.__intersectionCtx)
   },
   __resetInstance () {
-    this.__refs = {}
     this.__dispatchedSlotSet = new WeakSet()
   },
   __iter (val, fn) {
@@ -491,7 +490,7 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
   }
 
   if (type === 'page') {
-    const { Provider, useSafeAreaInsets, GestureHandlerRootView } = global.__navigationHelper
+    const { Provider, useSafeAreaInsets, GestureHandlerRootView, useHeaderHeight } = global.__navigationHelper
     const pageConfig = Object.assign({}, global.__mpxPageConfig, currentInject.pageConfig)
     const Page = ({ navigation, route }) => {
       const [enabled, setEnabled] = useState(false)
@@ -530,17 +529,13 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
       }, [])
 
       const rootRef = useRef(null)
-
-      useEffect(() => {
-        const unsubscribe = navigation.addListener('transitionEnd', (e) => {
-          setTimeout(() => {
-            rootRef.current?.measureInWindow((x, y, width, height) => {
-              navigation.layout = { x, y, width, height }
-            })
-          }, 200)
-        });
-        return unsubscribe;
-      }, [navigation]);
+      const onLayout = useCallback(() => {
+        setTimeout(() => {
+          rootRef.current?.measureInWindow((x, y, width, height) => {
+            navigation.layout = { x, y, width, height }
+          })
+        }, 200)
+      }, [])
 
       const withKeyboardAvoidingView = (element) => {
         if (__mpx_mode__ === 'ios') {
@@ -575,10 +570,12 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
       if (setStateRef.current !== setState) {
         setStateRef.current = setState
       }
-
       return createElement(GestureHandlerRootView,
         {
-          style: {
+          // https://github.com/software-mansion/react-native-reanimated/issues/6639 因存在此问题，iOS在页面上进行定宽来暂时规避
+          style: __mpx_mode__ === 'ios' && pageConfig.navigationStyle !== 'custom' ? {
+            height: ReactNative.Dimensions.get('screen').height - useHeaderHeight()
+          } : {
             flex: 1
           }
         },
@@ -589,7 +586,8 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
                 flex: 1,
                 backgroundColor: pageConfig.backgroundColor || '#ffffff'
               },
-              ref: rootRef
+              ref: rootRef,
+              onLayout
             },
             createElement(RouteContext.Provider,
               {