@fto-consult/expo-ui 3.6.1 → 4.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "3.6.1",
+  "version": "4.0.1",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -61,7 +61,7 @@
     "@emotion/native": "^11.10.0",
     "@expo/html-elements": "^0.2.0",
     "@expo/vector-icons": "^13.0.0",
-    "@fto-consult/common": "^2.15.4",
+    "@fto-consult/common": "^2.17.2",
     "@gorhom/portal": "^1.0.14",
     "@react-native-async-storage/async-storage": "~1.17.3",
     "@react-native-community/datetimepicker": "6.5.2",
@@ -70,7 +70,6 @@
     "@react-navigation/native-stack": "^6.9.7",
     "@shopify/flash-list": "1.3.1",
     "conf": "^10.2.0",
-    "electron": "^22.1.0",
     "expo": "^47.0.8",
     "expo-camera": "~13.1.0",
     "expo-clipboard": "~4.0.1",
@@ -86,6 +85,7 @@
     "google-libphonenumber": "^3.2.31",
     "htmlparser2-without-node-native": "^3.9.2",
     "mongo-parse": "^2.1.0",
+    "node-machine-id": "^1.1.12",
     "parent-package-json": "^2.0.1",
     "prop-types": "^15.8.1",
     "react": "18.1.0",
@@ -109,6 +109,7 @@
     "sharp-cli": "^2.1.0",
     "tippy.js": "^6.3.7",
     "use-event-callback": "^0.1.0",
+    "websql": "^2.0.3",
     "xlsx": "^0.18.5"
   },
   "devDependencies": {
@@ -118,6 +119,7 @@
     "@expo/webpack-config": "^0.17.3",
     "babel-plugin-inline-dotenv": "^1.7.0",
     "babel-plugin-module-resolver": "^4.1.0",
-    "babel-plugin-transform-inline-environment-variables": "^0.4.4"
+    "babel-plugin-transform-inline-environment-variables": "^0.4.4",
+    "electron": "^22.2.0"
   }
 }

package/readMe.md

@@ -1,11 +1,20 @@
-<!--
- Copyright 2022 @fto-consult/Boris Fouomene. All rights reserved.
- Use of this source code is governed by a BSD-style
- license that can be found in the LICENSE file.
--->
-
 ## Installation des dépendences, packages de dévéloppement
 
