@mpxjs/core 2.10.16 → 2.10.17

package/@types/global.d.ts

@@ -11,3 +11,6 @@ declare module '*?resolve' {
   const resourcePath: string
   export default resourcePath
 }
+
+declare let setAppShow: () => void
+declare let setAppHide: () => void

package/@types/index.d.ts

@@ -9,6 +9,7 @@
 
 import type { GetComputedType } from '@mpxjs/store'
 import type { ScaledSize } from 'react-native'
+import type { ComponentType } from 'react'
 export * from '@mpxjs/store'
 
 // utils
@@ -126,9 +127,17 @@ interface Context {
 type ExtendedComponentOptions = {
   disconnectOnUnmounted?: boolean
   shallowReactivePattern?: RegExp
+  /**
+   * 是否禁用render函数的useMemo，仅输出RN支持
+   */
+  disableMemo?: boolean
 } & WechatMiniprogram.Component.ComponentOptions
 
 interface ComponentOpt<D extends Data, P extends Properties, C, M extends Methods, Mi extends Array<any>, S extends Record<any, any>> extends Partial<WechatMiniprogram.Component.Lifetimes & WechatMiniprogram.Component.OtherOption> {
+  /**
+   * ReactNative 原生组件注册
+   */
+  components?: Record<string, ComponentType>,
   data?: D
   properties?: P
   computed?: C
@@ -221,7 +230,7 @@ type WxComponentIns<D extends Data = {}, P extends Properties = {}, M extends Me
   Omit<WechatMiniprogram.Component.Instance<D, P, M>, 'selectComponent' | 'selectAllComponents'>
   & ReplaceWxComponentIns
 
-type ComponentIns<D extends Data = {}, P extends Properties = {}, C = {}, M extends Methods = {}, Mi extends Array<any> = [], S extends Record<any, any> = {}, O = {}> =
+export type ComponentIns<D extends Data = {}, P extends Properties = {}, C = {}, M extends Methods = {}, Mi extends Array<any> = [], S extends Record<any, any> = {}, O = {}> =
   GetDataType<D> & UnboxMixinsField<Mi, 'data'> &
   M & UnboxMixinsField<Mi, 'methods'> & { [K in keyof S]: S[K] extends Ref<infer V> ? V : S[K] } &
   GetPropsType<P & UnboxMixinsField<Mi, 'properties'>> &
@@ -296,7 +305,7 @@ export interface RnConfig {
    * - `true`：允许退出应用
    * - `false`：阻止退出应用
    */
-  onAppBack?: () => boolean
+  onAppBack?: (delta: number) => boolean
 
   /**
    * 是否禁用框架内部的 AppStateChange 监听。
@@ -356,26 +365,6 @@ export interface RnConfig {
     dimensions: T
   ) => T | void
 
-  /**
-   * 异步分包加载配置。
-   */
-  asyncChunk?: {
-    /**
-     * 加载超时时长配置，单位为毫秒。
-     */
-    timeout: number
-
-    /**
-     * 异步分包页面加载超时或失败时，自定义兜底页面文件路径。
-     */
-    fallback: string
-
-    /**
-     * 异步分包页面加载时，自定义 loading 页面文件路径。
-     */
-    loading: string
-  }
-
   /**
    * 加载并执行异步分包的方法。
    *
@@ -392,6 +381,13 @@ export interface RnConfig {
    * @param packages 分包名数组
    */
   downloadChunkAsync?: (packages: Array<string>) => void
+
+  /**
+   * bundle 中是否关闭 android 键盘避让功能，如果关闭需要将该配置设置为 false，使用 mpx 内置的键盘避让逻辑
+   * @platform android
+   * @default true
+   */
+  enableNativeKeyboardAvoiding?: boolean
 }
 
 interface MpxConfig {
@@ -399,10 +395,10 @@ interface MpxConfig {
   ignoreWarning: boolean | string | RegExp | ((msg: string, location: string, e: Error) => boolean)
   ignoreProxyWhiteList: Array<string>
   observeClassInstance: boolean | Array<AnyConstructor>
-  errorHandler: (msg: String, location: String, e: Error) => any | null
-  warnHandler: (msg: String, location: String, e: Error) => any | null
-  proxyEventHandler: (e: WechatMiniprogram.CustomEvent, target: ComponentIns<{}, {}, {}, {}, []>) => any | null
-  setDataHandler: (data: object, target: ComponentIns<{}, {}, {}, {}, []>) => any | null
+  errorHandler: (msg: String, location: String, e: Error) => void
+  warnHandler: (msg: String, location: String, e: Error) => void
+  proxyEventHandler: (e: WechatMiniprogram.CustomEvent, target: ComponentIns<{}, {}, {}, {}, []>) => void
+  setDataHandler: (data: object, target: ComponentIns<{}, {}, {}, {}, []>) => void
   forceFlushSync: boolean,
   webRouteConfig: object,
   webConfig: object,
@@ -413,7 +409,7 @@ interface MpxConfig {
   */
   webviewConfig: WebviewConfig,
   /** react-native 相关配置，用于挂载事件等，如 onShareAppMessage */
-  rnConfig?: RnConfig,
+  rnConfig: RnConfig,
 }
 
 type SupportedMode = 'wx' | 'ali' | 'qq' | 'swan' | 'tt' | 'web' | 'qa'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.10.16",
+  "version": "2.10.17",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -19,7 +19,7 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@mpxjs/utils": "^2.10.16",
+    "@mpxjs/utils": "^2.10.17",
     "lodash": "^4.1.1",
     "miniprogram-api-typings": "^3.10.0"
   },
@@ -93,6 +93,10 @@
       "optional": true
     }
   },
+  "devDependencies": {
+    "@types/react": "^18.2.79",
+    "react-native": "^0.74.5"
+  },
   "publishConfig": {
     "registry": "https://registry.npmjs.org",
     "access": "public"
@@ -109,5 +113,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "be4129320e298edf935ea35f9ca3d375f75ac51c"
+  "gitHead": "33fbd0bb8d4b83555239a8931fabb23022af0866"
 }

package/src/convertor/wxToAli.js

@@ -7,7 +7,7 @@ import { implemented } from '../core/implement'
 const unsupported = ['moved', 'definitionFilter']
 
 function convertErrorDesc (key) {
-  error(`Options.${key} is not supported in runtime conversion from wx to ali.`, global.currentResource)
+  error(`Options.${key} is not supported in runtime conversion from wx to ali.`, global.currentResource || global.currentModuleId)
 }
 
 function notSupportTip (options) {

package/src/convertor/wxToReact.js

@@ -8,7 +8,7 @@ import { implemented } from '../core/implement'
 const unsupported = ['moved', 'definitionFilter']
 
 function convertErrorDesc (key) {
-  error(`Options.${key} is not supported in runtime conversion from wx to react native.`, global.currentResource)
+  error(`Options.${key} is not supported in runtime conversion from wx to react native.`, global.currentResource || global.currentModuleId)
 }
 
 function notSupportTip (options) {

package/src/convertor/wxToSwan.js

@@ -12,7 +12,7 @@ const BEHAVIORS_MAP = {
 const unsupported = ['moved', 'relations']
 
 function convertErrorDesc (key) {
-  error(`Options.${key} is not supported in runtime conversion from wx to swan.`, global.currentResource)
+  error(`Options.${key} is not supported in runtime conversion from wx to swan.`, global.currentResource || global.currentModuleId)
 }
 
 function notSupportTip (options) {

package/src/convertor/wxToTt.js

@@ -12,7 +12,7 @@ export default {
     if (options.behaviors) {
       options.behaviors.forEach((behavior, idx) => {
         if (BEHAVIORS_MAP.includes(behavior)) {
-          error(`Built-in behavior "${behavior}" is not supported in tt environment!`, global.currentResource)
+          error(`Built-in behavior "${behavior}" is not supported in tt environment!`, global.currentResource || global.currentModuleId)
           options.behaviors.splice(idx, 1)
         }
       })

package/src/convertor/wxToWeb.js

@@ -14,7 +14,7 @@ import { implemented } from '../core/implement'
 const unsupported = ['moved', 'definitionFilter', 'onShareAppMessage']
 
 function convertErrorDesc (key) {
-  error(`Options.${key} is not supported in runtime conversion from wx to web.`, global.currentResource)
+  error(`Options.${key} is not supported in runtime conversion from wx to web.`, global.currentResource || global.currentModuleId)
 }
 
 function notSupportTip (options) {

package/src/core/transferOptions.js

@@ -13,7 +13,7 @@ export default function transferOptions (options, type, needConvert = true) {
     }
   }
   // 文件编译路径
-  options.mpxFileResource = global.currentResource
+  options.mpxFileResource = global.currentResource || global.currentModuleId
   // 注入全局写入的mixins，原生模式下不进行注入
   if (!options.__nativeRender__) {
     options = mergeInjectedMixins(options, type)

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

@@ -8,10 +8,6 @@ const rawDimensions = {
 }
 let width, height
 
-// TODO 临时适配折叠屏场景适配
-// const isLargeFoldableLike = (__mpx_mode__ === 'android') && (height / width < 1.5) && (width > 600)
-// if (isLargeFoldableLike) width = width / 2
-
 function customDimensions (dimensions) {
   if (typeof Mpx.config.rnConfig?.customDimensions === 'function') {
     dimensions = Mpx.config.rnConfig.customDimensions(dimensions) || dimensions
@@ -236,8 +232,14 @@ export default function styleHelperMixin () {
             flex: 0,
             height: 0,
             width: 0,
-            padding: 0,
-            margin: 0,
+            paddingTop: 0,
+            paddingRight: 0,
+            paddingBottom: 0,
+            paddingLeft: 0,
+            marginTop: 0,
+            marginRight: 0,
+            marginBottom: 0,
+            marginLeft: 0,
             overflow: 'hidden'
           })
         }

package/src/platform/createApp.ios.js

@@ -10,7 +10,7 @@ import { createElement, memo, useRef, useEffect } from 'react'
 import * as ReactNative from 'react-native'
 import { initAppProvides } from './export/inject'
 import { NavigationContainer, createNativeStackNavigator, SafeAreaProvider, GestureHandlerRootView } from './env/navigationHelper'
-import { innerNav } from './env/nav'
+import MpxNav from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/mpx-nav'
 
 const appHooksMap = makeMap(mergeLifecycle(LIFECYCLE).app)
 
@@ -66,8 +66,8 @@ export default function createApp (options) {
               flex: 1
             }
           },
-          createElement(innerNav, {
-            pageConfig: pageConfig,
+          createElement(MpxNav, {
+            pageConfig,
             navigation
           }),
           children
@@ -230,7 +230,7 @@ export default function createApp (options) {
     const { initialRouteName, initialParams } = initialRouteRef.current
     const navScreenOpts = {
       headerShown: false,
-      statusBarTranslucent: true,
+      statusBarTranslucent: Mpx.config.rnConfig.statusBarTranslucent ?? true,
       statusBarBackgroundColor: 'transparent'
     }
 

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

@@ -13,12 +13,12 @@ import MpxKeyboardAvoidingView from '@mpxjs/webpack-plugin/lib/runtime/component
 import {
   IntersectionObserverContext,
   KeyboardAvoidContext,
+  ProviderContext,
   RouteContext
 } from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/context'
 import { PortalHost, useSafeAreaInsets } from '../env/navigationHelper'
-import { useInnerHeaderHeight } from '../env/nav'
+import { useInnerHeaderHeight } from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/mpx-nav'
 
-const ProviderContext = createContext(null)
 function getSystemInfo () {
   const windowDimensions = ReactNative.Dimensions.get('window')
   const screenDimensions = ReactNative.Dimensions.get('screen')
@@ -420,6 +420,11 @@ function usePageStatus (navigation, pageId) {
     set(pageStatusMap, pageId, '')
   }
   useEffect(() => {
+    if (navigation.isFocused && navigation.isFocused()) {
+      Promise.resolve().then(() => {
+        pageStatusMap[pageId] = 'show'
+      })
+    }
     const focusSubscription = navigation.addListener('focus', () => {
       pageStatusMap[pageId] = 'show'
     })
@@ -497,7 +502,6 @@ function getLayoutData (headerHeight) {
 
 export function PageWrapperHOC (WrappedComponent, pageConfig = {}) {
   return function PageWrapperCom ({ navigation, route, ...props }) {
-    const rootRef = useRef(null)
     const keyboardAvoidRef = useRef(null)
     const intersectionObservers = useRef({})
     const currentPageId = useMemo(() => ++pageId, [])
@@ -545,36 +549,36 @@ export function PageWrapperHOC (WrappedComponent, pageConfig = {}) {
     // android存在第一次打开insets都返回为0情况，后续会触发第二次渲染后正确
     navigation.insets = useSafeAreaInsets()
     return withKeyboardAvoidingView(
-      createElement(ReactNative.View,
-        {
-          style: {
-            flex: 1,
-            backgroundColor: currentPageConfig?.backgroundColor || '#fff',
-            // 解决页面内有元素定位relative left为负值的时候，回退的时候还能看到对应元素问题
-            overflow: 'hidden'
-          },
-          ref: rootRef
-        },
-        createElement(RouteContext.Provider,
-          {
-            value: routeContextValRef.current
-          },
-          createElement(IntersectionObserverContext.Provider,
+        createElement(ReactNative.View,
             {
-              value: intersectionObservers.current
+              style: {
+                flex: 1,
+                // 页面容器背景色
+                backgroundColor: currentPageConfig?.backgroundColorContent || '#fff',
+                // 解决页面内有元素定位relative left为负值的时候，回退的时候还能看到对应元素问题
+                overflow: 'hidden'
+              }
             },
-            createElement(PortalHost,
-              null,
-              createElement(WrappedComponent, {
-                ...props,
-                navigation,
-                route,
-                id: currentPageId
-              })
+            createElement(RouteContext.Provider,
+                {
+                  value: routeContextValRef.current
+                },
+                createElement(IntersectionObserverContext.Provider,
+                    {
+                      value: intersectionObservers.current
+                    },
+                    createElement(PortalHost,
+                        null,
+                        createElement(WrappedComponent, {
+                          ...props,
+                          navigation,
+                          route,
+                          id: currentPageId
+                        })
+                    )
+                )
             )
-          )
         )
-      )
     )
   }
 }

package/src/platform/env/nav.js

@@ -1,137 +0,0 @@
-import { createElement, useState, useMemo, memo } from 'react'
-import { useSafeAreaInsets } from 'react-native-safe-area-context'
-import { StatusBar, processColor, TouchableWithoutFeedback, Image, View, StyleSheet, Text } from 'react-native'
-import Mpx from '../../index'
-
-function convertToHex (color) {
-  try {
-    const intColor = processColor(color)
-    if (intColor === null || intColor === undefined) {
-      return null
-    }
-    // 将32位整数颜色值转换为RGBA
-    const r = (intColor >> 16) & 255
-    const g = (intColor >> 8) & 255
-    const b = intColor & 255
-    // 转换为十六进制
-    const hexR = r.toString(16).padStart(2, '0')
-    const hexG = g.toString(16).padStart(2, '0')
-    const hexB = b.toString(16).padStart(2, '0')
-    return `#${hexR}${hexG}${hexB}`
-  } catch (error) {
-    return null
-  }
-}
-
-const titleHeight = 44
-export function useInnerHeaderHeight (pageconfig) {
-  if (pageconfig.navigationStyle === 'custom') {
-    return 0
-  } else {
-    const safeAreaTop = useSafeAreaInsets()?.top || 0
-    const headerHeight = safeAreaTop + titleHeight
-    return headerHeight
-  }
-}
-
-const styles = StyleSheet.create({
-  header: {
-    elevation: 3
-  },
-  headerContent: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    justifyContent: 'center'
-  },
-  backButton: {
-    position: 'absolute',
-    height: '100%',
-    width: 40,
-    left: 0,
-    top: 0,
-    alignItems: 'center',
-    justifyContent: 'center'
-  },
-  backButtonImage: {
-    width: 22,
-    height: 22
-  },
-  title: {
-    fontSize: 17,
-    fontWeight: 600,
-    width: '60%',
-    textAlign: 'center'
-  }
-})
-const NavColor = {
-  White: '#ffffff',
-  Black: '#000000'
-}
-// navigationBarTextStyle只支持黑白'white'/'black
-const validBarTextStyle = (textStyle) => {
-  const textStyleColor = convertToHex(textStyle)
-  if (textStyle && [NavColor.White, NavColor.Black].includes(textStyleColor)) {
-    return textStyleColor
-  } else {
-    return NavColor.White
-  }
-}
-export const innerNav = memo(({ pageConfig, navigation }) => {
-  const [innerPageConfig, setPageConfig] = useState(pageConfig || {})
-  navigation.setPageConfig = (config) => {
-    const newConfig = Object.assign({}, innerPageConfig, config)
-    setPageConfig(newConfig)
-  }
-  const isCustom = innerPageConfig.navigationStyle === 'custom'
-  const navigationBarTextStyle = useMemo(() => validBarTextStyle(innerPageConfig.navigationBarTextStyle), [innerPageConfig.navigationBarTextStyle])
-  // 状态栏的颜色
-  const statusBarElement = createElement(StatusBar, {
-    translucent: true,
-    backgroundColor: 'transparent',
-    barStyle: (navigationBarTextStyle === NavColor.White) ? 'light-content' : 'dark-content' // 'default'/'light-content'/'dark-content'
-  })
-
-  if (isCustom) return statusBarElement
-  const safeAreaTop = useSafeAreaInsets()?.top || 0
-  // 假设是栈导航，获取栈的长度
-  const stackLength = navigation.getState()?.routes?.length
-  const onStackTopBack = Mpx.config?.rnConfig?.onStackTopBack
-  const isHandleStackTopBack = typeof onStackTopBack === 'function'
-
-  // 回退按钮与图标
-  const backElement = stackLength > 1 || isHandleStackTopBack
-    ? createElement(TouchableWithoutFeedback, {
-      onPress: () => {
-        if (stackLength <= 1 && isHandleStackTopBack) {
-          onStackTopBack()
-          return
-        }
-        navigation.goBack()
-      }
-    }, createElement(View, {
-      style: [styles.backButton]
-    }, createElement(Image, {
-      source: { uri: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAABICAYAAACqT5alAAAA2UlEQVR4nO3bMQrCUBRE0Yla6AYEN2nnBrTL+izcitW3MRDkEUWSvPzJvfCqgMwhZbAppWhNbbIHzB1g9wATERFRVyvpkj1irlpJ5X326D7WHh1hbdFD2CLpLmmftm7kfsEe09aNHFiBrT+wAlt/YAW2/sAKbP2BFdj6Ayuwy+ufz6XPL893krZ//O6iu2n4LT8kndLWTRTo4EC7BDo40C6BDg60S6CDA+0S6OBAuwQ6uNWiD2nrJmoIfU7cNWkR2hbb1UfbY7uuWhGWiIg+a/iHuHmA3QPs3gu4JW9Gan+OJAAAAABJRU5ErkJggg==' },
-      // 回退按钮的颜色与设置的title文案颜色一致
-      style: [styles.backButtonImage, { tintColor: navigationBarTextStyle }]
-    })
-    ))
-    : null
-
-  return createElement(View, {
-    style: [styles.header, {
-      paddingTop: safeAreaTop,
-      backgroundColor: innerPageConfig.navigationBarBackgroundColor || '#000000'
-    }]
-  },
-    statusBarElement,
-    createElement(View, {
-      style: styles.headerContent,
-      height: titleHeight
-    }, backElement,
-      createElement(Text, {
-        style: [styles.title, { color: navigationBarTextStyle }],
-        numberOfLines: 1
-      }, innerPageConfig.navigationBarTitleText?.trim() || ''))
-  )
-})