@fto-consult/expo-ui 2.20.0 → 2.20.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "2.20.0",
+  "version": "2.20.1",
   "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": "^1.23.2",
+    "@fto-consult/common": "^1.23.4",
     "@gorhom/portal": "^1.0.14",
     "@react-native-async-storage/async-storage": "~1.17.3",
     "@react-native-community/datetimepicker": "6.5.2",

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

@@ -118,6 +118,7 @@ export default class CommonDatagridComponent extends AppComponent {
             sectionListHeaderFooters : {value : {}},
             sectionListDataSize : {value : {current : 0}},
             enablePointerEventsRef : {value : {current:false}},
+            configureSectionListSelectedValues : {value : {}},
             sectionListColumnsSize : {value : {current:0}}, //la taille du nombre d'éléments de section dans les colonnes
         }) 
         this.isLoading = this.isLoading.bind(this);
@@ -1004,12 +1005,13 @@ export default class CommonDatagridComponent extends AppComponent {
         if(type.contains("date") || type =='time'){
             return new Promise((resolve,reject)=>{
                 DialogProvider.open({
+                    title : 'Format de date',
                     fields : {
                         dateFormat : {
                             type : 'select_dateformat',
                             required : true,
                             text : 'Sélectionnez un format de date',
-                            defaultValue : "dd/mm/yyyy",
+                            defaultValue : defaultStr(this.configureSectionListSelectedValues[column.field],"dd/mm/yyyy"),
                         }
                     },
                     onCancelButtonPress : ()=>{
@@ -1021,6 +1023,7 @@ export default class CommonDatagridComponent extends AppComponent {
                         icon : "check",
                         onPress : ({data})=>{
                             column.format = data.dateFormat;
+                            this.configureSectionListSelectedValues[column.field] = data.dateFormat;
                             DialogProvider.close();
                             setTimeout(()=>{
                                 resolve(column);
@@ -1058,7 +1061,7 @@ export default class CommonDatagridComponent extends AppComponent {
                 return cb();
             }
             return this.configureSectionListColumn(sectionListColumns[columnName]).then(cb).catch(notify.error)
-        }, 200);
+        }, 100);
    }
    removeAllColumnsInSectionList(){
         const {sectionListColumns} = this.prepareColumns({sectionListColumns:{}});
@@ -1097,7 +1100,7 @@ export default class CommonDatagridComponent extends AppComponent {
                     onPress : ()=>{
                         setTimeout(()=>{
                             this.removeAllColumnsInSectionList();
-                        },300)
+                        },100)
                     }
                 },
                 ...m,
@@ -1176,7 +1179,7 @@ export default class CommonDatagridComponent extends AppComponent {
                 onPress : ()=>{
                     setTimeout(() => {
                         this.toggleColumnVisibility(header.field);
-                    },300);
+                    },100);
                     return false;
                 },
                 title : title,
@@ -1896,7 +1899,7 @@ export default class CommonDatagridComponent extends AppComponent {
         }
         cb && setTimeout(() => {
             cb();
-        }, 500);
+        }, 200);
     }
     isAllRowsSelected(update){
         return this.selectedRowsCount && this.selectedRowsCount === this.getMaxSelectableRows()? true : false;

package/src/components/Date/FormatSelector.js

@@ -82,6 +82,7 @@ export const selectDateFormatFieldProps = ({onAdd:customOnAdd,onAddCustomFormat,
         ...defaultObj(props),
         onAdd,
         onAdd : undefined,
+        showAdd : false,
     }
 }
 export const getDateFormatSelectorItems = x=> Object.map(DateLib.formats,(format)=>{
@@ -89,7 +90,7 @@ export const getDateFormatSelectorItems = x=> Object.map(DateLib.formats,(format
 });
 
 export const dateFormatSelectorRenderItem = ({item})=>{
-    return "{0}, EX : {1}".sprintf(item.code,item.label);
+    return "{0} [{1}]".sprintf(item.label,item.code);
 }
 
 DateFormatSelector.propTypes = {