-```
+```javascript
 npm i --D @babel/plugin-proposal-export-namespace-from @babel/preset-react babel-plugin-inline-dotenv babel-plugin-module-resolver babel-plugin-transform-inline-environment-variables @expo/metro-config @expo/webpack-config
 ```
+
+## **#ELECTRON**
+
+## Pré-requis : Installer le package electron en global :  `npm i -g electron`
+
+### **Commandes electron : expo-ui electron cli**
+
+### `expo-ui [build|start] [compile] [build] [url=local-url] [platform=[window|linux|mac]] [arch=x64|x86]`
+
+1.  \[build|start\], le script à exécuter : build|start
+2.  \[compile\], si l'application sera compilé, via la commande expo export:web; valide lorsque aucune url n'est spécifiée
+3.  \[build\]\], si l'exécutable sera crée pour la plateforme \[platform\], valide uniquement pour le script \<\<build>>
+4.  \[url=local-url\], l'url à ouvrir via l'application electron (exemple : http://localhost:19006/), valide uniquement pour le script \<\<start>>;
+5.  \[plateforem\], la plateforme vers laquelle on souhaite exporter l'exécutable electron, vailde uniquement pour le script \<\<build>>
+6.  \[arch\], l'architecture de l'exécutable à exporter, valide uniquement pour le script \<\<build>>

package/src/components/Datagrid/Common/Common.js

@@ -3134,10 +3134,11 @@ export default class CommonDatagridComponent extends AppComponent {
         Elle pourra éventuellement passer directement la limite et les filtres à la fonction fetchdata
     */
     fetchData ({cb,callback,force,fetchOptions,...rest}){
-        if(!this._isMounted()) return Promise.resolve(this.state.data);
+        const sData = this.INITIAL_STATE.data || (!this.isTableData() || typeof this.props.fetchData !='function') ? this.props.data : this.state.data;
+        if(!this._isMounted()) return Promise.resolve(sData);
         if(this.isFetchingData) {
             if(!isPromise(this.fetchingPromiseData)){
-                this.fetchingPromiseData = Promise.resolve(this.state.data)
+                this.fetchingPromiseData = Promise.resolve(sData)
             }
             return this.fetchingPromiseData;
         };
@@ -3152,15 +3153,15 @@ export default class CommonDatagridComponent extends AppComponent {
                 fetchOptions = this.getFetchOptions({fetchOptions,convertToSQL:false});
                 if(typeof this.props.fetchOptionsMutator =='function' && this.props.fetchOptionsMutator(fetchOptions) === false){
                     this.isFetchingData = false;
-                    return resolve(this.state.data);
+                    return resolve(sData);
                 }
-                if(this.beforeFetchData(fetchOptions) === false) return resolve(this.state.data);
+                if(this.beforeFetchData(fetchOptions) === false) return resolve(sData);
                 if(this.willConvertFiltersToSQL()){
                     fetchOptions.selector = convertToSQL(fetchOptions.selector);
                 }
                 if(typeof this.props.beforeFetchData =='function' && this.props.beforeFetchData({...rest,context:this,force,fetchOptions,options:fetchOptions}) === false){
                     this.isFetchingData = false;
-                    return resolve(this.state.data);
+                    return resolve(sData);
                 }
                 if(force !== true && isArray(this.INITIAL_STATE.data)) {
                     return this.resolveFetchedDataPromise({cb,data:this.INITIAL_STATE.data}).then(resolve).catch(reject)
@@ -3190,8 +3191,7 @@ export default class CommonDatagridComponent extends AppComponent {
                             });;
                         })
                     } else {
-                        let data = !isPromise(fetchData)? Object.toArray(fetchData) : [];
-                        ///if(data.length <=0) data = this.state.data;
+                        const data = isObjOrArray(fetchData)? fetchData : sData;
                         return this.resolveFetchedDataPromise({cb,data,force}).then((data)=>{
                             resolve(data);
                         }).catch((e)=>{
@@ -3457,7 +3457,7 @@ export default class CommonDatagridComponent extends AppComponent {
         this[this.hidePreloaderOnRenderKey] = !!toggle;
     }
     onRender(){
-        if(!this.canHidePreloaderOnRender()) return ;
+        if(!this.canHidePreloaderOnRender() && this.isTableData() && this.canFetchOnlyVisibleColumns()) return ;
         if(typeof this.props.onRender ==='function' && this.props.onRender({context:this}) === false){
             return ;
         }
@@ -3545,11 +3545,11 @@ export default class CommonDatagridComponent extends AppComponent {
         }
     }
     getPointerEvents(){
-        if(this.enablePointerEventsRef.current) return true;
-        if(this.props.isLoading){
+        if(this.enablePointerEventsRef.current) return "auto";
+        if(this.props.isLoading == true){
             return "none";
         }
-        return this.isLoading()? "none":"auto";
+        return "auto";
     }
     updateLayout(p){
         this.measureLayout(state=>{

package/src/components/Datagrid/Table/index.js

@@ -125,7 +125,6 @@ const DatagridFactory = (Factory)=>{
             chartContainerProps = defaultObj(chartContainerProps);
             testID = this.getTestID();
             rest = defaultObj(rest);
-            let showDataSourceSelector = false;
             if(dataSourceSelector === true){
                 showDataSourceSelector = true;
             }  else if(dataSourceSelector ===false){

package/src/components/Table/index.js

@@ -59,7 +59,7 @@ const TableComponent = React.forwardRef(({containerProps,sortedColumn,listContai
     const hasEmptyData = emptyData && React.isValidElement(emptyData);
     const layoutRef = React.useRef({});
     
-    const preparedColumns = React.useStableMemo(()=>{
+    const preparedColumns = React.useMemo(()=>{
         const cols = {},headers = {},footers = {},filters = {},vColumnsMapping = [],visibleColumns = [],columnsNames = [];
         let hasFooters = false;
         columnProps = defaultObj(columnProps);
@@ -278,11 +278,7 @@ const TableComponent = React.forwardRef(({containerProps,sortedColumn,listContai
                     style = {[allScrollViewProps.style,headerScrollViewProps.style,{height:'100%',flex:1,flexWrap:'wrap'}]}
                     ref={headerScrollViewRef} 
                     horizontal {...allScrollViewProps}
-                    onScroll = {getOnScrollCb([scrollViewRef,footerScrollViewRef],null,(args)=>{
-                        return;
-                        const nativeEvent = args.nativeEvent;
-                        console.log(nativeEvent," is n event");
-                    })}
+                    onScroll = {getOnScrollCb([scrollViewRef,footerScrollViewRef])}
                     showsHorizontalScrollIndicator
             >
                     <View testID={testID+"Header2FootersWrapper"} style={[theme.styles.w100]}>

package/src/index.js

@@ -7,7 +7,7 @@ import { NavigationContainer} from '@react-navigation/native';
 import {navigationRef} from "$cnavigation"
 import NetInfo from '$utils/NetInfo';
 import Auth from "$cauth";
-import {isNativeMobile} from "$cplatform";
+import {isNativeMobile,isElectron} from "$cplatform";
 import Navigation from "./navigation";
 import {set as setSession,get as getSession} from "$session";
 import { showConfirm } from "$ecomponents/Dialog";
@@ -17,9 +17,10 @@ import {notify} from "$ecomponents/Dialog";
 import {decycle} from "$utils/json";
 import init from "$capp/init";
 import { setIsInitialized} from "$capp/utils";
-import {isObj,isNonNullString} from "$cutils";
+import {isObj,isNonNullString,isPromise,defaultObj,defaultStr} from "$cutils";
 import {loadFonts} from "$ecomponents/Icon/Font";
 import appConfig from "$capp/config";
+import Preloader from "$preloader";
 
 let MAX_BACK_COUNT = 1;
 let countBack = 0;
@@ -71,6 +72,56 @@ function App(props) {
        });
     };
     const subscription = AppState.addEventListener('change', AppStateService.getInstance().handleAppStateChange);
+    const beforeExitApp = (cb)=>{
+       return new Promise((resolve,reject)=>{
+          Preloader.closeAll();
+          showConfirm({
+              title : "Quitter l'application",
+              message : 'Voulez vous vraiment quitter l\'application?',
+              yes : 'Oui',
+              no : 'Non',
+              onSuccess : ()=>{
+                const foreceExit = ()=>{
+                  BackHandler.exitApp();
+                    if(isElectron() && window.ELECTRON && typeof ELECTRON.exitApp =='function'){
+                        ELECTRON.exitApp({APP});
+                    }
+                }
+                const exit = ()=>{
+                  if(typeof appConfig.beforeExit =='function'){
+                     const r2 = appConfig.beforeExit()
+                     if(!isPromise(r2)){
+                        throw {message:'La fonction before exit de appConfig.beforeExit doit retourner une promesse',returnedResult:r2}
+                     }
+                     return r2.then(foreceExit).catch(reject);
+                  }
+                  foreceExit();
+                }
+                const r = {APP,exit};
+                APP.trigger(APP.EVENTS.BEFORE_EXIT,exit,(result)=>{
+                  if(isObj(result) || Array.isArray(result)){
+                    for(let ik in result){
+                       if(result[ik] === false) return reject({message:'EXIT APP DENIED BY BEFORE EXIT EVENT HANDLER AT POSITON {0}'.sprintf(ik)});
+                    }
+                  }
+                  resolve(r);
+                  if(typeof cb =='function'){
+                     cb(r);
+                  }
+                });
+              },
+              onCancel : reject
+          })
+       })
+    }
+    /**** onBeforeExit prend en paramètre la fonction de rappel CB, qui lorsque la demande de sortie d'application est acceptée, alors elle est exécutée */
+    if(typeof APP.beforeExit !=='function'){
+      Object.defineProperties(APP,{
+         beforeExit : {
+            value : beforeExitApp,
+         }
+      })
+    }
     const backAction = (args) => {
       if(navigationRef && navigationRef.canGoBack()? true : false){
           resetExitCounter();
@@ -92,21 +143,10 @@ function App(props) {
           return false;
       }
       isBackConfirmShowing = true;
-      showConfirm({
-          title : "Quitter l'application",
-          message : 'Voulez vous vraiment quitter l\'application?',
-          yes : 'Oui',
-          no : 'Non',
-          onSuccess : ()=>{
-              isBackConfirmShowing = false;
-              countBack = 0;
-              BackHandler.exitApp();
-          },
-          onCancel : ()=>{
-              isBackConfirmShowing = false;
-              countBack = 0;
-              return;
-          }
+      return beforeExitApp().finally(x=>{
+        isBackConfirmShowing = false;
+      }).then(({exit})=>{
+          exit();
       })
     };
     const unsubscribeNetInfo = NetInfo.addEventListener(state => {
@@ -136,7 +176,11 @@ function App(props) {
           events.push(navigationRef.addListener(i,Events[i]));
         }
     }
-
+    APP.onElectron("BEFORE_EXIT",()=>{
+      return beforeExitApp().then(({exit})=>{
+        exit();
+      })
+    });
     APP.on(APP.EVENTS.BACK_BUTTON,backAction);
     return () => {
         APP.off(APP.EVENTS.BACK_BUTTON,backAction);