@tarojs/runtime-rn 3.7.0-beta.1 → 3.7.0-beta.4

package/dist/compute.js

@@ -1,4 +1,5 @@
 import { Dimensions } from 'react-native';
+import DeviceInfo from 'react-native-device-info';
 import { isFunction } from './utils';
 const globalAny = global;
 const defaultWidth = 750;
@@ -7,10 +8,13 @@ const defaultRadio = {
     750: 1,
     828: 1.81 / 2
 };
+let uiWidthPx = 375;
+if (DeviceInfo.isTablet()) {
+    uiWidthPx = 750;
+}
 export function pxTransform(size) {
     var _a;
     const deviceWidthDp = Dimensions.get('window').width;
-    const uiWidthPx = 375;
     const config = ((_a = globalAny.__taroAppConfig) === null || _a === void 0 ? void 0 : _a.appConfig) || {};
     const deviceRatio = config.deviceRatio || defaultRadio;
     const designWidth = (((input = 0) => isFunction(config.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;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"}
+{"version":3,"file":"compute.js","sourceRoot":"","sources":["../src/compute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,UAAU,MAAM,0BAA0B,CAAA;AAEjD,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,IAAI,SAAS,GAAG,GAAG,CAAA;AAEnB,IAAI,UAAU,CAAC,QAAQ,EAAE,EAAE;IACzB,SAAS,GAAG,GAAG,CAAA;CAChB;AAED,MAAM,UAAU,WAAW,CAAE,IAAY;;IACvC,MAAM,aAAa,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAA;IACpD,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/dist/scale2dp.js

@@ -1,12 +1,11 @@
-import { Dimensions, Platform } from 'react-native';
+import { Dimensions } from 'react-native';
+import DeviceInfo from 'react-native-device-info';
 // 一般app 只有竖屏模式，所以可以只获取一次 width
 const deviceWidthDp = Dimensions.get('window').width;
 const deviceHeightDp = Dimensions.get('window').height;
 let uiWidthPx = 375;
-if (Platform.OS === 'ios') {
-    if (Platform.isPad) {
-        uiWidthPx = 750;
-    }
+if (DeviceInfo.isTablet()) {
+    uiWidthPx = 750;
 }
 export function scalePx2dp(uiElementPx) {
     return uiElementPx * deviceWidthDp / uiWidthPx;

package/dist/scale2dp.js.map

@@ -1 +1 @@
-{"version":3,"file":"scale2dp.js","sourceRoot":"","sources":["../src/scale2dp.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAEnD,+BAA+B;AAC/B,MAAM,aAAa,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAA;AACpD,MAAM,cAAc,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAA;AACtD,IAAI,SAAS,GAAG,GAAG,CAAA;AAEnB,IAAI,QAAQ,CAAC,EAAE,KAAK,KAAK,EAAE;IACzB,IAAI,QAAQ,CAAC,KAAK,EAAE;QAClB,SAAS,GAAG,GAAG,CAAA;KAChB;CACF;AAED,MAAM,UAAU,UAAU,CAAE,WAAW;IACrC,OAAO,WAAW,GAAG,aAAa,GAAG,SAAS,CAAA;AAChD,CAAC;AACD,MAAM,UAAU,UAAU,CAAE,WAAW,EAAE,IAAI;IAC3C,IAAI,IAAI,KAAK,IAAI;QAAE,OAAO,WAAW,GAAG,cAAc,GAAG,GAAG,CAAA;IAC5D,IAAI,IAAI,KAAK,MAAM;QAAE,OAAO,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,cAAc,CAAC,GAAG,GAAG,CAAA;IACvF,IAAI,IAAI,KAAK,MAAM;QAAE,OAAO,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,cAAc,CAAC,GAAG,GAAG,CAAA;IACvF,OAAO,WAAW,GAAG,aAAa,GAAG,GAAG,CAAA;AAC1C,CAAC"}
+{"version":3,"file":"scale2dp.js","sourceRoot":"","sources":["../src/scale2dp.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,UAAU,MAAM,0BAA0B,CAAA;AAEjD,+BAA+B;AAC/B,MAAM,aAAa,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAA;AACpD,MAAM,cAAc,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAA;AACtD,IAAI,SAAS,GAAG,GAAG,CAAA;AAEnB,IAAI,UAAU,CAAC,QAAQ,EAAE,EAAE;IACzB,SAAS,GAAG,GAAG,CAAA;CAChB;AAED,MAAM,UAAU,UAAU,CAAE,WAAW;IACrC,OAAO,WAAW,GAAG,aAAa,GAAG,SAAS,CAAA;AAChD,CAAC;AACD,MAAM,UAAU,UAAU,CAAE,WAAW,EAAE,IAAI;IAC3C,IAAI,IAAI,KAAK,IAAI;QAAE,OAAO,WAAW,GAAG,cAAc,GAAG,GAAG,CAAA;IAC5D,IAAI,IAAI,KAAK,MAAM;QAAE,OAAO,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,cAAc,CAAC,GAAG,GAAG,CAAA;IACvF,IAAI,IAAI,KAAK,MAAM;QAAE,OAAO,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,cAAc,CAAC,GAAG,GAAG,CAAA;IACvF,OAAO,WAAW,GAAG,aAAa,GAAG,GAAG,CAAA;AAC1C,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/runtime-rn",
-  "version": "3.7.0-beta.1",
+  "version": "3.7.0-beta.4",
   "description": "taro-runtime-rn",
   "main": "dist/index.js",
   "types": "./src/index.ts",
@@ -20,11 +20,17 @@
     "url": "https://github.com/NervJS/taro/issues"
   },
   "dependencies": {
+    "react-native-device-info": "~10.3.0",
     "react-native-root-siblings": "^4.1.1",
-    "@tarojs/components-rn": "3.7.0-beta.1",
-    "@tarojs/router-rn": "3.7.0-beta.1"
+    "@tarojs/components-rn": "3.7.0-beta.4",
+    "@tarojs/router-rn": "3.7.0-beta.4"
+  },
+  "devDependencies": {
+    "@types/react-native": "^0.69.8"
+  },
+  "peerDependencies": {
+    "react-native-device-info": "~10.3.0"
   },
-  "devDependencies": {},
   "scripts": {
     "build": "tsc",
     "dev": "tsc -w",

package/src/compute.ts

@@ -1,4 +1,5 @@
 import { Dimensions } from 'react-native'
+import DeviceInfo from 'react-native-device-info'
 
 import { isFunction } from './utils'
 
@@ -12,9 +13,14 @@ const defaultRadio = {
   828: 1.81 / 2
 }
 
+let uiWidthPx = 375
+
+if (DeviceInfo.isTablet()) {
+  uiWidthPx = 750
+}
+
 export function pxTransform (size: number): number {
   const deviceWidthDp = Dimensions.get('window').width
-  const uiWidthPx = 375
   const config: AppConfig = globalAny.__taroAppConfig?.appConfig || {}
   const deviceRatio = config.deviceRatio || defaultRadio
   const designWidth = (((input = 0) => isFunction(config.designWidth)

package/src/scale2dp.tsx

@@ -1,14 +1,13 @@
-import { Dimensions, Platform } from 'react-native'
+import { Dimensions } from 'react-native'
+import DeviceInfo from 'react-native-device-info'
 
 // 一般app 只有竖屏模式，所以可以只获取一次 width
 const deviceWidthDp = Dimensions.get('window').width
 const deviceHeightDp = Dimensions.get('window').height
 let uiWidthPx = 375
 
-if (Platform.OS === 'ios') {
-  if (Platform.isPad) {
-    uiWidthPx = 750
-  }
+if (DeviceInfo.isTablet()) {
+  uiWidthPx = 750
 }
 
 export function scalePx2dp (uiElementPx) {