@fto-consult/expo-ui 6.26.2 → 6.26.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "6.26.2",
+  "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/Dialog/AppBarDialog.js

@@ -9,8 +9,9 @@ const AppBarDialogComponent = React.forwardRef((props,ref)=>{
     const forceRender = React.useForceRender();
     React.useEffect(()=>{
         const onResize = ()=>{
+            return;
             forceRender();
-         }
+        }
         if(responsive){
             APP.on(APP.EVENTS.RESIZE_PAGE,onResize);
         }

package/src/components/ErrorBoundary/ErrorMessage.js

@@ -13,6 +13,7 @@ import {isWeb} from "$cplatform";
 
 const ErrorMessage = React.forwardRef(function(props,ref){
   const { error,resetError,onGoBack, info } = props
+  const testID = defaultStr(props.testID,"RN_ErrorBoundaryMessage");
     const goToHome = ()=> {
       if(navigationRef){
         navigationRef.navigate(homeRoute);
@@ -26,8 +27,8 @@ const ErrorMessage = React.forwardRef(function(props,ref){
     const pointerEvents = 'auto';
     const {width,height} = useWindowDimensions();
     return <Portal>
-          <View ref={ref} testID='RN_ErrorBoundary_Container' pointerEvents={pointerEvents} style={[styles.container,isWeb()?{position:'fixed'}:null,{backgroundColor:theme.colors.surface,width,height}]}>
-            <View style={styles.content} pointerEvents={pointerEvents}>
+          <View ref={ref} testID={`${testID}_ErrorMessageContainer`} pointerEvents={pointerEvents} style={[styles.container,isWeb()?{position:'fixed'}:null,{backgroundColor:theme.colors.surface,width,height}]}>
+            <View style={styles.content} testID={`${testID}_ErrorMessageContentContainer`} pointerEvents={pointerEvents}>
               <Label style={styles.title}>Oops!</Label>
               <Label style={styles.subtitle}>{'Une erreur est survenue'}</Label>
               <Label style={styles.error}>{error.toString()}</Label>

package/src/components/ErrorBoundary/Provider.js

@@ -4,6 +4,7 @@ let providerRef = null;
 import * as React from "react";
 import useForceRender from "$react/useForceRender";
 import setRef from "$react/setRef";
+import {defaultStr} from "$cutils";
 
 const providerState = {};
 
@@ -38,9 +39,9 @@ const Provider = React.forwardRef((_props,innerRef)=>{
         },
     });
     setRef(ref,context);        
-
-    return <Portal>
-        <ErrorMessage {...propRef.current} ref={el=>{
+    const testID = defaultStr(propRef.current?.testID,_props.testID,"RN_ErrorBoundaryProvider");
+    return <Portal testID={testID}>
+        <ErrorMessage {...propRef.current} testID={testID+"_ErrorBoundaryPortalContent"}  ref={el=>{
             messageRef.current = el;
             setRef(propRef.current.messageRef);
         }}/>

package/src/components/ErrorBoundary/index.js

@@ -38,6 +38,7 @@ class ErrorBoundary extends React.Component {
       } else {
         return (
           <ErrorMessage
+            testID={"RN_ErrorBoundaryErrorMessage"}
             error={error}
             info={info}
             resetError={this.resetError}

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/Icon/Icon.js

@@ -3,7 +3,7 @@ import PropTypes from "prop-types";
 import Tooltip from "$ecomponents/Tooltip";
 import theme,{flattenStyle,Colors} from "$theme";
 import React from "$react";
-import {IconButton} from "react-native-paper"
+import {IconButton} from "react-native-paper";
 
 const IconComponentRef = React.forwardRef((props,ref)=>{
     let {icon,style,Component,button,color,name,containerColor,...rest} = props;

package/src/components/List/Virtuoso/index.js

@@ -58,8 +58,7 @@ const VirtuosoListComponent = React.forwardRef(({onRender,id,fixedHeaderContent,
     const containerId = `${id}-container`;
     const headId = `${id}-table-head`;
     testID = defaultStr(testID,containerProps.testID,"RN_VirtuosoListComponent");
-    const listIdRef = React.useRef(uniqid("virtuoso-list-id"));
-    const listId = listIdRef.current;
+    const listId = `${id}-list`;
     const listRef = React.useRef(null);
     const sizeRef = React.useRef({width:0,height:0});
     const listSize = sizeRef.current;

package/src/components/Logo/Progress.js

@@ -5,15 +5,19 @@ import { ActivityIndicator, Colors } from 'react-native-paper';
 import theme,{defaultDarkTheme} from "$theme";
 import {isIos} from "$cplatform";
 import appConfig from "$capp/config";
+import {defaultStr} from "$cutils";
 
-export default function LogoProgress (props){
+export default function LogoProgress ({testID}){
+    testID = defaultStr(testID,"RN_LogoProgress");
     let containerStyle = {width:(Logo.width?Logo.width:undefined),height:(Logo.height?(Logo.height+100):undefined),flex:1,alignItems:"center",justifyContent:"center"};
     const primaryColor = theme.colors.primaryOnSurface,
     secondaryColor = theme.colors.secondaryOnSurface;
-    return <View style={[containerStyle]}>
-            <Logo key='logo' style={{marginBottom:0}} color={primaryColor}/>
-            <ActivityIndicator size = {isIos()?'large':40} animating={true} color={secondaryColor} />
-            <View key={'app-version'} style={{flex:1}}>
+    return <View style={[containerStyle]} testID={testID+"_ProgressLogoContainer"}>
+            <Logo key='logo' style={{marginBottom:0}} color={primaryColor} testID={testID+"_ProgressLogo"}/>
+            <View style={{marginTop:20}} testID={testID+"_LogoProgressActivityIndicatorContainer"}>
+                <ActivityIndicator size = {isIos()?'large':40} animating={true} color={secondaryColor} />
+            </View>
+            <View key={'app-version'} style={{flex:1}} testID={testID+"_LogoProgressVersion"}>
                 <Label style={[{marginTop:10, fontWeight:'bold',color:secondaryColor}]}>version {appConfig.version}</Label>
             </View>
     </View>