@fto-consult/expo-ui 6.31.0 → 6.31.2

package/app.config.json

@@ -1,6 +1,6 @@
 {
 	"name": "@FTO-CONSULT/EXPO-UI",
-	"version": "6.30.0",
+	"version": "6.31.0",
 	"description": "Bibliothèque de composants UI Expo,react-native",
 	"bin": {
 		"expo-ui": "./bin/index.js"

package/babel.config.js

@@ -3,7 +3,6 @@ module.exports = function(api,opts) {
   api = api && typeof api =='object'? api : {};
   
   const isLocalDev = require("./is-local-dev")();//si l'application est en developpement local
-  
   ///les chemin vers la variable d'environnement, le chemin du fichier .env,@see : https://github.com/brysgo/babel-plugin-inline-dotenv
   //console.log(environmentPath," is envvv ",opts);
   const path = require("path");

package/electron/dependencies.js

@@ -6,7 +6,7 @@ module.exports = {
 		"node-sqlite" : "latest",
 	},
 	"dev" : {
-		"electron": "^22.2.0",
-		"electron-packager": "^17.1.1",
+		"electron": "latest",
+		"electron-packager": "latest",
 	}
 }

package/index.js

@@ -50,17 +50,14 @@ export default function registerApp (opts){
 
 registerRootComponent(MainAppEntry);
 
-const isLocalMode = true;
 //si après 5 secondes, l'application n'a pas été registrer, alors il s'agit d'un test en mode local
-if(isLocalMode){
-    registerApp({
-        navigation : {
-            screens : require("./src/test-screens").default
-        },
-        init : ({appConfig})=>{
-            appConfig.set("isAuthSingleUserAllowed",true);
-            appConfig.set("authDefaultUser",{code:"root",password:"admin123",label:"Master admin"})
-            return Promise.resolve("test ted")
-        }
-    });
-}
+registerApp({
+    navigation : {
+        screens : require("./src/test-screens").default
+    },
+    init : ({appConfig})=>{
+        appConfig.set("isAuthSingleUserAllowed",true);
+        appConfig.set("authDefaultUser",{code:"root",password:"admin123",label:"Master admin"})
+        return Promise.resolve("test ted")
+    }
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "6.31.0",
+  "version": "6.31.2",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -68,7 +68,7 @@
     "@expo/html-elements": "^0.5.1",
     "@expo/vector-icons": "^13.0.0",
     "@faker-js/faker": "^8.0.2",
-    "@fto-consult/common": "^3.29.8",
+    "@fto-consult/common": "^3.30.19",
     "@pchmn/expo-material3-theme": "^1.3.1",
     "@react-native-async-storage/async-storage": "1.18.2",
     "@react-native-community/datetimepicker": "7.2.0",
@@ -105,7 +105,7 @@
     "react-native-iphone-x-helper": "^1.3.1",
     "react-native-mime-types": "^2.4.0",
     "react-native-paper": "^5.10.3",
-    "react-native-paper-dates": "^0.18.19",
+    "react-native-paper-dates": "^0.18.20",
     "react-native-reanimated": "~3.3.0",
     "react-native-safe-area-context": "4.6.3",
     "react-native-screens": "~3.22.0",

package/src/components/Chart/appexChart/index.native.js

@@ -15,7 +15,7 @@ export const ChartComponent = React.forwardRef(({chartContext,testID,chartId,id,
         webViewRef.current.injectJavaScript(`
             const method = "${method}";
             const chartId = "${chartId}";
-            const a = ${typeof a =='string'? '"'+a.replaceAll('"','\"')+'"':typeof a =='boolean'? a : a && typeof a =='object'? JSON.stringify(a):undefined};
+            const a = ${typeof a =='string'? '"'+a.replaceAll('"','\"')+'"':typeof a =='boolean' || typeof a =="number" ? a : a && typeof a =='object'? JSON.stringify(a):undefined};
             let element = document.getElementById(chartId);
             if(!element){
                 element = document.createElement("div");
@@ -37,8 +37,8 @@ export const ChartComponent = React.forwardRef(({chartContext,testID,chartId,id,
     //@see : https://apexcharts.com/docs/methods/
     methodsNames.map((cb)=>{
         if(cb !=='exec'){
-            chartContext.current[cb]=(a,b,c,d,e)=>{
-                return exec(cb,a,b,c,d,e);
+            chartContext.current[cb]=(...args)=>{
+                return exec(cb,...args);
             }
         }
     });

package/src/components/Datagrid/Accordion/Row.js

@@ -190,7 +190,7 @@ const DatagridAccordionRow = React.forwardRef((props,ref)=>{
                     {title}
                     {description}
                 </View>
-                {right ? <Label testID={testID+"_Right"} primary selectable {...rightProps} style={[styles.right,styles.label,rStyles.lineHeight,rightProps.style]}>
+                {right && React.isValidElement(right,true) ? <Label testID={testID+"_Right"} primary selectable {...rightProps} style={[styles.right,styles.label,rStyles.lineHeight,rightProps.style]}>
                     {right}
                 </Label> : null}
             </View>

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

@@ -122,7 +122,7 @@ const DatagridFactory = (Factory)=>{
                 if(isObj(renderedContent.titleProps)){
                     titleProps = {...titleProps,...renderedContent.titleProps,style:[titleProps.style,renderedContent.titleProps.style]};
                 }
-                right = renderedContent.right
+                right = renderedContent.right;
                 rightProps = Object.assign({},renderedContent.rightProps);
                 description = defaultVal(renderedContent.description,renderedContent.content);
                 avatarContent = renderedContent.avatar;

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

@@ -174,6 +174,7 @@ export default class CommonDatagridComponent extends AppComponent {
             exportToPDFIsAllowed,
             exportToExcelIsAllowed,
             renderSectionListIsAllowed,
+            checkPerms : customCheckPerms,
             ...rest
         } = props;
         if(this.bindResizeEvents()){
@@ -204,6 +205,9 @@ export default class CommonDatagridComponent extends AppComponent {
         const ePDFIsAllowed = checkPerm(exportToPDFIsAllowed,pArgs);
         const eExcelISAllowed = checkPerm(exportToExcelIsAllowed,pArgs);
         const renderSectionListIsAllowedP = checkPerm(renderSectionListIsAllowed,pArgs);
+        if(typeof customCheckPerms =='function'){
+            customCheckPerms({context:this});
+        }
         Object.map(this.props.displayTypes,(dType,v)=>{
             if(isNonNullString(dType)){
                 dType = dType.toLowerCase().trim();
@@ -771,6 +775,7 @@ export default class CommonDatagridComponent extends AppComponent {
     }
     getActionsArgs (selected){
         const r = isObj(selected)? selected : {};
+        const isMobile = isMobileOrTabletMedia();
         const ret = {
             ...dataSourceArgs,
             rowsByKeys : this.rowsByKeys,
@@ -780,7 +785,8 @@ export default class CommonDatagridComponent extends AppComponent {
             notify,
             selected : defaultBool(selected,false),
             ...r,
-            isMobile : isMobileOrTabletMedia(),
+            isMobile,
+            isDesktop : !isMobile,
             component:'datagrid',
             data : this.state.data,
             rows : this.state.data,
@@ -789,7 +795,8 @@ export default class CommonDatagridComponent extends AppComponent {
             selectedRows : this.getSelectedRows(),
             selectedRowsCount : this.getSelectedRowsCount(),
             context:this,
-            isMobile : isMobileOrTabletMedia(),
+            isAccordion : this.isAccordion(),
+            isTableData : this.isTableData(),
             Auth,
         };
         if(this.props.getActionsArgs){
@@ -1264,6 +1271,7 @@ export default class CommonDatagridComponent extends AppComponent {
             DialogProvider.open({
                 title : 'Format de date',
                 subtitle : false,
+                withScrollView : true,
                 fields : {
                     dateFormat : {
                         type : 'select_dateformat',
@@ -1460,6 +1468,7 @@ export default class CommonDatagridComponent extends AppComponent {
             DialogProvider.open({
                 title : "Paramètres de groupe",
                 data : config,
+                withScrollView : true,
                 fields : {
                     displayGroupLabels : {
                         type : "switch",
@@ -1535,6 +1544,7 @@ export default class CommonDatagridComponent extends AppComponent {
                 title : 'Configuration des graphes',
                 subtitle : false,
                 data,
+                withScrollView : true,
                 fields : {
                     x : {
                         text : 'Axe des x[horizontal]',
@@ -1681,7 +1691,7 @@ export default class CommonDatagridComponent extends AppComponent {
     }
    ///reoturne les options de menus à appliquer sur le char
    getChartMenus(){
-        return  [
+        const menus =  [
             {
                 text : "Options du graphe",
                 textBold : true,
@@ -1692,7 +1702,23 @@ export default class CommonDatagridComponent extends AppComponent {
                 icon : "download",
                 onPress : this.downloadChart.bind(this),
             }
-        ]
+        ];
+        Object.map(this.props.chartActions,(menu,t)=>{
+            if(!isObj(menu)) return;
+            const {onPress} = menu;
+            menus.push({
+                ...menu,
+                onPress : (event)=>{
+                    if(!this.chartRef.current) return;
+                    const args = React.getOnPressArgs(event);
+                    args.chartContext = this.chartRef.current;
+                    if(typeof onPress =='function'){
+                        onPress(args);
+                    }
+                }
+            })
+        })
+        return menus;
    }
    getExportableFields(){
         return {
@@ -1736,6 +1762,7 @@ export default class CommonDatagridComponent extends AppComponent {
             return DialogProvider.open({
                 title : `Paramètre d'export ${excel?"excel":"pdf"}`,
                 data : sData,
+                withScrollView : true,
                 fields : {
                     ...this.getExportableFields(),
                     sheetName : excel && {
@@ -2907,7 +2934,7 @@ export default class CommonDatagridComponent extends AppComponent {
         const Cell = React.isComponent(args.Cell) ? args.Cell : View;
         const isA = this.isAccordion();
         const sectionListHeaderProps = defaultObj(args.sectionListHeaderProps);
-        const headerContent = <Label testID={testID+"_Label"} splitText numberOfLines={3} textBold {...sectionListHeaderProps} style={[theme.styles.w100,{color:theme.colors.primaryOnSurface,fontSize:isA?15 :16},lStyle,theme.styles.ph1,sectionListHeaderProps.style]}>{label}</Label>;
+        const headerContent = <Label testID={testID+"_Label"} splitText numberOfLines={3} textBold {...sectionListHeaderProps} style={[theme.styles.w100,{color:theme.colors.primaryOnSurface,fontSize:isA?15 :16},isA && tableStyles.accordionSectionListHeader,lStyle,theme.styles.ph1,sectionListHeaderProps.style]}>{label}</Label>;
         let hasAlreadRenderMainHeaderOnFirstCell = false;
         if(this.canShowFooters() && isObj(this.sectionListHeaderFooters[key])){
             const {visibleColumnsNames,widths} = defaultObj(this.preparedColumns);
@@ -2953,7 +2980,7 @@ export default class CommonDatagridComponent extends AppComponent {
             return <args.Row index={rowIndex} rowData={item} rowIndex={rowIndex} isSectionListHeader  cells={cells} headerContent={headerContent}/>
         }
         return <View testID={testID+"_ContentContainer"}  style={[theme.styles.w100,isA && this.state.displayOnlySectionListHeaders && {borderTopColor:theme.colors.divider,borderTopWidth:1},isA ? [theme.styles.ph2,theme.styles.pt1] : [theme.styles.pt1,theme.styles.noPadding,theme.styles.noMargin],theme.styles.justifyContentCenter,theme.styles.alignItemsCenter,theme.styles.pb1,!cells && theme.styles.ml1,theme.styles.mr1,cStyle]}>
-            {header}
+            {headerContent}
             {cells ? <View testID={testID+"_TableRow"} style = {[theme.styles.w100,theme.styles.row,isA && theme.styles.pt1,theme.styles.alignItemsFlexStart,this.isAccordion() && theme.styles.rowWrap]}
             >{cells}</View> : null}
         </View>
@@ -3845,6 +3872,10 @@ CommonDatagridComponent.propTypes = {
         PropTypes.object,
         PropTypes.object,
     ]),
+    chartActions : PropTypes.oneOfType([
+        PropTypes.object,
+        PropTypes.array, //les actions supplémentaires à passer au graphe chart
+    ]),
     /*** si l'opérateur or de filtre est accepté */
     filterOrOperator : PropTypes.bool,
     /*** si l'opérateur and de filtre est accepté */
@@ -4059,6 +4090,7 @@ CommonDatagridComponent.propTypes = {
     canFetchOnlyVisibleColumns : PropTypes.bool,//si l'on peut modifier le type d'affichage lié à la possibilité de récupérer uniquement les données reletives aux colonnes visibles
     useLinesProgressBar  : PropTypes.bool,//si le progress bar lignes horizontale seront utilisés
     abreviateValues : PropTypes.bool, //si les valeurs numériques seront abregées
+    checkPerms : PropTypes.func,//la fonction utilisée pour vérifier les permissions de l'utilisateur
 }
 
 const styles = StyleSheet.create({

package/src/components/Datagrid/SWRDatagrid.js

@@ -100,6 +100,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
         sort,
         defaultSortColumn,
         defaultSortOrder,
+        isLoading : customIsLoading,
         ...rest
     } = props;
     const {swrConfig} = useContext();
@@ -204,9 +205,9 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
     });
     const dataRef = React.useRef(null);
     const totalRef = React.useRef(0);
-    const loading = (isLoading || isValidating);
+    const loading = (customIsLoading === true || isLoading || isValidating);
     const {data,total} = React.useMemo(()=>{
-        if(loading || !isObjOrArray(result)){
+        if((loading && customIsLoading !== false) || !isObjOrArray(result)){
             return {data:dataRef.current,total:totalRef.current};
         }
         let {data,total} = (Array.isArray(result) ? {data:result,total:result.length} : isObj(result)? result : {data:[],total:0});

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

@@ -249,7 +249,8 @@ const DatagridFactory = (Factory)=>{
                                     ,icon :  showFooters?'view-column':'view-module'
                                     ,text : (showFooters?'Masquer/Ligne des totaux':'Afficher/Ligne des totaux')
                                 } : null,
-                                ...(selectableMultiple ? restItems : [])
+                                ...restItems,
+                                //...(selectableMultiple ? restItems : [])
                             ] : visibleColumns}
                         
                         />

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

@@ -5,6 +5,7 @@
 import Table from "../IndexComponent";
 import React from "$react";
 import { faker } from '@faker-js/faker';
+import DateLib from "$clib/date";
 export default function TestDatagridComponent({count,...props}){
     const data = React.useMemo(()=>{
         count = typeof count =='number' && count > 5 ? count : 100;
@@ -19,7 +20,7 @@ export default function TestDatagridComponent({count,...props}){
                 content : `${rowData.email}`,
                 title : rowData?.username,
                 //avatar : rowData.avatar,
-                right : rowData.birthdate,
+                right : DateLib.format(rowData.birthdate),
             }
         }}
     columns={{
@@ -32,6 +33,10 @@ export default function TestDatagridComponent({count,...props}){
             text : "Name",
             width : 220,
         },
+        amount : {
+            type : "number",
+            label : "Amount",
+        },
         email : {
             type : "email",
             label : 'Email',
@@ -51,6 +56,7 @@ export function createRandomUser (){
     return {
       userId: faker.string.uuid(),
       username: faker.internet.userName(),
+      amount : faker.number.int(),
       email: faker.internet.email(),
       avatar: faker.image.avatar(),
       password: faker.internet.password(),

package/src/components/Dialog/DialogContent.js

@@ -6,6 +6,6 @@ const DialogContentComponent = ({isPreloader,title,children,isFullScreen,...prop
     const isFull = isFullScreen();
     //useWindowDimensions();
     const content = React.useMemo(()=>children,[isPreloader,title,children]);
-    return isPreloader || !isFull ? content : <KeyboardAvoidingView>{content}</KeyboardAvoidingView>
+    return isPreloader || !isFull ? content : <KeyboardAvoidingView testID="RN_DialogKeybaordAvoidingView">{content}</KeyboardAvoidingView>
 }
 export default DialogContentComponent;

package/src/components/Drawer/index.js

@@ -34,8 +34,9 @@ const DrawerComponent = React.forwardRef((props,ref)=>{
       minimized,drawerItems,hideStatusBar,overlayColor, onDrawerMinimize,onDrawerToggleMinimize,
       onDrawerOpen,onDrawerClose,onDrawerToggle,header,headerProps,toggleIconProps,
       permanentToggleIcon,minimizedToggleIcon,temporaryToggleIcon,withMinimizedIcon,
-      isItemActive,onPageResize,navigationViewRef,children,testID,drawerType} = props;
+      isItemActive,onPageResize,navigationViewRef,children:customChildren,testID,drawerType} = props;
     
+    const children = React.useMemo(()=>customChildren,[customChildren]);
     testID = defaultStr(testID,"RN_DrawerComponent")
     const session = useSession(sessionName);
     sessionName = session.sessionName;

package/src/components/Dropdown/index.js

@@ -647,6 +647,9 @@ class DropdownComponent extends AppComponent {
             selectedText : this.getSelectedText(newSelected,selectedValuesKeys)
         });
     }
+    getBackgroundColor(){
+        return theme.surfaceBackground;
+    }
     render (){
         let {
             multiple:_multiple,
@@ -706,6 +709,7 @@ class DropdownComponent extends AppComponent {
             bindResizeEvents,
             left,
             right,
+            backgroundColor : cBackgroundColor,
             dialogProps,
             ...dropdownProps
         } = this.props;
@@ -837,10 +841,11 @@ class DropdownComponent extends AppComponent {
         helperText = <HelperText disabled = {disabled} error={error}>{helperText}</HelperText>
         let labelTextField = defaultVal(label,text);
         const isFlatMode = textInputProps.mode  === flatMode;
-        let backgroundColor = Colors.isValid(textInputProps.style.backgroundColor)?textInputProps.style.backgroundColor : Colors.isValid(flattenStyle.backgroundColor)? flattenStyle.backgroundColor : theme.colors.surface;
+        const dropdownStyle = StyleSheet.flatten(dropdownProps?.style);
+        let backgroundColor = Colors.isValid(cBackgroundColor)? cBackgroundColor : Colors.isValid(dropdownStyle?.backgroundColor)? dropdownStyle?.dropdownStyle: Colors.isValid(textInputProps.style.backgroundColor)?textInputProps.style.backgroundColor : Colors.isValid(flattenStyle.backgroundColor)? flattenStyle.backgroundColor : this.getBackgroundColor();
         const tagLabelStyle = {backgroundColor,color:Colors.setAlpha(theme.colors.text,theme.ALPHA)}
         if(!isFlatMode && backgroundColor ==='transparent'){
-            tagLabelStyle.backgroundColor = theme.colors.surface;
+            tagLabelStyle.backgroundColor = this.surfaceBackground();
         }
         textInputProps.style.backgroundColor = backgroundColor;
         progressBarProps = defaultObj(progressBarProps);
@@ -886,7 +891,6 @@ class DropdownComponent extends AppComponent {
                 accessibilityLabel={defaultStr(accessibilityLabel,label,text)}
                 testID = {testID}
             >
-            {<React.Fragment>{
                 <View {...dropdownProps} {...contentContainerProps} style={[contentContainerProps.style,{pointerEvents},flattenStyle]}
                     ref = {this.anchorRef}
                     collapsable = {false}
@@ -906,7 +910,7 @@ class DropdownComponent extends AppComponent {
                         alwaysUseLabel = {renderTag?true : false}
                         contentContainerProps = {{
                             ...contentContainerProps,
-                            style : [renderTag? styles.inputContainerTag:null,{pointerEvents:iconDisabled && (!enableCopy && disabled)?'none':'auto'},contentContainerProps.style],
+                            style : [renderTag? styles.inputContainerTag:null,{pointerEvents:iconDisabled && (!enableCopy && disabled)?'none':'auto'},styles.anchorContentContainer,contentContainerProps.style],
                         }}
                         containerProps = {{...containerProps,style:[containerProps.style,styles.mbO]}}
                         error = {!!error}
@@ -939,8 +943,7 @@ class DropdownComponent extends AppComponent {
                     />}
                     {!canHandle && isFlatMode && <ProgressBar  color={theme.colors.secondary} {...defaultObj(progressBarProps)} indeterminate />}
                     {helperText}
-                </View>
-            }</React.Fragment>}
+            </View>
         </Pressable>
 
         let restProps = {};
@@ -1067,7 +1070,7 @@ class DropdownComponent extends AppComponent {
                         {...listProps}
                         ref = {this.listRef}
                         responsive = {false}
-                        contentContainerStyle = {[{backgroundColor:theme.colors.surface},listProps.contentContainerStyle]}
+                        contentContainerStyle = {[{backgroundColor},listProps.contentContainerStyle]}
                         style = {[listProps.style]}
                         prepareItems = {false}
                         items = {renderingItems} 
@@ -1150,6 +1153,9 @@ const styles = StyleSheet.create({
         marginHorizontal : 0,
         paddingVertical : 0,
     },
+    anchorContentContainer : {
+        backgroundColor : 'transparent',
+    },
     searchInput : {
         paddingLeft : 8,
     },
@@ -1234,6 +1240,7 @@ const styles = StyleSheet.create({
 
 DropdownComponent.propTypes = {
     onAddCallback : PropTypes.func,
+    backgroundColor : PropTypes.string,//le background color du list
     checkedIcon : PropTypes.oneOfType([
         PropTypes.string,
         PropTypes.func,

package/src/components/Form/Form.js

@@ -3,7 +3,6 @@ import React from "$react";
 import {classExtends,isFunction,isNonNullString,defaultStr,defaultObj,defaultVal,extendObj} from "$cutils";
 import {warning,Forms} from "./utils";
 import Action from "./Action";
-import KeyboardAvoidingView from "$ecomponents/KeyboardAvoidingView";
 import { StyleSheet } from "react-native";
 import APP from "$capp/instance";
 import PropTypes from "prop-types";

package/src/components/Form/FormData/FormData.js

@@ -1,5 +1,5 @@
 import {getAppBarActionsProps} from "./utils";
-import React, {Component as AppComponent} from "$react";
+import React, {ObservableComponent as AppComponent} from "$react";
 import {isNonNullString,defaultStr,defaultNumber,defaultObj,extendObj,isObj,isFunction,defaultFunc,uniqid} from "$cutils";
 import {getForm,getFormField} from "../utils";
 import Surface from "$ecomponents/Surface";

package/src/components/Menu/utils.js

@@ -10,7 +10,7 @@ import Item from "./Item";
 export const MIN_WIDTH = 180;
 
 export const renderItems = (props)=>{
-    let _items = [];
+    const _items = [];
     let {items,renderItem,testID,isBottomSheetItem,onPressItem,filter,closeOnPressItem,openMenu,closeMenu,itemProps} = props;
     itemProps = defaultObj(itemProps);
     testID = defaultStr(testID,"RN_MenuComponents.Items")

package/src/components/Table/styles.js

@@ -125,5 +125,9 @@ const styles = StyleSheet.create({
         textAlign : "center",
         whiteSpace : "nowrap",
     },
+    accordionSectionListHeader : {
+        paddingLeft : 0,
+        paddingRight : 0,
+    },
 });
 export default styles;

package/src/components/TextField/index.js

@@ -542,7 +542,7 @@ const TextFieldComponent = React.forwardRef((componentProps,inputRef)=>{
                 {label}
             </Label> : null}
             <>
-                <Surface testID={testID+"_ContentContainer"}  {...contentContainerProps} elevation={0}  style={[styles.contentContainer,{pointerEvents},!left? styles.paddingLeft:null,styles.row,contentContainerStyle,contentContainerProps.style]}>
+                <Surface testID={testID+"_TextFieldContentContainer"}  {...contentContainerProps} elevation={0}  style={[styles.contentContainer,{pointerEvents},!left? styles.paddingLeft:null,styles.row,contentContainerStyle,contentContainerProps.style]}>
                     {left ? (<View testID={testID+"_Left"} {...leftContainerProps} style={[styles.AdornmentContainer,styles.leftAdornment,leftContainerProps.style,disabledStyle]}>
                         {left}
                     </View>) : null}

package/src/index.js

@@ -257,7 +257,7 @@ function App({init:initApp,initialRouteName:appInitialRouteName,render,onMount})
     ref={navigationRef}
     initialState={initialState}
     onStateChange={(state) =>{
-        setSession(NAVIGATION_PERSISTENCE_KEY,decycle(state),false);
+      setSession(NAVIGATION_PERSISTENCE_KEY,decycle(state),false);
     }
   }
   >

package/src/layouts/Screen/ScreenWithoutAuthContainer.js

@@ -132,7 +132,7 @@ export default function MainScreenScreenWithoutAuthContainer(props) {
               {fab}
             </ScrollView>
           ) : (
-            <View  testID={testID+'_ScreenContent'} {...rest} style={[styles.container, style]}>
+            <View  testID={testID+'_ScreenContent'} {...rest} style={[styles.container,contentContainerStyle, style]}>
               {children}
               {fab}
             </View>

package/src/layouts/Screen/TableData.js

@@ -217,7 +217,7 @@ export default class TableDataScreenComponent extends FormDataScreen{
             prepareField,
             prepareComponentProps,
             ...rest
-        } = this.prepareComponentProps({...props,tableName,fields:extendObj({},true,this.fields,props.fields),isUpdated,isUpdate:isUpdated,data,datas,currentIndex});
+        } = this.prepareComponentProps({...props,tableName,context:this,fields:extendObj({},true,this.fields,props.fields),isUpdated,isUpdate:isUpdated,data,datas,currentIndex});
         const sessionName = this.getSessionName();
         const prepareCb = typeof prepareField =='function'? prepareField : x=> x;
         ///on effectue une mutator sur le champ en cours de modification

package/src/screens/Help/openLibraries.js

@@ -1 +1 @@
-module.exports = {"@fto-consult/expo-ui":{"name":"@fto-consult/expo-ui","version":"6.30.1","repository":{"type":"git","url":"git+https://github.com/borispipo/expo-ui.git"},"homepage":"https://github.com/borispipo/expo-ui#readme"},"@emotion/native":{"version":"11.11.0","url":"https://emotion.sh","license":"MIT"},"@emotion/react":{"version":"11.11.1","url":"https://github.com/emotion-js/emotion/tree/main/packages/react","license":"MIT"},"@expo/html-elements":{"version":"0.5.1","url":"https://github.com/expo/expo/tree/main/packages/html-elements","license":"MIT"},"@expo/metro-config":{"version":"0.10.7","url":"https://github.com/expo/expo.git","license":"MIT"},"@expo/vector-icons":{"version":"13.0.0","url":"https://expo.github.io/vector-icons","license":"MIT"},"@expo/webpack-config":{"version":"19.0.0","url":"https://github.com/expo/expo-cli.git","license":"MIT"},"@faker-js/faker":{"version":"8.0.2","url":"https://github.com/faker-js/faker.git","license":"MIT"},"@fto-consult/common":{"version":"3.29.8","url":"https://github.com/borispipo/common#readme","license":"ISC"},"@pchmn/expo-material3-theme":{"version":"1.3.1","url":"https://github.com/pchmn/expo-material3-theme#readme","license":"MIT"},"@react-native-async-storage/async-storage":{"version":"1.18.2","url":"https://github.com/react-native-async-storage/async-storage#readme","license":"MIT"},"@react-native-community/datetimepicker":{"version":"7.2.0","url":"https://github.com/react-native-community/datetimepicker#readme","license":"MIT"},"@react-native-community/netinfo":{"version":"9.3.10","url":"https://github.com/react-native-netinfo/react-native-netinfo#readme","license":"MIT"},"@react-native/assets-registry":{"version":"0.72.0","url":"git@github.com:facebook/react-native.git","license":"MIT"},"@react-navigation/native":{"version":"6.1.7","url":"https://reactnavigation.org","license":"MIT"},"@react-navigation/native-stack":{"version":"6.9.13","url":"https://github.com/software-mansion/react-native-screens#readme","license":"MIT"},"@shopify/flash-list":{"version":"1.4.3","url":"https://shopify.github.io/flash-list/","license":"MIT"},"apexcharts":{"version":"3.42.0","url":"https://apexcharts.com","license":"MIT"},"babel-plugin-inline-dotenv":{"version":"1.7.0","url":"https://github.com/brysgo/babel-plugin-inline-dotenv#readme","license":"ISC"},"babel-plugin-module-resolver":{"version":"5.0.0","url":"https://github.com/tleunen/babel-plugin-module-resolver.git","license":"MIT"},"expo":{"version":"49.0.8","url":"https://github.com/expo/expo/tree/main/packages/expo","license":"MIT"},"expo-camera":{"version":"13.4.2","url":"https://docs.expo.dev/versions/latest/sdk/camera/","license":"MIT"},"expo-clipboard":{"version":"4.3.1","url":"https://docs.expo.dev/versions/latest/sdk/clipboard","license":"MIT"},"expo-font":{"version":"11.4.0","url":"https://docs.expo.dev/versions/latest/sdk/font/","license":"MIT"},"expo-image-picker":{"version":"14.3.2","url":"https://docs.expo.dev/versions/latest/sdk/imagepicker/","license":"MIT"},"expo-linking":{"version":"5.0.2","url":"https://docs.expo.dev/versions/latest/sdk/linking","license":"MIT"},"expo-sqlite":{"version":"11.3.2","url":"https://docs.expo.dev/versions/latest/sdk/sqlite/","license":"MIT"},"expo-status-bar":{"version":"1.6.0","url":"https://docs.expo.dev/versions/latest/sdk/status-bar/","license":"MIT"},"expo-system-ui":{"version":"2.4.0","url":"https://docs.expo.dev/versions/latest/sdk/system-ui","license":"MIT"},"expo-web-browser":{"version":"12.3.2","url":"https://docs.expo.dev/versions/latest/sdk/webbrowser/","license":"MIT"},"file-saver":{"version":"2.0.5","url":"https://github.com/eligrey/FileSaver.js#readme","license":"MIT"},"fs-extra":{"version":"11.1.1","url":"https://github.com/jprichardson/node-fs-extra","license":"MIT"},"google-libphonenumber":{"version":"3.2.33","url":"https://ruimarinho.github.io/google-libphonenumber/","license":"(MIT AND Apache-2.0)"},"htmlparser2-without-node-native":{"version":"3.9.2","url":"git://github.com/fb55/htmlparser2.git","license":"MIT"},"pdfmake":{"version":"0.2.7","url":"http://pdfmake.org","license":"MIT"},"process":{"version":"0.11.10","url":"git://github.com/shtylman/node-process.git","license":"MIT"},"prop-types":{"version":"15.8.1","url":"https://facebook.github.io/react/","license":"MIT"},"react":{"version":"18.2.0","url":"https://reactjs.org/","license":"MIT"},"react-content-loader":{"version":"6.2.1","url":"https://github.com/danilowoz/react-content-loader","license":"MIT"},"react-dom":{"version":"18.2.0","url":"https://reactjs.org/","license":"MIT"},"react-native":{"version":"0.72.4","license":"MIT"},"react-native-big-list":{"version":"1.6.1","url":"https://marcocesarato.github.io/react-native-big-list-docs/","license":"GPL-3.0-or-later"},"react-native-blob-util":{"version":"0.18.6","url":"https://github.com/RonRadtke/react-native-blob-util","license":"MIT"},"react-native-gesture-handler":{"version":"2.12.1","url":"https://github.com/software-mansion/react-native-gesture-handler#readme","license":"MIT"},"react-native-iphone-x-helper":{"version":"1.3.1","url":"https://github.com/ptelad/react-native-iphone-x-helper#readme","license":"MIT"},"react-native-mime-types":{"version":"2.4.0","license":"MIT"},"react-native-paper":{"version":"5.10.3","url":"https://callstack.github.io/react-native-paper","license":"MIT"},"react-native-paper-dates":{"version":"0.18.17","url":"https://github.com/web-ridge/react-native-paper-dates#readme","license":"MIT"},"react-native-reanimated":{"version":"3.3.0","url":"https://github.com/software-mansion/react-native-reanimated#readme","license":"MIT"},"react-native-safe-area-context":{"version":"4.6.3","url":"https://github.com/th3rdwave/react-native-safe-area-context#readme","license":"MIT"},"react-native-screens":{"version":"3.22.1","url":"https://github.com/software-mansion/react-native-screens#readme","license":"MIT"},"react-native-svg":{"version":"13.9.0","url":"https://github.com/react-native-community/react-native-svg","license":"MIT"},"react-native-web":{"version":"0.19.7","url":"git://github.com/necolas/react-native-web.git","license":"MIT"},"react-native-webview":{"version":"13.2.2","url":"https://github.com/react-native-webview/react-native-webview#readme","license":"MIT"},"react-virtuoso":{"version":"4.5.0","url":"https://virtuoso.dev/","license":"MIT"},"sharp-cli":{"version":"4.1.1","url":"https://github.com/vseventer/sharp-cli","license":"MIT"},"tippy.js":{"version":"6.3.7","url":"https://atomiks.github.io/tippyjs/","license":"MIT"},"uninstall":{"version":"0.0.0","license":"MIT"},"websql":{"version":"2.0.3","url":"git://github.com/nolanlawson/node-websql.git","license":"Apache-2.0"},"xlsx":{"version":"0.18.5","url":"https://sheetjs.com/","license":"Apache-2.0"}};
+module.exports = {"@fto-consult/expo-ui":{"name":"@fto-consult/expo-ui","version":"6.31.1","repository":{"type":"git","url":"git+https://github.com/borispipo/expo-ui.git"},"homepage":"https://github.com/borispipo/expo-ui#readme"},"@emotion/native":{"version":"11.11.0","url":"https://emotion.sh","license":"MIT"},"@emotion/react":{"version":"11.11.1","url":"https://github.com/emotion-js/emotion/tree/main/packages/react","license":"MIT"},"@expo/html-elements":{"version":"0.5.1","url":"https://github.com/expo/expo/tree/main/packages/html-elements","license":"MIT"},"@expo/metro-config":{"version":"0.10.7","url":"https://github.com/expo/expo.git","license":"MIT"},"@expo/vector-icons":{"version":"13.0.0","url":"https://expo.github.io/vector-icons","license":"MIT"},"@expo/webpack-config":{"version":"19.0.0","url":"https://github.com/expo/expo-cli.git","license":"MIT"},"@faker-js/faker":{"version":"8.0.2","url":"https://github.com/faker-js/faker.git","license":"MIT"},"@fto-consult/common":{"version":"3.30.19","url":"https://github.com/borispipo/common#readme","license":"ISC"},"@pchmn/expo-material3-theme":{"version":"1.3.1","url":"https://github.com/pchmn/expo-material3-theme#readme","license":"MIT"},"@react-native-async-storage/async-storage":{"version":"1.18.2","url":"https://github.com/react-native-async-storage/async-storage#readme","license":"MIT"},"@react-native-community/datetimepicker":{"version":"7.2.0","url":"https://github.com/react-native-community/datetimepicker#readme","license":"MIT"},"@react-native-community/netinfo":{"version":"9.3.10","url":"https://github.com/react-native-netinfo/react-native-netinfo#readme","license":"MIT"},"@react-native/assets-registry":{"version":"0.72.0","url":"git@github.com:facebook/react-native.git","license":"MIT"},"@react-navigation/native":{"version":"6.1.7","url":"https://reactnavigation.org","license":"MIT"},"@react-navigation/native-stack":{"version":"6.9.13","url":"https://github.com/software-mansion/react-native-screens#readme","license":"MIT"},"@shopify/flash-list":{"version":"1.4.3","url":"https://shopify.github.io/flash-list/","license":"MIT"},"apexcharts":{"version":"3.42.0","url":"https://apexcharts.com","license":"MIT"},"babel-plugin-inline-dotenv":{"version":"1.7.0","url":"https://github.com/brysgo/babel-plugin-inline-dotenv#readme","license":"ISC"},"babel-plugin-module-resolver":{"version":"5.0.0","url":"https://github.com/tleunen/babel-plugin-module-resolver.git","license":"MIT"},"expo":{"version":"49.0.8","url":"https://github.com/expo/expo/tree/main/packages/expo","license":"MIT"},"expo-camera":{"version":"13.4.2","url":"https://docs.expo.dev/versions/latest/sdk/camera/","license":"MIT"},"expo-clipboard":{"version":"4.3.1","url":"https://docs.expo.dev/versions/latest/sdk/clipboard","license":"MIT"},"expo-font":{"version":"11.4.0","url":"https://docs.expo.dev/versions/latest/sdk/font/","license":"MIT"},"expo-image-picker":{"version":"14.3.2","url":"https://docs.expo.dev/versions/latest/sdk/imagepicker/","license":"MIT"},"expo-linking":{"version":"5.0.2","url":"https://docs.expo.dev/versions/latest/sdk/linking","license":"MIT"},"expo-sqlite":{"version":"11.3.2","url":"https://docs.expo.dev/versions/latest/sdk/sqlite/","license":"MIT"},"expo-status-bar":{"version":"1.6.0","url":"https://docs.expo.dev/versions/latest/sdk/status-bar/","license":"MIT"},"expo-system-ui":{"version":"2.4.0","url":"https://docs.expo.dev/versions/latest/sdk/system-ui","license":"MIT"},"expo-web-browser":{"version":"12.3.2","url":"https://docs.expo.dev/versions/latest/sdk/webbrowser/","license":"MIT"},"file-saver":{"version":"2.0.5","url":"https://github.com/eligrey/FileSaver.js#readme","license":"MIT"},"fs-extra":{"version":"11.1.1","url":"https://github.com/jprichardson/node-fs-extra","license":"MIT"},"google-libphonenumber":{"version":"3.2.33","url":"https://ruimarinho.github.io/google-libphonenumber/","license":"(MIT AND Apache-2.0)"},"htmlparser2-without-node-native":{"version":"3.9.2","url":"git://github.com/fb55/htmlparser2.git","license":"MIT"},"pdfmake":{"version":"0.2.7","url":"http://pdfmake.org","license":"MIT"},"process":{"version":"0.11.10","url":"git://github.com/shtylman/node-process.git","license":"MIT"},"prop-types":{"version":"15.8.1","url":"https://facebook.github.io/react/","license":"MIT"},"react":{"version":"18.2.0","url":"https://reactjs.org/","license":"MIT"},"react-content-loader":{"version":"6.2.1","url":"https://github.com/danilowoz/react-content-loader","license":"MIT"},"react-dom":{"version":"18.2.0","url":"https://reactjs.org/","license":"MIT"},"react-native":{"version":"0.72.4","license":"MIT"},"react-native-big-list":{"version":"1.6.1","url":"https://marcocesarato.github.io/react-native-big-list-docs/","license":"GPL-3.0-or-later"},"react-native-blob-util":{"version":"0.18.6","url":"https://github.com/RonRadtke/react-native-blob-util","license":"MIT"},"react-native-gesture-handler":{"version":"2.12.1","url":"https://github.com/software-mansion/react-native-gesture-handler#readme","license":"MIT"},"react-native-iphone-x-helper":{"version":"1.3.1","url":"https://github.com/ptelad/react-native-iphone-x-helper#readme","license":"MIT"},"react-native-mime-types":{"version":"2.4.0","license":"MIT"},"react-native-paper":{"version":"5.10.3","url":"https://callstack.github.io/react-native-paper","license":"MIT"},"react-native-paper-dates":{"version":"0.18.20","url":"https://github.com/web-ridge/react-native-paper-dates#readme","license":"MIT"},"react-native-reanimated":{"version":"3.3.0","url":"https://github.com/software-mansion/react-native-reanimated#readme","license":"MIT"},"react-native-safe-area-context":{"version":"4.6.3","url":"https://github.com/th3rdwave/react-native-safe-area-context#readme","license":"MIT"},"react-native-screens":{"version":"3.22.1","url":"https://github.com/software-mansion/react-native-screens#readme","license":"MIT"},"react-native-svg":{"version":"13.9.0","url":"https://github.com/react-native-community/react-native-svg","license":"MIT"},"react-native-web":{"version":"0.19.7","url":"git://github.com/necolas/react-native-web.git","license":"MIT"},"react-native-webview":{"version":"13.2.2","url":"https://github.com/react-native-webview/react-native-webview#readme","license":"MIT"},"react-virtuoso":{"version":"4.5.0","url":"https://virtuoso.dev/","license":"MIT"},"sharp-cli":{"version":"4.1.1","url":"https://github.com/vseventer/sharp-cli","license":"MIT"},"tippy.js":{"version":"6.3.7","url":"https://atomiks.github.io/tippyjs/","license":"MIT"},"uninstall":{"version":"0.0.0","license":"MIT"},"websql":{"version":"2.0.3","url":"git://github.com/nolanlawson/node-websql.git","license":"Apache-2.0"},"xlsx":{"version":"0.18.5","url":"https://sheetjs.com/","license":"Apache-2.0"}};

package/src/screens/index.js

@@ -22,7 +22,11 @@ export const handleScreen = ({Screen,Factory,ModalFactory,result,filter,index})=
     } else if(typeof Screen ==='object' && React.isComponent(Screen.Component) && isNonNullString(Screen.screenName)){
         screenName = Screen.screenName;
         screenOptions = Screen.options;
+        const Modal = typeof Screen.Modal =='boolean'? Screen.Modal : typeof Screen.modal =='boolean'? Screen.modal : undefined;
         Screen = Screen.Component;
+        if(Modal !== undefined){
+            Screen.Modal = Modal;
+        }
     }
     if(React.isComponent(Screen)) {
         screenName = defaultStr(screenName,Screen.screenName);
@@ -74,7 +78,7 @@ export const handleScreen = ({Screen,Factory,ModalFactory,result,filter,index})=
                 options.elevation = typeof options.elevation =='number'? options.elevation : typeof Screen.elevation =='number'? Screen.elevation : undefined;
                 options.back = args.navigation.canGoBack();
                 options.extra = defaultObj(extra);
-                options.isModal = Screen.isModalScreen;
+                options.isModal = options.Modal = Screen.isModalScreen;
                 return options;
             }} component = {ScreenWrapper}/>);
         } else {

package/src/components/Datagrid/Test/fields.js

@@ -1,6 +0,0 @@
-// Copyright 2023 @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.
-export default {
-    
-}