@mpxjs/core 2.10.10 → 2.10.11-beta.2

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.10",
+  "version": "2.10.11-beta.2",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -109,5 +109,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "cee4b9ba7c2b455ebb864cbad7d2a8374b2d7308"
+  "gitHead": "2d37697869b9bdda3efab92dda8c910b68fd05c0"
 }

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

@@ -2,7 +2,7 @@ import { isObject, isArray, dash2hump, cached, isEmptyObject } from '@mpxjs/util
 import { Dimensions, StyleSheet } from 'react-native'
 import Mpx from '../../index'
 
-let dimensionsInfo = {
+const rawDimensions = {
   screen: Dimensions.get('screen'),
   window: Dimensions.get('window')
 }
@@ -12,16 +12,15 @@ let width, height
 // const isLargeFoldableLike = (__mpx_mode__ === 'android') && (height / width < 1.5) && (width > 600)
 // if (isLargeFoldableLike) width = width / 2
 
-function customDimensionsInfo (dimensions) {
-  if (typeof Mpx.config.rnConfig?.customDimensionsInfo === 'function') {
-    dimensionsInfo = Mpx.config.rnConfig.customDimensionsInfo(dimensions) || dimensions
-    width = dimensionsInfo.screen.width
-    height = dimensionsInfo.screen.height
+function customDimensions (dimensions) {
+  if (typeof Mpx.config.rnConfig?.customDimensions === 'function') {
+    dimensions = Mpx.config.rnConfig.customDimensions(dimensions) || dimensions
   }
+  width = dimensions.screen.width
+  height = dimensions.screen.height
 }
 
-customDimensionsInfo(dimensionsInfo)
-Dimensions.addEventListener('change', customDimensionsInfo)
+Dimensions.addEventListener('change', customDimensions)
 
 function rpx (value) {
   // rn 单位 dp = 1(css)px =  1 物理像素 * pixelRatio(像素比)
@@ -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/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.