@fto-consult/expo-ui 6.76.3 → 6.76.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "6.76.3",
+  "version": "6.76.6",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "main",
   "scripts": {
@@ -71,7 +71,7 @@
     "@expo/html-elements": "^0.5.1",
     "@expo/vector-icons": "^13.0.0",
     "@faker-js/faker": "^8.0.2",
-    "@fto-consult/common": "^3.61.13",
+    "@fto-consult/common": "^3.61.23",
     "@pchmn/expo-material3-theme": "^1.3.1",
     "@react-native-async-storage/async-storage": "1.18.2",
     "@react-native-community/datetimepicker": "7.2.0",

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

@@ -3398,8 +3398,8 @@ export default class CommonDatagridComponent extends AppComponent {
        </Tooltip>
     }
     /*** récupère les fetchOptions du datagrid */
-    getFetchOptions({fetchOptions,convertToSQL}){
-        const fetchFilters = this.getFilters({convertToSQL:typeof convertToSQL =='boolean'? convertToSQL : false});
+    getFetchOptions({fetchOptions}){
+        const fetchFilters = this.getFilters({convertToSQL : false});
         fetchOptions = Object.clone(isObj(fetchOptions)? fetchOptions : {});
         fetchOptions.selector = defaultObj(fetchOptions.selector);
         fetchOptions.dataSources = this.currentDataSources;

package/src/components/Datagrid/SWRDatagrid.js

@@ -152,7 +152,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
         fileName : rest.exportTableProps.fileName,
         title : React.getTextContent(title),
     },rest.exportTableProps.pdf);
-    const fetchOptionsRef = React.useRef(defaultObj(customFetchOptions));
+    const fetchOptionsRef = React.useRef({});
     const fPathRef = React.useRef(defaultStr(fetchPathKey,uniqid("fetchPath")));
     fetchPath = defaultStr(fetchPath,table?.queryPath,tableName.toLowerCase()).trim();
     if(fetchPath){
@@ -174,7 +174,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
             }
             opts = defaultObj(opts);
             opts.fetchOptions = isObj(opts.fetchOptions)? Object.clone(opts.fetchOptions) : {};
-            extendObj(true,opts.fetchOptions,fetchOptionsRef.current?.fetchOptions);
+            extendObj(true,opts.fetchOptions,fetchOptionsRef.current);
             if(props.convertFiltersToSQL === false){
                 opts.fetchOptions.selector = extendObj(true,{},opts.fetchOptions.selector,fetchOptionsRef.current?.selector);
             }
@@ -297,6 +297,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
             testID = {testID}
             {...defaultObj(table?.datagrid)} 
             {...rest}
+            fetchOptions = {customFetchOptions}
             title = {customTitle || title || undefined}
             sort = {sort}
             onSort = {({sort})=>{
@@ -397,16 +398,16 @@ 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;
-                fetchOptionsRef.current = opts;
-                opts.withTotal = true;
+                fetchOptionsRef.current = opts.fetchOptions;
+                opts.fetchOptions.withTotal = true;
                 sortRef.current = opts.fetchOptions.sort;
                 if(force){
                     pageRef.current = firstPage;
                 }
+                if(typeof beforeFetchData =="function" && beforeFetchData(args)==false) return;
                 doRefresh(typeof renderProgressBar =='boolean'? renderProgressBar : force);
                 return false;
             }}