@fto-consult/expo-ui 6.71.1 → 6.71.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "6.71.1",
+  "version": "6.71.3",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "main",
   "scripts": {

package/src/components/Fab/Group.js

@@ -213,24 +213,22 @@ const FabGroupComponent = React.forwardRef((props,innerRef)=>{
             MANAGER.active = null;
         }
     },[display]);
-    return <Portal>
-        <Group
-          {...rest}
-          color = {color}
-          style = {[rest.style,styles.container]}
-          fabStyle = {[styles.fab,fabStyle,{backgroundColor},!display && styles.hidden]}
-          open={open ?true : false}
-          icon={open ? openedIcon : closedIcon}
-          actions={actions}
-          onStateChange={onStateChange}
-          onPress={(e) => {
-            context.opened = open;
-            if (open && onOpen) {
-              onOpen(e);
-            }
-          }}
-        />
-    </Portal>
+    return <Group
+        {...rest}
+        color = {color}
+        style = {[rest.style,styles.container]}
+        fabStyle = {[styles.fab,fabStyle,{backgroundColor},!display && styles.hidden]}
+        open={open ?true : false}
+        icon={open ? openedIcon : closedIcon}
+        actions={actions}
+        onStateChange={onStateChange}
+        onPress={(e) => {
+          context.opened = open;
+          if (open && onOpen) {
+            onOpen(e);
+          }
+        }}
+      />
 });
 const actionType = PropTypes.shape({
     icon : PropTypes.string,

package/src/components/Form/Fields/SelectTableData/Component.js

@@ -23,7 +23,7 @@ const TableDataSelectField = React.forwardRef(({foreignKeyColumn,foreignKeyLabel
     props.data = defaultObj(props.data);
     const type = defaultStr(props.type)?.toLowerCase();
     isStructData = isStructData || type?.replaceAll("-","").replaceAll("_","").trim().contains("structdata");
-    const {getTableData:appGetForeignKeyTable,getStructData,components:{datagrid}} = useApp();
+    const {getTableData:appGetForeignKeyTable,getStructData} = useApp();
     if(!foreignKeyColumn && isNonNullString(props.field)){
         foreignKeyColumn = props.field;
     }
@@ -37,7 +37,7 @@ const TableDataSelectField = React.forwardRef(({foreignKeyColumn,foreignKeyLabel
         }
     }
     const getForeignKeyTable = typeof cGetForeignKeyTable =='function'? cGetForeignKeyTable : isStructData ? getStructData: appGetForeignKeyTable;
-    convertFiltersToSQL = defaultVal(convertFiltersToSQL,datagrid.convertFiltersToSQL);
+    convertFiltersToSQL = defaultVal(convertFiltersToSQL);
     const foreignKeyTableStr = defaultStr(foreignKeyTable,props.tableName,props.table);
     if(typeof getForeignKeyTable !=='function'){
         console.error("la fonction getTableData non définie des les paramètres d'initialisation de l'application!!! Rassurez vous d'avoir définier cette fonction!!, options : foreignKeyTable:",foreignKeyTable,"foreignKeyColumn:",foreignKeyColumn,props)
@@ -145,7 +145,7 @@ const TableDataSelectField = React.forwardRef(({foreignKeyColumn,foreignKeyLabel
     const context = {
         refresh : (force,cb)=>{
             if(!isMounted()) return;
-            if(typeof beforeFetchItems ==='function' && beforeFetchItems(fetchOptions) === false) return;
+            if(typeof beforeFetchItems ==='function' && beforeFetchItems({fetchOptions}) === false) return;
             let opts = Object.clone(fetchOptions);
             if(cPrepareFilters !== false){
                 opts.selector = prepareFilters(fetchOptions.selector,{convertToSQL:convertFiltersToSQL});
@@ -233,9 +233,11 @@ const TableDataSelectField = React.forwardRef(({foreignKeyColumn,foreignKeyLabel
                             itv = t =='money'? itv.formatMoney()  : itv.formatNumber();
                         }
                     }  else {
-                        if(typeof itv =='string' && itv && DateLib.isIsoDateStr(itv)){
-                            itv = DateLib.format(itv,DateLib.defaultDateFormat);
-                        }
+                        /***
+                            if(typeof itv =='string' && itv && DateLib.isIsoDateStr(itv)){
+                                itv = DateLib.format(itv,DateLib.defaultDateFormat);
+                            }
+                        */
                     }
                 }
                 itl+= (itl?" ":"")+ (itv || defaultStr(itv))

package/src/context/TableData.js

@@ -54,6 +54,7 @@ export function prepareScreens ({tables,screens:screensProps,TableDataScreen,Tab
     TableDataScreenComponentRef.current = React.isComponent(TableDataScreen)? TableDataScreen : TableDataScreenComponentRef.current;
     TableDataScreenComponentRef.List = React.isComponent(TableDataScreenList)? TableDataScreenList : TableDataScreenComponentRef.List;
     const Modal = defaultBool(TableDataScreenComponentRef.current?.Modal,TableDataScreenComponentRef.current?.modal,true)
+    const withFab = typeof TableDataScreenComponentRef.current?.withFab =="boolean"? TableDataScreenComponentRef.current?.withFab : false;
     loopForScreen(screensProps,screens,foundTables);
     Object.map(tables,(table,i)=>{
         if(!isObj(table) || !isNonNullString(i)) return;
@@ -63,16 +64,19 @@ export function prepareScreens ({tables,screens:screensProps,TableDataScreen,Tab
             screens.push({
                 Component : TableDataScreenItem,
                 screenName,
+                withFab,
                 Modal
             })
             foundTables[screenName] = TableDataScreenItem;
         } else if(React.isComponent(foundTables[screenName])){
             foundTables[screenName].Modal = defaultBool(foundTables[screenName]?.Modal,foundTables[screenName].modal,Modal)
+            foundTables[screenName].withFab = typeof foundTables[screenName]?.withFab ==="boolean" ? foundTables[screenName]?.withFab : withFab;
         }
         if(!foundTables[listScreenName] && table.datagrid !== false){
             screens.push({
                 Component : TableDataListScreen,
                 screenName : listScreenName,
+                withFab,
             });
             foundTables[listScreenName] = TableDataListScreen;
         }

package/src/layouts/Fab/index.js

@@ -14,7 +14,6 @@ const FabLayoutComponent = React.forwardRef((p,ref)=>{
   const {components:{fabPropsMutator},tablesData} = useExpoUI();
   const {style,actions:fabActions,...props} = typeof fabPropsMutator == 'function'? extendObj({},p,fabPropsMutator({...p,isLoggedIn})) : p;
   const isLoggedIn = useIsSignedIn();
-  const isMounted = React.useIsMounted();
   const tables = isObjOrArray(fabActions)? fabActions : tablesData;
   const actions = React.useMemo(()=>{
       if(Array.isArray(fabActions)) return fabActions;

package/src/layouts/Screen/ScreenWithoutAuthContainer.js

@@ -100,7 +100,7 @@ export default function MainScreenScreenWithoutAuthContainer(props) {
   const Wrapper = React.useMemo(()=>modal ? PortalCP : React.Fragment,[modal]);
   const WrapperProps = modal? {screenName} : {};
   const portalId = uniqid("screeen-container-"+screenName);
-  return <Wrapper {...WrapperProps}>
+  return <Wrapper {...WrapperProps} key={screenName}>
     <View  testID={testID+"_ScreenContentContainer"} id={portalId} {...containerProps} style={[styles.container,{backgroundColor},modal && styles.modal,containerProps.style]} >
       <KeyboardAvoidingView testID={testID} {...keyboardAvoidingViewProps} style={[styles.keyboardAvoidingView,keyboardAvoidingViewProps.style]}>
           {withStatusBar !== false ? <StatusBar/> : null}
@@ -134,8 +134,8 @@ export default function MainScreenScreenWithoutAuthContainer(props) {
   </Wrapper>
 }
 
-const PortalCP = ({children})=>{
-  return <RNPortal>
+const PortalCP = ({children,screenName})=>{
+  return <RNPortal key={screenName}>
     {children}
   </RNPortal>
 }

package/src/screens/ScreenWrapper.js

@@ -63,7 +63,7 @@ export default function ScreenWrapperNavComponent(_props){
     },[]);
     setScreenOptions(options);
     const allowDrawer = typeof options.allowDrawer ==='boolean'? options.allowDrawer : typeof options.withDrawer =='boolean'? options.withDrawer : typeof Screen.allowDrawer =='boolean'? Screen.allowDrawer : typeof Screen.withDrawer =='boolean' ? Screen.withDrawer : Screen.isModalScreen == true ? false : true;
-    const withFab = typeof options.withFab ==='boolean' ? options.withFab : typeof Screen.withFab =='boolean'? Screen.withFab : allowDrawer;
+    const withFab = typeof options.withFab ==='boolean' ? options.withFab : typeof Screen.withFab =='boolean'? Screen.withFab : false;
     return <Screen 
         withFab = {withFab}
         groupName = {groupName}