@fto-consult/expo-ui 6.73.15 → 6.74.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "6.73.15",
+  "version": "6.74.1",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "main",
   "scripts": {
@@ -82,7 +82,7 @@
     "@react-navigation/stack": "^6.3.20",
     "@shopify/flash-list": "1.4.3",
     "apexcharts": "^3.44.0",
-    "expo": "^49.0.16",
+    "expo": "^49.0.17",
     "expo-camera": "~13.4.4",
     "expo-clipboard": "~4.3.1",
     "expo-font": "~11.4.0",
@@ -99,7 +99,7 @@
     "htmlparser2-without-node-native": "^3.9.2",
     "is-plain-obj": "^4.1.0",
     "js-base64": "^3.7.5",
-    "pdfmake": "^0.2.7",
+    "pdfmake": "^0.2.8",
     "process": "^0.11.10",
     "prop-types": "^15.8.1",
     "react": "^18.2.0",

package/src/components/Datagrid/SWRDatagrid.js

@@ -101,15 +101,16 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
         defaultSortColumn,
         defaultSortOrder,
         isLoading : customIsLoading,
+        icon : cIcon,
         ...rest
     } = props;
     const {swrConfig} = useContext();
     rest = defaultObj(rest);
     rest.exportTableProps = defaultObj(rest.exportTableProps)
     const firstPage = 1;
-    const tableName = defaultStr(table.tableName,table.table).trim().toUpperCase();
-    defaultSortColumn = defaultStr(defaultSortColumn,table.defaultSortColumn);
-    defaultSortOrder = defaultStr(defaultSortOrder,table.defaultSortOrder).toLowerCase().trim();
+    const tableName = defaultStr(table?.tableName,table?.table).trim().toUpperCase();
+    defaultSortColumn = defaultStr(defaultSortColumn,table?.defaultSortColumn);
+    defaultSortOrder = defaultStr(defaultSortOrder,table?.defaultSortOrder).toLowerCase().trim();
     sort = isNonNullString(sort)? {column:sort} : isObj(sort)?sort : {};
     const sColumn = defaultStr(sort.column,defaultSortColumn);
     if(sColumn){
@@ -120,26 +121,28 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
     } else {
         delete sort.column;
     }
-    canMakePhoneCall = defaultBool(canMakePhoneCall,table.canMakePhoneCall);
-    makePhoneCallProps = isValidMakePhoneCallProps(makePhoneCallProps) && makePhoneCallProps || isValidMakePhoneCallProps(rest.makePhoneCallProps) && rest.makePhoneCallProps ||  isValidMakePhoneCallProps(table.makePhoneCallProps) && table.makePhoneCallProps || {};
-    rowKey = defaultStr(rowKey,table.rowKey,table.primaryKeyColumnName);
-    const title = React.isValidElement(customTitle,true) && customTitle || defaultStr(table.label,table.text)
-    columns = table.fields;
+    canMakePhoneCall = defaultBool(canMakePhoneCall,table?.canMakePhoneCall);
+    makePhoneCallProps = isValidMakePhoneCallProps(makePhoneCallProps) && makePhoneCallProps || isValidMakePhoneCallProps(rest.makePhoneCallProps) && rest.makePhoneCallProps ||  isValidMakePhoneCallProps(table?.makePhoneCallProps) && table?.makePhoneCallProps || {};
+    rowKey = defaultStr(rowKey,table?.rowKey,table?.primaryKeyColumnName);
+    const title = React.isValidElement(customTitle,true) && customTitle || defaultStr(table?.label,table?.text)
+    columns = (isObj(columns) || Array.isArray(columns)) && Object.size(columns,true) && columns || table?.fields;
     const fetchFields = [];
     Object.map(columns,(column,i)=>{
         if(isObj(column)){
             fetchFields.push(defaultStr(column.field,i));
         }
-    })
-    actions = defaultVal(table.actions,actions);
-    for(let i in Datagrid.propTypes){
-        if(i in table){
-            rest[i] = isObj(rest[i])? extendObj(true,{},rest[i],table[i]) : table[i];
+    });
+    actions = defaultVal(table?.actions,actions);
+    if(isObj(table) && isObj(table?.datagrid)){
+        for(let i in Datagrid.propTypes){
+            if(i in table){
+                rest[i] = isObj(rest[i])? extendObj({},rest[i],table[i]) : table[i];
+            }
         }
     }
     rest.actions = actions;
     rest.columns = columns || [];
-    const icon = defaultStr(table.icon);
+    const icon = defaultStr(cIcon,table?.icon);
     rest.tableName = tableName;
     rest.canMakePhoneCall = canMakePhoneCall;
     rest.makePhoneCallProps = makePhoneCallProps;
@@ -151,7 +154,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
     },rest.exportTableProps.pdf);
     const fetchOptionsRef = React.useRef(defaultObj(customFetchOptions));
     const fPathRef = React.useRef(defaultStr(fetchPathKey,uniqid("fetchPath")));
-    fetchPath = defaultStr(fetchPath,table.queryPath,tableName.toLowerCase()).trim();
+    fetchPath = defaultStr(fetchPath,table?.queryPath,tableName.toLowerCase()).trim();
     if(fetchPath){
         fetchPath = setQueryParams(fetchPath,"SWRFetchPathKey",fPathRef.current)
     }
@@ -292,7 +295,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
     return (
         <Datagrid 
             testID = {testID}
-            {...defaultObj(table.datagrid)} 
+            {...defaultObj(table?.datagrid)} 
             {...rest}
             title = {customTitle || title || undefined}
             sort = {sort}
@@ -448,7 +451,7 @@ SWRDatagridComponent.propTypes = {
             PropTypes.objectOf(PropTypes.object),
             PropTypes.arrayOf(PropTypes.object),
         ])
-    }).isRequired,
+    }),
 }
 
 const styles = StyleSheet.create({