@fto-consult/expo-ui 5.8.0 → 5.8.2

package/appConfig.txt

@@ -21,4 +21,6 @@
     getTableData : {function(tableName)=>table} retourne l'ojet table data,
     swrRefreshTimeout : {number} le délai d'inactivité auquel, une fois l'application active, les données de type listData sont rafraichies
     handleHelpScreen : {boolean}, //if Help screen will be added on navigation's main drawer
+    
+    checkNavigationPermsOnTableOrStructData : {boolean}, si le test de la permission sur la table data où sur la struct data sera effectuée lorsqu'on appelera la fonction navigateToTableData ou navigateToStructData
  }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "5.8.0",
+  "version": "5.8.2",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -61,7 +61,7 @@
     "@emotion/native": "^11.10.6",
     "@expo/html-elements": "^0.2.0",
     "@expo/vector-icons": "^13.0.0",
-    "@fto-consult/common": "^3.10.69",
+    "@fto-consult/common": "^3.10.70",
     "@gorhom/portal": "^1.0.14",
     "@react-native-async-storage/async-storage": "^1.17.11",
     "@react-native-community/datetimepicker": "^6.7.3",
@@ -71,7 +71,7 @@
     "@react-navigation/native-stack": "^6.9.12",
     "@shopify/flash-list": "^1.4.0",
     "apexcharts": "^3.37.2",
-    "expo": "^48.0.10",
+    "expo": "^48.0.15",
     "expo-camera": "~13.2.1",
     "expo-clipboard": "~4.1.1",
     "expo-font": "~11.1.1",
@@ -107,7 +107,6 @@
     "react-virtuoso": "^4.0.9",
     "sharp-cli": "^2.1.0",
     "tippy.js": "^6.3.7",
-    "use-event-callback": "^0.1.0",
     "websql": "^2.0.3",
     "xlsx": "^0.18.5"
   },

package/src/App.js

@@ -31,8 +31,6 @@ Object.map(Utils,(v,i)=>{
   }
 });
 export default function getIndex({onMount,onUnmount,swrConfig,render,onRender,preferences:appPreferences,...rest}){
-  const child = <Index {...rest} theme={theme}/>;
-  const content = typeof render == 'function'? render({children:child}) : child;
   const isScreenFocusedRef = React.useRef(true);
     ///garde pour chaque écran sa date de dernière activité
     const screensRef = React.useRef({});//la liste des écrans actifs
@@ -110,6 +108,8 @@ export default function getIndex({onMount,onUnmount,swrConfig,render,onRender,pr
         theme,
         ...defaultObj(pref),
     }),[theme,pref]);
+    const child = <Index {...rest} theme={theme}/>;
+    const content = typeof render == 'function'? render({children:child,appConfig,config:appConfig}) : child;  
     return (
       <SWRConfig 
         value={{

package/src/components/Grid/Grid.js

@@ -10,11 +10,11 @@ const GridComponent = React.forwardRef((p,ref)=>{
     const {onPress,responsive,activeOpacity,onLongPress,flexGrow =1,flex:customFlex,style,onPressIn,col,onPressOut,...props} = p;
     const testID = defaultStr(props.testID,"RN_GridComponent");
     const flattenedStyle = StyleSheet.flatten(style);
-    const flex = customFlex !== undefined ? customFlex :   (flattenedStyle && (col && flattenedStyle.width || !col && flattenedStyle.height)) ? 0 : 0;
+    const flex = customFlex !== undefined ? customFlex :   (flattenedStyle && (col && flattenedStyle.width || !col && flattenedStyle.height)) ? undefined : undefined;
     const C = onPress || onLongPress || onPressIn || onPressOut ? TouchableOpacity : View;
     return <C {...props} activeOpacity={activeOpacity} onLongPress={onLongPress} onPressIn={onPressIn} onPressOut={onPressOut}
         testID={testID+"_Container"} onPress={onPress}
-        style={[styles.container,{flexGrow},col && {flexDirection:'column'},responsive!== false && !col && grid.row(false),style,{flex}]} ref={ref}
+        style={[styles.container,{flexGrow},col && {flexDirection:'column'},responsive!== false && !col && grid.row(false),style,flex !== undefined && {flex}]} ref={ref}
     />
 });
 

package/src/components/Snackbar/index.js

@@ -12,7 +12,7 @@ import {
 import theme from "$theme";
 import {defaultObj,isObj,defaultStr} from "$cutils";
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
-import useEventCallback from 'use-event-callback';
+import useEventCallback from '$react/useEventCallback';
 import PropTypes from "prop-types";
 import Surface from '$ecomponents/Surface';
 import Label from "$ecomponents/Label"

package/src/layouts/Fab/index.js

@@ -89,6 +89,6 @@ const styles = StyleSheet.create({
     tables : PropTypes.oneOfType([
         PropTypes.objectOf(PropTypes.object),
         PropTypes.arrayOf(PropTypes.object)
-    ]).isRequired,
+    ]),
     screenName : PropTypes.string,
   }

package/src/navigation/utils.js

@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 import {navigate,sanitizeName} from "$cnavigation";
 import {isNonNullString,defaultStr,defaultObj,isObj} from "$cutils";
-
+import appConfig from "$capp/config";
 
 export const tableDataRouteName = 'TableData';
 
@@ -25,10 +25,12 @@ const navigateToTableOrStructData = function(tableName,params,actionType){
     const isTableData = actionType =='tabledata';
     if(isNonNullString(perm)){
         isAllowed = Auth.isAllowedFromStr(perm)
-    } else if(actionType =='structdata') {
-        isAllowed = Auth.isStructDataAllowed({table:tableName})
-    } else if(isTableData){
-        isAllowed = Auth.isTableDataAllowed({table:tableName});
+    } else if(appConfig.checkNavigationPermsOnTableOrStructData !== false){
+        if(actionType =='structdata') {
+            isAllowed = Auth.isStructDataAllowed({table:tableName})
+        } else if(isTableData){
+            isAllowed = Auth.isTableDataAllowed({table:tableName});
+        }
     }
     if(!isAllowed){
         return Auth.showError();