@fto-consult/expo-ui 5.7.3 → 5.7.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "5.7.3",
+  "version": "5.7.4",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -61,7 +61,7 @@
     "@emotion/native": "^11.10.0",
     "@expo/html-elements": "^0.2.0",
     "@expo/vector-icons": "^13.0.0",
-    "@fto-consult/common": "^3.10.33",
+    "@fto-consult/common": "^3.10.39",
     "@gorhom/portal": "^1.0.14",
     "@react-native-async-storage/async-storage": "^1.17.11",
     "@react-native-community/datetimepicker": "^6.7.3",

package/src/components/Dropdown/index.js

@@ -766,6 +766,9 @@ class DropdownComponent extends AppComponent {
         if(disabled || readOnly || editable === false){
             showAdd = false;
         }
+        if(typeof showAdd ==='function'){
+            showAdd = showAdd(props);
+        }
         showAdd = defaultBool(showAdd,false);
         if(addIcon ===false) {
             showAdd = false;
@@ -1314,7 +1317,10 @@ DropdownComponent.propTypes = {
     ]),
     /*** la liste des champs qu'on peut trier sur forme de clé/libelé */
     sortableFields : PropTypes.object,
-    showAdd : PropTypes.bool,
+    showAdd : PropTypes.oneOfType([
+        PropTypes.func,
+        PropTypes.bool,
+    ]),
     onAdd : PropTypes.func,
     getItemKey : PropTypes.func,///la fonction prenant en paramètre un item et retourne sa clé unique
 }

package/src/layouts/Screen/TableData.js

@@ -250,10 +250,13 @@ export default class TableDataScreenComponent extends FormDataScreen{
         this.INITIAL_STATE.archived = archived;
         this.INITIAL_STATE.tableName = tableName;
         const fields = {};
-        Object.map(this.fields,(field,i,counterIndex)=>{
-            let currentField = isObj(field)?Object.clone(field):field;
+        const fieldsToPrepare = extendObj({},true,this.fields,customFields);
+        const prepareCb = typeof prepareField =='function'? prepareField : x=> x;
+        ///on effectue une mutator sur le champ en cours de modification
+        Object.map(fieldsToPrepare,(field,i,counterIndex)=>{
+            const currentField = isObj(field)?Object.clone(field):field;
             if(isObj(field)){
-                const type = currentField.type = defaultStr(currentField.jsType,currentField.type,"text").toLowerCase();
+                const columnField = defaultStr(currentField.field,i);
                 /**** lorsqu'un champ porte la propriété visibleOnlyOnEditing  à true alors ce champ sera disponible uniquement en cas de modification */
                 if(currentField.visibleOnlyOnEditing === true && !isUpdated){
                     currentField.form = false;
@@ -265,10 +268,9 @@ export default class TableDataScreenComponent extends FormDataScreen{
                         currentField.readOnly = true;
                     }
                 });
-                const columnField = defaultStr(currentField.field,i);
+                const cArgs = {field:currentField,columnField,columnDef:currentField,isUpdate:isUpdated,name:columnField,index:i,counterIndex,isPrimary,fields:fieldsToPrepare,contex:this,data:this.getCurrentData(),datas,currentIndex,isUpdated,tableName,table};
                 if(isUpdated){
                     //la props readOnlyOnEditing permet de rendre le champ readOnly en cas de mise à jour de la tableData
-                    const cArgs = {...this.state,columnField,columnDef:currentField,field:columnField,data:this.getCurrentData()};
                     const readOnlyOnEditing = typeof currentField.readOnlyOnEditing =='function'? currentField.readOnlyOnEditing(cArgs) : currentField.readOnlyOnEditing;
                     if((readOnlyOnEditing === true)){
                         currentField.readOnly = true;
@@ -278,25 +280,16 @@ export default class TableDataScreenComponent extends FormDataScreen{
                         currentField.disabled = true;
                     }
                 }
-                
-            }
-            fields[i] = currentField;
-        })
-        if(isObj(customFields)){
-            extendObj(true,fields,customFields);
-        }
-        ///on effectue une mutator sur le champ en cours de modification
-        if(typeof prepareField =='function'){
-            Object.map(fields,(field,i,counterIndex)=>{
-                if(!isObj(field)) return;
-                const name = defaultStr(field.field,i);
-                const isPrimary = this.primaryKeyFields[name] && true || false;
-                const f = prepareField({field,columnField:name,columnDef:field,isUpdate:isUpdated,name,index:i,counterIndex,isPrimary,fields,contex:this,data,datas,currentIndex,isUpdated,tableName,table});  
+                const isPrimary = this.primaryKeyFields[columnField] && true || false;
+                const f = prepareCb(cArgs);  
                 if(f === false) {
                     delete fields[i];
+                    return;
                 }
-            });
-        }
+                
+            }
+            fields[i] = currentField;
+        });
         const context = this;
         const formProps = ({
             ...defaultObj(customFormProps),