esoftplay 0.0.134 → 0.0.135-a

package/bin/build.js

@@ -28,7 +28,7 @@ if (fs.existsSync(packjson)) {
 	/* ADD SCRIPTS.PRESTART AND SCRIPTS.POSTSTOP */
 
 	if (args[0] == "install") {
-		$package.scripts.start = "esp start && expo start --dev-client"
+		$package.scripts.start = "esp start && npx expo start --dev-client"
 		$package.trustedDependencies = [
 			"esoftplay",
 			"esoftplay-android-print",
@@ -39,6 +39,8 @@ if (fs.existsSync(packjson)) {
 			"esoftplay-log",
 			"esoftplay-market",
 			"esoftplay-ppob",
+			"esoftplay-web",
+			"esoftplay-web-pwa"
 		]
 		fs.writeFile(packjson, JSON.stringify($package, null, 2), (err) => {
 			if (err) throw err;
@@ -87,7 +89,7 @@ if (fs.existsSync(packjson)) {
 			try {
 				$appjson = JSON.parse(fs.readFileSync(appjson, 'utf8')) || {};
 			} catch (error) { }
-		if (!$appjson.expo.hasOwnProperty('runtimeVersion')) {
+		if (!$appjson?.expo?.hasOwnProperty?.('runtimeVersion')) {
 			$appjson.expo.runtimeVersion = "1"
 			$appjson.expo.android = {
 				"package": "com.domain",
@@ -248,6 +250,8 @@ config.json\n\
 config.debug.json\n\
 config.live.json\n\
 node_modules/\n\
+code-signing/\n\
+certificate.pem\n\
 web-build/\n\
 npm-debug.*\n\
 package-lock.json\n\

package/bin/cli.js

@@ -480,6 +480,7 @@ function publish(notes) {
 	jsEng(appdebug, true)
 	jsEng(applive, true)
 	let status = "-"
+	let isCustomServer = false
 	let ajson = readToJSON(appjson)
 	let pack = readToJSON(packjson)
 	if (fs.existsSync(confjson)) {
@@ -500,6 +501,9 @@ function publish(notes) {
 		if (fs.existsSync(appdebug)) {
 			adebug = readToJSON(appdebug)
 		}
+		if (ajson.expo.updates.url) {
+			isCustomServer = true
+		}
 		if (clive) {
 			if (clive.config.domain == cjson.config.domain) {
 				status = "live"
@@ -565,38 +569,109 @@ function publish(notes) {
 		ajson.config.publish_id = last_id + 1
 		fs.writeFileSync(appjson, JSON.stringify(ajson, undefined, 2))
 		consoleSucces("start publishing " + status.toUpperCase() + " - PUBLISH_ID : " + (last_id + 1))
-		command("expo p")
-		consoleSucces("Berhasil")
-		const os = require('os')
-		var d = new Date();
-		d = new Date(d.getTime() - 3000000);
-		var date_format_str = d.getFullYear().toString() + "-" + ((d.getMonth() + 1).toString().length == 2 ? (d.getMonth() + 1).toString() : "0" + (d.getMonth() + 1).toString()) + "-" + (d.getDate().toString().length == 2 ? d.getDate().toString() : "0" + d.getDate().toString());
-		let stringBuilder = "#" + ajson.expo.slug + "\n" + cjson.config.domain + "\n" + os.userInfo().username + '@' + os.hostname() + "\n" + date_format_str + "\nsdk: " + pack.dependencies.expo + "\nruntimeVersion: " + ajson.expo.runtimeVersion
-		stringBuilder += "\nid: " + (last_id + 1)
-		let esplibs = Object.keys(pack.dependencies).filter((key) => key.includes("esoftplay"))
-		esplibs.forEach((key) => {
-			stringBuilder += ("\n" + key + ": " + pack.dependencies[key])
-		})
-		const { exec } = require('child_process');
-		exec("publisher=$(npx expo whoami &); echo $publisher;", (error, stdout, stderr) => {
-			if (error) {
-				console.error(`exec error: ${error}`);
-				return;
+		if (isCustomServer) {
+			if (!fs.existsSync('/var/www/html/ota/')) {
+				consoleError("ota not found at /var/www/html/ota, please clone it first!")
+				return
 			}
-			let accountName = stdout.trim();
-			stringBuilder += "\npublisher: @" + accountName + "\n"
-			stringBuilder += (notes != '' ? ("\n\n- " + notes) : '')
-			tm(stringBuilder)
-			if (notes.startsWith('*') && ajson.config.publish_id) {
-				const config = readToJSON(confjson).config;
-				const ajson = readToJSON(appjson);
-				const url = config.publish_uri + ajson.config.publish_id
-				const fetch = require('node-fetch')
-				console.log("\n\nPROCESSING FORCE UPDATE")
-				fetch(url).then((res) => JSON.stringify(res.json(), undefined, 2)).then(consoleSucces)
+			const isUpdateExist = fs.existsSync('/var/www/html/ota/updates/' + ajson.expo.runtimeVersion)
+			let currentUpdate;
+			let date_format_str;
+			if (isUpdateExist) {
+				currentUpdate = fs.readdirSync('/var/www/html/ota/updates/' + ajson.expo.runtimeVersion)[0]
+				var d = new Date(currentUpdate * 1000).toISOString();
+				date_format_str = d
 			}
-		});
+			var out = false
+			const rl = readline.createInterface({
+				input: process.stdin,
+				output: process.stdout
+			});
 
+			rl.question(`
+--- Detail Publish ---
+Nama Aplikasi  : ${ajson.expo.name}
+isDebug        : ${cjson.config.isDebug}
+runtimeVersion : ${ajson.expo.runtimeVersion}
+Update terakhir: ${currentUpdate ? date_format_str : '- not found'}
+
+Pastikan data sudah benar sebelum anda melanjutkan, lanjut publish(y/n)?`,
+				function (input) {
+					out = input
+					rl.close();
+				});
+
+			rl.on("close", function () {
+				if (out && out.toLowerCase() == 'y') {
+					command("rm -rf ./dist && esp start && currentPath=$(pwd) && cd /var/www/html/ota/ && npm run publish $currentPath \"" + notes + "\" && cd $currentPath && rm -rf ./dist")
+					consoleSucces("Berhasil")
+					const os = require('os')
+					var d = new Date();
+					d = new Date(d.getTime() - 3000000);
+					var date_format_str = d.getFullYear().toString() + "-" + ((d.getMonth() + 1).toString().length == 2 ? (d.getMonth() + 1).toString() : "0" + (d.getMonth() + 1).toString()) + "-" + (d.getDate().toString().length == 2 ? d.getDate().toString() : "0" + d.getDate().toString());
+					let stringBuilder = "#" + ajson.expo.slug + "\n" + cjson.config.domain + "\n" + os.userInfo().username + '@' + os.hostname() + "\n" + date_format_str + "\nsdk: " + pack.dependencies.expo + "\nruntimeVersion: " + ajson.expo.runtimeVersion
+					stringBuilder += "\nid: " + (last_id + 1)
+					let esplibs = Object.keys(pack.dependencies).filter((key) => key.includes("esoftplay"))
+					esplibs.forEach((key) => {
+						stringBuilder += ("\n" + key + ": " + pack.dependencies[key])
+					})
+					const { exec } = require('child_process');
+					exec("publisher=$(npx expo whoami &); echo $publisher;", (error, stdout, stderr) => {
+						if (error) {
+							console.error(`exec error: ${error}`);
+							return;
+						}
+						let accountName = stdout.trim();
+						stringBuilder += "\npublisher: @" + accountName + "\n"
+						stringBuilder += (notes != '' ? ("\n\n- " + notes) : '')
+						tm(stringBuilder)
+						if (notes.startsWith('*') && ajson.config.publish_id) {
+							const config = readToJSON(confjson).config;
+							const ajson = readToJSON(appjson);
+							const url = config.publish_uri + ajson.config.publish_id
+							const fetch = require('node-fetch')
+							console.log("\n\nPROCESSING FORCE UPDATE")
+							fetch(url).then((res) => JSON.stringify(res.json(), undefined, 2)).then(consoleSucces)
+						}
+					});
+				} else {
+					consoleError("Build Canceled")
+				}
+			});
+			return
+		} else {
+			command("expo p")
+			consoleSucces("Berhasil")
+			const os = require('os')
+			var d = new Date();
+			d = new Date(d.getTime() - 3000000);
+			var date_format_str = d.getFullYear().toString() + "-" + ((d.getMonth() + 1).toString().length == 2 ? (d.getMonth() + 1).toString() : "0" + (d.getMonth() + 1).toString()) + "-" + (d.getDate().toString().length == 2 ? d.getDate().toString() : "0" + d.getDate().toString());
+			let stringBuilder = "#" + ajson.expo.slug + "\n" + cjson.config.domain + "\n" + os.userInfo().username + '@' + os.hostname() + "\n" + date_format_str + "\nsdk: " + pack.dependencies.expo + "\nruntimeVersion: " + ajson.expo.runtimeVersion
+			stringBuilder += "\nid: " + (last_id + 1)
+			let esplibs = Object.keys(pack.dependencies).filter((key) => key.includes("esoftplay"))
+			esplibs.forEach((key) => {
+				stringBuilder += ("\n" + key + ": " + pack.dependencies[key])
+			})
+			const { exec } = require('child_process');
+			exec("publisher=$(npx expo whoami &); echo $publisher;", (error, stdout, stderr) => {
+				if (error) {
+					console.error(`exec error: ${error}`);
+					return;
+				}
+				let accountName = stdout.trim();
+				stringBuilder += "\npublisher: @" + accountName + "\n"
+				stringBuilder += (notes != '' ? ("\n\n- " + notes) : '')
+				tm(stringBuilder)
+				if (notes.startsWith('*') && ajson.config.publish_id) {
+					const config = readToJSON(confjson).config;
+					const ajson = readToJSON(appjson);
+					const url = config.publish_uri + ajson.config.publish_id
+					const fetch = require('node-fetch')
+					console.log("\n\nPROCESSING FORCE UPDATE")
+					fetch(url).then((res) => JSON.stringify(res.json(), undefined, 2)).then(consoleSucces)
+				}
+			});
+		}
 	}
 }
 
@@ -761,6 +836,13 @@ function configAvailable(enabled) {
 		} else {
 			_git = _git.replace(notignore, ignore)
 		}
+		var ignore = "code-signing/"
+		var notignore = "#code-signing/"
+		if (enabled) {
+			_git = _git.replace(ignore, notignore)
+		} else {
+			_git = _git.replace(notignore, ignore)
+		}
 		fs.writeFileSync(gitignore, _git, { encoding: 'utf8' })
 	} else {
 		consoleError(gitignore)
@@ -930,7 +1012,11 @@ function build() {
 							// const oldFileName = fileName.replace(regexPattern, '$1');
 							let ext = fileName.split(".")
 							ext.shift()
-							fs.renameSync('./' + fileName, './' + ajson.expo.name + "-" + Named + "-" + getTime() + "." + ext.join("."))
+							const appname = ajson.expo.name + "-" + Named + "-" + getTime() + "." + ext.join(".")
+							fs.renameSync('./' + fileName, './' + appname)
+							// if (fs.existsSync('./build/post.js')) {
+							// 	fs.writeFileSync("./build/latestBuildName", appname, { encoding: 'utf8' })
+							// }
 						});
 					});
 					let tmId = "-1001429450501"

package/bin/router.js

@@ -161,11 +161,23 @@ if (isChange(tmpDir + "assets.js", Text))
 
 /* CREATE INDEX.D.TS */
 function createIndex() {
+  let importer = []
+  importer.push(`import useGlobalState from 'esoftplay/global'`)
+  importer.push(`import usePersistState from 'esoftplay/persist'`)
+  importer.push(`import useGlobalSubscriber from 'esoftplay/subscribe'`)
+  importer.push(`import useSafeState from 'esoftplay/state'`)
+  importer.push(`import useLazyState from 'esoftplay/lazy'`)
+  importer.push(`import Storage from 'esoftplay/storage'`)
+  AllRoutes.forEach((nav) => {
+    const [module, task] = nav.split('/')
+    const comp = ucword(module) + ucword(task)
+    importer.push(`import { ${comp} } from ${'"esoftplay/cache/' + module + '/' + task + '/import"'} `)
+  })
   var PreText = ''
   var Text = `
 import { Component } from 'react';
 import { AntDesignTypes, EntypoTypes, EvilIconsTypes, FeatherTypes, FontAwesomeTypes, FontistoTypes, FoundationTypes, IoniconsTypes, MaterialCommunityIconsTypes, MaterialIconsTypes, OcticonsTypes, SimpleLineIconsTypes, ZocialTypes, } from '@expo/vector-icons/build/esoftplay_icons'
-
+${importer.join('\n')}
 declare module "esoftplay" {
   function applyStyle<T>(style: T): T;
   `;
@@ -209,6 +221,8 @@ var AllRoutes = []
 function createRouter() {
   var Task = "";
   var dTask = "";
+  var dImportArgs = "";
+  var dArgs = "";
   var dImportTask = "";
   var TaskProperty = "";
   var dTaskProperty = "";
@@ -240,6 +254,11 @@ function createRouter() {
       dImportTaskProperty += `import * as ${ucword(module) + ucword(task) + 'Property'} from '../../.${Modules[module][task]}';\n`;
       dTaskProperty += `"${nav}": typeof ${ucword(module) + ucword(task) + "Property"};\n\t`;
 
+      if (NavsExclude[nav] == false) {
+        dImportArgs += `import { ${ucword(module) + ucword(task) + 'Args }'} from '../../.${Modules[module][task]}';\n`;
+        dArgs += `"${nav}": ${ucword(module) + ucword(task) + "Args"};\n\t`;
+      }
+
       /* ADD ROUTER EACH FILE FOR STATIC IMPORT */
       var item = `import { stable } from 'usestable';\n`
       var deItem = ``
@@ -347,6 +366,18 @@ export interface EspRouterInterface {
     });
   }
 
+  Text = `\n${dImportArgs}
+export interface EspArgsInterface {
+  ${dArgs}
+}`
+  if (isChange(tmpDir + "args.d.ts", Text)) {
+    fs.writeFile(tmpDir + "args.d.ts", Text, { flag: 'w' }, function (err) {
+      if (err) {
+        return console.log(err);
+      }
+    });
+  }
+
   Text = 'function routers(modtask) {' + "\n\t" +
     'var Out = {}' + "\n\t" +
     'switch (modtask) {' + "\n" +
@@ -372,6 +403,7 @@ export interface EspRouterInterface {
   let importer = []
   let screens = []
 
+
   Navigations.forEach((nav) => {
     const orientation = NavsOrientation[nav]
     const [module, task] = nav.split('/')

package/lazy.ts

@@ -1,34 +1,32 @@
 import { useEffect, useRef, useState } from 'react';
 
-export default function useLazyState<T>(initialState?: T): [T, (newState: T | ((newState: T) => T)) => void, () => T] {
-  const [, rerender] = useState({})
-  const dispatch = () => { rerender({}) }
-  const value = useRef(initialState)
-  const isMounted = useRef(true)
+export default function useLazyState<T>(initialState?: T): [T, (newValue: T | ((prev: T) => T)) => () => void, () => T] {
+  const [, rerender] = useState({});
+  const dispatch = () => rerender({});
+  const value = useRef<T>(initialState as T);
+  const isMounted = useRef(true);
 
-  const getter = () => {
-    return value.current
-  }
-
-  const setter = (newValue: T) => {
+  const setter = (newValue: T | ((prev: T) => T)) => {
     if (isMounted.current) {
-      if (typeof newValue == 'function') {
-        value.current = newValue(value.current)
+      if (typeof newValue === 'function') {
+        value.current = (newValue as (prev: T) => T)(value.current);
       } else {
         value.current = newValue;
       }
     }
     return () => {
       if (isMounted.current) {
-        dispatch()
+        dispatch();
       }
-    }
-  }
+    };
+  };
 
   useEffect(() => {
-    isMounted.current = true
-    return () => { isMounted.current = false }
-  }, [])
+    isMounted.current = true;
+    return () => {
+      isMounted.current = false;
+    };
+  }, []);
 
-  return [value.current, setter, getter]
-}
+  return [value.current, setter, () => value.current];
+}

package/modules/lib/focus.tsx

@@ -3,14 +3,14 @@
 
 import { useIsFocused } from '@react-navigation/native';
 import React, { useEffect } from 'react';
-import { InteractionManager, View } from 'react-native';
+import { InteractionManager, View, ViewStyle } from 'react-native';
 
 export interface LibFocusProps {
   isFocused?: boolean
   blurView?: any,
   onFocus?: () => void,
   onBlur?: () => void,
-  style?: any
+  style?: ViewStyle,
   children?: any
 }
 export interface LibFocusState {

package/modules/lib/icon.tsx

@@ -26,85 +26,86 @@ import {
 } from '@expo/vector-icons/build/esoftplay_icons';
 import { LibComponent } from 'esoftplay/cache/lib/component/import';
 import React from 'react';
+import { TextStyle } from 'react-native';
 
 export interface LibAntDesignIconProps {
   name: AntDesignTypes,
   size?: number,
   color?: string,
-  style?: any
+  style?: TextStyle
 }
 export interface LibEvilIconsIconProps {
   name: EvilIconsTypes,
   size?: number,
   color?: string,
-  style?: any
+  style?: TextStyle
 }
 export interface LibFeatherIconProps {
   name: FeatherTypes,
   size?: number,
   color?: string,
-  style?: any
+  style?: TextStyle
 }
 export interface LibFontAwesomeIconProps {
   name: FontAwesomeTypes,
   size?: number,
   color?: string,
-  style?: any
+  style?: TextStyle
 }
 export interface LibFontistoIconProps {
   name: FontistoTypes,
   size?: number,
   color?: string,
-  style?: any
+  style?: TextStyle
 }
 export interface LibFoundationIconProps {
   name: FoundationTypes,
   size?: number,
   color?: string,
-  style?: any
+  style?: TextStyle
 }
 export interface LibMaterialIconsIconProps {
   name: MaterialIconsTypes,
   size?: number,
   color?: string,
-  style?: any
+  style?: TextStyle
 }
 export interface LibEntypoIconProps {
   name: EntypoTypes,
   size?: number,
   color?: string,
-  style?: any
+  style?: TextStyle
 }
 export interface LibOcticonsIconProps {
   name: OcticonsTypes,
   size?: number,
   color?: string,
-  style?: any
+  style?: TextStyle
 }
 export interface LibZocialIconProps {
   name: ZocialTypes,
   size?: number,
   color?: string,
-  style?: any
+  style?: TextStyle
 }
 export interface LibSimpleLineIconProps {
   name: SimpleLineIconsTypes,
   size?: number,
   color?: string,
-  style?: any
+  style?: TextStyle
 }
 export interface LibIoniconsProps {
   name: IoniconsTypes,
   size?: number,
   color?: string,
-  style?: any
+  style?: TextStyle
 }
 
 export interface LibIconProps {
   name: MaterialCommunityIconsTypes,
   size?: number,
   color?: string,
-  style?: any
+  style?: TextStyle
 }
 
 export type LibIconStyle = MaterialCommunityIconsTypes

package/modules/lib/infinite.tsx

@@ -1,8 +1,7 @@
 // noPage
-import { FlashList } from "@shopify/flash-list";
+import { ContentStyle, FlashList } from "@shopify/flash-list";
 import { LibComponent } from 'esoftplay/cache/lib/component/import';
 import { LibCurl } from 'esoftplay/cache/lib/curl/import';
-import { LibListItemLayout } from 'esoftplay/cache/lib/list/import';
 import { LibLoading } from 'esoftplay/cache/lib/loading/import';
 import { LibStyle } from 'esoftplay/cache/lib/style/import';
 import { LibTextstyle } from 'esoftplay/cache/lib/textstyle/import';
@@ -54,7 +53,7 @@ export interface LibInfiniteProps {
   renderItem: (item: any, index: number) => any,
   viewabilityConfig?: any,
   removeClippedSubviews?: boolean,
-  style?: any
+  style?: ContentStyle
 }
 
 export interface LibInfiniteState {

package/modules/lib/list.tsx

@@ -2,7 +2,7 @@
 
 
 // 
-import { FlashList } from "@shopify/flash-list";
+import { ContentStyle, FlashList } from "@shopify/flash-list";
 import { LibComponent } from 'esoftplay/cache/lib/component/import';
 import React from "react";
 import { View } from 'react-native';
@@ -41,7 +41,7 @@ export interface LibListProps {
   renderFooter?: () => any,
   renderItem: (item: any, index: number) => any,
   viewabilityConfig?: any,
-  style?: any,
+  style?: ContentStyle,
   removeClippedSubviews?: boolean,
 }
 

package/modules/lib/navigation.ts

@@ -2,8 +2,10 @@
 // withObject
 import { CommonActions, StackActions } from '@react-navigation/native';
 import { LibNavigationRoutes } from 'esoftplay';
+import { EspArgsInterface } from 'esoftplay/cache/args';
 import { UserClass } from 'esoftplay/cache/user/class/import';
 import { UserRoutes } from 'esoftplay/cache/user/routes/import';
+
 import esp from 'esoftplay/esp';
 import React from "react";
 
@@ -35,7 +37,7 @@ export default {
     }
     return props?.route?.params?.[key] || defOutput;
   },
-  getArgsAll<S>(props: any, defOutput?: any): S {
+  getArgsAll<S extends keyof EspArgsInterface>(props: any, defOutput?: any): EspArgsInterface[S] {
     if (defOutput == undefined) {
       defOutput = "";
     }
@@ -61,7 +63,8 @@ export default {
       delete this._redirect[key]
     }
   },
-  navigate<S>(route: LibNavigationRoutes, params?: S): void {
+  /* <T  EspRouterInterface>(path: T): EspRouterInterface[T] { */
+  navigate<S extends keyof EspArgsInterface>(route: S, params?: EspArgsInterface[S]): void {
     this._ref?.navigate?.(route, params)
   },
   getResultKey(props: any): number {
@@ -85,7 +88,7 @@ export default {
     }
     this.back()
   },
-  navigateForResult<S>(route: LibNavigationRoutes, params?: S | any, key?: number): Promise<any> {
+  navigateForResult<S extends keyof EspArgsInterface>(route: S, params?: EspArgsInterface[S], key?: number): Promise<any> {
     if (!key) {
       key = 1
     }
@@ -102,12 +105,12 @@ export default {
       this.push(route, params)
     })
   },
-  replace<S>(route: LibNavigationRoutes, params?: any): void {
+  replace<S extends keyof EspArgsInterface>(route: S, params?: EspArgsInterface[S]): void {
     this._ref.dispatch(
       StackActions.replace(route, params)
     )
   },
-  push<S>(route: LibNavigationRoutes, params?: any): void {
+  push<S extends keyof EspArgsInterface>(route: S, params?: EspArgsInterface[S]): void {
     this._ref?.dispatch?.(
       StackActions.push(
         route,

package/modules/lib/picture.tsx

@@ -1,6 +1,7 @@
 // withHooks
 // noPage
 import React from 'react';
+import { ImageStyle } from 'react-native';
 import FastImage from 'react-native-fast-image';
 
 export interface LibPictureSource {
@@ -8,7 +9,7 @@ export interface LibPictureSource {
 }
 export interface LibPictureProps {
   source: LibPictureSource | any,
-  style: any,
+  style: ImageStyle,
   resizeMode?: "contain" | "cover",
   noCache?: boolean,
   onError?: () => void,

package/modules/lib/pin.tsx

@@ -2,15 +2,15 @@
 // noPage
 
 import React, { useEffect, useRef, useState } from 'react';
-import { TextInput, View } from 'react-native';
+import { TextInput, View, ViewStyle } from 'react-native';
 
 export interface LibPinProps {
   length: number,
   onChangePin: (pin: string) => void
-  boxStyle?: any,
+  boxStyle?: ViewStyle,
   overrideKeyboard?: boolean,
   pinValue?: string,
-  pinStyle?: any
+  pinStyle?: ViewStyle
 }
 export default function m(props: LibPinProps): any {
   const [pin, setPin] = useState<string[]>([])

package/modules/lib/scrollpicker.tsx

@@ -6,14 +6,15 @@ import {
   Dimensions,
   Platform, ScrollView, StyleSheet,
   Text,
-  View
+  View,
+  ViewStyle
 } from 'react-native';
 
 export interface LibScrollpickerProps {
   itemHeight: number;
   wrapperHeight: number;
   selectedIndex: number;
-  style?: any;
+  style?: ViewStyle;
   highlightColor: string;
   wrapperColor: string;
   renderItem: (item: any, index: number, isSelected: boolean) => any;

package/modules/lib/textstyle.tsx

@@ -1,11 +1,11 @@
 // noPage
 import { LibComponent } from 'esoftplay/cache/lib/component/import';
 import React from "react";
-import { StyleSheet, Text } from "react-native";
+import { StyleSheet, Text, TextStyle } from "react-native";
 
 export interface LibTextstyleProps {
   textStyle: "largeTitle" | "title1" | "title2" | "title3" | "headline" | "body" | "callout" | "subhead" | "footnote" | "caption1" | "caption2" | "m_h1" | "m_h2" | "m_h3" | "m_h4" | "m_h5" | "m_h6" | "m_subtitle1" | "m_subtitle2" | "m_body1" | "m_body2" | "m_button" | "m_caption" | "m_overline",
-  style?: any,
+  style?: TextStyle,
   children?: string | "",
   numberOfLines?: number,
   ellipsizeMode?: string,

package/package.json

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

package/state.ts

@@ -4,23 +4,23 @@ type useSafeStateReturn<T> = [T, (newState: T | ((newState: T) => T)) => void, (
 
 export default function useSafeState<T = any>(defaultValue?: T): useSafeStateReturn<T> {
   const isMountedRef = useRef<boolean>(true);
-  const valueRef = useRef(defaultValue)
-  const [, rerender] = useState({})
+  const valueRef = useRef<T>(defaultValue as T);
+  const [, rerender] = useState({});
 
-  const updateState = useCallback((value: T | undefined) => {
+  const updateState = useCallback((value: T | ((prevState: T) => T)) => {
     if (isMountedRef.current) {
-      if (typeof value == 'function') {
-        valueRef.current = value(valueRef.current)
+      if (typeof value === 'function') {
+        valueRef.current = (value as (prevState: T) => T)(valueRef.current);
       } else {
         valueRef.current = value;
       }
-      rerender({})
+      rerender({});
     }
   }, []);
 
   const getter = () => {
-    return valueRef.current
-  }
+    return valueRef.current;
+  };
 
   useEffect(() => {
     isMountedRef.current = true;