@fto-consult/expo-ui 7.18.1 → 7.19.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "7.18.1",
+  "version": "7.19.1",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "scripts": {
     "clear-npx-cache": "npx clear-npx-cache",
@@ -72,7 +72,7 @@
     "@expo/vector-icons": "^13.0.0",
     "@faker-js/faker": "^8.0.2",
     "@fto-consult/common": "^4.4.0",
-    "@fto-consult/electron-gen": "^2.2.1",
+    "@fto-consult/electron-gen": "^2.3.0",
     "@fto-consult/expo-ui": "^7.17.9",
     "@pchmn/expo-material3-theme": "^1.3.1",
     "@react-native-async-storage/async-storage": "1.18.2",

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

@@ -4175,6 +4175,7 @@ CommonDatagridComponent.propTypes = {
     aggregatorFunction : PropTypes.string,
     /*** permet de faire une mutation sur les options de la recherche, immédiatement avant le lancement de la recherche */
     fetchOptionsMutator : PropTypes.func,
+    fetchOptions : PropTypes.object,
     resetSessionData : PropTypes.bool, //pour forcer la réinitialisation des données de sessions liés à la table data 
     /*** si les données à récupérer à distance seront  */
     fetchOnlyVisibleColumns : PropTypes.bool,

package/src/components/Datagrid/SWRDatagrid.js

@@ -81,10 +81,12 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
         isLoading : customIsLoading,
         icon : cIcon,
         swrOptions,
+        pagination,
         ...rest
     } = props;
     const screenContext = useScreen();
     rest = defaultObj(rest);
+    pagination = defaultObj(pagination);
     rest.exportTableProps = defaultObj(rest.exportTableProps)
     const firstPage = 1;
     const tableName = defaultStr(table?.tableName,table?.table).trim().toUpperCase();
@@ -94,7 +96,8 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
     const sColumn = defaultStr(sort.column,defaultSortColumn);
     if(sColumn){
         sort.column = sColumn;
-        if(defaultSortOrder =='asc' || defaultSortOrder =='desc'){
+        sort.dir = defaultStr(sort.dir).toLowerCase().trim();
+        if(!['asc','desc'].includes(sort.dir) && ['asc','desc'].includes(defaultSortOrder)){
             sort.dir = defaultSortOrder;
         }
     } else {
@@ -133,7 +136,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
     },rest.exportTableProps.pdf);
     const fetchOptionsRef = React.useRef({});
     const isFetchPathNull = fetchPath === null || fetchPath ===false;
-    const fPathRef = React.useRef(defaultStr(fetchPathKey,uniqid("fetchPath")));
+    const fPathRef = React.useRef(defaultStr(fetchPathKey,"defaultFetchPathKey"));
     fetchPath = defaultStr(fetchPath,table?.queryPath,tableName.toLowerCase()).trim();
     if(fetchPath){
         fetchPath = setQueryParams(fetchPath,"SWRFetchPathKey",fPathRef.current)
@@ -142,10 +145,10 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
     const innerRef = React.useRef(null);
     const showProgressRef = React.useRef(true);
     const forceRefreshRef = React.useRef(true);
-    const pageRef = React.useRef(1);
+    const pageRef = React.useRef(defaultNumber(pagination.start,1));
     const canHandlePagination = handlePagination !== false ? true : false;
     const canHandleLimit = handleQueryLimit !== false && canHandlePagination ? true : false;
-    const limitRef = React.useRef(!canHandleLimit ?0 : defaultNumber(getSessionData("limit"),500));
+    const limitRef = React.useRef(!canHandleLimit ?0 : defaultNumber(getSessionData("limit"),pagination.limit,500));
     const isInitializedRef = React.useRef(false);
     const hasFetchedRef = React.useRef(false);
     swrOptions = defaultObj(swrOptions);

package/src/components/Form/Fields/SelectTableData/Component.js

@@ -110,8 +110,12 @@ const TableDataSelectField = React.forwardRef(({foreignKeyColumn,swrOptions,fore
     const fetchItemsRef = React.useRef(customFetchItem);
     fetchItemsRef.current = customFetchItem;
     swrOptions = Object.assign({},swrOptions);
-    if(isFilter){
+    ///@see : https://swr.vercel.app/docs/revalidation#disable-automatic-revalidations
+    if(isFilter || isDisabled){
         swrOptions.refreshInterval = 0;
+        swrOptions.revalidateOnFocus = false;
+        swrOptions.revalidateIfStale = false;
+        swrOptions.revalidateOnReconnect = false;
     }
     const restOptionsRef = React.useRef({});
     const fetchedResultRef = React.useRef({});

package/src/screens/Help/openLibraries.js

@@ -1,12 +1,8 @@
 module.exports = {
 	"@fto-consult/expo-ui": {
-		"name": "@fto-consult/expo-ui",
 		"version": "7.17.9",
-		"repository": {
-			"type": "git",
-			"url": "git+https://github.com/borispipo/expo-ui.git"
-		},
-		"homepage": "https://github.com/borispipo/expo-ui#readme"
+		"url": "https://github.com/borispipo/expo-ui#readme",
+		"license": "ISC"
 	},
 	"@babel/plugin-proposal-export-namespace-from": {
 		"version": "7.18.9",
@@ -49,12 +45,12 @@ module.exports = {
 		"license": "MIT"
 	},
 	"@fto-consult/common": {
-		"version": "4.2.1",
+		"version": "4.4.0",
 		"url": "https://github.com/borispipo/common#readme",
 		"license": "ISC"
 	},
 	"@fto-consult/electron-gen": {
-		"version": "2.2.1",
+		"version": "2.3.0",
 		"license": "ISC"
 	},
 	"@pchmn/expo-material3-theme": {