@tarojs/runtime-rn 3.4.0 → 3.4.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/app.js +5 -1
- package/dist/app.js.map +1 -1
- package/dist/compute.js +2 -2
- package/dist/compute.js.map +1 -1
- package/package.json +6 -5
- package/src/{app.ts → app.tsx} +12 -7
- package/src/compute.ts +2 -2
package/dist/app.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
2
|
import { createRouter } from '@tarojs/router-rn';
|
|
3
3
|
import { Provider as TCNProvider } from '@tarojs/components-rn';
|
|
4
|
+
import { RootSiblingParent } from 'react-native-root-siblings';
|
|
4
5
|
import { Current } from './current';
|
|
5
6
|
import { isFunction } from './utils';
|
|
6
7
|
export function isClassComponent(component) {
|
|
@@ -29,9 +30,12 @@ export function createReactNativeApp(component, config) {
|
|
|
29
30
|
props = { ref };
|
|
30
31
|
}
|
|
31
32
|
const { initPath = '', initParams = {} } = this.props;
|
|
33
|
+
const appProps = Object.assign(Object.assign({}, props), this.props);
|
|
32
34
|
routerConfig.initPath = initPath;
|
|
33
35
|
routerConfig.initParams = initParams;
|
|
34
|
-
return React.createElement(
|
|
36
|
+
return React.createElement(RootSiblingParent, null,
|
|
37
|
+
React.createElement(TCNProvider, Object.assign({}, this.props),
|
|
38
|
+
React.createElement(AppCompoent, Object.assign({}, appProps), createRouter(routerConfig))));
|
|
35
39
|
}
|
|
36
40
|
};
|
|
37
41
|
};
|
package/dist/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAE,YAAY,EAAgB,MAAM,mBAAmB,CAAA;AAC9D,OAAO,EAAE,QAAQ,IAAI,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAGnC,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAEpC,MAAM,UAAU,gBAAgB,CAAE,SAAS;;IACzC,OAAO,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC;QACjC,CAAC,CAAC,CAAA,MAAA,SAAS,CAAC,SAAS,0CAAE,gBAAgB,CAAA;QACvC,SAAS,CAAC,SAAS,YAAY,KAAK,CAAC,SAAS,CAAA;AAClD,CAAC;AACD,6EAA6E;AAC7E,MAAM,UAAU,oBAAoB,CAAE,SAA+B,EAAE,MAAmB;IACxF,MAAM,YAAY,GAAiB;QACjC,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC,MAAM;QAC/B,KAAK,EAAE,MAAM,CAAC,QAAQ;QACtB,aAAa,EAAE,MAAM,CAAC,SAAS,CAAC,aAAa;QAC7C,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC,MAAM;QAC/B,UAAU,EAAE,MAAM,CAAC,SAAS,CAAC,UAAU,IAAI,EAAE;QAC7C,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE;KACpC,CAAA;IAED,MAAM,GAAG,GAAG,KAAK,CAAC,SAAS,EAAe,CAAA;IAE1C,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAA;IAEpD,MAAM,eAAe,GAAG,CAAC,WAAW,EAAE,EAAE;QACtC,OAAO,MAAM,KAAM,SAAQ,KAAK,CAAC,SAAoB;YACnD,MAAM;gBACJ,IAAI,KAAK,GAA4B,IAAI,CAAA;gBAEzC,IAAI,gBAAgB,EAAE;oBACpB,KAAK,GAAG,EAAE,GAAG,EAAE,CAAA;iBAChB;gBACD,MAAM,EAAE,QAAQ,GAAG,EAAE,EAAE,UAAU,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;gBACrD,MAAM,QAAQ,mCACT,KAAK,GACL,IAAI,CAAC,KAAK,CACd,CAAA;gBACD,YAAY,CAAC,QAAQ,GAAG,QAAQ,CAAA;gBAChC,YAAY,CAAC,UAAU,GAAG,UAAU,CAAA;gBACpC,OAAO,oBAAC,iBAAiB;oBACvB,oBAAC,WAAW,oBAAK,IAAI,CAAC,KAAK;wBACzB,oBAAC,WAAW,oBAAK,QAAQ,GACtB,YAAY,CAAC,YAAY,CAAC,CACf,CACF,CACI,CAAA;YACtB,CAAC;SACF,CAAA;IACH,CAAC,CAAA;IAED,MAAM,GAAG,GAAG,eAAe,CAAC,SAAS,CAAC,CAAA;IAEtC,cAAc;IACd,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE;QAChC,MAAM,EAAE;YACN,QAAQ,EAAE,IAAI;YACd,UAAU,EAAE,IAAI;YAChB,YAAY,EAAE,IAAI;YAClB,KAAK,EAAE,MAAM,CAAC,SAAS;SACxB;QACD,QAAQ,EAAE;YACR,UAAU,EAAE,IAAI;YAChB,QAAQ,EAAE,IAAI;YACd,KAAK,CAAE,OAAO;gBACZ,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAA;gBACvB,IAAI,GAAG,IAAI,IAAI,IAAI,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;oBAC3C,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;iBACtC;YACH,CAAC;SACF;QACD,MAAM,EAAE;YACN,UAAU,EAAE,IAAI;YAChB,QAAQ,EAAE,IAAI;YACd,KAAK,CAAE,OAAO;gBACZ,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAA;gBACvB,IAAI,GAAG,IAAI,IAAI,IAAI,UAAU,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE;oBACnD,GAAG,CAAC,gBAAgB,IAAI,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAA;iBACtD;YACH,CAAC;SACF;QACD,MAAM,EAAE;YACN,UAAU,EAAE,IAAI;YAChB,QAAQ,EAAE,IAAI;YACd,KAAK,CAAE,OAAgB;gBACrB,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAA;gBACvB,IAAI,GAAG,IAAI,IAAI,IAAI,UAAU,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE;oBACnD,GAAG,CAAC,gBAAgB,IAAI,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAA;iBACtD;YACH,CAAC;SACF;KACF,CAAC,CAAA;IAEF,OAAO,CAAC,GAAG,GAAG,OAAO,CAAA;IACrB,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,MAAM,UAAU,MAAM;IACpB,OAAO,OAAO,CAAC,GAAG,CAAA;AACpB,CAAC"}
|
package/dist/compute.js
CHANGED
|
@@ -16,7 +16,7 @@ export function pxTransform(size) {
|
|
|
16
16
|
throw new Error(`deviceRatio 配置中不存在 ${designWidth} 的设置！`);
|
|
17
17
|
}
|
|
18
18
|
const formatSize = ~~size;
|
|
19
|
-
const rateSize = formatSize
|
|
20
|
-
return rateSize * deviceWidthDp / uiWidthPx;
|
|
19
|
+
const rateSize = formatSize * deviceRatio[designWidth];
|
|
20
|
+
return rateSize * deviceWidthDp / (uiWidthPx * 2);
|
|
21
21
|
}
|
|
22
22
|
//# sourceMappingURL=compute.js.map
|
package/dist/compute.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compute.js","sourceRoot":"","sources":["../src/compute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAGzC,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,
|
|
1
|
+
{"version":3,"file":"compute.js","sourceRoot":"","sources":["../src/compute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAGzC,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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tarojs/runtime-rn",
|
|
3
|
-
"version": "3.4.
|
|
3
|
+
"version": "3.4.3",
|
|
4
4
|
"description": "taro-runtime-rn",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "./src/index.ts",
|
|
@@ -28,14 +28,15 @@
|
|
|
28
28
|
"url": "https://github.com/NervJS/taro/issues"
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@tarojs/components-rn": "3.4.
|
|
32
|
-
"@tarojs/router-rn": "3.4.
|
|
31
|
+
"@tarojs/components-rn": "3.4.3",
|
|
32
|
+
"@tarojs/router-rn": "3.4.3",
|
|
33
|
+
"react-native-root-siblings": "^4.1.1"
|
|
33
34
|
},
|
|
34
35
|
"resolutions": {
|
|
35
36
|
"@types/react": "17.0.11"
|
|
36
37
|
},
|
|
37
38
|
"devDependencies": {
|
|
38
|
-
"@types/react-native": "0.
|
|
39
|
+
"@types/react-native": "0.67.0"
|
|
39
40
|
},
|
|
40
|
-
"gitHead": "
|
|
41
|
+
"gitHead": "de55da7a845e9c09ba65528e74c7310e5082c2d5"
|
|
41
42
|
}
|
package/src/{app.ts → app.tsx}
RENAMED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import * as React from 'react'
|
|
2
2
|
import { createRouter, RouterConfig } from '@tarojs/router-rn'
|
|
3
3
|
import { Provider as TCNProvider } from '@tarojs/components-rn'
|
|
4
|
+
import { RootSiblingParent } from 'react-native-root-siblings'
|
|
4
5
|
import { Current } from './current'
|
|
5
6
|
import { RNAppConfig } from './types/index'
|
|
6
7
|
import { AppInstance } from './instance'
|
|
@@ -35,15 +36,19 @@ export function createReactNativeApp (component: React.ComponentClass, config: R
|
|
|
35
36
|
props = { ref }
|
|
36
37
|
}
|
|
37
38
|
const { initPath = '', initParams = {} } = this.props
|
|
39
|
+
const appProps = {
|
|
40
|
+
...props,
|
|
41
|
+
...this.props
|
|
42
|
+
}
|
|
38
43
|
routerConfig.initPath = initPath
|
|
39
44
|
routerConfig.initParams = initParams
|
|
40
|
-
return
|
|
41
|
-
|
|
42
|
-
...
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
45
|
+
return <RootSiblingParent>
|
|
46
|
+
<TCNProvider {...this.props}>
|
|
47
|
+
<AppCompoent {...appProps}>
|
|
48
|
+
{createRouter(routerConfig)}
|
|
49
|
+
</AppCompoent>
|
|
50
|
+
</TCNProvider>
|
|
51
|
+
</RootSiblingParent>
|
|
47
52
|
}
|
|
48
53
|
}
|
|
49
54
|
}
|
package/src/compute.ts
CHANGED
|
@@ -18,6 +18,6 @@ export function pxTransform (size: number): number {
|
|
|
18
18
|
throw new Error(`deviceRatio 配置中不存在 ${designWidth} 的设置！`)
|
|
19
19
|
}
|
|
20
20
|
const formatSize = ~~size
|
|
21
|
-
const rateSize = formatSize
|
|
22
|
-
return rateSize * deviceWidthDp / uiWidthPx
|
|
21
|
+
const rateSize = formatSize * deviceRatio[designWidth]
|
|
22
|
+
return rateSize * deviceWidthDp / (uiWidthPx * 2)
|
|
23
23
|
}
|