@mpxjs/core 2.10.15-prelease.1 → 2.10.16-beta.2

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
-  }
-
   /**
    * 加载并执行异步分包的方法。
    *
@@ -399,10 +388,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 +402,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.15-prelease.1",
+  "version": "2.10.16-beta.2",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -19,7 +19,7 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@mpxjs/utils": "^2.10.13",
+    "@mpxjs/utils": "^2.10.16",
     "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"

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,12 +232,18 @@ 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'
           })
         }
-        const isEmpty = isNativeStaticStyle ? result.length > 0 : isEmptyObject(result)
+        const isEmpty = isNativeStaticStyle ? !result.length : isEmptyObject(result)
         return isEmpty ? empty : result
       }
     }

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

@@ -3,7 +3,7 @@ import * as ReactNative from 'react-native'
 import { ReactiveEffect } from '../../observer/effect'
 import { watch } from '../../observer/watch'
 import { del, reactive, set } from '../../observer/reactive'
-import { hasOwn, isFunction, noop, isObject, isArray, getByPath, collectDataset, hump2dash, dash2hump, callWithErrorHandling, wrapMethodsWithErrorHandling, error, setFocusedNavigation } from '@mpxjs/utils'
+import { hasOwn, isFunction, noop, isObject, isArray, getByPath, collectDataset, hump2dash, dash2hump, callWithErrorHandling, wrapMethodsWithErrorHandling, error, warn, setFocusedNavigation } from '@mpxjs/utils'
 import MpxProxy from '../../core/proxy'
 import { BEFOREUPDATE, ONLOAD, UPDATED, ONSHOW, ONHIDE, ONRESIZE, REACTHOOKSEXEC } from '../../core/innerLifecycle'
 import mergeOptions from '../../core/mergeOptions'
@@ -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'
 
-const ProviderContext = createContext(null)
 function getSystemInfo () {
   const windowDimensions = ReactNative.Dimensions.get('window')
   const screenDimensions = ReactNative.Dimensions.get('screen')
@@ -497,7 +497,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 +544,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
+                        })
+                    )
+                )
             )
-          )
         )
-      )
     )
   }
 }
@@ -593,7 +592,7 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
     const instanceRef = useRef(null)
     const propsRef = useRef(null)
     const intersectionCtx = useContext(IntersectionObserverContext)
-    const { pageId } = useContext(RouteContext) || {}
+    const { pageId, navigation } = useContext(RouteContext) || {}
     const parentProvides = useContext(ProviderContext)
     let relation = null
     if (hasDescendantRelation || hasAncestorRelation) {
@@ -652,6 +651,10 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
     usePageEffect(proxy, pageId)
     useEffect(() => {
       proxy.mounted()
+      if (navigation.camera?.multi) {
+        navigation.camera.multi = false
+        warn('<camera>: 一个页面只能插入一个')
+      }
       return () => {
         proxy.unmounted()
         proxy.target.__resetInstance()