@rdyl/react-native-navigator-connect 0.1.5 → 0.1.6

package/dist/context.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NavContext = void 0;
+const react_1 = require("react");
+exports.NavContext = (0, react_1.createContext)({});

package/dist/hooks.js

@@ -3,17 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useNavigator = void 0;
 const native_1 = require("@react-navigation/native");
 const react_1 = require("react");
+const context_1 = require("./context");
 const useNavigator = () => {
+    const { findOption } = (0, react_1.useContext)(context_1.NavContext);
     const navigation = (0, native_1.useNavigation)();
     const route = (0, native_1.useRoute)();
     const option = (0, react_1.useMemo)(() => {
-        if (!(global === null || global === void 0 ? void 0 : global.$findNavigatorOption))
-            return;
-        const opt = global.$findNavigatorOption(route.name);
+        const opt = findOption(route.name);
         if (opt) {
             return opt.option;
         }
-    }, [route.name]);
+    }, [route.name, findOption]);
     const push = (0, react_1.useCallback)((name, params) => {
         navigation.dispatch(native_1.CommonActions.navigate({
             name,
@@ -24,10 +24,12 @@ const useNavigator = () => {
         if (navigation.canGoBack()) {
             navigation.dispatch(native_1.CommonActions.goBack());
         }
+        else {
+            throw Error();
+        }
     }, [navigation]);
     const redirect = (0, react_1.useCallback)((name, params) => {
-        // @ts-ignore
-        const opt = global.$findNavigatorOption(name);
+        const opt = findOption(name);
         if (opt) {
             if (opt.type === "tab") {
                 navigation.dispatch(native_1.TabActions.jumpTo(name, params));
@@ -36,7 +38,7 @@ const useNavigator = () => {
                 navigation.dispatch(native_1.StackActions.replace(name, params));
             }
         }
-    }, [navigation]);
+    }, [navigation, findOption]);
     const onParams = (0, react_1.useCallback)((params = {}) => {
         navigation.dispatch(Object.assign(Object.assign({}, native_1.CommonActions.setParams(params)), { source: route.key }));
     }, [navigation, route]);

package/dist/index.js

@@ -40,12 +40,13 @@ const react_1 = __importStar(require("react"));
 const native_1 = require("@react-navigation/native");
 const stack_1 = require("@react-navigation/stack");
 const bottom_tabs_1 = require("@react-navigation/bottom-tabs");
+const context_1 = require("./context");
 const Tab = (0, bottom_tabs_1.createBottomTabNavigator)();
 const Stack = (0, stack_1.createStackNavigator)();
 const NavigatorConnect = ({ afterEach, stack = [], initial, tabs, }) => {
     const navigatorRef = (0, native_1.useNavigationContainerRef)();
     const [routeName, setRouteName] = (0, react_1.useState)("");
-    const findNavigatorOption = (0, react_1.useCallback)((name) => {
+    const findOption = (0, react_1.useCallback)((name) => {
         const tab = ((tabs === null || tabs === void 0 ? void 0 : tabs.list) || []).find(ele => ele.name === name);
         if (tab) {
             return {
@@ -62,17 +63,14 @@ const NavigatorConnect = ({ afterEach, stack = [], initial, tabs, }) => {
         }
         return null;
     }, [tabs, stack]);
-    const option = (0, react_1.useMemo)(() => {
-        const opt = findNavigatorOption(routeName);
-        if (opt) {
-            return opt.option;
-        }
-    }, [findNavigatorOption, routeName]);
     (0, react_1.useEffect)(() => {
-        if (option && afterEach) {
-            afterEach(option);
+        if (afterEach) {
+            const opt = findOption(routeName);
+            if (opt) {
+                afterEach(opt.option);
+            }
         }
-    }, [afterEach, option]);
+    }, [afterEach, routeName]);
     (0, react_1.useEffect)(() => {
         const callback = ({ data }) => {
             var _a;
@@ -84,25 +82,25 @@ const NavigatorConnect = ({ afterEach, stack = [], initial, tabs, }) => {
         navigatorRef.addListener("__unsafe_action__", callback);
         return () => navigatorRef.removeListener("__unsafe_action__", callback);
     }, [navigatorRef.isReady]);
-    (0, react_1.useEffect)(() => {
-        global.$findNavigatorOption = findNavigatorOption;
-    }, [findNavigatorOption]);
-    return (react_1.default.createElement(native_1.NavigationContainer, { ref: navigatorRef },
-        react_1.default.createElement(Stack.Navigator, { initialRouteName: initial },
-            !!tabs && (react_1.default.createElement(Stack.Screen, { key: "tabs", name: tabs.name, options: {
-                    headerShown: false,
-                }, component: () => (react_1.default.createElement(Tab.Navigator, { initialRouteName: (tabs === null || tabs === void 0 ? void 0 : tabs.initial) || (tabs === null || tabs === void 0 ? void 0 : tabs.list[0].name) || "" }, tabs.list.map(ele => {
-                    const { component, name, meta: { title = "", tabBarIcon } = {}, } = ele;
-                    return (react_1.default.createElement(Tab.Screen, { options: {
-                            headerShown: false,
-                            tabBarLabel: title,
-                            tabBarIcon,
-                            tabBarActiveTintColor: "#333",
-                        }, key: name, name: name, component: component }));
-                }))) })),
-            stack.map(({ component, name }) => (react_1.default.createElement(Stack.Screen, { options: {
-                    headerShown: false,
-                }, key: name, name: name, component: component }))))));
+    return (react_1.default.createElement(context_1.NavContext.Provider, { value: {
+            findOption,
+        } },
+        react_1.default.createElement(native_1.NavigationContainer, { ref: navigatorRef },
+            react_1.default.createElement(Stack.Navigator, { initialRouteName: initial },
+                !!tabs && (react_1.default.createElement(Stack.Screen, { key: "tabs", name: tabs.name, options: {
+                        headerShown: false,
+                    }, component: () => (react_1.default.createElement(Tab.Navigator, { initialRouteName: (tabs === null || tabs === void 0 ? void 0 : tabs.initial) || (tabs === null || tabs === void 0 ? void 0 : tabs.list[0].name) || "" }, tabs.list.map(ele => {
+                        const { component, name, meta: { title = "", tabBarIcon } = {}, } = ele;
+                        return (react_1.default.createElement(Tab.Screen, { options: {
+                                headerShown: false,
+                                tabBarLabel: title,
+                                tabBarIcon,
+                                tabBarActiveTintColor: "#333",
+                            }, key: name, name: name, component: component }));
+                    }))) })),
+                stack.map(({ component, name }) => (react_1.default.createElement(Stack.Screen, { options: {
+                        headerShown: false,
+                    }, key: name, name: name, component: component })))))));
 };
 __exportStar(require("./hooks"), exports);
 exports.default = NavigatorConnect;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rdyl/react-native-navigator-connect",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "main": "./dist/index.js",
   "types": "./types/index.d.ts",
   "license": "MIT",

package/types/context.d.ts

@@ -0,0 +1,5 @@
+export declare const NavContext: import("react").Context<NavContextValue>;
+interface NavContextValue {
+    findOption(n: string): FindNavigatorOptionType;
+}
+export {};

package/types/type.d.ts

@@ -11,7 +11,6 @@ interface NavigatorOptionMeta {
 
 interface NavigatorOption {
   name: string;
-  path: string;
   meta?: NavigatorOptionMeta;
   isPublic?: boolean;
   component: React.ComponentType<any>;
@@ -33,5 +32,3 @@ type FindNavigatorOptionType = {
   type: "tab" | "stack";
   option: NavigatorOption;
 } | null;
-
-declare var $findNavigatorOption: (n: string) => FindNavigatorOptionType;