@fto-consult/expo-ui 6.21.22 → 6.22.1

package/%ProgramData%/Microsoft/Windows/UUS/State/_active.uusver

@@ -0,0 +1 @@
+1023.609.1142.0

package/app.config.json

@@ -0,0 +1,11 @@
+{
+	"name": "@FTO-CONSULT/EXPO-UI",
+	"version": "6.21.23",
+	"description": "Bibliothèque de composants UI Expo,react-native",
+	"bin": {
+		"expo-ui": "./bin/index.js"
+	},
+	"author": "Boris Fouomene",
+	"license": "ISC",
+	"homepage": "https://github.com/borispipo/expo-ui#readme"
+}

package/babel.config.alias.js

@@ -116,7 +116,9 @@ module.exports = (opts)=>{
     }
     const jsonPath = path.resolve(projectRoot,'package.json');
     if(fs.existsSync(jsonPath)){
-        require("./electron/utils/copy")(jsonPath,path.resolve(dir,"electron","package.app.json"));
+        try {
+            require("./electron/utils/copy")(jsonPath,path.resolve(dir,"electron","package.app.json"))
+        } catch{}
     }
     ///on sauvegarde les chemins des fichiers utiles, qui seront utilisées par la variable electron plus tard
     writeFile(path.resolve(dir,"electron","paths.json"),JSON.stringify(electronPaths));

package/expo-ui-path.js

@@ -15,6 +15,7 @@ module.exports = function (){
     })
     const expoUIPath = path.resolve(process.cwd(),"node_modules","@fto-consult","expo-ui");
     const sep = path.sep;
