esoftplay 0.0.108-q → 0.0.108-u

package/_cache.ts

@@ -42,7 +42,9 @@ export default (() => {
         if (o?.persistKey) {
           AsyncStorage.setItem(o.persistKey, JSON.stringify(value[_idx]))
         }
-        o.listener(ns instanceof Function ? ns(value[_idx]) : ns)
+        if (o?.listener) {
+          o?.listener?.(ns instanceof Function ? ns(value[_idx]) : ns)
+        }
       }
     };
 

package/bin/build.js

@@ -255,6 +255,29 @@ yarn.lock\n\
 			console.log('.gitignore has been created');
 		});
 
+// 		const AppJS = `import { esp, LibNotification } from 'esoftplay';
+// import * as ErrorReport from 'esoftplay/error';
+// import * as Notifications from 'expo-notifications';
+// import React, { useEffect, useRef } from 'react';
+// import { enableFreeze, enableScreens } from 'react-native-screens';
+// const { globalIdx } = require('esoftplay/global')
+// enableScreens();
+// enableFreeze(true);
+
+// Notifications.addNotificationResponseReceivedListener(x => LibNotification.onAction(x))
+
+// export default function App() {
+// 	const Home = useRef(esp.home()).current
+
+// 	useEffect(() => {
+// 		globalIdx.reset()
+// 		ErrorReport.getError()
+// 	}, [])
+
+// 	return <Home />
+// }`;
+
+
 		const AppJS = `import React, { useEffect, useRef } from 'react';
 import { esp, LibNotification } from 'esoftplay';
 import * as ErrorReport from 'esoftplay/error'
@@ -360,13 +383,13 @@ export default function App() {
 			cmd += "&& node ./node_modules/esoftplay/bin/router.js"
 			execSync(cmd, { stdio: ['inherit', 'inherit', 'inherit'] })
 			console.log('App.js has been replace to App.tsx');
-			/* bugfix AsyncStorage @firebase, remove this section if firebase has update the AsyncStorage */
-			if (fs.existsSync('../@firebase/app/dist/index.rn.cjs.js')) {
-				let firebaseText = fs.readFileSync('../@firebase/app/dist/index.rn.cjs.js', 'utf8')
-				firebaseText = firebaseText.replace("var AsyncStorage = require('react-native').AsyncStorage;", "var AsyncStorage = require('@react-native-async-storage/async-storage').default;")
-				fs.writeFileSync('../@firebase/app/dist/index.rn.cjs.js', firebaseText)
-			}
-			/* end AsyncStorage @firebase section */
+			// /* bugfix AsyncStorage @firebase, remove this section if firebase has update the AsyncStorage */
+			// if (fs.existsSync('../@firebase/app/dist/index.rn.cjs.js')) {
+			// 	let firebaseText = fs.readFileSync('../@firebase/app/dist/index.rn.cjs.js', 'utf8')
+			// 	firebaseText = firebaseText.replace("var AsyncStorage = require('react-native').AsyncStorage;", "var AsyncStorage = require('@react-native-async-storage/async-storage').default;")
+			// 	fs.writeFileSync('../@firebase/app/dist/index.rn.cjs.js', firebaseText)
+			// }
+			// /* end AsyncStorage @firebase section */
 			if (fs.existsSync('../@expo/vector-icons')) {
 				let esoftplayIcon = ''
 				fs.readdir('../@expo/vector-icons/build', (err, files) => {

package/modules/lib/curl.ts

@@ -55,6 +55,7 @@ export default class ecurl {
       if (this.abort?.cancel) {
         // reportApiError(`Request timeout`, this.url + this.uri)
         this.closeConnection()
+        LibProgress.hide()
       }
     }, customTimeout ?? this.timeout);
   }

package/modules/lib/list.tsx

@@ -73,7 +73,7 @@ export default class EList extends LibComponent<LibListProps, LibListState> {
   render(): any {
     const isStatic = () => {
       if (this.props.staticHeight)
-        return { getItemLayout: (data, index) => this.props.staticHeight ? ({ length: this.props.staticHeight, offset: this.props.staticHeight, index: index }) : undefined }
+        return ({ getItemLayout: (data, index) => this.props.staticHeight ? ({ length: this.props.staticHeight, offset: this.props.staticHeight, index: index }) : undefined })
     }
     return (
       <View ref={(e) => this.view = e} style={[{ flex: 1 }]} >

package/modules/lib/navigation.ts

@@ -22,6 +22,19 @@ export default (() => {
       libNavigationData._navigation = nav
     }
 
+    static getArgs(props: any, key: string, defOutput?: any): any {
+      if (defOutput == undefined) {
+        defOutput = "";
+      }
+      return props?.route?.params?.[key] || defOutput;
+    }
+    static getArgsAll<S>(props: any, defOutput?: any): S {
+      if (defOutput == undefined) {
+        defOutput = "";
+      }
+      return props?.route?.params || defOutput;
+    }
+
     static navigation(): any {
       return libNavigationData?._navigation
     }

package/modules/lib/utils.ts

@@ -60,12 +60,14 @@ export default class eutils {
   }
 
   static getArgs(props: any, key: string, defOutput?: any): any {
+    console.warn('LibUtils.getArgs is deprecated, use LibNavigation.getArgs instead')
     if (defOutput == undefined) {
       defOutput = "";
     }
     return props?.route?.params?.[key] || defOutput;
   }
   static getArgsAll<S>(props: any, defOutput?: any): S {
+    console.warn('LibUtils.getArgsAll is deprecated, use LibNavigation.getArgsAll instead')
     if (defOutput == undefined) {
       defOutput = "";
     }

package/package.json

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