@tarojs/runtime-rn 3.6.0-beta.2 → 3.6.0-beta.3

package/dist/compute.js

@@ -1,4 +1,5 @@
 import { Dimensions } from 'react-native';
+import { isFunction } from './utils';
 const globalAny = global;
 const defaultWidth = 750;
 const defaultRadio = {
@@ -11,7 +12,10 @@ export function pxTransform(size) {
     const deviceWidthDp = Dimensions.get('window').width;
     const uiWidthPx = 375;
     const config = ((_a = globalAny.__taroAppConfig) === null || _a === void 0 ? void 0 : _a.appConfig) || {};
-    const { designWidth = defaultWidth, deviceRatio = defaultRadio } = config;
+    const deviceRatio = config.deviceRatio || defaultRadio;
+    const designWidth = (((input = 0) => isFunction(config.designWidth)
+        ? config.designWidth(input)
+        : config.designWidth || defaultWidth))(size);
     if (!(designWidth in deviceRatio)) {
         throw new Error(`deviceRatio 配置中不存在 ${designWidth} 的设置！`);
     }

package/dist/compute.js.map

@@ -1 +1 @@
-{"version":3,"file":"compute.js","sourceRoot":"","sources":["../src/compute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAIzC,MAAM,SAAS,GAAQ,MAAM,CAAA;AAC7B,MAAM,YAAY,GAAG,GAAG,CAAA;AACxB,MAAM,YAAY,GAAG;IACnB,GAAG,EAAE,IAAI,GAAG,CAAC;IACb,GAAG,EAAE,CAAC;IACN,GAAG,EAAE,IAAI,GAAG,CAAC;CACd,CAAA;AAED,MAAM,UAAU,WAAW,CAAE,IAAY;;IACvC,MAAM,aAAa,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAA;IACpD,MAAM,SAAS,GAAG,GAAG,CAAA;IACrB,MAAM,MAAM,GAAc,CAAA,MAAA,SAAS,CAAC,eAAe,0CAAE,SAAS,KAAI,EAAE,CAAA;IACpE,MAAM,EAAE,WAAW,GAAG,YAAY,EAAE,WAAW,GAAG,YAAY,EAAE,GAAG,MAAM,CAAA;IACzE,IAAI,CAAC,CAAC,WAAW,IAAI,WAAW,CAAC,EAAE;QACjC,MAAM,IAAI,KAAK,CAAC,sBAAsB,WAAW,OAAO,CAAC,CAAA;KAC1D;IACD,MAAM,UAAU,GAAG,CAAC,CAAC,IAAI,CAAA;IACzB,MAAM,QAAQ,GAAG,UAAU,GAAG,WAAW,CAAC,WAAW,CAAC,CAAA;IACtD,OAAO,QAAQ,GAAG,aAAa,GAAG,CAAC,SAAS,GAAG,CAAC,CAAC,CAAA;AACnD,CAAC"}
+{"version":3,"file":"compute.js","sourceRoot":"","sources":["../src/compute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEzC,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAIpC,MAAM,SAAS,GAAQ,MAAM,CAAA;AAC7B,MAAM,YAAY,GAAG,GAAG,CAAA;AACxB,MAAM,YAAY,GAAG;IACnB,GAAG,EAAE,IAAI,GAAG,CAAC;IACb,GAAG,EAAE,CAAC;IACN,GAAG,EAAE,IAAI,GAAG,CAAC;CACd,CAAA;AAED,MAAM,UAAU,WAAW,CAAE,IAAY;;IACvC,MAAM,aAAa,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAA;IACpD,MAAM,SAAS,GAAG,GAAG,CAAA;IACrB,MAAM,MAAM,GAAc,CAAA,MAAA,SAAS,CAAC,eAAe,0CAAE,SAAS,KAAI,EAAE,CAAA;IACpE,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,IAAI,YAAY,CAAA;IACtD,MAAM,WAAW,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC;QACjE,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC;QAC3B,CAAC,CAAC,MAAM,CAAC,WAAW,IAAI,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;IAC9C,IAAI,CAAC,CAAC,WAAW,IAAI,WAAW,CAAC,EAAE;QACjC,MAAM,IAAI,KAAK,CAAC,sBAAsB,WAAW,OAAO,CAAC,CAAA;KAC1D;IACD,MAAM,UAAU,GAAG,CAAC,CAAC,IAAI,CAAA;IACzB,MAAM,QAAQ,GAAG,UAAU,GAAG,WAAW,CAAC,WAAW,CAAC,CAAA;IACtD,OAAO,QAAQ,GAAG,aAAa,GAAG,CAAC,SAAS,GAAG,CAAC,CAAC,CAAA;AACnD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/runtime-rn",
-  "version": "3.6.0-beta.2",
+  "version": "3.6.0-beta.3",
   "description": "taro-runtime-rn",
   "main": "dist/index.js",
   "types": "./src/index.ts",
@@ -21,8 +21,8 @@
   },
   "dependencies": {
     "react-native-root-siblings": "^4.1.1",
-    "@tarojs/components-rn": "3.6.0-beta.2",
-    "@tarojs/router-rn": "3.6.0-beta.2"
+    "@tarojs/components-rn": "3.6.0-beta.3",
+    "@tarojs/router-rn": "3.6.0-beta.3"
   },
   "devDependencies": {
     "@types/react-native": "^0.69.8"

package/src/compute.ts

@@ -1,6 +1,8 @@
 import { Dimensions } from 'react-native'
 
-import { AppConfig } from './types/index'
+import { isFunction } from './utils'
+
+import type { AppConfig } from './types/index'
 
 const globalAny: any = global
 const defaultWidth = 750
@@ -14,7 +16,10 @@ export function pxTransform (size: number): number {
   const deviceWidthDp = Dimensions.get('window').width
   const uiWidthPx = 375
   const config: AppConfig = globalAny.__taroAppConfig?.appConfig || {}
-  const { designWidth = defaultWidth, deviceRatio = defaultRadio } = config
+  const deviceRatio = config.deviceRatio || defaultRadio
+  const designWidth = (((input = 0) => isFunction(config.designWidth)
+    ? config.designWidth(input)
+    : config.designWidth || defaultWidth))(size)
   if (!(designWidth in deviceRatio)) {
     throw new Error(`deviceRatio 配置中不存在 ${designWidth} 的设置！`)
   }

package/src/types/index.d.ts

@@ -154,16 +154,16 @@ export interface WindowConfig extends CommonConfig {
   allowsBounceVertical?: 'YES' | 'NO'
 }
 export interface AppConfig {
-  pages: string[],
-  window?: WindowConfig,
-  tabBar?: TabBar,
+  pages: string[]
+  window?: WindowConfig
+  tabBar?: TabBar
   subPackages?: SubPackage[]
-  subpackages?: SubPackage[],
-  designWidth: number,
-  deviceRatio: Record<number, number>,
-  linkPrefix: string[],
-  rn?: any,
-  entryPagePath?: string,
+  subpackages?: SubPackage[]
+  designWidth: number | ((size: number) => number)
+  deviceRatio: Record<string, number>
+  linkPrefix: string[]
+  rn?: any
+  entryPagePath?: string
 }
 
 export interface RNAppConfig {

package/src/utils.ts

@@ -35,7 +35,7 @@ export const incrementId = () => {
 }
 
 
-export function isFunction (o: unknown): boolean {
+export function isFunction (o: unknown): o is (...args: any[]) => any {
   return typeof o === 'function'
 }