@fto-consult/expo-ui 2.18.1 → 2.18.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "2.18.1",
+  "version": "2.18.2",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {

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

@@ -993,23 +993,19 @@ export default class CommonDatagridComponent extends AppComponent {
             sectionListColumns[columnName] = {};
         }
         const {sectionListColumns:pSListColumns} = this.prepareColumns({sectionListColumns});
-        this.setIsLoading(true,()=>{
-            this.prepareData({data:this.INITIAL_STATE.data,sectionListColumns:pSListColumns},(state)=>{
-                this.setState({...state,sectionListColumns:pSListColumns},()=>{
-                    this.setIsLoading(false);
-                });
+        this.prepareData({data:this.INITIAL_STATE.data,sectionListColumns:pSListColumns},(state)=>{
+            this.setState({...state,sectionListColumns:pSListColumns},()=>{
+                this.setIsLoading(false);
             });
-        })
+        });
    }
    removeAllColumnsInSectionList(){
         const {sectionListColumns} = this.prepareColumns({sectionListColumns:{}});
-        this.setIsLoading(true,()=>{
-            this.prepareData({data:this.INITIAL_STATE.data,sectionListColumns},(state)=>{
-                this.setState({...state,sectionListColumns},()=>{
-                    this.setIsLoading(false);
-                });
+        this.prepareData({data:this.INITIAL_STATE.data,sectionListColumns},(state)=>{
+            this.setState({...state,sectionListColumns},()=>{
+                this.setIsLoading(false);
             });
-        })
+        });
    }
    /*** permet d'effectuer le rendu des colonnes groupable dans le menu item */
    renderSectionListMenu(){
@@ -1885,8 +1881,11 @@ export default class CommonDatagridComponent extends AppComponent {
     canAutoSort(){
         return this.isSortable() && this.props.autoSort !==false ? true : false;
     }
+    isSelectable(){
+        return this.props.selectable !== false ? true : false;
+    }
     isSelectableMultiple(){
-        return defaultBool(this.props.selectableMultiple,true)
+        return this.isSelectable() && defaultBool(this.props.selectableMultiple,true)
     }
     getSort(){
         return defaultObj(this.sortRef.current);

package/src/components/Datagrid/Table/index.js

@@ -112,7 +112,8 @@ const DatagridFactory = (Factory)=>{
             }
         }
         render(){
-            let {title,testID,actions,selectableMultiple,
+            let {title,testID,actions,
+                selectableMultiple,
                 sortable,
                 autoSort,
                 exportable,
@@ -144,7 +145,7 @@ const DatagridFactory = (Factory)=>{
             exportable = defaultBool(exportable,true);
             let isMobile = isMobileOrTabletMedia();
             selectable = defaultVal(selectable,true);
-            selectableMultiple = defaultBool(selectableMultiple,true);
+            selectableMultiple = this.isSelectableMultiple();
             pagin = defaultVal(pagin,true)
             showPagination = defaultVal(showPagination,true);
 
@@ -167,10 +168,9 @@ const DatagridFactory = (Factory)=>{
             let _progressBar = this.getProgressBar();
             const pointerEvents = isLoading? "none":"auto"; 
 
-            let selectAllRowsToggleTitle = isAllRowsSelected?"Tout Déselec":"Tout Select"
             let restItems = [];
             let max = this.getMaxSelectableRows();
-            if(selectableMultiple && max && defaultBool(this.props.selectableMultiple,true)){
+            if(selectableMultiple && max){
                 max = max.formatNumber();
                 restItems = [
                     ...this.renderCustomMenu(),