@mpxjs/core 2.10.11 → 2.10.13

package/@types/index.d.ts

@@ -8,7 +8,7 @@
 /// <reference path="./node.d.ts" />
 
 import type { GetComputedType } from '@mpxjs/store'
-
+import type { ScaledSize } from 'react-native'
 export * from '@mpxjs/store'
 
 // utils
@@ -122,6 +122,10 @@ interface Context {
   createIntersectionObserver: WechatMiniprogram.Component.InstanceMethods<Record<string, any>>['createIntersectionObserver'],
   getPageId: WechatMiniprogram.Component.InstanceMethods<Record<string, any>>['getPageId']
 }
+type ExtendedComponentOptions = {
+  disconnectOnUnmounted?: boolean
+  shallowReactivePattern?: RegExp
+} & 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> {
   data?: D
@@ -130,6 +134,7 @@ interface ComponentOpt<D extends Data, P extends Properties, C, M extends Method
   methods?: M
   mixins?: Mi
   watch?: WatchField
+  options?: ExtendedComponentOptions
   setup?: (props: GetPropsType<P & UnboxMixinsField<Mi, 'properties'>>, context: Context) => S
 
   pageShow?: () => void
@@ -140,8 +145,8 @@ interface ComponentOpt<D extends Data, P extends Properties, C, M extends Method
 
   provide?: Record<string, any> | (() => Record<string, any>)
   inject?:
-    | { [key: string]: string | Symbol | { from?: string | Symbol; default?: any } }
-    | Array<string>
+  | { [key: string]: string | Symbol | { from?: string | Symbol; default?: any } }
+  | Array<string>
 
   [index: string]: any
 }
@@ -260,15 +265,122 @@ export interface WebviewConfig {
   apiImplementations?: object
 }
 
