@fto-consult/expo-ui 5.7.5 → 5.7.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "5.7.5",
+  "version": "5.7.6",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -58,17 +58,17 @@
   },
   "homepage": "https://github.com/borispipo/expo-ui#readme",
   "dependencies": {
-    "@emotion/native": "^11.10.0",
+    "@emotion/native": "^11.10.6",
     "@expo/html-elements": "^0.2.0",
     "@expo/vector-icons": "^13.0.0",
-    "@fto-consult/common": "^3.10.48",
+    "@fto-consult/common": "^3.10.55",
     "@gorhom/portal": "^1.0.14",
     "@react-native-async-storage/async-storage": "^1.17.11",
     "@react-native-community/datetimepicker": "^6.7.3",
     "@react-native-community/netinfo": "^9.3.7",
     "@react-native/assets-registry": "^0.72.0",
-    "@react-navigation/native": "^6.1.1",
-    "@react-navigation/native-stack": "^6.9.7",
+    "@react-navigation/native": "^6.1.6",
+    "@react-navigation/native-stack": "^6.9.12",
     "@shopify/flash-list": "^1.4.0",
     "apexcharts": "^3.37.2",
     "expo": "^48.0.10",
@@ -83,12 +83,12 @@
     "expo-web-browser": "~12.1.1",
     "file-saver": "^2.0.5",
     "fs-extra": "^11.1.1",
-    "google-libphonenumber": "^3.2.31",
+    "google-libphonenumber": "^3.2.32",
     "htmlparser2-without-node-native": "^3.9.2",
     "process": "^0.11.10",
     "prop-types": "^15.8.1",
     "react": "^18.2.0",
-    "react-content-loader": "^6.2.0",
+    "react-content-loader": "^6.2.1",
     "react-dom": "^18.2.0",
     "react-native": "^0.71.3",
     "react-native-big-list": "^1.6.0",

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

@@ -774,12 +774,15 @@ export default class CommonDatagridComponent extends AppComponent {
         }
         const footers = this.getFootersFields(true);
         let isAccordion = this.isAccordion();
+        const rowKeysColumns = {};
         Object.mapToArray(columns,(headerCol1,headerIndex)=>{
             if(!isObj(headerCol1)) return;
-            const headerCol = Object.clone(headerCol1);
-            if(isAccordion && headerCol.accordion === false) return null;
-            let header = {...headerCol};
+            const header = Object.clone(headerCol1);
             header.field = defaultStr(header.field, headerIndex)
+            if(header.primaryKey){
+                rowKeysColumns[header.field] = true;
+            }
+            if(isAccordion && header.accordion === false) return null;
             header.type = defaultStr(header.jsType,header.type,"text").toLowerCase();
             if(header.type.contains("date")){
                 this.dateFields[header.field] = header;
@@ -799,7 +802,8 @@ export default class CommonDatagridComponent extends AppComponent {
             if(!this.hasColumnsHalreadyInitialized){
                 this.initColumnsCallback({...header,colIndex,columnField:header.field});
             }
-        })
+        });
+        this.rowKeysColumns = Object.keys(rowKeysColumns);
         return footers;
     }
     getFootersFields(init){
@@ -3436,16 +3440,30 @@ export default class CommonDatagridComponent extends AppComponent {
     isVirtual(){
         return false;
     }
-
     getRowKey(row,rowIndex){
         let k = rowIndex;
+        if(isFunction(this.props.getRowKey)){
+            k = this.props.getRowKey({row,rowData:row,data:row,rowIndex,item:row,index:rowIndex,context:this});
+            if(typeof k =='string' && k || typeof k =='number'){
+                return k;
+            }
+        } 
         const rowKey = this.props.rowKey;
+        const rKey = Array.isArray(this.rowKeysColumns) && this.rowKeysColumns.length ? this.rowKeysColumns : null;
+        if(rKey){
+            const rr = React.getKeyFromObj(row,rKey);
+            if(rr){
+                return rr;
+            }
+        }
+        const rkey = React.getKeyFromObj(row,rowIndex,rowKey);
+        if(rkey){
+            return rkey;
+        }
         if(isNonNullString(rowKey) && isObj(row) && (isNonNullString(row[rowKey]) || isDecimal(row[rowKey]))){
             return row[rowKey];
         } 
-        if(isFunction(this.props.getRowKey)){
-            k = this.props.getRowKey({row,rowData:row,data:row,rowIndex,item:row,index:rowIndex,context:this});
-        } else if(isObj(row)){
+        if(isObj(row)){
             return React.getKey(row,rowIndex);
         } else k = rowIndex;
         if(isObj(row) && isNonNullString(row.rowKey)){

package/src/components/TextField/index.js

@@ -324,7 +324,7 @@ const TextFieldComponent = React.forwardRef((componentProps,inputRef)=>{
             const txt = defaultStr(text).trim();
             if((txt.length <=1 && !error)){
                 if(validType.contains("unique") || validType.contains("required")){
-                    callOnChange(txt);
+                    callOnChange(toCase(txt));
                 }
             }
             if(props.onBlur){
@@ -388,9 +388,10 @@ const TextFieldComponent = React.forwardRef((componentProps,inputRef)=>{
                     }
                 }
             }
-            if(toCase(text2) !== text){
+            const tVal = toCase(text2);
+            if(tVal !== text){
                 setText(text2,true);
-                callOnChange(text2);
+                callOnChange(tVal);
             }
         },
         selection,

package/src/layouts/Screen/ScreenWithOrWithoutAuthContainer.js

@@ -5,7 +5,7 @@ import PropTypes from "prop-types";
 import {defaultObj,defaultStr,defaultNumber,defaultBool} from "$cutils";
 import View from "$ecomponents/View";
 import { useNavigation} from '$cnavigation';
-import Fab from "$elayouts/Fab";
+import Fab from "$layouts/Fab";
 import APP from "$capp";
 import AppBar,{createAppBarRef} from "$elayouts/AppBar";
 import ErrorBoundary from "$ecomponents/ErrorBoundary";

package/src/layouts/Screen/utils.js

@@ -205,7 +205,7 @@ export  function renderActions({context,isUpdate,newElementLabel,makePhoneCallPr
             flat : true,
             onPress : createCallback({context:self,action:'makePhoneCall',force:true,callback:onPressToMakePhoneCall})
         }:null,
-        copyToClipboard : (isUpdate)?{
+        copyToClipboard : (false && isUpdate)?{
             text : 'Copier',
             icon : COPY_ICON,
             title : 'Copier',

package/src/screens/ScreenWrapper.js

@@ -63,7 +63,9 @@ 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;
     return <Screen 
+        withFab = {withFab}
         {...rest}
         key = {sanitizedName}
         authRequired={authRequired||allowDrawer}