esoftplay 0.0.122-u → 0.0.122-v

package/bin/router.js

@@ -71,14 +71,12 @@ import { createNativeStackNavigator } from '@react-navigation/native-stack';
 \nimport { _global } from "esoftplay";\n
 ${importer}
 const Stack = createNativeStackNavigator();
-
 const config = require('../../../config.json')
 import { LibNavigation } from 'esoftplay/cache/lib/navigation/import';
 
 export default function m(props): any {
 	const { user, initialState, handler } = props
 	const econf = config.config
-	const [s] = LibNavigation.state().useState()
 	const appOrientation = econf?.orientation ? String(econf.orientation) : 'portrait'
 	return (
 		<NavigationContainer
@@ -723,16 +721,14 @@ function createRouter() {
   let screens = []
 
   Navigations.forEach((nav) => {
-    const prefix = "{(s['" + nav + "'] || __DEV__ ) && "
-    const suffix = "}"
     const orientation = NavsOrientation[nav]
     const [module, task] = nav.split('/')
     const comp = ucword(module) + ucword(task)
     importer.push(`import { ${comp} } from ${'"esoftplay/cache/' + module + '/' + task + '/import"'}`)
     if (orientation)
-      screens.push("\t\t\t\t" + prefix + "<Stack.Screen name={\"" + nav + "\"} options={{ orientation: '" + orientation + "' }} component={" + comp + "} />" + suffix)
+      screens.push("\t\t\t\t" + "<Stack.Screen name={\"" + nav + "\"} options={{ orientation: '" + orientation + "' }} component={" + comp + "} />")
     else
-      screens.push("\t\t\t\t" + prefix + "<Stack.Screen name={\"" + nav + "\"} component={" + comp + "} />" + suffix)
+      screens.push("\t\t\t\t" + "<Stack.Screen name={\"" + nav + "\"} component={" + comp + "} />")
   })
 
   let N = Nav5(importer.join("\n"), screens.join("\n"))

package/modules/lib/navigation.ts

@@ -1,10 +1,9 @@
 // noPage
 import { CommonActions, StackActions } from '@react-navigation/native';
-import { LibNavigationRoutes, useGlobalReturn } from 'esoftplay';
+import { LibNavigationRoutes } from 'esoftplay';
 import { UserClass } from 'esoftplay/cache/user/class/import';
 import { UserRoutes } from 'esoftplay/cache/user/routes/import';
 import esp from 'esoftplay/esp';
-import useGlobalState from 'esoftplay/global';
 import _global from 'esoftplay/_global';
 import React from "react";
 
@@ -13,28 +12,6 @@ export interface LibNavigationInjector {
   children?: any
 }
 
-const config = require('../../../../config.json')
-
-let init = {
-  [config.config.home.member]: true,
-  [config.config.home.public]: true,
-}
-
-export const state = useGlobalState(init)
-function openNav(route: string, fun: Function) {
-  state.set(Object.assign({}, state.get(), { [route]: true }))
-  const open = () => {
-   /*  */ setTimeout(() => {
-    if (state.get()[route]) {
-     /*  */ fun()
-    } else {
-      /*  */open()
-    }
-  });
-  }
-  /*  */open()
-}
-
 export default (() => {
   let libNavigationData: any = {}
   let libNavigationRedirect: any = {}
@@ -43,10 +20,6 @@ export default (() => {
       _global.libNavigationRef = ref
     }
 
-    static state(): useGlobalReturn<any> {
-      return state
-    }
-
     static setNavigation(nav: any): void {
       libNavigationData._navigation = nav
     }
@@ -92,9 +65,7 @@ export default (() => {
     }
 
     static navigate<S>(route: LibNavigationRoutes, params?: S): void {
-      openNav(route, () => {
-        _global.libNavigationRef?.navigate?.(route, params)
-      })
+      _global.libNavigationRef?.navigate?.(route, params)
     }
 
     static getResultKey(props: any): number {
@@ -121,7 +92,7 @@ export default (() => {
       m.back()
     }
 
-    static navigateForResult<S>(route: LibNavigationRoutes, params?: S, key?: number): Promise<any> {
+    static navigateForResult<S>(route: LibNavigationRoutes, params?: S | any, key?: number): Promise<any> {
       if (!key) {
         key = 1
       }
@@ -130,34 +101,28 @@ export default (() => {
           params = {}
         }
         params['_senderKey'] = key
-        if (!libNavigationData.hasOwnProperty(key)) {
+        if (!libNavigationData.hasOwnProperty(key) && key != undefined) {
           libNavigationData[key] = (value: any) => {
             r(value)
           };
         }
-        openNav(route, () => {
-          m.push(route, params)
-        })
+        m.push(route, params)
       })
     }
 
     static replace<S>(route: LibNavigationRoutes, params?: S): void {
-      openNav(route, () => {
-        _global.libNavigationRef.dispatch(
-          StackActions.replace(route, params)
-        )
-      })
+      _global.libNavigationRef.dispatch(
+        StackActions.replace(route, params)
+      )
     }
 
     static push<S>(route: LibNavigationRoutes, params?: S): void {
-      openNav(route, () => {
-        _global.libNavigationRef?.dispatch?.(
-          StackActions.push(
-            route,
-            params
-          )
+      _global.libNavigationRef?.dispatch?.(
+        StackActions.push(
+          route,
+          params
         )
-      })
+      )
     }
 
     static reset(route?: LibNavigationRoutes, ...routes: LibNavigationRoutes[]): void {
@@ -166,16 +131,11 @@ export default (() => {
       if (routes && routes.length > 0) {
         _route = [..._route, ...routes]
       }
-      _route.forEach((route) => {
-        state.set(Object.assign({}, state.get(), { [route]: true }))
-      })
-      openNav(_route?.[_route?.length - 1], () => {
-        const resetAction = CommonActions.reset({
-          index: _route.length - 1,
-          routes: _route.map((rn) => ({ name: rn }))
-        });
-        _global.libNavigationRef?.dispatch?.(resetAction);
-      })
+      const resetAction = CommonActions.reset({
+        index: _route.length - 1,
+        routes: _route.map((rn) => ({ name: rn }))
+      });
+      _global.libNavigationRef?.dispatch?.(resetAction);
     }
 
     static back(deep?: number): void {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esoftplay",
-  "version": "0.0.122-u",
+  "version": "0.0.122-v",
   "description": "embedding data from esoftplay framework (web based) into mobile app",
   "main": "cache/index.js",
   "types": "../../index.d.ts",