npm - @tarojs/runtime-rn - Versions diffs - 3.5.3-aplha.0 → 3.5.4 - Mend

@tarojs/runtime-rn 3.5.3-aplha.0 → 3.5.4

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.

Files changed (10) hide show

package/dist/app.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import { Provider as TCNProvider } from '@tarojs/components-rn';
 import { createRouter } from '@tarojs/router-rn';
-import React, { Component, createRef } from 'react';
+import * as React from 'react';
 import { RootSiblingParent } from 'react-native-root-siblings';
 import { Current } from './current';
 import { isFunction } from './utils';
@@ -8,8 +8,9 @@ export function isClassComponent(component) {
     var _a;
     return isFunction(component.render) ||
         !!((_a = component.prototype) === null || _a === void 0 ? void 0 : _a.isReactComponent) ||
-        component.prototype instanceof Component;
+        component.prototype instanceof React.Component;
 }
+// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 export function createReactNativeApp(component, config) {
     const routerConfig = {
         tabBar: config.appConfig.tabBar,
@@ -19,10 +20,10 @@ export function createReactNativeApp(component, config) {
         linkPrefix: config.appConfig.linkPrefix || [],
         rnConfig: config.appConfig.rn || {}
     };
-    const ref = createRef();
+    const ref = React.createRef();
     const isReactComponent = isClassComponent(component);
     const NewAppComponent = (AppCompoent) => {
-        return class Entry extends Component {
+        return class Entry extends React.Component {
             render() {
                 let props = null;
                 if (isReactComponent) {

package/dist/app.js.map CHANGED Viewed

	@@ -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,~~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"}
1	+ {"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.tsx"],"names":[],"mappings":"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"}

package/dist/page.js CHANGED Viewed

@@ -1,7 +1,6 @@
 import { getCurrentRoute, PageProvider } from '@tarojs/router-rn';
-import { camelCase } from 'lodash';
-import { Component, createContext, createElement, createRef, forwardRef } from 'react';
-import { AppState, Dimensions, RefreshControl, ScrollView, View } from 'react-native';
+import * as React from 'react';
+import { AppState, Dimensions, RefreshControl, ScrollView } from 'react-native';
 import { isClassComponent } from './app';
 import { Current } from './current';
 import { eventCenter } from './emmiter';
@@ -85,29 +84,21 @@ Dimensions.addEventListener('change', ({ window }) => {
 });
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 export function createPageConfig(Page, pageConfig) {
-    var _a;
-    const h = createElement;
+    const h = React.createElement;
     const pagePath = pageConfig.pagePath.replace(/^\//, '') || '';
-    const pageId = (_a = camelCase(pagePath)) !== null && _a !== void 0 ? _a : `taro_page_${compId}`;
     const isReactComponent = isClassComponent(Page);
     if (PageContext === EMPTY_OBJ) {
-        PageContext = createContext('');
+        PageContext = React.createContext('');
     }
     let ScreenPage = Page;
     if (!isReactComponent) {
-        const PageComponent = (props, ref) => {
-            const newProps = Object.assign({}, props);
-            newProps.ref = ref;
-            return h(View, Object.assign({ style: {
-                    minHeight: '100%'
-                } }, newProps), h(Page, Object.assign({}, props), null));
-        };
-        ScreenPage = forwardRef(PageComponent);
+        // eslint-disable-next-line react/display-name
+        ScreenPage = React.forwardRef((props, ref) => {
+            return h(Page, Object.assign({ forwardRef: ref }, props), null);
+        });
     }
-    // 注入的页面实例
-    injectPageInstance(Page, pageId);
     const WrapScreen = (Screen) => {
-        return class PageScreen extends Component {
+        return class PageScreen extends React.Component {
             constructor(props) {
                 var _a, _b, _c, _d;
                 super(props);
@@ -138,9 +129,10 @@ export function createPageConfig(Page, pageConfig) {
                     textColor: refreshStyle.textColor || (backgroundTextStyle === 'dark' ? '#000000' : '#ffffff'),
                     backgroundColor: refreshStyle.backgroundColor || '#ffffff'
                 };
-                this.screenRef = createRef();
-                this.pageScrollView = createRef();
+                this.screenRef = React.createRef();
+                this.pageScrollView = React.createRef();
                 this.setPageInstance();
+                this.pageId = `taro_page_${compId()}`;
             }
             componentDidMount() {
                 var _a;
@@ -175,6 +167,7 @@ export function createPageConfig(Page, pageConfig) {
             }
             setPageInstance() {
                 const pageRef = this.screenRef;
+                const pageId = this.pageId;
                 const { params = {}, key = '' } = this.props.route;
                 // 和小程序的page实例保持一致
                 const inst = {
@@ -309,8 +302,6 @@ export function createPageConfig(Page, pageConfig) {
             }
             onPageScroll(e) {
                 var _a, _b, _c, _d;
-                if (!(e === null || e === void 0 ? void 0 : e.nativeEvent))
-                    return;
                 const { contentOffset } = e.nativeEvent;
                 const scrollTop = contentOffset.y;
                 if (scrollTop < 0)
@@ -328,8 +319,6 @@ export function createPageConfig(Page, pageConfig) {
             // 监听的onMomentumScrollEnd
             onReachBottom(e) {
                 var _a, _b, _c, _d;
-                if (!(e === null || e === void 0 ? void 0 : e.nativeEvent))
-                    return;
                 const { onReachBottomDistance = 50 } = pageConfig;
                 const { layoutMeasurement, contentSize, contentOffset } = e.nativeEvent;
                 if ((contentOffset === null || contentOffset === void 0 ? void 0 : contentOffset.y) + (layoutMeasurement === null || layoutMeasurement === void 0 ? void 0 : layoutMeasurement.height) + onReachBottomDistance >= contentSize.height) {
@@ -376,7 +365,7 @@ export function createPageConfig(Page, pageConfig) {
             }
             handleHooksEvent(method, options = {}) {
                 if (!isReactComponent) {
-                    return safeExecute(pageId, method, options);
+                    return safeExecute(this.pageId, method, options);
                 }
             }
             getTabItem(itemPath) {
@@ -406,7 +395,7 @@ export function createPageConfig(Page, pageConfig) {
             }
             refreshPullDown() {
                 const { refreshing, textColor, backgroundColor } = this.state;
-                return createElement(RefreshControl, {
+                return React.createElement(RefreshControl, {
                     refreshing: refreshing,
                     enabled: true,
                     titleColor: textColor,
@@ -416,7 +405,7 @@ export function createPageConfig(Page, pageConfig) {
                 }, null);
             }
             createPage() {
-                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 }))));
+                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 }))));
             }
             createScrollPage() {
                 var _a, _b, _c, _d, _e;

package/dist/page.js.map CHANGED Viewed

	@@ -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 CHANGED Viewed

@@ -1,6 +1,31 @@
 export const incrementId = () => {
-    let id = 0;
-    return () => (id++).toString();
+    const chatCodes = [];
+    // A-Z
+    for (let i = 65; i <= 90; i++) {
+        chatCodes.push(i);
+    }
+    // a-z
+    for (let i = 97; i <= 122; i++) {
+        chatCodes.push(i);
+    }
+    const chatCodesLen = chatCodes.length - 1;
+    const list = [0, 0];
+    return () => {
+        const target = list.map(item => chatCodes[item]);
+        const res = String.fromCharCode(...target);
+        let tailIdx = list.length - 1;
+        list[tailIdx]++;
+        while (list[tailIdx] > chatCodesLen) {
+            list[tailIdx] = 0;
+            tailIdx = tailIdx - 1;
+            if (tailIdx < 0) {
+                list.push(0);
+                break;
+            }
+            list[tailIdx]++;
+        }
+        return res;
+    };
 };
 export function isFunction(o) {
     return typeof o === 'function';

package/dist/utils.js.map CHANGED Viewed

	@@ -1 +1 @@
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"}
1	+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,EAAE;IAC9B,MAAM,SAAS,GAAa,EAAE,CAAA;IAC9B,MAAM;IACN,KAAK,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE;QAC7B,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;KAClB;IACD,MAAM;IACN,KAAK,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,EAAE,EAAE;QAC9B,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;KAClB;IACD,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,CAAA;IACzC,MAAM,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IACnB,OAAO,GAAG,EAAE;QACV,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAA;QAChD,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC,CAAA;QAE1C,IAAI,OAAO,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAA;QAE7B,IAAI,CAAC,OAAO,CAAC,EAAE,CAAA;QAEf,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,YAAY,EAAE;YACnC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;YACjB,OAAO,GAAG,OAAO,GAAG,CAAC,CAAA;YACrB,IAAI,OAAO,GAAG,CAAC,EAAE;gBACf,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;gBACZ,MAAK;aACN;YACD,IAAI,CAAC,OAAO,CAAC,EAAE,CAAA;SAChB;QAED,OAAO,GAAG,CAAA;IACZ,CAAC,CAAA;AACH,CAAC,CAAA;AAGD,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 Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/runtime-rn",
-  "version": "3.5.3-aplha.0",
+  "version": "3.5.4",
   "description": "taro-runtime-rn",
   "main": "dist/index.js",
   "types": "./src/index.ts",
@@ -20,12 +20,13 @@
     "url": "https://github.com/NervJS/taro/issues"
   },
   "dependencies": {
-    "@tarojs/components-rn": "3.5.3-aplha.0",
-    "@tarojs/router-rn": "3.5.3-aplha.0",
+    "@tarojs/components-rn": "3.5.4",
+    "@tarojs/router-rn": "3.5.4",
     "react-native-root-siblings": "^4.1.1"
   },
   "devDependencies": {
-    "@types/react-native": "^0.69.5"
+    "@types/react": "^17.0.0",
+    "@types/react-native": "^0.67.7"
   },
   "scripts": {
     "build": "tsc",

package/src/app.tsx CHANGED Viewed

@@ -1,6 +1,6 @@
 import { Provider as TCNProvider } from '@tarojs/components-rn'
 import { createRouter, RouterConfig } from '@tarojs/router-rn'
-import React, { Component, ComponentClass,ComponentProps, createRef } from 'react'
+import * as React from 'react'
 import { RootSiblingParent } from 'react-native-root-siblings'
 import { Current } from './current'
@@ -11,10 +11,10 @@ import { isFunction } from './utils'
 export function isClassComponent (component): boolean {
   return isFunction(component.render) ||
     !!component.prototype?.isReactComponent ||
-    component.prototype instanceof Component
+    component.prototype instanceof React.Component
 }
-export function createReactNativeApp (component: ComponentClass, config: RNAppConfig) {
+// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+export function createReactNativeApp (component: React.ComponentClass, config: RNAppConfig) {
   const routerConfig: RouterConfig = {
     tabBar: config.appConfig.tabBar,
     pages: config.pageList,
@@ -24,14 +24,14 @@ export function createReactNativeApp (component: ComponentClass, config: RNAppCo
     rnConfig: config.appConfig.rn || {}
   }
-  const ref = createRef<AppInstance>()
+  const ref = React.createRef<AppInstance>()
   const isReactComponent = isClassComponent(component)
   const NewAppComponent = (AppCompoent) => {
-    return class Entry extends Component <any, any> {
+    return class Entry extends React.Component <any, any> {
       render () {
-        let props: ComponentProps<any> | null = null
+        let props: React.Props<any> | null = null
         if (isReactComponent) {
           props = { ref }

package/src/page.ts CHANGED Viewed

@@ -1,7 +1,6 @@
 import { getCurrentRoute, PageProvider } from '@tarojs/router-rn'
-import { camelCase } from 'lodash'
-import { Component, ComponentProps,Context, createContext, createElement, createRef, forwardRef, RefObject } from 'react'
-import { AppState, Dimensions, EmitterSubscription, NativeEventSubscription, RefreshControl, ScrollView, View } from 'react-native'
+import * as React from 'react'
+import { AppState, Dimensions, EmitterSubscription, NativeEventSubscription, RefreshControl, ScrollView } from 'react-native'
 import { isClassComponent } from './app'
 import { Current } from './current'
@@ -60,7 +59,7 @@ function safeExecute (path: string, lifecycle: keyof Instance, ...args: unknown[
 const globalAny: any = global
 // eslint-disable-next-line import/no-mutable-exports
-export let PageContext: Context<string> = EMPTY_OBJ
+export let PageContext: React.Context<string> = EMPTY_OBJ
 // APP 前后台状态发生变化时调用对应的生命周期函数
 let appState = AppState.currentState
@@ -99,41 +98,31 @@ Dimensions.addEventListener('change', ({ window }) => {
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 export function createPageConfig (Page: any, pageConfig: PageConfig): any {
-  const h = createElement
+  const h = React.createElement
   const pagePath = pageConfig.pagePath.replace(/^\//, '') || ''
-  const pageId = camelCase(pagePath) ?? `taro_page_${compId}`
   const isReactComponent = isClassComponent(Page)
   if (PageContext === EMPTY_OBJ) {
-    PageContext = createContext('')
+    PageContext = React.createContext('')
   }
   let ScreenPage = Page
   if (!isReactComponent) {
-    const PageComponent = (props, ref) => {
-      const newProps: ComponentProps<any> = { ...props }
-      newProps.ref = ref
-      return h(View, {
-        style: {
-          minHeight: '100%'
-        },
-        ...newProps
-      }, h(Page, { ...props }, null))
-    }
-    ScreenPage = forwardRef(PageComponent)
+    // eslint-disable-next-line react/display-name
+    ScreenPage = React.forwardRef((props, ref) => {
+      return h(Page, { forwardRef: ref, ...props }, null)
+    })
   }
-  // 注入的页面实例
-  injectPageInstance(Page, pageId)
   const WrapScreen = (Screen: any) => {
-    return class PageScreen extends Component<any, any> {
-      screenRef: RefObject<any>
-      pageScrollView: RefObject<any>
+    return class PageScreen extends React.Component<any, any> {
+      // eslint-disable-next-line react/sort-comp
+      screenRef: React.RefObject<any>
+      pageScrollView: React.RefObject<any>
       unSubscribleBlur: any
       unSubscribleFocus: any
       unSubscribleTabPress: any
+      pageId: string
       appStateSubscription: NativeEventSubscription | undefined
       dimensionsSubscription: EmitterSubscription | undefined
       isPageReady: boolean
@@ -148,18 +137,17 @@ export function createPageConfig (Page: any, pageConfig: PageConfig): any {
           textColor: refreshStyle.textColor || (backgroundTextStyle === 'dark' ? '#000000' : '#ffffff'),
           backgroundColor: refreshStyle.backgroundColor || '#ffffff'
         }
-        this.screenRef = createRef<Instance>()
-        this.pageScrollView = createRef()
+        this.screenRef = React.createRef<Instance>()
+        this.pageScrollView = React.createRef()
         this.setPageInstance()
+        this.pageId = `taro_page_${compId()}`
       }
       componentDidMount () {
         const { navigation, route } = this.props
         // 实现 useLoad hook
         // handleHooksEvent 在组件构造函数中调用不生效，只能在挂载之后进行调用
         this.handleHooksEvent('onLoad', route?.params ?? {})
         if (navigation) {
           this.unSubscribleTabPress = navigation.addListener('tabPress', () => this.onTabItemTap())
           this.unSubscribleFocus = navigation.addListener('focus', () => this.onFocusChange())
@@ -189,6 +177,7 @@ export function createPageConfig (Page: any, pageConfig: PageConfig): any {
       setPageInstance () {
         const pageRef = this.screenRef
+        const pageId = this.pageId
         const { params = {}, key = '' } = this.props.route
         // 和小程序的page实例保持一致
         const inst: PageInstance = {
@@ -331,7 +320,6 @@ export function createPageConfig (Page: any, pageConfig: PageConfig): any {
       }
       onPageScroll (e) {
-        if(!e?.nativeEvent) return
         const { contentOffset } = e.nativeEvent
         const scrollTop = contentOffset.y
         if (scrollTop < 0) return
@@ -345,7 +333,6 @@ export function createPageConfig (Page: any, pageConfig: PageConfig): any {
       // 监听的onMomentumScrollEnd
       onReachBottom (e) {
-        if(!e?.nativeEvent) return
         const { onReachBottomDistance = 50 } = pageConfig
         const { layoutMeasurement, contentSize, contentOffset } = e.nativeEvent
         if (contentOffset?.y + layoutMeasurement?.height + onReachBottomDistance >= contentSize.height) {
@@ -383,7 +370,7 @@ export function createPageConfig (Page: any, pageConfig: PageConfig): any {
       handleHooksEvent (method: HooksMethods, options: Record<string, unknown> = {}) {
         if (!isReactComponent) {
-          return safeExecute(pageId, method, options)
+          return safeExecute(this.pageId, method, options)
         }
       }
@@ -413,7 +400,7 @@ export function createPageConfig (Page: any, pageConfig: PageConfig): any {
       refreshPullDown () {
         const { refreshing, textColor, backgroundColor } = this.state
-        return createElement(RefreshControl, {
+        return React.createElement(RefreshControl, {
           refreshing: refreshing,
           enabled: true,
           titleColor: textColor,
@@ -425,7 +412,7 @@ export function createPageConfig (Page: any, pageConfig: PageConfig): any {
       createPage () {
         return h(PageProvider, { currentPath: pagePath, pageConfig, ...this.props },
-          h(PageContext.Provider, { value: pageId }, h(Screen,
+          h(PageContext.Provider, { value: this.pageId }, h(Screen,
             { ...this.props, ref: this.screenRef })
           )
         )

package/src/utils.ts CHANGED Viewed

@@ -1,9 +1,41 @@
+// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 import { CallbackResult, OptionsFunc } from './types/index'
 export const incrementId = () => {
-  let id = 0
-  return () => (id++).toString()
+  const chatCodes: number[] = []
+  // A-Z
+  for (let i = 65; i <= 90; i++) {
+    chatCodes.push(i)
+  }
+  // a-z
+  for (let i = 97; i <= 122; i++) {
+    chatCodes.push(i)
+  }
+  const chatCodesLen = chatCodes.length - 1
+  const list = [0, 0]
+  return () => {
+    const target = list.map(item => chatCodes[item])
+    const res = String.fromCharCode(...target)
+    let tailIdx = list.length - 1
+    list[tailIdx]++
+    while (list[tailIdx] > chatCodesLen) {
+      list[tailIdx] = 0
+      tailIdx = tailIdx - 1
+      if (tailIdx < 0) {
+        list.push(0)
+        break
+      }
+      list[tailIdx]++
+    }
+    return res
+  }
 }
 export function isFunction (o: unknown): boolean {
   return typeof o === 'function'
 }