+    //return path.resolve(__dirname,suffix).replace(sep,(sep+sep));///pour la résolution du module expo-ui en mode test
     const rootPath = process.cwd();
     const src = path.resolve(rootPath,"src");
     try {

package/index.js

@@ -49,3 +49,9 @@ export default function registerApp (opts){
 }
 
 registerRootComponent(MainAppEntry);
+
+registerApp({
+    init : ()=>{
+        return Promise.resolve("test ted")
+    }
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "6.21.22",
+  "version": "6.22.1",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -43,7 +43,7 @@
     "expo-fix": "npx expo install --fix",
     "delete-node-modules": "rimraf ./**/node_modules",
     "modifier-url-remote-git": "git remote set-url origin 'https://borispipo@github.com/borispipo/smart-eneo.git'",
-    "update": "npm i expo @emotion/native@latest react-native-big-list@latest apexcharts@latest file-saver@latest fs-extra@latest google-libphonenumber@latest @pchmn/expo-material3-theme@latest @gorhom/portal@latest @emotion/native@latest @fto-consult/common@latest react-native-blob-util react-native-gesture-handler@latest react-native-iphone-x-helper@latest react-native-mime-types@latest react-native-paper@latest react-native-safe-area-context@latest react-native-paper-dates@latest @react-navigation/native@latest @react-navigation/native-stack@latest react-native-screens@latest react-virtuoso@latest tippy.js@latest websql@latest xlsx@latest && npx expo install --fix"
+    "update": "npm i expo @emotion/native@latest @react-native-community/netinfo@latest react-native-big-list@latest apexcharts@latest file-saver@latest fs-extra@latest google-libphonenumber@latest @pchmn/expo-material3-theme@latest @gorhom/portal@latest @emotion/native@latest @fto-consult/common@latest react-native-blob-util react-native-gesture-handler@latest react-native-iphone-x-helper@latest react-native-mime-types@latest react-native-paper@latest react-native-safe-area-context@latest react-native-paper-dates@latest @react-navigation/native@latest @react-navigation/native-stack@latest react-native-screens@latest react-virtuoso@latest tippy.js@latest websql@latest xlsx@latest && npx expo install --fix"
   },
   "bin": {
     "expo-ui": "./bin/index.js"
@@ -66,7 +66,7 @@
     "@emotion/native": "^11.11.0",
     "@expo/html-elements": "^0.5.1",
     "@expo/vector-icons": "^13.0.0",
-    "@fto-consult/common": "^3.24.7",
+    "@fto-consult/common": "^3.25.0",
     "@gorhom/portal": "^1.0.14",
     "@pchmn/expo-material3-theme": "^1.3.1",
     "@react-native-async-storage/async-storage": "1.18.2",

package/src/App.js

@@ -1,7 +1,6 @@
 import '$session';
 import React from 'react';
 import {SWRConfig} from "$swr";
-import {defaultObj} from "$cutils";
 import Index from './index';
 import notify  from "$notify";
 import { SafeAreaProvider } from 'react-native-safe-area-context';
@@ -19,6 +18,7 @@ import {isTouchDevice} from "$platform";
 import * as Utils from "$cutils";
 import {useContext} from "$econtext/hooks";
 import appConfig from "$capp/config";
+import { useKeepAwake } from 'expo-keep-awake';
 
 Object.map(Utils,(v,i)=>{
   if(typeof v =='function' && typeof window !='undefined' && window && !window[i]){
@@ -29,6 +29,7 @@ Object.map(Utils,(v,i)=>{
 export default function getIndex({onMount,onUnmount,render,onRender,init}){
     const {swrConfig} = useContext();
     const isScreenFocusedRef = React.useRef(true);
+    useKeepAwake();
     ///garde pour chaque écran sa date de dernière activité
     const screensRef = React.useRef({});//la liste des écrans actifs
     const activeScreenRef = React.useRef('');
@@ -130,7 +131,10 @@ export default function getIndex({onMount,onUnmount,render,onRender,init}){
               subscription?.remove()
             }
           },
-          initReconnect(callback) {
+          initReconnect(cb) {
+            const callback = ()=>{
+              cb();
+            }
             /* Register the listener with your state provider */
             APP.on(APP.EVENTS.GO_ONLINE,callback);
             return ()=>{

package/src/components/Label/index.js

@@ -10,7 +10,7 @@ const defaultSelectable = canTextBeSelectable();
 
 export const EllipsizeMode = {'head':'head','middle':'middle', 'tail':'tail' , 'clip':'clip'}
 
-const LabelComponent = React.forwardRef(({ children,color,upperCase,fontSize,testID,wrap,id,wrapText,error,underlined,splitText,secondary,primary,bold,textBold,disabled,text,style,...rest},ref)=> {
+const LabelComponent = React.forwardRef(({ children,role,color,upperCase,fontSize,testID,wrap,id,wrapText,error,underlined,splitText,secondary,primary,bold,textBold,disabled,text,style,...rest},ref)=> {
     children = defaultVal(children,text);
     let isText = false;
     if(!React.isValidElement(children) && Array.isArray(children) && children.length){
@@ -64,7 +64,10 @@ const LabelComponent = React.forwardRef(({ children,color,upperCase,fontSize,tes
         if(fontSize){
             r1.fontSize = fontSize;
         }
-        return (<Text allowFontScaling = {true} ref = {ref} selectable={defaultSelectable} {...rest} {...restProps} testID={testID} disabled={disabled} style={[styles.label,splitText?styles.wrap:null,splitText?styles.w100:null,bold?styles.bold:null,r2,style,r1,styles.webFontFamilly]}>{children}</Text>)
+        return (<Text  allowFontScaling = {true} ref = {ref} selectable={defaultSelectable} 
+            {...rest} {...restProps} testID={testID} disabled={disabled} 
+            role={typeof role =='string' && role && supportedRoles.includes(role.trim()) && role.trim() || undefined}
+            style={[styles.label,splitText?styles.wrap:null,splitText?styles.w100:null,bold?styles.bold:null,r2,style,r1,styles.webFontFamilly]}>{children}</Text>)
     }
     let hasP = false;
     if(isObj(rest)){
@@ -139,4 +142,7 @@ LabelComponentExported.withRef = React.forwardRef((props,ref)=>{
 
 LabelComponentExported.withRef.displayName = "LabelComponent.Dynamic";
 
-LabelComponentExported.WithRef = LabelComponentExported.withRef;
+LabelComponentExported.WithRef = LabelComponentExported.withRef;
+
+
+export const supportedRoles = ["alert","alertdialog","application","article","banner","button","cell","checkbox","columnheader","combobox","complementary","contentinfo","definition","dialog","directory","document","feed","figure","form","grid","group","heading","img","link","list","listitem","log","main","marquee","math","menu","menubar","menuitem","meter","navigation","none","note","option","presentation","progressbar","radio","radiogroup","region","row","rowgroup","rowheader","scrollbar","searchbox","separator","slider","spinbutton","status","summary","switch","tab","table","tablist","tabpanel","term","timer","toolbar","tooltip","tree","treegrid","treeitem"];

package/src/components/SplashScreen/index.js

@@ -102,32 +102,15 @@ const SplashScreenComponent = ({isLoaded,children , duration, delay,logoWidth,lo
   const child = (animationDone && isLoaded)? React.isValidElement(children) && children : null;
   return (
     <View style={[styles.container]} testID={testID} id={testID}>
-      {!animationDone && <View style={StyleSheet.absoluteFill} testID={testID+"_Animation"}/>}
-      <View style={styles.containerGlue}>
+      {!animationDone ? <View style={StyleSheet.absoluteFill} testID={testID+"_Animation"}/> : null}
+      <View style={styles.containerGlue} testID={testID+"_ContainerGlue"}>
         {!animationDone && (
           <Animated.View
             style={_staticBackground(logoOpacity, backgroundColor)}
             testID={testID+"_AnimationDone"}
           />
         )}
-        {(animationDone || isNative) && <Component style={[!disableAppScale && appScale, opacityClearToVisible, styles.flex]}>
-          {child}
-        </Component>}
-        {!animationDone && (
-          <Animated.Image
-            testID={testID+"AnimateImage"}
-            resizeMode={imageBackgroundResizeMode || "cover"}
-            source={imageBackgroundSource}
-            style={[disableImageBackgroundAnimation && _staticBackground(
-              logoOpacity,
-              backgroundColor
-            ), disableImageBackgroundAnimation && _dynamicImageBackground(
-              imageScale,
-              logoOpacity,
-              backgroundColor
-            )]}
-          />
-        )}
+        {(animationDone || isNative) && child}
         {!animationDone && (
           <PortalProvider>
             <PaperProvider>

package/src/components/SplashScreen/styles.js

@@ -42,7 +42,6 @@ export const _dynamicLogoStyle = (
 export const _dynamicCustomComponentStyle = (
   logoScale,
   logoOpacity,
-  logoWidth,
   logoHeight
 ) => [
   logoScale,

package/src/index.js

@@ -1,5 +1,5 @@
 import React from "$react"
-import { AppState,View,Text} from "react-native";
+import { AppState} from "react-native";
 import BackHandler from "$ecomponents/BackHandler";
 import * as Linking from 'expo-linking';
 import APP from "$capp";
@@ -59,7 +59,6 @@ const NAVIGATION_PERSISTENCE_KEY = 'NAVIGATION_STATE';
  *  getStartedRouteName : la route par défaut de getStarted lorsque l'application est en mode getStarted, c'est à dire lorsque la fonction init renvoie une erreur (reject)
  */
 function App({init:initApp,initialRouteName:appInitialRouteName,render,onMount}) {
-  return <View><Text>Un test pas comme les tttt</Text></View>;
   AppStateService.init();
   const {FontsIconsFilter,beforeExit,preferences:appPreferences,getStartedRouteName} = useContext();
   const [initialState, setInitialState] = React.useState(undefined);
@@ -176,7 +175,7 @@ function App({init:initApp,initialRouteName:appInitialRouteName,render,onMount})
       })
     };
     const unsubscribeNetInfo = NetInfo.addEventListener(state => {
-       APP.setOnlineState(state);
+        APP.setOnlineState(state);
     });
     NetInfo.fetch().catch((e)=>{
       console.log(e," is net info heinn")
@@ -190,8 +189,7 @@ function App({init:initApp,initialRouteName:appInitialRouteName,render,onMount})
           ...state,hasGetStarted:true,...defaultObj(args && args?.state),isInitialized:true,isLoading : false,
         });  
       }).catch((e)=>{
-          console.error(e," initializing app");
-          return;
+          console.error(e," loading resources for app initialization");
           setState({...state,isInitialized:true,isLoading : false,hasGetStarted:false});
       })
     });

package/src/screens/Help/openLibraries.js

@@ -1 +1 @@
-module.exports = {"@fto-consult/expo-ui":{"name":"@fto-consult/expo-ui","version":"6.21.20","repository":{"type":"git","url":"git+https://github.com/borispipo/expo-ui.git"},"homepage":"https://github.com/borispipo/expo-ui#readme"}};
+module.exports = {"@FTO-CONSULT/EXPO-UI":{"name":"@FTO-CONSULT/EXPO-UI","version":"6.21.23","homepage":"https://github.com/borispipo/expo-ui#readme"}};