@common-stack/client-react 0.6.1-alpha.3 → 1.0.1-alpha.0

package/lib/route/react-navigation/react-navigation-render.test.js

@@ -1,40 +1,26 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const react_1 = __importDefault(require("react"));
+import React from 'react';
 // import { Ionicons } from '@expo/vector-icons';
-const bottom_tabs_1 = require("@react-navigation/bottom-tabs");
-const stack_1 = require("@react-navigation/stack");
-const react_native_1 = require("@testing-library/react-native");
-const native_1 = require("@react-navigation/native");
-const react_navigation_render_1 = __importDefault(require("./react-navigation-render"));
-require("@testing-library/jest-dom");
-const react_native_2 = require("react-native");
+import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
+import { createStackNavigator } from '@react-navigation/stack';
+import { render, screen } from '@testing-library/react-native';
+import { NavigationContainer } from '@react-navigation/native';
+import resolveRootRoute from './react-navigation-render';
+import '@testing-library/jest-dom';
+import { Text, View } from 'react-native';
 function DetailsScreen(props) {
     const item = Object.keys(props).find((item) => item === 'navigation') || "";
-    return (react_1.default.createElement(react_native_2.View, null,
-        react_1.default.createElement(react_native_2.Text, null, item)));
+    return (React.createElement(View, null,
+        React.createElement(Text, null, item)));
 }
 function SampleComponent(props) {
-    return (react_1.default.createElement(react_native_2.View, null,
-        react_1.default.createElement(react_native_2.Text, null, "Showing details for"),
-        react_1.default.createElement(react_native_2.Text, null, "the number you have chosen is")));
+    return (React.createElement(View, null,
+        React.createElement(Text, null, "Showing details for"),
+        React.createElement(Text, null, "the number you have chosen is")));
 }
 describe('react-navigation ', () => {
     const rootRoutes = [
         {
-            container: (0, stack_1.createStackNavigator)(),
+            container: createStackNavigator(),
             name: 'MainStack',
             props: {
                 initialRouteName: 'Guest',
@@ -45,7 +31,7 @@ describe('react-navigation ', () => {
             children: [
                 {
                     name: 'Guest',
-                    container: (0, bottom_tabs_1.createBottomTabNavigator)(),
+                    container: createBottomTabNavigator(),
                     props: {
                         initialRouteName: 'Home',
                         screenOptions: {
@@ -70,7 +56,7 @@ describe('react-navigation ', () => {
                         },
                         {
                             name: 'About',
-                            container: (0, stack_1.createStackNavigator)(),
+                            container: createStackNavigator(),
                             props: {
                                 initialRouteName: 'Hello',
                             },
@@ -114,14 +100,14 @@ describe('react-navigation ', () => {
             ],
         },
     ];
-    const MainStack = (0, react_navigation_render_1.default)(rootRoutes[0], 'MainStack');
+    const MainStack = resolveRootRoute(rootRoutes[0], 'MainStack');
     it('test component', () => {
         expect(MainStack).toMatchSnapshot();
     });
-    it('tests that child screen component has navigation props ', () => __awaiter(void 0, void 0, void 0, function* () {
+    it('tests that child screen component has navigation props ', async () => {
         const sampleRoutes = [
             {
-                container: (0, stack_1.createStackNavigator)(),
+                container: createStackNavigator(),
                 name: 'MainStack',
                 props: {
                     initialRouteName: 'MainStack.Setting',
@@ -145,9 +131,9 @@ describe('react-navigation ', () => {
                 ],
             },
         ];
-        const MainStack = (0, react_navigation_render_1.default)(sampleRoutes[0], 'MainStack');
-        (0, react_native_1.render)(react_1.default.createElement(native_1.NavigationContainer, null, MainStack));
-        expect(yield react_native_1.screen.findByText('navigation')).toBeOnTheScreen();
-    }));
+        const MainStack = resolveRootRoute(sampleRoutes[0], 'MainStack');
+        render(React.createElement(NavigationContainer, null, MainStack));
+        expect(await screen.findByText('navigation')).toBeOnTheScreen();
+    });
 });
 //# sourceMappingURL=react-navigation-render.test.js.map

package/lib/route/react-navigation/react-navigation-render.test.js.map

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

package/lib/route/react-navigation/root-navigation.js

@@ -1,12 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.navigate = exports.navigationRef = void 0;
-const native_1 = require("@react-navigation/native");
-exports.navigationRef = (0, native_1.createNavigationContainerRef)();
-function navigate(name, params) {
-    if (exports.navigationRef.isReady()) {
-        exports.navigationRef.navigate(name, params);
+import { createNavigationContainerRef } from '@react-navigation/native';
+export const navigationRef = createNavigationContainerRef();
+export function navigate(name, params) {
+    if (navigationRef.isReady()) {
+        navigationRef.navigate(name, params);
     }
 }
-exports.navigate = navigate;
 //# sourceMappingURL=root-navigation.js.map

package/lib/route/react-navigation/root-navigation.js.map

@@ -1 +1 @@
-{"version":3,"file":"root-navigation.js","sourceRoot":"","sources":["../../../src/route/react-navigation/root-navigation.tsx"],"names":[],"mappings":";;;AAAA,qDAAwE;AAE3D,QAAA,aAAa,GAAG,IAAA,qCAA4B,GAAE,CAAA;AAE3D,SAAgB,QAAQ,CAAC,IAAY,EAAE,MAAa;IAClD,IAAI,qBAAa,CAAC,OAAO,EAAE,EAAE;QAC3B,qBAAa,CAAC,QAAQ,CAAC,IAAa,EAAE,MAAM,CAAC,CAAC;KAC/C;AACH,CAAC;AAJD,4BAIC"}
+{"version":3,"file":"root-navigation.js","sourceRoot":"","sources":["../../../src/route/react-navigation/root-navigation.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AAExE,MAAM,CAAC,MAAM,aAAa,GAAG,4BAA4B,EAAE,CAAA;AAE3D,MAAM,UAAU,QAAQ,CAAC,IAAY,EAAE,MAAa;IAClD,IAAI,aAAa,CAAC,OAAO,EAAE,EAAE;QAC3B,aAAa,CAAC,QAAQ,CAAC,IAAa,EAAE,MAAM,CAAC,CAAC;KAC/C;AACH,CAAC"}

package/lib/route/react-navigation/routes.js

@@ -1,3 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};
 //# sourceMappingURL=routes.js.map

package/lib/route/react-navigation/types.d.ts

@@ -8,8 +8,8 @@ interface Navigator<T extends (...args: any) => any> {
         name: string;
     })[];
 }
-export declare type TabNavigator = Navigator<typeof createBottomTabNavigator>;
-export declare type StackNavigationNavigator = Navigator<typeof createStackNavigator>;
+export type TabNavigator = Navigator<typeof createBottomTabNavigator>;
+export type StackNavigationNavigator = Navigator<typeof createStackNavigator>;
 interface StackNavigationScreen {
     props: Omit<ComponentProps<ReturnType<typeof createStackNavigator>['Screen']>, 'name'> & {
         component: any;
@@ -20,8 +20,8 @@ interface TabNavigationScreen {
         component: any;
     };
 }
-export declare type NavigatorItem = StackNavigationNavigator | StackNavigationScreen | TabNavigator | TabNavigationScreen;
-export declare type RootAppNavigators = {
+export type NavigatorItem = StackNavigationNavigator | StackNavigationScreen | TabNavigator | TabNavigationScreen;
+export type RootAppNavigators = {
     [routeName: string]: NavigatorItem;
 };
 export declare const isStackOrTab: (s: NavigatorItem) => s is Navigator<any>;

package/lib/route/react-navigation/types.js

@@ -1,6 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isStackOrTab = void 0;
-const isStackOrTab = (s) => s.hasOwnProperty('children');
-exports.isStackOrTab = isStackOrTab;
+export const isStackOrTab = (s) => s.hasOwnProperty('children');
 //# sourceMappingURL=types.js.map

package/lib/route/react-navigation/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/route/react-navigation/types.tsx"],"names":[],"mappings":";;;AA2BO,MAAM,YAAY,GAAG,CAAC,CAAgB,EAAuB,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;AAAvF,QAAA,YAAY,gBAA2E"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/route/react-navigation/types.tsx"],"names":[],"mappings":"AA2BA,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,CAAgB,EAAuB,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC"}

package/lib/route/render-routes.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import * as React from 'react';
 import { IRouterRederOptions } from '../interfaces/new-router';
-declare function renderRoutes(opts: IRouterRederOptions): JSX.Element;
+declare function renderRoutes(opts: IRouterRederOptions): React.JSX.Element;
 export { renderRoutes as renderRoutes2 };

package/lib/route/render-routes.js

@@ -1,68 +1,22 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderRoutes2 = void 0;
-const React = __importStar(require("react"));
-const react_1 = require("react");
-const react_router_1 = require("react-router");
+import * as React from 'react';
+import { useEffect, useState, createElement } from 'react';
+import { Switch, Route, Redirect } from 'react-router';
 function wrapInitialPropsFetch(route, opts) {
-    const { component } = route, restRouteParams = __rest(route, ["component"]);
+    const { component, ...restRouteParams } = route;
     let Component = route.component;
     function ComponentWithInitialPropsFetch(props) {
-        const [initialProps, setInitialProps] = (0, react_1.useState)(() => window.g_initialProps);
-        (0, react_1.useEffect)(() => {
+        const [initialProps, setInitialProps] = useState(() => window.g_initialProps);
+        useEffect(() => {
             /**
              * 1. 首次渲染时，此时 window.g_initialProps 变量存在，不需要再走一次 getInitialProps，这样一次 SSR 就走了 2 次 getInitialProps
              * 2. 但是路由切换时，window.getInitialProps 会被赋为 null，这时候就走 getInitialProps 逻辑
              * 3. 如果任何时候都走 2 次，配置 forceInitial: true，这个场景用于静态站点的首屏加载希望走最新数据
              * 4. 开启动态加载后，会在执行 getInitialProps 前预加载下
              */
-            const handleGetInitialProps = () => __awaiter(this, void 0, void 0, function* () {
+            const handleGetInitialProps = async () => {
                 // preload when enalbe dynamicImport
                 if (Component.preload) {
-                    const preloadComponent = yield Component.preload();
+                    const preloadComponent = await Component.preload();
                     // for test case, really use .default
                     Component = preloadComponent.default || preloadComponent;
                 }
@@ -87,13 +41,13 @@ function wrapInitialPropsFetch(route, opts) {
                 //   );
                 //   setInitialProps(initialProps);
                 // }
-            });
+            };
             // null 时，一定会触发 getInitialProps 执行
             if (!window.g_initialProps) {
                 handleGetInitialProps();
             }
         }, [window.location.pathname, window.location.search]);
-        return React.createElement(Component, Object.assign({}, props, initialProps));
+        return React.createElement(Component, { ...props, ...initialProps });
     }
     // flag for having wrappered
     ComponentWithInitialPropsFetch.wrapInitialPropsLoaded = true;
@@ -101,20 +55,30 @@ function wrapInitialPropsFetch(route, opts) {
     return ComponentWithInitialPropsFetch;
 }
 function render({ route, opts, props, }) {
-    const routes = renderRoutes(Object.assign(Object.assign({}, opts), { routes: route.routes || [], rootRoutes: opts.rootRoutes }));
+    const routes = renderRoutes({
+        ...opts,
+        routes: route.routes || [],
+        rootRoutes: opts.rootRoutes,
+    });
     let { component: Component, wrappers } = route;
     if (Component) {
         const defaultPageInitialProps = opts.isServer
             ? {}
             : window.g_initialProps;
-        const newProps = Object.assign(Object.assign(Object.assign(Object.assign({}, props), opts.extraProps), (opts.pageInitialProps || defaultPageInitialProps)), { route, routes: opts.rootRoutes });
+        const newProps = {
+            ...props,
+            ...opts.extraProps,
+            ...(opts.pageInitialProps || defaultPageInitialProps),
+            route,
+            routes: opts.rootRoutes,
+        };
         // @ts-ignore
-        let ret = React.createElement(Component, Object.assign({}, newProps), routes);
+        let ret = React.createElement(Component, { ...newProps }, routes);
         // route.wrappers
         if (wrappers) {
             let len = wrappers.length - 1;
             while (len >= 0) {
-                ret = (0, react_1.createElement)(wrappers[len], newProps, ret);
+                ret = createElement(wrappers[len], newProps, ret);
                 len -= 1;
             }
         }
@@ -133,7 +97,7 @@ function getRouteElement({ route, index, opts }) {
         path: route.path,
     };
     if (route.redirect) {
-        return React.createElement(react_router_1.Redirect, Object.assign({}, routeProps, { from: route.path, to: route.redirect }));
+        return React.createElement(Redirect, { ...routeProps, from: route.path, to: route.redirect });
     }
     else {
         // avoid mount and unmount with url hash change
@@ -149,20 +113,23 @@ function getRouteElement({ route, index, opts }) {
         //   // client Render for enable ssr, but not sure SSR success
         //   route.component = wrapInitialPropsFetch(route, opts);
         // }
-        return (React.createElement(react_router_1.Route, Object.assign({}, routeProps, { render: (props) => {
+        return (React.createElement(Route, { ...routeProps, render: (props) => {
                 return render({ route, opts, props });
-            } })));
+            } }));
     }
 }
 function renderRoutes(opts) {
-    return opts.routes ? (React.createElement(react_router_1.Switch, null, opts.routes.map((route, index) => {
+    return opts.routes ? (React.createElement(Switch, null, opts.routes.map((route, index) => {
         const renderedR = getRouteElement({
             route,
             index,
-            opts: Object.assign(Object.assign({}, opts), { rootRoutes: opts.rootRoutes || opts.routes }),
+            opts: {
+                ...opts,
+                rootRoutes: opts.rootRoutes || opts.routes,
+            },
         });
         return renderedR;
     }))) : null;
 }
-exports.renderRoutes2 = renderRoutes;
+export { renderRoutes as renderRoutes2 };
 //# sourceMappingURL=render-routes.js.map

package/lib/route/render-routes.js.map

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

package/lib/route/render-routes.native.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import * as React from 'react';
 import { IRouterRederOptions } from '../interfaces/new-router';
-declare function renderRoutes(opts: IRouterRederOptions): JSX.Element;
+declare function renderRoutes(opts: IRouterRederOptions): React.JSX.Element;
 export { renderRoutes };

package/lib/route/render-routes.native.js

@@ -1,68 +1,22 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderRoutes = void 0;
-const React = __importStar(require("react"));
-const react_1 = require("react");
-const react_router_native_1 = require("react-router-native");
+import * as React from 'react';
+import { useEffect, useState, createElement } from 'react';
+import { Switch, Route, Redirect } from 'react-router-native';
 function wrapInitialPropsFetch(route, opts) {
-    const { component } = route, restRouteParams = __rest(route, ["component"]);
+    const { component, ...restRouteParams } = route;
     let Component = route.component;
     function ComponentWithInitialPropsFetch(props) {
-        const [initialProps, setInitialProps] = (0, react_1.useState)(() => window.g_initialProps);
-        (0, react_1.useEffect)(() => {
+        const [initialProps, setInitialProps] = useState(() => window.g_initialProps);
+        useEffect(() => {
             /**
              * 1. 首次渲染时，此时 window.g_initialProps 变量存在，不需要再走一次 getInitialProps，这样一次 SSR 就走了 2 次 getInitialProps
              * 2. 但是路由切换时，window.getInitialProps 会被赋为 null，这时候就走 getInitialProps 逻辑
              * 3. 如果任何时候都走 2 次，配置 forceInitial: true，这个场景用于静态站点的首屏加载希望走最新数据
              * 4. 开启动态加载后，会在执行 getInitialProps 前预加载下
              */
-            const handleGetInitialProps = () => __awaiter(this, void 0, void 0, function* () {
+            const handleGetInitialProps = async () => {
                 // preload when enalbe dynamicImport
                 if (Component.preload) {
-                    const preloadComponent = yield Component.preload();
+                    const preloadComponent = await Component.preload();
                     // for test case, really use .default
                     Component = preloadComponent.default || preloadComponent;
                 }
@@ -87,13 +41,13 @@ function wrapInitialPropsFetch(route, opts) {
                 //   );
                 //   setInitialProps(initialProps);
                 // }
-            });
+            };
             // null 时，一定会触发 getInitialProps 执行
             if (!window.g_initialProps) {
                 handleGetInitialProps();
             }
         }, [window.location.pathname, window.location.search]);
-        return React.createElement(Component, Object.assign({}, props, initialProps));
+        return React.createElement(Component, { ...props, ...initialProps });
     }
     // flag for having wrappered
     ComponentWithInitialPropsFetch.wrapInitialPropsLoaded = true;
@@ -101,18 +55,28 @@ function wrapInitialPropsFetch(route, opts) {
     return ComponentWithInitialPropsFetch;
 }
 function render({ route, opts, props }) {
-    const routes = renderRoutes(Object.assign(Object.assign({}, opts), { routes: route.routes || [], rootRoutes: opts.rootRoutes }));
+    const routes = renderRoutes({
+        ...opts,
+        routes: route.routes || [],
+        rootRoutes: opts.rootRoutes,
+    });
     const { component: Component, wrappers } = route;
     if (Component) {
         const defaultPageInitialProps = opts.isServer ? {} : window.g_initialProps;
-        const newProps = Object.assign(Object.assign(Object.assign(Object.assign({}, props), opts.extraProps), (opts.pageInitialProps || defaultPageInitialProps)), { route, routes: opts.rootRoutes });
+        const newProps = {
+            ...props,
+            ...opts.extraProps,
+            ...(opts.pageInitialProps || defaultPageInitialProps),
+            route,
+            routes: opts.rootRoutes,
+        };
         // @ts-ignore
-        let ret = React.createElement(Component, Object.assign({}, newProps), routes);
+        let ret = React.createElement(Component, { ...newProps }, routes);
         // route.wrappers
         if (wrappers) {
             let len = wrappers.length - 1;
             while (len >= 0) {
-                ret = (0, react_1.createElement)(wrappers[len], newProps, ret);
+                ret = createElement(wrappers[len], newProps, ret);
                 len -= 1;
             }
         }
@@ -129,7 +93,7 @@ function getRouteElement({ route, index, opts }) {
         path: route.path,
     };
     if (route.redirect) {
-        return React.createElement(react_router_native_1.Redirect, Object.assign({}, routeProps, { from: route.path, to: route.redirect }));
+        return React.createElement(Redirect, { ...routeProps, from: route.path, to: route.redirect });
     }
     // avoid mount and unmount with url hash change
     // @sri not supproted yet
@@ -144,19 +108,22 @@ function getRouteElement({ route, index, opts }) {
     //   // client Render for enable ssr, but not sure SSR success
     //   route.component = wrapInitialPropsFetch(route, opts);
     // }
-    return (React.createElement(react_router_native_1.Route, Object.assign({}, routeProps, { render: (props) => {
+    return (React.createElement(Route, { ...routeProps, render: (props) => {
             return render({ route, opts, props });
-        } })));
+        } }));
 }
 function renderRoutes(opts) {
-    return opts.routes ? (React.createElement(react_router_native_1.Switch, null, opts.routes.map((route, index) => {
+    return opts.routes ? (React.createElement(Switch, null, opts.routes.map((route, index) => {
         const renderedR = getRouteElement({
             route,
             index,
-            opts: Object.assign(Object.assign({}, opts), { rootRoutes: opts.rootRoutes || opts.routes }),
+            opts: {
+                ...opts,
+                rootRoutes: opts.rootRoutes || opts.routes,
+            },
         });
         return renderedR;
     }))) : null;
 }
-exports.renderRoutes = renderRoutes;
+export { renderRoutes };
 //# sourceMappingURL=render-routes.native.js.map

package/lib/route/render-routes.native.js.map

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