@tarojs/runtime-rn 3.5.1 → 3.5.2-aplha.1
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 +4 -5
- package/dist/app.js.map +1 -1
- package/dist/hooks.js +2 -0
- package/dist/hooks.js.map +1 -1
- package/dist/page.js +26 -20
- package/dist/page.js.map +1 -1
- package/dist/utils.js.map +1 -1
- package/package.json +4 -5
- package/src/app.tsx +7 -7
- package/src/hooks.ts +4 -0
- package/src/instance.ts +1 -1
- package/src/page.ts +28 -22
- package/src/types/index.d.ts +1 -1
- package/src/utils.ts +0 -1
package/dist/app.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Provider as TCNProvider } from '@tarojs/components-rn';
|
|
2
2
|
import { createRouter } from '@tarojs/router-rn';
|
|
3
|
-
import
|
|
3
|
+
import React, { Component, createRef } from 'react';
|
|
4
4
|
import { RootSiblingParent } from 'react-native-root-siblings';
|
|
5
5
|
import { Current } from './current';
|
|
6
6
|
import { isFunction } from './utils';
|
|
@@ -8,9 +8,8 @@ export function isClassComponent(component) {
|
|
|
8
8
|
var _a;
|
|
9
9
|
return isFunction(component.render) ||
|
|
10
10
|
!!((_a = component.prototype) === null || _a === void 0 ? void 0 : _a.isReactComponent) ||
|
|
11
|
-
component.prototype instanceof
|
|
11
|
+
component.prototype instanceof Component;
|
|
12
12
|
}
|
|
13
|
-
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
|
|
14
13
|
export function createReactNativeApp(component, config) {
|
|
15
14
|
const routerConfig = {
|
|
16
15
|
tabBar: config.appConfig.tabBar,
|
|
@@ -20,10 +19,10 @@ export function createReactNativeApp(component, config) {
|
|
|
20
19
|
linkPrefix: config.appConfig.linkPrefix || [],
|
|
21
20
|
rnConfig: config.appConfig.rn || {}
|
|
22
21
|
};
|
|
23
|
-
const ref =
|
|
22
|
+
const ref = createRef();
|
|
24
23
|
const isReactComponent = isClassComponent(component);
|
|
25
24
|
const NewAppComponent = (AppCompoent) => {
|
|
26
|
-
return class Entry extends
|
|
25
|
+
return class Entry extends Component {
|
|
27
26
|
render() {
|
|
28
27
|
let props = null;
|
|
29
28
|
if (isReactComponent) {
|
package/dist/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAC/D,OAAO,EAAE,YAAY,EAAgB,MAAM,mBAAmB,CAAA;AAC9D,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAC/D,OAAO,EAAE,YAAY,EAAgB,MAAM,mBAAmB,CAAA;AAC9D,OAAO,KAAK,EAAE,EAAE,SAAS,EAAiC,SAAS,EAAE,MAAM,OAAO,CAAA;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AAE9D,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,SAAS,CAAA;AAC5C,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAE,SAAyB,EAAE,MAAmB;IAClF,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,SAAS,EAAe,CAAA;IAEpC,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAA;IAEpD,MAAM,eAAe,GAAG,CAAC,WAAW,EAAE,EAAE;QACtC,OAAO,MAAM,KAAM,SAAQ,SAAoB;YAC7C,MAAM;gBACJ,IAAI,KAAK,GAA+B,IAAI,CAAA;gBAE5C,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/hooks.js
CHANGED
|
@@ -45,7 +45,9 @@ const taroHooks = (lifecycle) => {
|
|
|
45
45
|
};
|
|
46
46
|
export const useDidShow = taroHooks('componentDidShow');
|
|
47
47
|
export const useDidHide = taroHooks('componentDidHide');
|
|
48
|
+
export const useLoad = taroHooks('onLoad');
|
|
48
49
|
export const useReady = taroHooks('onReady');
|
|
50
|
+
export const useUnload = taroHooks('onUnload');
|
|
49
51
|
export const usePullDownRefresh = taroHooks('onPullDownRefresh');
|
|
50
52
|
export const useReachBottom = taroHooks('onReachBottom');
|
|
51
53
|
export const usePageScroll = taroHooks('onPageScroll');
|
package/dist/hooks.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../src/hooks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;AACzE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAE7C,MAAM,SAAS,GAAG,CAAC,SAA8B,EAAE,EAAE;IACnD,wDAAwD;IACxD,OAAO,CAAC,EAAY,EAAE,EAAE;QACtB,MAAM,EAAE,GAAG,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAA;QAExC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAC9B,IAAI,KAAK,CAAC,OAAO,KAAK,EAAE;YAAE,KAAK,CAAC,OAAO,GAAG,EAAE,CAAA;QAE5C,KAAK,CAAC,eAAe,CAAC,GAAG,EAAE;YACzB,IAAI,IAAI,GAAG,eAAe,CAAC,EAAE,CAAC,CAAA;YAC9B,IAAI,KAAK,GAAG,KAAK,CAAA;YACjB,IAAI,IAAI,IAAI,IAAI,EAAE;gBAChB,KAAK,GAAG,IAAI,CAAA;gBACZ,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;aAC3B;YAED,IAAI,GAAG,IAAK,CAAA;YAEZ,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAS,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAA;YAEzD,IAAI,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE;gBAC9B,IAAI,CAAC,SAAS,CAAS,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,CAAA;aACvD;iBAAM;gBACJ,IAAI,CAAC,SAAS,CAAS,GAAG;oBACzB,GAAG,CAAE,IAAI,CAAC,SAAS,CAAS,IAAI,EAAE,CAAC;oBACnC,QAAQ;iBACT,CAAA;aACF;YAED,IAAI,KAAK,EAAE;gBACT,kBAAkB,CAAC,IAAK,EAAE,EAAE,CAAC,CAAA;aAC9B;YACD,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,GAAG,eAAe,CAAC,EAAE,CAAC,CAAA;gBAChC,MAAM,IAAI,GAAG,IAAK,CAAC,SAAS,CAAC,CAAA;gBAC7B,IAAI,IAAI,KAAK,QAAQ,EAAE;oBACpB,IAAK,CAAC,SAAS,CAAS,GAAG,SAAS,CAAA;iBACtC;qBAAM,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE;oBACvB,IAAK,CAAC,SAAS,CAAS,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAA;iBACnE;YACH,CAAC,CAAA;QACH,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;IACV,CAAC,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,SAAS,CAAC,kBAAkB,CAAC,CAAA;AAEvD,MAAM,CAAC,MAAM,UAAU,GAAG,SAAS,CAAC,kBAAkB,CAAC,CAAA;AAEvD,MAAM,CAAC,MAAM,QAAQ,GAAG,SAAS,CAAC,SAAS,CAAC,CAAA;AAE5C,MAAM,CAAC,MAAM,kBAAkB,GAAG,SAAS,CAAC,mBAAmB,CAAC,CAAA;AAEhE,MAAM,CAAC,MAAM,cAAc,GAAG,SAAS,CAAC,eAAe,CAAC,CAAA;AAExD,MAAM,CAAC,MAAM,aAAa,GAAG,SAAS,CAAC,cAAc,CAAC,CAAA;AAEtD,MAAM,CAAC,MAAM,SAAS,GAAG,SAAS,CAAC,UAAU,CAAC,CAAA;AAE9C,MAAM,CAAC,MAAM,aAAa,GAAG,SAAS,CAAC,cAAc,CAAC,CAAA;AAEtD,6EAA6E;AAC7E,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,OAAO,GAAG,KAAK,EAAE,EAAE;IAC3C,OAAO,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AAC3E,CAAC,CAAA;AAED,6EAA6E;AAC7E,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,EAAE,CAAC,SAAS,CAAA"}
|
|
1
|
+
{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../src/hooks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;AACzE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAE7C,MAAM,SAAS,GAAG,CAAC,SAA8B,EAAE,EAAE;IACnD,wDAAwD;IACxD,OAAO,CAAC,EAAY,EAAE,EAAE;QACtB,MAAM,EAAE,GAAG,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAA;QAExC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAC9B,IAAI,KAAK,CAAC,OAAO,KAAK,EAAE;YAAE,KAAK,CAAC,OAAO,GAAG,EAAE,CAAA;QAE5C,KAAK,CAAC,eAAe,CAAC,GAAG,EAAE;YACzB,IAAI,IAAI,GAAG,eAAe,CAAC,EAAE,CAAC,CAAA;YAC9B,IAAI,KAAK,GAAG,KAAK,CAAA;YACjB,IAAI,IAAI,IAAI,IAAI,EAAE;gBAChB,KAAK,GAAG,IAAI,CAAA;gBACZ,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;aAC3B;YAED,IAAI,GAAG,IAAK,CAAA;YAEZ,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAS,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAA;YAEzD,IAAI,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE;gBAC9B,IAAI,CAAC,SAAS,CAAS,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,CAAA;aACvD;iBAAM;gBACJ,IAAI,CAAC,SAAS,CAAS,GAAG;oBACzB,GAAG,CAAE,IAAI,CAAC,SAAS,CAAS,IAAI,EAAE,CAAC;oBACnC,QAAQ;iBACT,CAAA;aACF;YAED,IAAI,KAAK,EAAE;gBACT,kBAAkB,CAAC,IAAK,EAAE,EAAE,CAAC,CAAA;aAC9B;YACD,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,GAAG,eAAe,CAAC,EAAE,CAAC,CAAA;gBAChC,MAAM,IAAI,GAAG,IAAK,CAAC,SAAS,CAAC,CAAA;gBAC7B,IAAI,IAAI,KAAK,QAAQ,EAAE;oBACpB,IAAK,CAAC,SAAS,CAAS,GAAG,SAAS,CAAA;iBACtC;qBAAM,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE;oBACvB,IAAK,CAAC,SAAS,CAAS,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAA;iBACnE;YACH,CAAC,CAAA;QACH,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;IACV,CAAC,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,SAAS,CAAC,kBAAkB,CAAC,CAAA;AAEvD,MAAM,CAAC,MAAM,UAAU,GAAG,SAAS,CAAC,kBAAkB,CAAC,CAAA;AAEvD,MAAM,CAAC,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAA;AAE1C,MAAM,CAAC,MAAM,QAAQ,GAAG,SAAS,CAAC,SAAS,CAAC,CAAA;AAE5C,MAAM,CAAC,MAAM,SAAS,GAAG,SAAS,CAAC,UAAU,CAAC,CAAA;AAE9C,MAAM,CAAC,MAAM,kBAAkB,GAAG,SAAS,CAAC,mBAAmB,CAAC,CAAA;AAEhE,MAAM,CAAC,MAAM,cAAc,GAAG,SAAS,CAAC,eAAe,CAAC,CAAA;AAExD,MAAM,CAAC,MAAM,aAAa,GAAG,SAAS,CAAC,cAAc,CAAC,CAAA;AAEtD,MAAM,CAAC,MAAM,SAAS,GAAG,SAAS,CAAC,UAAU,CAAC,CAAA;AAE9C,MAAM,CAAC,MAAM,aAAa,GAAG,SAAS,CAAC,cAAc,CAAC,CAAA;AAEtD,6EAA6E;AAC7E,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,OAAO,GAAG,KAAK,EAAE,EAAE;IAC3C,OAAO,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AAC3E,CAAC,CAAA;AAED,6EAA6E;AAC7E,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,EAAE,CAAC,SAAS,CAAA"}
|
package/dist/page.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { getCurrentRoute, PageProvider } from '@tarojs/router-rn';
|
|
2
2
|
import { camelCase } from 'lodash';
|
|
3
|
-
import
|
|
3
|
+
import { Component, createContext, createElement, createRef, forwardRef } from 'react';
|
|
4
4
|
import { AppState, Dimensions, RefreshControl, ScrollView, View } from 'react-native';
|
|
5
5
|
import { isClassComponent } from './app';
|
|
6
6
|
import { Current } from './current';
|
|
@@ -85,31 +85,27 @@ Dimensions.addEventListener('change', ({ window }) => {
|
|
|
85
85
|
});
|
|
86
86
|
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
|
|
87
87
|
export function createPageConfig(Page, pageConfig) {
|
|
88
|
-
|
|
89
|
-
const h = React.createElement;
|
|
88
|
+
const h = createElement;
|
|
90
89
|
const pagePath = pageConfig.pagePath.replace(/^\//, '') || '';
|
|
91
|
-
const pageId = (_a = camelCase(pagePath)) !== null && _a !== void 0 ? _a : `taro_page_${compId}`;
|
|
92
90
|
const isReactComponent = isClassComponent(Page);
|
|
93
91
|
if (PageContext === EMPTY_OBJ) {
|
|
94
|
-
PageContext =
|
|
92
|
+
PageContext = createContext('');
|
|
95
93
|
}
|
|
96
94
|
let ScreenPage = Page;
|
|
97
95
|
if (!isReactComponent) {
|
|
98
|
-
|
|
99
|
-
ScreenPage = React.forwardRef((props, ref) => {
|
|
96
|
+
const PageComponent = (props, ref) => {
|
|
100
97
|
const newProps = Object.assign({}, props);
|
|
101
98
|
newProps.ref = ref;
|
|
102
99
|
return h(View, Object.assign({ style: {
|
|
103
100
|
minHeight: '100%'
|
|
104
101
|
} }, newProps), h(Page, Object.assign({}, props), null));
|
|
105
|
-
}
|
|
102
|
+
};
|
|
103
|
+
ScreenPage = forwardRef(PageComponent);
|
|
106
104
|
}
|
|
107
|
-
// 注入的页面实例
|
|
108
|
-
injectPageInstance(Page, pageId);
|
|
109
105
|
const WrapScreen = (Screen) => {
|
|
110
|
-
return class PageScreen extends
|
|
106
|
+
return class PageScreen extends Component {
|
|
111
107
|
constructor(props) {
|
|
112
|
-
var _a, _b, _c, _d;
|
|
108
|
+
var _a, _b, _c, _d, _e;
|
|
113
109
|
super(props);
|
|
114
110
|
this.pullDownRefresh = (path, refresh) => {
|
|
115
111
|
if (path === pagePath) {
|
|
@@ -130,20 +126,27 @@ export function createPageConfig(Page, pageConfig) {
|
|
|
130
126
|
(_b = (_a = this.pageScrollView) === null || _a === void 0 ? void 0 : _a.current) === null || _b === void 0 ? void 0 : _b.scrollTo({ x: 0, y: scrollTop, animated: true });
|
|
131
127
|
}
|
|
132
128
|
};
|
|
133
|
-
|
|
134
|
-
|
|
129
|
+
this.pageId = `${(_a = camelCase(pagePath)) !== null && _a !== void 0 ? _a : 'taro_page_'}${compId()}`;
|
|
130
|
+
// 注入的页面实例
|
|
131
|
+
injectPageInstance(this, this.pageId);
|
|
132
|
+
const refreshStyle = (_b = globalAny === null || globalAny === void 0 ? void 0 : globalAny.__taroRefreshStyle) !== null && _b !== void 0 ? _b : {};
|
|
133
|
+
const backgroundTextStyle = pageConfig.backgroundTextStyle || ((_e = (_d = (_c = globalAny.__taroAppConfig) === null || _c === void 0 ? void 0 : _c.appConfig) === null || _d === void 0 ? void 0 : _d.window) === null || _e === void 0 ? void 0 : _e.backgroundTextStyle) || 'dark';
|
|
135
134
|
this.state = {
|
|
136
135
|
refreshing: false,
|
|
137
136
|
appState: AppState.currentState,
|
|
138
137
|
textColor: refreshStyle.textColor || (backgroundTextStyle === 'dark' ? '#000000' : '#ffffff'),
|
|
139
138
|
backgroundColor: refreshStyle.backgroundColor || '#ffffff'
|
|
140
139
|
};
|
|
141
|
-
this.screenRef =
|
|
142
|
-
this.pageScrollView =
|
|
140
|
+
this.screenRef = createRef();
|
|
141
|
+
this.pageScrollView = createRef();
|
|
143
142
|
this.setPageInstance();
|
|
144
143
|
}
|
|
145
144
|
componentDidMount() {
|
|
146
|
-
|
|
145
|
+
var _a;
|
|
146
|
+
const { navigation, route } = this.props;
|
|
147
|
+
// 实现 useLoad hook
|
|
148
|
+
// handleHooksEvent 在组件构造函数中调用不生效,只能在挂载之后进行调用
|
|
149
|
+
this.handleHooksEvent('onLoad', (_a = route === null || route === void 0 ? void 0 : route.params) !== null && _a !== void 0 ? _a : {});
|
|
147
150
|
if (navigation) {
|
|
148
151
|
this.unSubscribleTabPress = navigation.addListener('tabPress', () => this.onTabItemTap());
|
|
149
152
|
this.unSubscribleFocus = navigation.addListener('focus', () => this.onFocusChange());
|
|
@@ -166,9 +169,12 @@ export function createPageConfig(Page, pageConfig) {
|
|
|
166
169
|
if (route && route.key) {
|
|
167
170
|
pagesObj.delete(route.key);
|
|
168
171
|
}
|
|
172
|
+
// 实现 useUnload hook
|
|
173
|
+
this.handleHooksEvent('onUnload');
|
|
169
174
|
}
|
|
170
175
|
setPageInstance() {
|
|
171
176
|
const pageRef = this.screenRef;
|
|
177
|
+
const pageId = this.pageId;
|
|
172
178
|
const { params = {}, key = '' } = this.props.route;
|
|
173
179
|
// 和小程序的page实例保持一致
|
|
174
180
|
const inst = {
|
|
@@ -366,7 +372,7 @@ export function createPageConfig(Page, pageConfig) {
|
|
|
366
372
|
}
|
|
367
373
|
handleHooksEvent(method, options = {}) {
|
|
368
374
|
if (!isReactComponent) {
|
|
369
|
-
return safeExecute(pageId, method, options);
|
|
375
|
+
return safeExecute(this.pageId, method, options);
|
|
370
376
|
}
|
|
371
377
|
}
|
|
372
378
|
getTabItem(itemPath) {
|
|
@@ -396,7 +402,7 @@ export function createPageConfig(Page, pageConfig) {
|
|
|
396
402
|
}
|
|
397
403
|
refreshPullDown() {
|
|
398
404
|
const { refreshing, textColor, backgroundColor } = this.state;
|
|
399
|
-
return
|
|
405
|
+
return createElement(RefreshControl, {
|
|
400
406
|
refreshing: refreshing,
|
|
401
407
|
enabled: true,
|
|
402
408
|
titleColor: textColor,
|
|
@@ -406,7 +412,7 @@ export function createPageConfig(Page, pageConfig) {
|
|
|
406
412
|
}, null);
|
|
407
413
|
}
|
|
408
414
|
createPage() {
|
|
409
|
-
return h(PageProvider, Object.assign({ currentPath: pagePath, pageConfig }, this.props), h(PageContext.Provider, { value: pageId }, h(Screen, Object.assign(Object.assign({}, this.props), { ref: this.screenRef }))));
|
|
415
|
+
return h(PageProvider, Object.assign({ currentPath: pagePath, pageConfig }, this.props), h(PageContext.Provider, { value: this.pageId }, h(Screen, Object.assign(Object.assign({}, this.props), { ref: this.screenRef }))));
|
|
410
416
|
}
|
|
411
417
|
createScrollPage() {
|
|
412
418
|
var _a, _b, _c, _d, _e;
|
package/dist/page.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.js","sourceRoot":"","sources":["../src/page.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"page.js","sourceRoot":"","sources":["../src/page.ts"],"names":[],"mappings":"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"}
|
package/dist/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,EAAE;IAC9B,IAAI,EAAE,GAAG,CAAC,CAAA;IACV,OAAO,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAA;AAChC,CAAC,CAAA;AACD,MAAM,UAAU,UAAU,CAAE,CAAU;IACpC,OAAO,OAAO,CAAC,KAAK,UAAU,CAAA;AAChC,CAAC;AAED,MAAM,CAAC,MAAM,SAAS,GAAQ,EAAE,CAAA;AAEhC,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAA;AAEpC,MAAM,UAAU,cAAc,CAAE,OAAgC,EAAE,QAAiC;IACjG,OAAO,UAAU,GAAmB;QAClC,OAAO,IAAI,UAAU,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,CAAA;QAC9C,QAAQ,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,CAAA;QACjD,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;IAC7B,CAAC,CAAA;AACH,CAAC;AAED,MAAM,UAAU,YAAY,CAAE,IAA6B,EAAE,QAAiC;IAC5F,OAAO,UAAU,GAAmB;QAClC,IAAI,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,CAAA;QACrC,QAAQ,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,CAAA;QACjD,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IAC5B,CAAC,CAAA;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tarojs/runtime-rn",
|
|
3
|
-
"version": "3.5.1",
|
|
3
|
+
"version": "3.5.2-aplha.1",
|
|
4
4
|
"description": "taro-runtime-rn",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "./src/index.ts",
|
|
@@ -20,13 +20,12 @@
|
|
|
20
20
|
"url": "https://github.com/NervJS/taro/issues"
|
|
21
21
|
},
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@tarojs/components-rn": "3.5.1",
|
|
24
|
-
"@tarojs/router-rn": "3.5.1",
|
|
23
|
+
"@tarojs/components-rn": "3.5.2-aplha.1",
|
|
24
|
+
"@tarojs/router-rn": "3.5.2-aplha.1",
|
|
25
25
|
"react-native-root-siblings": "^4.1.1"
|
|
26
26
|
},
|
|
27
27
|
"devDependencies": {
|
|
28
|
-
"@types/react": "^
|
|
29
|
-
"@types/react-native": "^0.67.7"
|
|
28
|
+
"@types/react-native": "^0.69.5"
|
|
30
29
|
},
|
|
31
30
|
"scripts": {
|
|
32
31
|
"build": "tsc",
|
package/src/app.tsx
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Provider as TCNProvider } from '@tarojs/components-rn'
|
|
2
2
|
import { createRouter, RouterConfig } from '@tarojs/router-rn'
|
|
3
|
-
import
|
|
3
|
+
import React, { Component, ComponentClass,ComponentProps, createRef } from 'react'
|
|
4
4
|
import { RootSiblingParent } from 'react-native-root-siblings'
|
|
5
5
|
|
|
6
6
|
import { Current } from './current'
|
|
@@ -11,10 +11,10 @@ import { isFunction } from './utils'
|
|
|
11
11
|
export function isClassComponent (component): boolean {
|
|
12
12
|
return isFunction(component.render) ||
|
|
13
13
|
!!component.prototype?.isReactComponent ||
|
|
14
|
-
component.prototype instanceof
|
|
14
|
+
component.prototype instanceof Component
|
|
15
15
|
}
|
|
16
|
-
|
|
17
|
-
export function createReactNativeApp (component:
|
|
16
|
+
|
|
17
|
+
export function createReactNativeApp (component: ComponentClass, config: RNAppConfig) {
|
|
18
18
|
const routerConfig: RouterConfig = {
|
|
19
19
|
tabBar: config.appConfig.tabBar,
|
|
20
20
|
pages: config.pageList,
|
|
@@ -24,14 +24,14 @@ export function createReactNativeApp (component: React.ComponentClass, config: R
|
|
|
24
24
|
rnConfig: config.appConfig.rn || {}
|
|
25
25
|
}
|
|
26
26
|
|
|
27
|
-
const ref =
|
|
27
|
+
const ref = createRef<AppInstance>()
|
|
28
28
|
|
|
29
29
|
const isReactComponent = isClassComponent(component)
|
|
30
30
|
|
|
31
31
|
const NewAppComponent = (AppCompoent) => {
|
|
32
|
-
return class Entry extends
|
|
32
|
+
return class Entry extends Component <any, any> {
|
|
33
33
|
render () {
|
|
34
|
-
let props:
|
|
34
|
+
let props: ComponentProps<any> | null = null
|
|
35
35
|
|
|
36
36
|
if (isReactComponent) {
|
|
37
37
|
props = { ref }
|
package/src/hooks.ts
CHANGED
|
@@ -54,8 +54,12 @@ export const useDidShow = taroHooks('componentDidShow')
|
|
|
54
54
|
|
|
55
55
|
export const useDidHide = taroHooks('componentDidHide')
|
|
56
56
|
|
|
57
|
+
export const useLoad = taroHooks('onLoad')
|
|
58
|
+
|
|
57
59
|
export const useReady = taroHooks('onReady')
|
|
58
60
|
|
|
61
|
+
export const useUnload = taroHooks('onUnload')
|
|
62
|
+
|
|
59
63
|
export const usePullDownRefresh = taroHooks('onPullDownRefresh')
|
|
60
64
|
|
|
61
65
|
export const useReachBottom = taroHooks('onReachBottom')
|
package/src/instance.ts
CHANGED
|
@@ -11,7 +11,7 @@ interface Show {
|
|
|
11
11
|
|
|
12
12
|
export interface PageLifeCycle extends Show {
|
|
13
13
|
onPullDownRefresh?(): void
|
|
14
|
-
onReachBottom?(): void
|
|
14
|
+
onReachBottom?(event: { nativeEvent: any }): void
|
|
15
15
|
onPageScroll?(obj: { scrollTop: number }): void
|
|
16
16
|
onResize?(options: unknown): void
|
|
17
17
|
onTabItemTap?(obj: { index: string, pagePath: string, text: string }): void
|
package/src/page.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { getCurrentRoute, PageProvider } from '@tarojs/router-rn'
|
|
2
2
|
import { camelCase } from 'lodash'
|
|
3
|
-
import
|
|
3
|
+
import { Component, ComponentProps,Context, createContext, createElement, createRef, forwardRef, RefObject } from 'react'
|
|
4
4
|
import { AppState, Dimensions, EmitterSubscription, NativeEventSubscription, RefreshControl, ScrollView, View } from 'react-native'
|
|
5
5
|
|
|
6
6
|
import { isClassComponent } from './app'
|
|
@@ -60,7 +60,7 @@ function safeExecute (path: string, lifecycle: keyof Instance, ...args: unknown[
|
|
|
60
60
|
|
|
61
61
|
const globalAny: any = global
|
|
62
62
|
// eslint-disable-next-line import/no-mutable-exports
|
|
63
|
-
export let PageContext:
|
|
63
|
+
export let PageContext: Context<string> = EMPTY_OBJ
|
|
64
64
|
|
|
65
65
|
// APP 前后台状态发生变化时调用对应的生命周期函数
|
|
66
66
|
let appState = AppState.currentState
|
|
@@ -99,21 +99,18 @@ Dimensions.addEventListener('change', ({ window }) => {
|
|
|
99
99
|
|
|
100
100
|
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
|
|
101
101
|
export function createPageConfig (Page: any, pageConfig: PageConfig): any {
|
|
102
|
-
const h =
|
|
102
|
+
const h = createElement
|
|
103
103
|
const pagePath = pageConfig.pagePath.replace(/^\//, '') || ''
|
|
104
104
|
|
|
105
|
-
const pageId = camelCase(pagePath) ?? `taro_page_${compId}`
|
|
106
|
-
|
|
107
105
|
const isReactComponent = isClassComponent(Page)
|
|
108
106
|
if (PageContext === EMPTY_OBJ) {
|
|
109
|
-
PageContext =
|
|
107
|
+
PageContext = createContext('')
|
|
110
108
|
}
|
|
111
109
|
|
|
112
110
|
let ScreenPage = Page
|
|
113
111
|
if (!isReactComponent) {
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
const newProps: React.Props<any> = { ...props }
|
|
112
|
+
const PageComponent = (props, ref) => {
|
|
113
|
+
const newProps: ComponentProps<any> = { ...props }
|
|
117
114
|
newProps.ref = ref
|
|
118
115
|
return h(View, {
|
|
119
116
|
style: {
|
|
@@ -121,17 +118,16 @@ export function createPageConfig (Page: any, pageConfig: PageConfig): any {
|
|
|
121
118
|
},
|
|
122
119
|
...newProps
|
|
123
120
|
}, h(Page, { ...props }, null))
|
|
124
|
-
}
|
|
121
|
+
}
|
|
122
|
+
ScreenPage = forwardRef(PageComponent)
|
|
125
123
|
}
|
|
126
124
|
|
|
127
|
-
// 注入的页面实例
|
|
128
|
-
injectPageInstance(Page, pageId)
|
|
129
125
|
|
|
130
126
|
const WrapScreen = (Screen: any) => {
|
|
131
|
-
return class PageScreen extends
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
pageScrollView:
|
|
127
|
+
return class PageScreen extends Component<any, any> {
|
|
128
|
+
screenRef: RefObject<any>
|
|
129
|
+
pageId: string
|
|
130
|
+
pageScrollView: RefObject<any>
|
|
135
131
|
unSubscribleBlur: any
|
|
136
132
|
unSubscribleFocus: any
|
|
137
133
|
unSubscribleTabPress: any
|
|
@@ -141,6 +137,9 @@ export function createPageConfig (Page: any, pageConfig: PageConfig): any {
|
|
|
141
137
|
|
|
142
138
|
constructor (props: any) {
|
|
143
139
|
super(props)
|
|
140
|
+
this.pageId = `${camelCase(pagePath) ?? 'taro_page_'}${compId()}`
|
|
141
|
+
// 注入的页面实例
|
|
142
|
+
injectPageInstance(this, this.pageId)
|
|
144
143
|
const refreshStyle = globalAny?.__taroRefreshStyle ?? {}
|
|
145
144
|
const backgroundTextStyle = pageConfig.backgroundTextStyle || globalAny.__taroAppConfig?.appConfig?.window?.backgroundTextStyle || 'dark'
|
|
146
145
|
this.state = {
|
|
@@ -149,13 +148,17 @@ export function createPageConfig (Page: any, pageConfig: PageConfig): any {
|
|
|
149
148
|
textColor: refreshStyle.textColor || (backgroundTextStyle === 'dark' ? '#000000' : '#ffffff'),
|
|
150
149
|
backgroundColor: refreshStyle.backgroundColor || '#ffffff'
|
|
151
150
|
}
|
|
152
|
-
this.screenRef =
|
|
153
|
-
this.pageScrollView =
|
|
151
|
+
this.screenRef = createRef<Instance>()
|
|
152
|
+
this.pageScrollView = createRef()
|
|
154
153
|
this.setPageInstance()
|
|
155
154
|
}
|
|
156
155
|
|
|
157
156
|
componentDidMount () {
|
|
158
|
-
const { navigation } = this.props
|
|
157
|
+
const { navigation, route } = this.props
|
|
158
|
+
|
|
159
|
+
// 实现 useLoad hook
|
|
160
|
+
// handleHooksEvent 在组件构造函数中调用不生效,只能在挂载之后进行调用
|
|
161
|
+
this.handleHooksEvent('onLoad', route?.params ?? {})
|
|
159
162
|
|
|
160
163
|
if (navigation) {
|
|
161
164
|
this.unSubscribleTabPress = navigation.addListener('tabPress', () => this.onTabItemTap())
|
|
@@ -180,10 +183,13 @@ export function createPageConfig (Page: any, pageConfig: PageConfig): any {
|
|
|
180
183
|
if (route && route.key) {
|
|
181
184
|
pagesObj.delete(route.key)
|
|
182
185
|
}
|
|
186
|
+
// 实现 useUnload hook
|
|
187
|
+
this.handleHooksEvent('onUnload')
|
|
183
188
|
}
|
|
184
189
|
|
|
185
190
|
setPageInstance () {
|
|
186
191
|
const pageRef = this.screenRef
|
|
192
|
+
const pageId = this.pageId
|
|
187
193
|
const { params = {}, key = '' } = this.props.route
|
|
188
194
|
// 和小程序的page实例保持一致
|
|
189
195
|
const inst: PageInstance = {
|
|
@@ -376,7 +382,7 @@ export function createPageConfig (Page: any, pageConfig: PageConfig): any {
|
|
|
376
382
|
|
|
377
383
|
handleHooksEvent (method: HooksMethods, options: Record<string, unknown> = {}) {
|
|
378
384
|
if (!isReactComponent) {
|
|
379
|
-
return safeExecute(pageId, method, options)
|
|
385
|
+
return safeExecute(this.pageId, method, options)
|
|
380
386
|
}
|
|
381
387
|
}
|
|
382
388
|
|
|
@@ -406,7 +412,7 @@ export function createPageConfig (Page: any, pageConfig: PageConfig): any {
|
|
|
406
412
|
|
|
407
413
|
refreshPullDown () {
|
|
408
414
|
const { refreshing, textColor, backgroundColor } = this.state
|
|
409
|
-
return
|
|
415
|
+
return createElement(RefreshControl, {
|
|
410
416
|
refreshing: refreshing,
|
|
411
417
|
enabled: true,
|
|
412
418
|
titleColor: textColor,
|
|
@@ -418,7 +424,7 @@ export function createPageConfig (Page: any, pageConfig: PageConfig): any {
|
|
|
418
424
|
|
|
419
425
|
createPage () {
|
|
420
426
|
return h(PageProvider, { currentPath: pagePath, pageConfig, ...this.props },
|
|
421
|
-
h(PageContext.Provider, { value: pageId }, h(Screen,
|
|
427
|
+
h(PageContext.Provider, { value: this.pageId }, h(Screen,
|
|
422
428
|
{ ...this.props, ref: this.screenRef })
|
|
423
429
|
)
|
|
424
430
|
)
|
package/src/types/index.d.ts
CHANGED
|
@@ -171,7 +171,7 @@ export interface RNAppConfig {
|
|
|
171
171
|
pageList: PageItem[]
|
|
172
172
|
}
|
|
173
173
|
|
|
174
|
-
export type HooksMethods = 'componentDidShow' | 'componentDidHide' | 'onReady' | 'onPullDownRefresh' | 'onReachBottom' | 'onPageScroll' | 'onResize' | 'onTabItemTap'
|
|
174
|
+
export type HooksMethods = 'componentDidShow' | 'componentDidHide' | 'onLoad' | 'onUnload' | 'onReady' | 'onPullDownRefresh' | 'onReachBottom' | 'onPageScroll' | 'onResize' | 'onTabItemTap'
|
|
175
175
|
|
|
176
176
|
export interface CallbackResult {
|
|
177
177
|
errMsg: string
|
package/src/utils.ts
CHANGED