@fto-consult/expo-ui 6.76.5 → 6.77.0

package/package.json

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

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

@@ -514,7 +514,7 @@ const DatagridFactory = (Factory)=>{
                      <View testID={testID+"_AccordionHeader"} style={[styles.accordionHeader]} ref={(el)=>{
                         this.layoutRef.current = el;
                      }} onLayout={this.updateLayout.bind(this)}>
-                        {this.props.showActions !== false ? <DatagridActions 
+                        {this.canRenderActions() ? <DatagridActions 
                             testID={testID+"_Actions"}
                             pointerEvents = {pointerEvents}
                             title = {this.renderDataSourceSelector()}

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

@@ -3781,6 +3781,9 @@ export default class CommonDatagridComponent extends AppComponent {
             key = {props.rowKey}
         />
     }
+    canRenderActions(){
+        return this.props.showActions !== false && this.props.renderActions !== false;
+    }
     renderSelectFieldCell(args){
         return this.renderSelectFieldCell(args);
     }
@@ -3918,6 +3921,11 @@ CommonDatagridComponent.propTypes = {
         PropTypes.bool,
         PropTypes.object,
     ]),
+    /*** alias à show actions */
+    renderActions : PropTypes.oneOfType([
+        PropTypes.bool,
+        PropTypes.func,
+    ]),
     showActions : PropTypes.bool,//si on affichera les actions du datagrid
     /*** affiche ou masque les filtres */
     showFilters : PropTypes.bool,

package/src/components/Datagrid/SWRDatagrid.js

@@ -398,7 +398,6 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
             autoSort = {canSortRemotely()? false : true}
             isLoading = {loading && showProgressRef.current || false}
             beforeFetchData = {(args)=>{
-                if(typeof beforeFetchData =="function" && beforeFetchData(args)==false) return;
                 let {fetchOptions:opts,force,renderProgressBar} = args;
                 opts = getFetchOptions({showError:showProgressRef.current,...opts});
                 isInitializedRef.current = true;
@@ -408,7 +407,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
                 if(force){
                     pageRef.current = firstPage;
                 }
-                console.log(fetchOptionsRef.current," is current fetching options heee");
+                if(typeof beforeFetchData =="function" && beforeFetchData(args)==false) return;
                 doRefresh(typeof renderProgressBar =='boolean'? renderProgressBar : force);
                 return false;
             }}

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

@@ -291,7 +291,7 @@ const DatagridFactory = (Factory)=>{
             return <DatagridProvider context={this}>
                      <View style={[styles.container,{flex:1}]} testID={testID+"_TableContainer"} pointerEvents={pointerEvents}>
                         <View ref={(el)=>{this.layoutRef.current = el;}} testID={testID+"_LayoutContainer"}>
-                            {this.props.showActions !== false ? <DatagridActions 
+                            {this.canRenderActions() ? <DatagridActions 
                                 pointerEvents = {pointerEvents}
                                 title = {this.renderDataSourceSelector()}
                                 actions = {actions}

package/src/components/Form/FormData/FormData.js

@@ -257,7 +257,6 @@ export default class FormDataComponent extends AppComponent{
             ignoreFields, //la liste des champs à ignorer lors du parcours des champs
             toolbarProps,
             text,
-            showActionsOnTop,
             getFieldProps, ///pour ajouter des champs supplémentaires aux props de la field
             title,
             onMount,