+/**
+ * 输出为 ReactNative 时使用的特殊配置，用于与容器进行功能桥接
+ */
 export interface RnConfig {
-  onStateChange?: (state: any) => void
-  parseAppProps?: (props: any) => ({ initialRouteName?: string, initialParams?: any } | undefined | null | void)
   /**
-   * 外层可能会异常设置此配置，因此加载监听函数内部
+   * 当导航状态发生变化时触发，例如页面跳转、返回等。
+   *
+   * @param state 当前的导航状态对象
+   */
+  onStateChange?: (state: Record<string, any>) => void;
+
+  /**
+   * 用于获取初始路由配置的函数。
+   *
+   * @param props ReactNative根组件接收到的参数
+   * @returns
+   * - `object`：包含 `initialRouteName` 和 `initialParams`
+   * - 或不返回，表示不设置初始路由
+   */
+  parseAppProps?: (
+    props: Record<string, any>
+  ) => { initialRouteName?: string; initialParams?: any } | void;
+
+  /**
+   * 页面栈长度为 1（即根页面）且用户尝试退出 App 时触发。
+   *
+   * @returns
+   * - `true`：允许退出应用
+   * - `false`：阻止退出应用
+   */
+  onAppBack?: () => boolean;
+
+  /**
+   * 是否禁用框架内部的 AppStateChange 监听。
+   */
+  disableAppStateListener?: boolean;
+
+  /**
+   * 控制首页回退按钮是否展示，并监听点击事件。
+   *
+   * 如果绑定该函数，则首页显示返回按钮，点击后调用该函数作为回调。
+   * 如需返回，请在函数内部手动调用 `back()`。
+   */
+  onStackTopBack?: () => void;
+
+  /**
+   * 容器实现的 open-type 能力集合。
+   */
+  openTypeHandler?: {
+    /**
+     * 在使用 button 组件并指定 `open-type="share"` 时触发分享。
+     *
+     * @param shareInfo 分享参数对象
+     * @param shareInfo.title 分享标题
+     * @param shareInfo.path 分享路径
+     * @param shareInfo.imageUrl 可选的分享图片
+     * @returns `void`
+     */
+    onShareAppMessage?: (shareInfo: {
+      title: string;
+      path: string;
+      imageUrl?: string;
+    }) => void;
+  };
+
+  /**
+   * 在使用 picker-view-column 时，触发短震动反馈。
+   */
+  pickerVibrate?: () => void;
+
+  /**
+   * 自定义屏幕尺寸信息，用于 mpx style 渲染等依赖尺寸的功能。
+   *
+   * @param dimensions 包含 window 和 screen 的尺寸信息
+   * @returns 返回修改后的尺寸对象，或 void 表示不修改
+   */
+  customDimensions?: <T extends { window: ScaledSize; screen: ScaledSize }>(
+    dimensions: T
+  ) => T | void;
+
+  /**
+   * 异步分包加载配置。
+   */
+  asyncChunk?: {
+    /**
+     * 加载超时时长配置，单位为毫秒。
+     */
+    timeout: number;
+
+    /**
+     * 异步分包页面加载超时或失败时，自定义兜底页面文件路径。
+     */
+    fallback: string;
+
+    /**
+     * 异步分包页面加载时，自定义 loading 页面文件路径。
+     */
+    loading: string;
+  };
+
+  /**
+   * 加载并执行异步分包的方法。
+   *
+   * @param params 分包下载参数
+   * @param params.url 资源地址
+   * @param params.package 分包名
+   * @returns Promise，表示加载完成
+   */
+  loadChunkAsync?: (params: { url: string; package: string }) => Promise<any>;
+
+  /**
+   * 下载多个异步分包的方法（不执行）。
+   *
+   * @param packages 分包名数组
    */
-  disableAppStateListener?: boolean
-  /** 进入页面是否控制回退按钮的展示以及监听回退按钮的点击 */
-  onStackTopBack?: () => void
+  downloadChunkAsync?: (packages: Array<string>) => void;
 }
 
 interface MpxConfig {
@@ -598,11 +710,11 @@ export function set<T extends object> (target: T, key: string | number, value: a
 export function del<T extends object> (target: T, key: keyof T): void
 
 // provide & inject
-export declare function provide<T>(key: InjectionKey<T> | string | number, value: T): void;
-export declare function inject<T>(key: InjectionKey<T> | string): T | undefined;
-export declare function inject<T>(key: InjectionKey<T> | string, defaultValue: T, treatDefaultAsFactory?: false): T;
-export declare function inject<T>(key: InjectionKey<T> | string, defaultValue: T | (() => T), treatDefaultAsFactory: true): T;
-export declare interface InjectionKey<T> extends Symbol {}
+export declare function provide<T> (key: InjectionKey<T> | string | number, value: T): void
+export declare function inject<T> (key: InjectionKey<T> | string): T | undefined
+export declare function inject<T> (key: InjectionKey<T> | string, defaultValue: T, treatDefaultAsFactory?: false): T
+export declare function inject<T> (key: InjectionKey<T> | string, defaultValue: T | (() => T), treatDefaultAsFactory: true): T
+export declare interface InjectionKey<T> extends Symbol { }
 
 // nextTick
 export function nextTick (fn: () => any): void

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.10.11",
+  "version": "2.10.13",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -19,7 +19,7 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@mpxjs/utils": "^2.10.8",
+    "@mpxjs/utils": "^2.10.13",
     "lodash": "^4.1.1",
     "miniprogram-api-typings": "^3.10.0"
   },
@@ -109,5 +109,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "4ea2a49ba7989edb3b0e292ed41e357d476d70fc"
+  "gitHead": "1b4a2d4765341ef6c6b74e501f72a0f856f247f9"
 }

package/src/core/proxy.js

@@ -101,6 +101,7 @@ function preProcessRenderData (renderData) {
   })
   return processedRenderData
 }
