@fto-consult/expo-ui 8.61.10 → 8.62.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "8.61.10",
+  "version": "8.62.0",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "react-native-paper-doc": "https://github.com/callstack/react-native-paper/tree/main/docs/docs/guides",
   "scripts": {

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

@@ -374,7 +374,7 @@ const DatagridFactory = (Factory)=>{
             const showFooters = this.canShowFooters();
             let restItems = [];
             let max = this.getMaxSelectableRows();
-            if(max && this.isSelectableMultiple()){
+            if(max && this.isSelectableMultiple() && this.canRenderActions()){
                 max = max.formatNumber();
                 restItems = [
                     {

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

@@ -3565,6 +3565,16 @@ export default class CommonDatagridComponent extends AppComponent {
         opts.onSuccess = cb = typeof cb =="function"? cb : typeof opts.onSuccess =='function'? opts.onSuccess : undefined;
         opts.force = defaultBool(force,opts.force,true)
         return new Promise((resolve,reject)=>{
+            if(typeof this.props.onRefreshDatagrid =="function"){
+                const r = this.props.onRefreshDatagrid({context:this});
+                if(r === false){
+                    return resolve([]);
+                }
+                if(isPromise(r)){
+                    return r.then(resolve).catch(reject);
+                }
+                return resolve(r);
+            }
             return this.fetchData(opts).then((data)=>{
                 if(isFunction(cb)){
                     cb(data,{...opts,context:this});
@@ -3572,11 +3582,7 @@ export default class CommonDatagridComponent extends AppComponent {
                 if(typeof this.props.onRefresh ==='function'){
                     this.props.onRefresh({...opts,context:this});
                 }
-            }).then(resolve).catch(reject).finally(()=>{
-                if(typeof this.props.onRefreshDatagrid =="function"){
-                    this.props.onRefreshDatagrid({context:this});
-                }
-            });
+            }).then(resolve).catch(reject);
         })
     }
     componentDidMount(){

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

@@ -165,7 +165,7 @@ const DatagridFactory = (Factory)=>{
             let max = this.getMaxSelectableRows();
             if(selectableMultiple && max){
                 max = max.formatNumber();
-                if(selectableMultiple && !canRenderChart){
+                if(selectableMultiple && !canRenderChart && this.canRenderActions()){
                     restItems.push({
                         label : "Sélectionner "+max.formatNumber(),
                         icon : "select-all",