esoftplay 0.0.141-u → 0.0.141-w

package/modules/lib/compose.tsx

@@ -1,5 +1,8 @@
 // withHooks
+import { LibNavigationRoutes } from 'esoftplay';
+import { LibNavigation } from 'esoftplay/cache/lib/navigation/import';
 import { LibObject } from 'esoftplay/cache/lib/object/import';
+import { LibUtils } from 'esoftplay/cache/lib/utils/import';
 import { EspRouterInterface } from 'esoftplay/cache/routers';
 import esp from 'esoftplay/esp';
 import useGlobalState from 'esoftplay/global';
@@ -14,31 +17,7 @@ export interface RNTypes extends EspRouterInterface {
   // "TextInput": typeof TextInput,
 }
 
-const form = useGlobalState({})
-
-const action: any = {
-  "navigate": (args: any[]) => esp.mod("lib/navigation").navigate(args[0], args[1]),
-  "replace": (args: any[]) => esp.mod("lib/navigation").replace(args[0], args[1]),
-  "back": (args: any[]) => esp.mod("lib/navigation").back(),
-  "copy": (args: any[]) => {
-    esp.mod("lib/utils").copyToClipboard(JSON.stringify(args))
-    esp.modProp("lib/toast").show(args + " copied!")
-  },
-  "curl": (args: any[]) => {
-    let post = args?.[1]
-    try {
-      post = JSON.parse(args?.[1])
-    } catch (error) {
-      post = args?.[1]
-    }
-    post = Object.assign({}, post, form.get())
-    new (esp.mod('lib/curl'))(args[0], post, (res, msg) => {
-      esp.modProp("lib/toast").show(msg)
-    }, (err) => {
-      esp.modProp("lib/toast").show(err.message)
-    }, 1)
-  }
-}
+const formState = useGlobalState({})
 
 function buildUIFromJSON(json: any): ReactElement {
   const { component, props } = json;
@@ -80,14 +59,14 @@ function buildUIFromJSON(json: any): ReactElement {
         const [type, postkey] = cleanForm.split('.')
         if (type == 'input') {
           _props[key] = (input: string) => {
-            form.set(LibObject.set(form.get(), input)(postkey))
+            formState.set(LibObject.set(formState.get(), input)(postkey))
           }
         }
         if (type == 'select') {
           console.log(type, postkey, key)
           const [_key, _value] = postkey.split(":")
           _props[key] = () => {
-            form.set(LibObject.set(form.get(), _value)(_key))
+            formState.set(LibObject.set(formState.get(), _value)(_key))
           }
         }
       } else {
@@ -109,6 +88,60 @@ export default function m({ schema }: { schema: any }): ReactElement {
   return buildUIFromJSON(schema)
 }
 
+const action: any = {
+  "navigate": (args: any[]) => esp.mod("lib/navigation").navigate(args[0], args[1]),
+  "replace": (args: any[]) => esp.mod("lib/navigation").replace(args[0], args[1]),
+  "back": (args: any[]) => esp.mod("lib/navigation").back(),
+  "copy": (args: any[]) => {
+    esp.mod("lib/utils").copyToClipboard(JSON.stringify(args))
+    esp.modProp("lib/toast").show(args + " copied!")
+  },
+  "curl": (args: any[]) => {
+    esp.mod("lib/progress").show("Please Wait..")
+    let post = args?.[1]
+    try {
+      post = JSON.parse(args?.[1])
+    } catch (error) {
+      post = args?.[1]
+    }
+    post = Object.assign({}, post, formState.get())
+    new (esp.mod('lib/curl'))(args[0], post, (res, msg) => {
+      esp.modProp("lib/toast").show(msg)
+      esp.mod("lib/progress").hide()
+    }, (err) => {
+      esp.modProp("lib/toast").show(err.message)
+      esp.mod("lib/progress").hide()
+    })
+  }
+}
+
+export const forms = {
+  select: (postKey: string, value: string) => `#form.select.${postKey}:${value}`,
+  input: (postKey: string) => `#form.input.${postKey}`,
+}
+export const actions = {
+  navigate: (module: LibNavigationRoutes, params: any) => {
+    LibNavigation.navigate(module, params)
+  },
+  replace: (module: LibNavigationRoutes, params: any) => {
+    LibNavigation.replace(module, params)
+  },
+  back: () => {
+    LibNavigation.back()
+  },
+  copy: (args: string) => {
+    LibUtils.copyToClipboard(args)
+    esp.modProp("lib/toast").show(args + " copied!")
+  },
+  curl: (uri: string, post?: any) => {
+    new (esp.mod('lib/curl'))(uri, post, (res, msg) => {
+      esp.modProp("lib/toast").show(msg)
+    }, (err) => {
+      esp.modProp("lib/toast").show(err.message)
+    }, 1)
+  }
+}
+
 export function build<T extends keyof RNTypes>(cmpn: T, props: React.ComponentProps<RNTypes[T]>): any {
   let obj: any = {};
   obj.component = cmpn;

package/modules/lib/toast.tsx

@@ -3,7 +3,7 @@
 
 import { LibStyle } from 'esoftplay/cache/lib/style/import';
 import useGlobalState from 'esoftplay/global';
-import React, { useEffect } from 'react';
+import React, { useEffect, useRef } from 'react';
 import { Text, View } from 'react-native';
 import Animated, { interpolate, useAnimatedProps, useSharedValue, withTiming } from 'react-native-reanimated';
 
@@ -16,7 +16,7 @@ const initState = {
   timeout: 3000
 }
 
-const state = useGlobalState<any>(initState)
+const state = useGlobalState(initState)
 
 let _timeout: any = undefined
 
@@ -34,12 +34,13 @@ export function show(message: string, timeout?: number): void {
     _timeout = undefined
   }
   _timeout = setTimeout(() => {
-    hide()
     clearTimeout(_timeout)
+    hide()
   }, timeout || initState.timeout);
 }
 
 export default function m(props: LibToastProps): any {
+  const isFirstInit = useRef(true)
   const [data] = state.useState()
   const anim = useSharedValue(0)
 
@@ -51,11 +52,17 @@ export default function m(props: LibToastProps): any {
   }))
 
   useEffect(() => {
-    anim.value = withTiming(data?.message ? 1 : 0, { duration: 500 })
+    if (!isFirstInit.current && data.message == undefined) {
+      anim.value = 1
+    }
+    if (isFirstInit.current) {
+      isFirstInit.current = false
+    }
+    anim.value = withTiming(data.message != undefined ? 1 : 0, { duration: 500 })
   }, [data])
 
   return (
-    <Animated.View pointerEvents={'none'} style={[{ flex: 1, position: 'absolute', justifyContent: 'center', alignContent: 'center', alignItems: 'center', top: LibStyle.STATUSBAR_HEIGHT + 20, left: 0, right: 0, }, style, LibStyle.elevation(2)]} >
+    <Animated.View pointerEvents={'none'} style={[{ flex: 1, position: 'absolute', justifyContent: 'center', alignContent: 'center', alignItems: 'center', top: LibStyle.STATUSBAR_HEIGHT + 20, opacity: 0, left: 0, right: 0, }, style, LibStyle.elevation(2)]} >
       <View style={{ maxWidth: Math.min(500, LibStyle.width - 30), minWidth: Math.min(500, LibStyle.width - 30), marginHorizontal: 15, marginVertical: 4, borderRadius: 4, borderWidth: 1, borderColor: '#505050', backgroundColor: '#323232', paddingVertical: 13, paddingHorizontal: 16, }} >
         <Text style={{ fontSize: 14, textAlign: "center", color: 'white' }} >{String(data?.message || '')}</Text>
       </View>

package/package.json

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