+
 export default class MpxProxy {
   constructor (options, target, reCreated) {
     this.target = target
@@ -111,6 +112,7 @@ export default class MpxProxy {
     this.name = options.name || ''
     this.options = options
     this.shallowReactivePattern = this.options.options?.shallowReactivePattern
+    this.disconnectOnUnmounted = !!this.options.options?.disconnectOnUnmounted
     // beforeCreate -> created -> mounted -> unmounted
     this.state = BEFORECREATE
     this.ignoreProxyMap = makeMap(Mpx.config.ignoreProxyWhiteList)
@@ -257,6 +259,21 @@ export default class MpxProxy {
         observer.disconnect()
       })
     }
+    // 临时规避Reanimated worklet闭包捕获导致的内存泄漏问题
+    if (isReact && this.disconnectOnUnmounted) {
+      Object.keys(this.localKeysMap).forEach((key) => {
+        delete this.target[key]
+      })
+      Object.keys(this.props).forEach((key) => {
+        delete this.target[key]
+      })
+      this.scope = null
+      this.data = null
+      this.props = null
+      this.renderData = null
+      this.miniRenderData = null
+      this.forceUpdateData = null
+    }
   }
 
   isUnmounted () {
@@ -266,10 +283,10 @@ export default class MpxProxy {
   createProxyConflictHandler (owner) {
     return (key) => {
       if (this.ignoreProxyMap[key]) {
-        !this.reCreated && error(`The ${owner} key [${key}] is a reserved keyword of miniprogram, please check and rename it.`, this.options.mpxFileResource)
+        error(`The ${owner} key [${key}] is a reserved keyword of miniprogram, please check and rename it.`, this.options.mpxFileResource)
         return false
       }
-      !this.reCreated && error(`The ${owner} key [${key}] exist in the current instance already, please check and rename it.`, this.options.mpxFileResource)
+      if (!this.reCreated) error(`The ${owner} key [${key}] exist in the current instance already, please check and rename it.`, this.options.mpxFileResource)
     }
   }
 
@@ -467,10 +484,16 @@ export default class MpxProxy {
     return res
   }
 
-  collectLocalKeys (data, filter = () => true) {
-    Object.keys(data).filter((key) => filter(key, data[key])).forEach((key) => {
-      this.localKeysMap[key] = true
-    })
+  collectLocalKeys (data, filter) {
+    if (isFunction(filter)) {
+      Object.keys(data).filter((key) => filter(key, data[key])).forEach((key) => {
+        this.localKeysMap[key] = true
+      })
+    } else {
+      Object.keys(data).forEach((key) => {
+        this.localKeysMap[key] = true
+      })
+    }
   }
 
   callHook (hookName, params, hooksOnly) {

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

@@ -20,7 +20,6 @@ function customDimensions (dimensions) {
   height = dimensions.screen.height
 }
 
-customDimensions(rawDimensions)
 Dimensions.addEventListener('change', customDimensions)
 
 function rpx (value) {
@@ -44,6 +43,7 @@ const unit = {
 const empty = {}
 
 function formatValue (value) {
+  if (width === undefined) customDimensions(rawDimensions)
   const matched = unitRegExp.exec(value)
   if (matched) {
     if (!matched[2] || matched[2] === 'px') {

package/src/platform/env/index.ios.js

@@ -18,7 +18,6 @@ export function init (Mpx) {
     Mpx.i18n = createI18n(global.i18n)
   }
   initGlobalErrorHandling()
-  initGlobalLazyLoadHandling()
 }
 
 function initGlobalErrorHandling () {
@@ -65,13 +64,3 @@ function initGlobalErrorHandling () {
     require('promise/setimmediate/rejection-tracking').enable(rejectionTrackingOptions)
   }
 }
-
-function initGlobalLazyLoadHandling () {
-  global.onLazyLoadError = function (error) {
-    if (global.__mpxAppCbs?.lazyLoad?.length) {
-      global.__mpxAppCbs.lazyLoad.forEach((cb) => {
-        cb(error)
-      })
-    }
-  }
-}

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 } from '@mpxjs/utils'
+import { hasOwn, isFunction, noop, isObject, isArray, getByPath, collectDataset, hump2dash, dash2hump, callWithErrorHandling, wrapMethodsWithErrorHandling, error, 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'
@@ -301,6 +301,7 @@ function createInstance ({ propsRef, type, rawOptions, currentInject, validProps
     instance.route = props.route.name
     global.__mpxPagesMap = global.__mpxPagesMap || {}
     global.__mpxPagesMap[props.route.key] = [instance, props.navigation]
+    setFocusedNavigation(props.navigation)
     // App onLaunch 在 Page created 之前执行
     if (!global.__mpxAppHotLaunched && global.__mpxAppOnLaunch) {
       global.__mpxAppOnLaunch(props.navigation)