@fto-consult/expo-ui 6.26.3 → 6.26.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "6.26.3",
+  "version": "6.26.4",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -68,7 +68,7 @@
     "@expo/html-elements": "^0.5.1",
     "@expo/vector-icons": "^13.0.0",
     "@faker-js/faker": "^8.0.2",
-    "@fto-consult/common": "^3.28.4",
+    "@fto-consult/common": "^3.29.1",
     "@gorhom/portal": "^1.0.14",
     "@pchmn/expo-material3-theme": "^1.3.1",
     "@react-native-async-storage/async-storage": "1.18.2",

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

@@ -2,7 +2,7 @@ import {Content} from "$ecomponents/BottomSheet";
 import Icon from "$ecomponents/Icon";
 import React from "$react";
 import {defaultStr,defaultBool,defaultObj} from "$cutils";
-import Filter, {canHandleFilter,getFilterStateValues} from "$ecomponents/Filter";
+import Filter, {canHandleFilter} from "$ecomponents/Filter";
 import PropTypes from "prop-types";
 import { StyleSheet,View } from "react-native";
 import Menu from "$ecomponents/Menu";
@@ -18,16 +18,14 @@ const MIN_WIDTH = 250;
 let windowWidth = Dimensions.get("window").width;
 
 const FiltersAccordionComponent = React.forwardRef((props,ref)=>{
-    const {filters,isLoading,filteredColumns,children,label,filterTitle:customFilterTitle,visible:customVisible,orOperator,andOperator,onToggleFilters,context:customContext,...restProps} = props;
+    const {filters,isLoading,filteredColumns,children,label,testID:cTestID,filterTitle:customFilterTitle,visible:customVisible,orOperator,andOperator,onToggleFilters,context:customContext,...restProps} = props;
     const context = defaultObj(customContext);
-    const [state,setState] = React.useState({
-        visible : defaultBool(customVisible,false),
-        visibleColumns : defaultObj(filteredColumns),
-    });
+    const testID = defaultStr(testID,"RN_AccordionFilters");
+    const [visibleColumns,setVisibleColumns] = React.useState(filteredColumns);
+    const [visible,setVisible] = React.useState(defaultBool(customVisible,false));
     const valuesRefs = React.useRef({});
     windowWidth = Dimensions.get("window").width;
     const innerRef = React.useRef(null);
-    const {visible,visibleColumns} = state;
     const rest = defaultObj(restProps);
     const filterTitle = defaultStr(customFilterTitle,'Filtres');
     const canHandlerFilterRef = React.useRef(0);
@@ -50,8 +48,8 @@ const FiltersAccordionComponent = React.forwardRef((props,ref)=>{
             if(React.isValidElement(filter)){
                 content.push(<Grid.Cell {...cellProps} key={index}>{filter}</Grid.Cell>)
             } else if(isObj(filter)){ 
-                const {onChange} = filter;
-                const key = defaultStr(filter.key,filter.field,filter.index,index+"");
+                const {onChange,visible:cVisible,...rest} = filter;
+                const key = defaultStr(filter.key,filter.field,filter.columnField,filter.index,index+"");
                 const visible = !!visibleColumns[key];
                 colMenus.push(<Menu.Item
                     key = {key}
@@ -61,7 +59,7 @@ const FiltersAccordionComponent = React.forwardRef((props,ref)=>{
                         if(context.toggleFilterColumnVisibility){
                             context.toggleFilterColumnVisibility(key,!visible);
                         }
-                        setState({...state,visibleColumns:{...visibleColumns,[key]:!visible}})
+                        setVisibleColumns({...visibleColumns,[key]:!visible});
                     }}
                 />)
                 if(!visible) {
@@ -72,32 +70,32 @@ const FiltersAccordionComponent = React.forwardRef((props,ref)=>{
                 if(renderMenusOnly) return null;
                 content.push(
                     <Grid.Cell {...cellProps} key={key}>
-                    <Filter
-                        {...filter}
-                        {...(isObj(valuesRefs.current[key]) ? valuesRefs.current[key] : {})}
-                        dynamicRendered
-                        //isLoading = {isLoading && filteredRef.current[key] ? true : false}
-                        orOperator = {defaultBool(orOperator,filter.orOperator,true)}
-                        andOperator = {defaultBool(andOperator,filter.andOperator,true)}
-                        onChange = {(arg)=>{
-                            if(!arg.action && !arg.operator || !arg.field) return;
-                            const canHandle = canHandleFilter(arg);
-                            valuesRefs.current[key] = arg;
-                            if(filteredRef.current[key] !== canHandle){
-                                if(canHandle){
-                                    canHandlerFilterRef.current++;
-                                } else {
-                                    canHandlerFilterRef.current = Math.max(0,canHandlerFilterRef.current-1);
+                        <Filter
+                            {...rest}
+                            {...(isObj(valuesRefs.current[key]) ? valuesRefs.current[key] : {})}
+                            dynamicRendered
+                            //isLoading = {isLoading && filteredRef.current[key] ? true : false}
+                            orOperator = {defaultBool(orOperator,filter.orOperator,true)}
+                            andOperator = {defaultBool(andOperator,filter.andOperator,true)}
+                            onChange = {(arg)=>{
+                                if(!arg.action && !arg.operator || !arg.field) return;
+                                const canHandle = canHandleFilter(arg);
+                                valuesRefs.current[key] = arg;
+                                if(filteredRef.current[key] !== canHandle){
+                                    if(canHandle){
+                                        canHandlerFilterRef.current++;
+                                    } else {
+                                        canHandlerFilterRef.current = Math.max(0,canHandlerFilterRef.current-1);
+                                    }
                                 }
-                            }
-                            filteredRef.current[key] = canHandle;
-                            if(onChange){
-                                onChange(arg);
-                            }
-                        }}
-                        withBottomSheet
-                        containerProps = {{...containerProps}}
-                        inputProps = {{containerProps}}
+                                filteredRef.current[key] = canHandle;
+                                if(onChange){
+                                    onChange(arg);
+                                }
+                            }}
+                            withBottomSheet
+                            containerProps = {{...containerProps}}
+                            inputProps = {{containerProps}}
                     /></Grid.Cell>)
             }
         })
@@ -115,7 +113,7 @@ const FiltersAccordionComponent = React.forwardRef((props,ref)=>{
         title = {null}
         visible = {visible}
         onDissmiss = {()=>{
-            setState({...state,visible:false})
+            setVisible(false);
         }}
         anchor = {(props)=><Tooltip title = {mainFilterTitle}Component={Pressable} {...props} style={[theme.styles.row]}>
              <Icon 
@@ -132,8 +130,8 @@ const FiltersAccordionComponent = React.forwardRef((props,ref)=>{
     >
          {({open,close})=>{
             const {content,colMenus} = prepareContent(filters);
-            return <View style={[styles.wrapper]}>
-                <View style = {[styles.menuWrapper]}>
+            return <View style={[styles.wrapper]} testID={testID+"_AccordionFiltersWrapper"}>
+                <View style = {[styles.menuWrapper]} testID={testID+"_AccordionFilterWraperContent"}>
                     <Expandable
                         left = {(props)=><Icon {...props} icon={content.length?'filter-plus':'filter-menu'}/>}
                         style = {styles.expandable}

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

@@ -2560,7 +2560,6 @@ export default class CommonDatagridComponent extends AppComponent {
                     sortedProps,
                     width,
                     columnField : field,
-                    //columnDef : header,
                     index : headerIndex,
                     visible,
                     key : header.field,
@@ -3617,9 +3616,13 @@ export default class CommonDatagridComponent extends AppComponent {
         return false;
     }
     UNSAFE_componentWillReceiveProps(nextProps){
-        if(React.areEquals(nextProps.data,this.props.data) || (stableHash(nextProps.data) === stableHash(this.props.data))) {
+        if(nextProps.data === this.props.data || React.areEquals(nextProps.data,this.props.data)) {
             return false;
         }
+        const newStableHash = stableHash(nextProps.data);
+        this.prevStableDataHash = this.prevStableDataHash !== undefined ? this.prevStableDataHash : stableHash(this.props.data);
+        if(newStableHash == this.prevStableDataHash) return false;
+        this.prevStableDataHash = newStableHash;
         this.setIsLoading(true,true);
         this.prepareData({...nextProps,force:true},(state)=>{
             this.setState(state)

package/src/components/Datagrid/SWRDatagrid.js

@@ -151,7 +151,6 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
         title
     },rest.exportTableProps.pdf);
     const fetchOptionsRef = React.useRef(defaultObj(customFetchOptions));
-    const refreshCBRef = React.useRef(null);
     const fPathRef = React.useRef(defaultStr(fetchPathKey,uniqid("fetchPath")));
     fetchPath = defaultStr(fetchPath,table.queryPath,tableName.toLowerCase()).trim();
     if(fetchPath){
@@ -160,23 +159,16 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
     const sortRef = React.useRef({});
     const innerRef = React.useRef(null);
     const showProgressRef = React.useRef(true);
-    const dataRef = React.useRef([]);
-    const hasResultRef = React.useRef(false);
-    const totalRef = React.useRef(0);
-    const isFetchingRef = React.useRef(false);
     const pageRef = React.useRef(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 isInitializedRef = React.useRef(false);
     testID = defaultStr(testID,"RNSWRDatagridComponent");
-    const isLoadingRef = React.useRef(true);
-    const {error, isValidating,isLoading:customIsLoading,refresh} = useSWR(fetchPath,{
+    const {error, isValidating,isLoading,data:result,refresh} = useSWR(fetchPath,{
         fetcher : (url,opts)=>{
             if(!isInitializedRef.current) {
-                isFetchingRef.current = false;
-                isLoadingRef.current = false;
-                return;
+                return Promise.resolve({data:[],total:0});
             }
             opts = defaultObj(opts);
             opts.fetchOptions = isObj(opts.fetchOptions)? Object.clone(opts.fetchOptions) : {};
@@ -195,35 +187,14 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
                 delete opts.page;
                 delete opts.offset;
             }
-            const fetchCB = (fArgs)=>{
-                let {data,total} = (Array.isArray(fArgs) ? {data:fArgs,total:fArgs.length} : isObj(fArgs)? fArgs : {data:[],total:0});
-                totalRef.current = total;
-                dataRef.current = data;
-                const dd = Object.size(data);
-                if(dd>total){
-                    total = dd;
-                }
-                hasResultRef.current = true;
-                if(onFetchData && typeof onFetchData =='function'){
-                    onFetchData({allData:data,total,data,context:innerRef.current})
-                }
-                return data;
-            };
-            hasResultRef.current = false;
-            isFetchingRef.current = true;
             if(typeof fetcher =='function'){
-                return fetcher(url,opts).then(fetchCB).finally(()=>{
-                    isFetchingRef.current = false;
-                    isLoadingRef.current = false;
-                });
+                return fetcher(url,opts);
             }
             const {url:fUrl,fetcher:cFetcher,...rest} = getFetcherOptions(url,opts);
             if(showProgressRef.current ===false){
                 rest.showError = false;
             }
-            return cFetcher(fUrl,rest).then(fetchCB).finally(()=>{
-                isFetchingRef.current = false;
-            }).catch((e)=>{
+            return cFetcher(fUrl,rest).catch((e)=>{
                 console.log(e," is swr fetching data");
                 throw e;
             });
@@ -231,39 +202,38 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
         showError  : false,
         swrOptions : getSWROptions(swrConfig.refreshTimeout)
     });
-    const isLoading = isLoadingRef.current  && customIsLoading || false;
-    /*React.useEffect(()=>{
-        innerRef.current && innerRef.current.setIsLoading && innerRef.current.setIsLoading(isLoading);
-    },[isLoading])*/
-    React.useEffect(()=>{
-        const cb = refreshCBRef.current;
-        refreshCBRef.current = null;
-        if(!isValidating && !customIsLoading && typeof cb =='function'){
-            cb();
+    const {data,total} = React.useMemo(()=>{
+        const {data,total} = (Array.isArray(result) ? {data:result,total:result.length} : isObj(result)? result : {data:[],total:0});
+        const dd = Object.size(data);
+        if(dd>total){
+            total = dd;
+        }
+        if(onFetchData && typeof onFetchData =='function'){
+            onFetchData({allData:data,total,data,context:innerRef.current})
         }
-    },[isValidating,customIsLoading])
+        return {data,total};
+    },[result])
+    const loading = (isLoading || isValidating);
     React.useEffect(()=>{
         setTimeout(x=>{
             if(error && innerRef.current && innerRef.current.isLoading && innerRef.current.isLoading()){
                 innerRef.current.setIsLoading(false,false);
             }
-        },500)
-    },[error])
+        },500);
+    },[error]);
     const doRefresh = (showProgress)=>{
         showProgressRef.current = showProgress ? typeof showProgress ==='boolean' : false;
-        if(isFetchingRef.current) return;
-        isLoadingRef.current = true;
         refresh();
     }
     const canPaginate = ()=>{
         if(!canHandlePagination) return false;
-        if(canHandleLimit && typeof totalRef.current !=='number' || typeof pageRef.current !='number' || typeof limitRef.current !='number') return false;
+        if(canHandleLimit && typeof total !=='number' || typeof pageRef.current !='number' || typeof limitRef.current !='number') return false;
         if(limitRef.current <= 0) return false;
         return true;
     }
     const getTotalPages = ()=>{
         if(!canPaginate()) return false;
-        return Math.ceil(totalRef.current / limitRef.current);;
+        return Math.ceil(total / limitRef.current);;
     };
     const getNextPage = ()=>{
         if(!canPaginate()) return false;
@@ -289,9 +259,8 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
     }, canSortRemotely = ()=>{
         if(!canPaginate() || autoSort === true) return false;
         ///si le nombre total d'élements est inférieur au nombre limite alors le trie peut être fait localement
-        return totalRef.current > limitRef.current && true || false;
+        return total > limitRef.current && true || false;
     }
-    const loading = (isLoadingRef.current && (isLoading|| isValidating));
     const pointerEvents = loading ?"node" : "auto";
     const itLimits = [{
         text : "Limite nbre elts par page",
@@ -378,7 +347,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
                         />
                         <View testID={testID+"_PaginationLabel"}>
                             <Label style={{fontSize:15}}>
-                                {(totalRef.current?page:0).formatNumber()}-{totalPages.formatNumber()}{" / "}{totalRef.current.formatNumber()}
+                                {(total?page:0).formatNumber()}-{totalPages.formatNumber()}{" / "}{total.formatNumber()}
                             </Label>
                         </View>
                         <Icon
@@ -433,7 +402,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
             isSWRDatagrid
             isTableData
             fetchData = {undefined}
-            data = {dataRef.current}
+            data = {data}
             canMakePhoneCall={canMakePhoneCall} 
             key={tableName} 
             sessionName={defaultStr(sessionName,'list-data')} 

package/src/components/Filter/index.js

@@ -425,6 +425,7 @@ export default class Filter extends AppComponent {
       dynamicRendered,
       tooltipLabel,
       andOperator,
+      orOperator,
       searchIcon,
       field,
       style,

package/src/components/Form/Fields/Field.js

@@ -245,6 +245,7 @@ export default class Field extends AppComponent {
         return false;
     }
     callOnChange(args){
+        args.isFilter = this.isFilter();
         if(typeof this.props.onChange === "function" && this.hasValueChanged(args.value)){
             this.props.onChange(args);
         }
@@ -278,7 +279,7 @@ export default class Field extends AppComponent {
                     actions[k][action]();
                 }
                 let form = Forms.getForm(this.formName);
-                this.INITIAL_STATE.onValidate.call(this,{...defaultObj(rest),props:this.props,formName:this.formName,form,name:this.name,field:this.name,value,event,context:this});
+                this.INITIAL_STATE.onValidate.call(this,{...defaultObj(rest),isFilter:this.isFilter(),props:this.props,formName:this.formName,form,name:this.name,field:this.name,value,event,context:this});
                 this.callOnChange({value,event,isValid:true,...rest});
                 if(form && form.props){
                     if(canEnable){
@@ -351,7 +352,7 @@ export default class Field extends AppComponent {
                 for(var k in actions){
                     actions[k].disable();
                 }
-                this.INITIAL_STATE.onNoValidate.call(this,{...defaultObj(rest),props:this.props,msg,value,formName:this.formName,field:this.name,name:this.name,context:this,event,validRule,validType:validRule,validParams,context:this});
+                this.INITIAL_STATE.onNoValidate.call(this,{...defaultObj(rest),isFilter:this.isFilter(),props:this.props,msg,value,formName:this.formName,field:this.name,name:this.name,context:this,event,validRule,validType:validRule,validParams,context:this});
                 let form = Forms.getForm(this.formName);
                 this.callOnChange({value,validRule,validParams,event,isValid:false,...rest});
                 if(form){

package/src/components/Form/Fields/IdField.js

@@ -29,6 +29,9 @@ export default class FormIDField extends TextField {
 
     /*** met à jour la données du numéro de piece */
     fetchNewId(focus){
+        if(this.isFilter()){
+            return Promise.resolve("");
+        }
         const data = defaultObj(this.props.data);
         if(!isNonNullString(this.name)) return undefined;
         const cb = (value)=>{
@@ -66,41 +69,48 @@ export default class FormIDField extends TextField {
         return false;
     }
     componentDidUpdate(){
-        if(!isNonNullString(this.newFieldIdValue)){
+        if(!this.isFilter() && !isNonNullString(this.newFieldIdValue)){
             this.fetchNewId();
         }
     }
     _render(props,setRef){
         delete props.validType;
-        const upper = props.upper !== false ? UPPER_CASE : "";
-        if(isNonNullString(this.name) && isObj(props.data) && isNonNullString(props.data[this.name])){
-            props.disabled = true;         
-            props.validType = upper;
-            props.defaultValue = props.data[this.name];
-        } else {
-            props.validType = 'required|'+upper;
-        }
-        if(typeof props.minLength !=='number'){
-            props.minLength = 2;
-        }
-        const defValue = props.defaultValue = isNonNullString(props.defaultValue)? props.defaultValue : isNonNullString(this.newFieldIdValue)? this.newFieldIdValue : undefined;
-        props.validRule = props.validType;
-        props.contentContainerProps = Object.assign({},props.contentContainerProps)
-        props.contentContainerProps.pointerEvents = defaultStr(props.contentContainerProps.pointerEvents,"auto");
-        props.enableCopy = typeof props.enableCopy ==='boolean'? props.enableCopy : (props.defaultValue || this.newFieldIdValue ? true : false);
-        const {right} = props;
-        props.readOnly = typeof props.disabled ==='boolean' ? !!!props.disabled : typeof props.readOnly =="boolean"? !!!props.disabled : false;
-        props.right = (props)=>{
-            const r = typeof right =='function'? right (props) : React.isValidElement(right)? right : null;
-            if(!defValue){
-                return <>{r}<ActivityIndicator
-                    {...props}
-                    style = {[props.style,{marginRight:10}]}
-                /></>
+        if(!this.isFilter()){
+            const upper = props.upper !== false ? UPPER_CASE : "";
+            if(isNonNullString(this.name) && isObj(props.data) && isNonNullString(props.data[this.name])){
+                props.disabled = true;         
+                props.validType = upper;
+                props.defaultValue = props.data[this.name];
+            } else {
+                props.validType = 'required|'+upper;
             }
-            return r;
+            if(typeof props.minLength !=='number'){
+                props.minLength = 2;
+            }
+            const defValue = props.defaultValue = isNonNullString(props.defaultValue)? props.defaultValue : isNonNullString(this.newFieldIdValue)? this.newFieldIdValue : undefined;
+            props.validRule = props.validType;
+            props.contentContainerProps = Object.assign({},props.contentContainerProps)
+            props.contentContainerProps.pointerEvents = defaultStr(props.contentContainerProps.pointerEvents,"auto");
+            props.enableCopy = typeof props.enableCopy ==='boolean'? props.enableCopy : (props.defaultValue || this.newFieldIdValue ? true : false);
+            props.readOnly = typeof props.disabled ==='boolean' ? !!!props.disabled : typeof props.readOnly =="boolean"? !!!props.disabled : false;
+            
+            const {right} = props;
+            props.right = (props)=>{
+                const r = typeof right =='function'? right (props) : React.isValidElement(right)? right : null;
+                if(!defValue){
+                    return <>{r}<ActivityIndicator
+                        {...props}
+                        style = {[props.style,{marginRight:10}]}
+                    /></>
+                }
+                return r;
+            }
+                
+            this.setValidRule(props.validType);
+        } else {
+            props.enableCopy = false;
+            props.disabled = props.readOnly = false;
         }
-        this.setValidRule(props.validType);
         return  super._render(props,setRef);
     }
 }

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

@@ -70,13 +70,19 @@ export const getFilterComponentProps = (_props)=>{
         errorText,
         label,text,
         primary,
-        onValidate,
         checkPiece,
         check,
         width,
         type,
+        visible,
         jsType,
         filterType,
+        getValidValue,
+        validate,
+        onValidate,
+        onValidatorValid,///il s'agit de la fonction de rappel appelée immédiatement après que le validateur ait réuissie la validation
+        onValidateField,
+        onNoValidate,
         ...props
     } = _props;
     props = defaultObj(props);
@@ -86,13 +92,13 @@ export const getFilterComponentProps = (_props)=>{
     const sanitizedType = type.replaceAll("_","").toLowerCase().trim();
     props = defaultObj(props);
     props.label = defaultStr(label,text);
-    if(type.startsWith("select")){
+    if(sanitizedType.startsWith("select")){
         props.inputProps = Object.assign({},props.inputProps);
         props.inputProps.placeholder = defaultStr(props.inputProps.placeholder,i18n.lang("search.."))
         component = componentTypes.SelectField;
-        if(type =='select_country' || type =='selectcountry'){
+        if(sanitizedType ==='selectcountry'){
             component = componentTypes.SelectCountry;
-        } else if(type =='select_tabledata' || type =='selecttabledata'){
+        } else if(sanitizedType ==='selecttabledata'){
             component = componentTypes.SelectTableData;
         } else if(React.isComponent(componentTypes[type])){
             component = componentTypes[type];
@@ -133,6 +139,7 @@ export const getFilterComponentProps = (_props)=>{
         props.multiple = true;
     }
     props.renderFilter = true;
+    props.isFilter = true;
     if(type.contains("date") || type.contains("time")){
         delete props.right;
     }

package/src/components/Table/index.js

@@ -125,9 +125,9 @@ const TableComponent = React.forwardRef(({containerProps,listContainerStyle,onRe
             }
         }
     }
-    const onComponentRender = (a,b,c)=>{
+    const onComponentRender = (...args)=>{
         if(onRender){
-            onRender(a,b,c);
+            onRender(...args);
         }
         //au paravant il était possible de faire scroller le composant Table lorsque les données sont raffraichies, ce qui n'avait pas un bon impact sur le rendu de la table de données
         if(false && itemsChanged){

package/src/components/TextField/index.js

@@ -424,6 +424,7 @@ const TextFieldComponent = React.forwardRef((componentProps,inputRef)=>{
             {valueToCopy?<Icon
                 {...iconProps}
                 title = {"Copier la valeur ["+valueToCopy+"] dans le presse papier"}
+                style = {[iconProps.style,{pointerEvents:"auto"}]}
                 icon = {COPY_ICON}
                 onPress = {(e)=>{
                     /*if(selectFieldToCopy){

package/src/context/hooks.js

@@ -5,7 +5,6 @@ import useStableMemo  from "$react/useStableMemo";
 import { useWindowDimensions } from "$cdimensions";
 import {isObj,isNonNullString} from "$cutils";
 import { StyleSheet } from "react-native";
-
 import { createContext,useContext as useReactContext } from "react";
 
 export const ExpoUIContext = createContext(null);
@@ -63,4 +62,4 @@ export function useMediaQueryUpdateStyle({useCurrentMedia,target,mediaQueryUpdat
         if(isObj(nStyle) || Array.isArray(nStyle)) return StyleSheet.flatten([props.style,nStyle]);
         return StyleSheet.flatten(props.style)||{};
     },[handleProps,useCurrentMedia,dimensions,props.style]);
-}
+}

package/src/context/query.js

@@ -0,0 +1,92 @@
+import {isNonNullString,isObj,extendObj,defaultObj,defaultStr} from "$utils";
+import { useQuery as useRQuery, useMutation as RQUseMutation, useQueryClient } from "@tanstack/react-query";
+import { getFetcherOptions as apiGetFetcherOptions } from '$capi';
+
+export const RETRY_OPTIONS = { cacheTime: 2000,refetchInterval:5000};
+
+export const RETRY_LIST_OPTIONS = {cacheTime:5000,refetchInterval:20000};
+
+const isValidNetworkMode = (nMode)=>isNonNullString(nMode) && ['online','always','offlineFirst'].includes(nMode.toLowerCase().trim());
+const isValidRetryDelay = (retryDelay) => typeof retryDelay =='number' || typeof retryDelay ==='function'? true : false;
+
+const queries403Cached = {};
+
+/***** override of useQuery
+  @see : https://tanstack.com/query/v4/docs/react/guides/migrating-to-react-query-4
+  @see : https://tanstack.com/query/v4/docs/react/reference/useQuery for useQuery options
+  @param {boolean} handle403, pour la prise en compte du 403
+  @param {Array} key, array of key string, The query key to use for this query.The query key will be hashed into a stable hash. See Query Keys for more information. The query will automatically update when this key changes (as long as enabled is not set to false).
+  @param {function} queryFn, query function  (context: QueryFunctionContext) => Promise<TData>
+  @param {boolean} enabled  Set this to false to disable this query from automatically running.
+  @param {string} networkMode 'online' | 'always' | 'offlineFirst
+  @param {boolean| number | (failureCount: number, error: TError) => boolean} retry If false, failed queries will not retry by default.If true, failed queries will retry infinitely. If set to a number, e.g. 3, failed queries will retry until the failed query count meets that number.
+  @param {boolean} retryOnMount If set to false, the query will not be retried on mount if it contains an error. Defaults to true.
+  @param {number | (retryAttempt: number, error: TError) => number} retryDelay  This function receives a retryAttempt integer and the actual Error and returns the delay to apply before he next attempt in milliseconds.  A function like attempt => Math.min(attempt > 1 ? 2 ** attempt * 1000 : 1000, 30 * 1000) applies exponential backoff., A function like attempt => attempt * 1000 applies linear backoff.
+*/
+export const useQuery = (key,queryFn,enabled,networkMode,retry,retryOnMount,retryDelay,...args)=>{
+    const options = isObj(key)? Object.assign({},key) : isNonNullString(key)? {queryKey:key.split(",")} : Array.isArray(key)? {queryKey:key} : {};
+    key = isNonNullString(key)? key.split(",") : Array.isArray(key)? key : [];
+    options.queryKey = Array.isArray(options.queryKey) && options.queryKey.length && options.queryKey || key;
+    options.queryFn = typeof queryFn =='function' ? queryFn : typeof options.queryFn =='function'? options.queryFn : undefined; 
+    options.enabled = typeof enabled === "boolean" ? enabled : typeof options.enabled =='boolean' ? options.enabled : true;
+    options.networkMode = isValidNetworkMode(networkMode) ? networkMode.toLowerCase().trim() : isValidNetworkMode(options.networkMode) ? options.networkMode.toLowerCase().trim() : "online";
+    options.retry = typeof retry =='boolean' || typeof retry ==='number' ? retry : typeof options.retry ==='boolean' || typeof options.retry =='number' ? options.retry : undefined;
+    options.retryOnMount = typeof retryOnMount ==='boolean'? retryOnMount : typeof options.retryOnMount =='boolean' ? options.retryOnMount : undefined;
+    options.retryDelay = isValidRetryDelay(retryDelay)? retryDelay : isValidRetryDelay(options.retryDelay) ? options.retryDelay : undefined;
+    [queryFn,enabled,networkMode,retry,retryOnMount,retryDelay].map((a)=>{
+      isObj(a) && extendObj(true,options,a);
+    }); 
+    args.map((a)=>{
+      isObj(a) && extendObj(true,options,a);
+    });
+    options.enabled = !options.queryKey?.length ? false : options.enabled;
+    //if not enabled, we have to disabled retry option
+    options.retry = !options.enabled ? false : options.retry;
+    const {onError} = options;
+    const keyString = key.join(",");
+    if(keyString && queries403Cached[keyString]){
+      options.retry = false;
+    }
+    const {handle403} = options;
+    delete options.handle403;
+    options.onError = (e,...args)=>{
+      if(handle403){
+        const {response} = isObj(e)? e : {};
+        if(isObj(response) && response.status === 403){
+          keyString ? queries403Cached[keyString] = true : null;
+          setTimeout(()=>{
+            keyString && delete queries403Cached[keyString];
+          },100);
+        }
+      }
+      if(typeof onError ==='function' && (onError(e,options) === false)) return;
+    }
+    //const r = !options.enabled ? console.error("unable to get query for options",options) : null;
+    return useRQuery(options);
+}
+
+/**** 
+  @see : https://tanstack.com/query/v4/docs/react/reference/useMutation
+*/
+export const useMutation = (mutationFn,cacheTime,mutationKey,...args)=>{
+    const options = isObj(mutationFn)? Object.assign({},mutationFn) : typeof(mutationFn) =='function'? {mutationFn} : {};
+    mutationFn = typeof mutationFn ==='function' ? mutationFn : undefined;
+    mutationFn = mutationFn || typeof options.mutationFn == 'function' ? options.mutationFn : undefined;
+    options.cacheTime = typeof cacheTime =='number' ? cacheTime : typeof options.cacheTime =='number'? options.cacheTime : undefined; 
+    options.mutationKey = isNonNullString(mutationKey) && mutationKey || isNonNullString(options.mutationKey) ? options.mutationKey : undefined;
+    [cacheTime,mutationKey].map((a)=>{
+      isObj(a) && extendObj(true,options,a);
+    }); 
+    args.map((a)=>{
+      isObj(a) && extendObj(true,options,a);
+    });
+    options.mutationFn = async (params,...rest) => {
+        return await mutationFn(params,...rest);
+    }
+    return RQUseMutation(options);
+}
+
+
+export const getFetcherOptions = (path,opts)=>{
+  return apiGetFetcherOptions(path,opts);
+}

package/src/screens/Help/openLibraries.js

@@ -1 +1 @@
-module.exports = {"@fto-consult/expo-ui":{"name":"@fto-consult/expo-ui","version":"6.26.2","repository":{"type":"git","url":"git+https://github.com/borispipo/expo-ui.git"},"homepage":"https://github.com/borispipo/expo-ui#readme"},"@emotion/native":{"version":"11.11.0","url":"https://emotion.sh","license":"MIT"},"@emotion/react":{"version":"11.11.1","url":"https://github.com/emotion-js/emotion/tree/main/packages/react","license":"MIT"},"@expo/html-elements":{"version":"0.5.1","url":"https://github.com/expo/expo/tree/main/packages/html-elements","license":"MIT"},"@expo/metro-config":{"version":"0.10.7","url":"https://github.com/expo/expo.git","license":"MIT"},"@expo/vector-icons":{"version":"13.0.0","url":"https://expo.github.io/vector-icons","license":"MIT"},"@expo/webpack-config":{"version":"18.1.2","url":"https://github.com/expo/expo-cli.git","license":"MIT"},"@faker-js/faker":{"version":"8.0.2","url":"https://github.com/faker-js/faker.git","license":"MIT"},"@fto-consult/common":{"version":"3.28.4","url":"https://github.com/borispipo/common#readme","license":"ISC"},"@gorhom/portal":{"version":"1.0.14","url":"https://github.com/gorhom/react-native-portal#readme","license":"MIT"},"@pchmn/expo-material3-theme":{"version":"1.3.1","url":"https://github.com/pchmn/expo-material3-theme#readme","license":"MIT"},"@react-native-async-storage/async-storage":{"version":"1.18.2","url":"https://github.com/react-native-async-storage/async-storage#readme","license":"MIT"},"@react-native-community/datetimepicker":{"version":"7.2.0","url":"https://github.com/react-native-community/datetimepicker#readme","license":"MIT"},"@react-native-community/netinfo":{"version":"9.3.10","url":"https://github.com/react-native-netinfo/react-native-netinfo#readme","license":"MIT"},"@react-native/assets-registry":{"version":"0.72.0","url":"git@github.com:facebook/react-native.git","license":"MIT"},"@react-navigation/native":{"version":"6.1.7","url":"https://reactnavigation.org","license":"MIT"},"@react-navigation/native-stack":{"version":"6.9.13","url":"https://github.com/software-mansion/react-native-screens#readme","license":"MIT"},"@shopify/flash-list":{"version":"1.4.3","url":"https://shopify.github.io/flash-list/","license":"MIT"},"apexcharts":{"version":"3.41.1","url":"https://apexcharts.com","license":"MIT"},"babel-plugin-inline-dotenv":{"version":"1.7.0","url":"https://github.com/brysgo/babel-plugin-inline-dotenv#readme","license":"ISC"},"babel-plugin-module-resolver":{"version":"5.0.0","url":"https://github.com/tleunen/babel-plugin-module-resolver.git","license":"MIT"},"expo":{"version":"49.0.7","url":"https://github.com/expo/expo/tree/main/packages/expo","license":"MIT"},"expo-camera":{"version":"13.4.2","url":"https://docs.expo.dev/versions/latest/sdk/camera/","license":"MIT"},"expo-clipboard":{"version":"4.3.1","url":"https://docs.expo.dev/versions/latest/sdk/clipboard","license":"MIT"},"expo-font":{"version":"11.4.0","url":"https://docs.expo.dev/versions/latest/sdk/font/","license":"MIT"},"expo-image-picker":{"version":"14.3.2","url":"https://docs.expo.dev/versions/latest/sdk/imagepicker/","license":"MIT"},"expo-linking":{"version":"5.0.2","url":"https://docs.expo.dev/versions/latest/sdk/linking","license":"MIT"},"expo-sqlite":{"version":"11.3.2","url":"https://docs.expo.dev/versions/latest/sdk/sqlite/","license":"MIT"},"expo-status-bar":{"version":"1.6.0","url":"https://docs.expo.dev/versions/latest/sdk/status-bar/","license":"MIT"},"expo-system-ui":{"version":"2.4.0","url":"https://docs.expo.dev/versions/latest/sdk/system-ui","license":"MIT"},"expo-web-browser":{"version":"12.3.2","url":"https://docs.expo.dev/versions/latest/sdk/webbrowser/","license":"MIT"},"file-saver":{"version":"2.0.5","url":"https://github.com/eligrey/FileSaver.js#readme","license":"MIT"},"fs-extra":{"version":"11.1.1","url":"https://github.com/jprichardson/node-fs-extra","license":"MIT"},"google-libphonenumber":{"version":"3.2.33","url":"https://ruimarinho.github.io/google-libphonenumber/","license":"(MIT AND Apache-2.0)"},"htmlparser2-without-node-native":{"version":"3.9.2","url":"git://github.com/fb55/htmlparser2.git","license":"MIT"},"pdfmake":{"version":"0.2.7","url":"http://pdfmake.org","license":"MIT"},"process":{"version":"0.11.10","url":"git://github.com/shtylman/node-process.git","license":"MIT"},"prop-types":{"version":"15.8.1","url":"https://facebook.github.io/react/","license":"MIT"},"react":{"version":"18.2.0","url":"https://reactjs.org/","license":"MIT"},"react-content-loader":{"version":"6.2.1","url":"https://github.com/danilowoz/react-content-loader","license":"MIT"},"react-dom":{"version":"18.2.0","url":"https://reactjs.org/","license":"MIT"},"react-native":{"version":"0.72.3","license":"MIT"},"react-native-big-list":{"version":"1.6.1","url":"https://marcocesarato.github.io/react-native-big-list-docs/","license":"GPL-3.0-or-later"},"react-native-blob-util":{"version":"0.18.6","url":"https://github.com/RonRadtke/react-native-blob-util","license":"MIT"},"react-native-gesture-handler":{"version":"2.12.1","url":"https://github.com/software-mansion/react-native-gesture-handler#readme","license":"MIT"},"react-native-iphone-x-helper":{"version":"1.3.1","url":"https://github.com/ptelad/react-native-iphone-x-helper#readme","license":"MIT"},"react-native-mime-types":{"version":"2.4.0","license":"MIT"},"react-native-paper":{"version":"5.10.1","url":"https://callstack.github.io/react-native-paper","license":"MIT"},"react-native-paper-dates":{"version":"0.18.14","url":"https://github.com/web-ridge/react-native-paper-dates#readme","license":"MIT"},"react-native-reanimated":{"version":"3.3.0","url":"https://github.com/software-mansion/react-native-reanimated#readme","license":"MIT"},"react-native-safe-area-context":{"version":"4.6.3","url":"https://github.com/th3rdwave/react-native-safe-area-context#readme","license":"MIT"},"react-native-screens":{"version":"3.22.1","url":"https://github.com/software-mansion/react-native-screens#readme","license":"MIT"},"react-native-svg":{"version":"13.9.0","url":"https://github.com/react-native-community/react-native-svg","license":"MIT"},"react-native-web":{"version":"0.19.7","url":"git://github.com/necolas/react-native-web.git","license":"MIT"},"react-native-webview":{"version":"13.2.2","url":"https://github.com/react-native-webview/react-native-webview#readme","license":"MIT"},"react-virtuoso":{"version":"4.5.0","url":"https://virtuoso.dev/","license":"MIT"},"sharp-cli":{"version":"4.1.1","url":"https://github.com/vseventer/sharp-cli","license":"MIT"},"tippy.js":{"version":"6.3.7","url":"https://atomiks.github.io/tippyjs/","license":"MIT"},"uninstall":{"version":"0.0.0","license":"MIT"},"websql":{"version":"2.0.3","url":"git://github.com/nolanlawson/node-websql.git","license":"Apache-2.0"},"xlsx":{"version":"0.18.5","url":"https://sheetjs.com/","license":"Apache-2.0"}};
+module.exports = {"@fto-consult/expo-ui":{"name":"@fto-consult/expo-ui","version":"6.26.3","repository":{"type":"git","url":"git+https://github.com/borispipo/expo-ui.git"},"homepage":"https://github.com/borispipo/expo-ui#readme"},"@emotion/native":{"version":"11.11.0","url":"https://emotion.sh","license":"MIT"},"@emotion/react":{"version":"11.11.1","url":"https://github.com/emotion-js/emotion/tree/main/packages/react","license":"MIT"},"@expo/html-elements":{"version":"0.5.1","url":"https://github.com/expo/expo/tree/main/packages/html-elements","license":"MIT"},"@expo/metro-config":{"version":"0.10.7","url":"https://github.com/expo/expo.git","license":"MIT"},"@expo/vector-icons":{"version":"13.0.0","url":"https://expo.github.io/vector-icons","license":"MIT"},"@expo/webpack-config":{"version":"18.1.2","url":"https://github.com/expo/expo-cli.git","license":"MIT"},"@faker-js/faker":{"version":"8.0.2","url":"https://github.com/faker-js/faker.git","license":"MIT"},"@fto-consult/common":{"version":"3.29.0","url":"https://github.com/borispipo/common#readme","license":"ISC"},"@gorhom/portal":{"version":"1.0.14","url":"https://github.com/gorhom/react-native-portal#readme","license":"MIT"},"@pchmn/expo-material3-theme":{"version":"1.3.1","url":"https://github.com/pchmn/expo-material3-theme#readme","license":"MIT"},"@react-native-async-storage/async-storage":{"version":"1.18.2","url":"https://github.com/react-native-async-storage/async-storage#readme","license":"MIT"},"@react-native-community/datetimepicker":{"version":"7.2.0","url":"https://github.com/react-native-community/datetimepicker#readme","license":"MIT"},"@react-native-community/netinfo":{"version":"9.3.10","url":"https://github.com/react-native-netinfo/react-native-netinfo#readme","license":"MIT"},"@react-native/assets-registry":{"version":"0.72.0","url":"git@github.com:facebook/react-native.git","license":"MIT"},"@react-navigation/native":{"version":"6.1.7","url":"https://reactnavigation.org","license":"MIT"},"@react-navigation/native-stack":{"version":"6.9.13","url":"https://github.com/software-mansion/react-native-screens#readme","license":"MIT"},"@shopify/flash-list":{"version":"1.4.3","url":"https://shopify.github.io/flash-list/","license":"MIT"},"apexcharts":{"version":"3.41.1","url":"https://apexcharts.com","license":"MIT"},"babel-plugin-inline-dotenv":{"version":"1.7.0","url":"https://github.com/brysgo/babel-plugin-inline-dotenv#readme","license":"ISC"},"babel-plugin-module-resolver":{"version":"5.0.0","url":"https://github.com/tleunen/babel-plugin-module-resolver.git","license":"MIT"},"expo":{"version":"49.0.7","url":"https://github.com/expo/expo/tree/main/packages/expo","license":"MIT"},"expo-camera":{"version":"13.4.2","url":"https://docs.expo.dev/versions/latest/sdk/camera/","license":"MIT"},"expo-clipboard":{"version":"4.3.1","url":"https://docs.expo.dev/versions/latest/sdk/clipboard","license":"MIT"},"expo-font":{"version":"11.4.0","url":"https://docs.expo.dev/versions/latest/sdk/font/","license":"MIT"},"expo-image-picker":{"version":"14.3.2","url":"https://docs.expo.dev/versions/latest/sdk/imagepicker/","license":"MIT"},"expo-linking":{"version":"5.0.2","url":"https://docs.expo.dev/versions/latest/sdk/linking","license":"MIT"},"expo-sqlite":{"version":"11.3.2","url":"https://docs.expo.dev/versions/latest/sdk/sqlite/","license":"MIT"},"expo-status-bar":{"version":"1.6.0","url":"https://docs.expo.dev/versions/latest/sdk/status-bar/","license":"MIT"},"expo-system-ui":{"version":"2.4.0","url":"https://docs.expo.dev/versions/latest/sdk/system-ui","license":"MIT"},"expo-web-browser":{"version":"12.3.2","url":"https://docs.expo.dev/versions/latest/sdk/webbrowser/","license":"MIT"},"file-saver":{"version":"2.0.5","url":"https://github.com/eligrey/FileSaver.js#readme","license":"MIT"},"fs-extra":{"version":"11.1.1","url":"https://github.com/jprichardson/node-fs-extra","license":"MIT"},"google-libphonenumber":{"version":"3.2.33","url":"https://ruimarinho.github.io/google-libphonenumber/","license":"(MIT AND Apache-2.0)"},"htmlparser2-without-node-native":{"version":"3.9.2","url":"git://github.com/fb55/htmlparser2.git","license":"MIT"},"pdfmake":{"version":"0.2.7","url":"http://pdfmake.org","license":"MIT"},"process":{"version":"0.11.10","url":"git://github.com/shtylman/node-process.git","license":"MIT"},"prop-types":{"version":"15.8.1","url":"https://facebook.github.io/react/","license":"MIT"},"react":{"version":"18.2.0","url":"https://reactjs.org/","license":"MIT"},"react-content-loader":{"version":"6.2.1","url":"https://github.com/danilowoz/react-content-loader","license":"MIT"},"react-dom":{"version":"18.2.0","url":"https://reactjs.org/","license":"MIT"},"react-native":{"version":"0.72.3","license":"MIT"},"react-native-big-list":{"version":"1.6.1","url":"https://marcocesarato.github.io/react-native-big-list-docs/","license":"GPL-3.0-or-later"},"react-native-blob-util":{"version":"0.18.6","url":"https://github.com/RonRadtke/react-native-blob-util","license":"MIT"},"react-native-gesture-handler":{"version":"2.12.1","url":"https://github.com/software-mansion/react-native-gesture-handler#readme","license":"MIT"},"react-native-iphone-x-helper":{"version":"1.3.1","url":"https://github.com/ptelad/react-native-iphone-x-helper#readme","license":"MIT"},"react-native-mime-types":{"version":"2.4.0","license":"MIT"},"react-native-paper":{"version":"5.10.1","url":"https://callstack.github.io/react-native-paper","license":"MIT"},"react-native-paper-dates":{"version":"0.18.14","url":"https://github.com/web-ridge/react-native-paper-dates#readme","license":"MIT"},"react-native-reanimated":{"version":"3.3.0","url":"https://github.com/software-mansion/react-native-reanimated#readme","license":"MIT"},"react-native-safe-area-context":{"version":"4.6.3","url":"https://github.com/th3rdwave/react-native-safe-area-context#readme","license":"MIT"},"react-native-screens":{"version":"3.22.1","url":"https://github.com/software-mansion/react-native-screens#readme","license":"MIT"},"react-native-svg":{"version":"13.9.0","url":"https://github.com/react-native-community/react-native-svg","license":"MIT"},"react-native-web":{"version":"0.19.7","url":"git://github.com/necolas/react-native-web.git","license":"MIT"},"react-native-webview":{"version":"13.2.2","url":"https://github.com/react-native-webview/react-native-webview#readme","license":"MIT"},"react-virtuoso":{"version":"4.5.0","url":"https://virtuoso.dev/","license":"MIT"},"sharp-cli":{"version":"4.1.1","url":"https://github.com/vseventer/sharp-cli","license":"MIT"},"tippy.js":{"version":"6.3.7","url":"https://atomiks.github.io/tippyjs/","license":"MIT"},"uninstall":{"version":"0.0.0","license":"MIT"},"websql":{"version":"2.0.3","url":"git://github.com/nolanlawson/node-websql.git","license":"Apache-2.0"},"xlsx":{"version":"0.18.5","url":"https://sheetjs.com/","license":"Apache-2.0"}};