@fto-consult/expo-ui 6.53.0 → 6.53.1

package/package.json

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

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

@@ -18,8 +18,7 @@ import { useDatagrid } from "../hooks";
 const MIN_WIDTH = 250;
 let windowWidth = Dimensions.get("window").width;
 
-const FiltersAccordionComponent = React.forwardRef(({children,label,testID:cTestID,filterTitle:customFilterTitle,visible:customVisible,orOperator,andOperator,onToggleFilters,...rest},ref)=>{
-    const {filters,filteredColumns,context} = useDatagrid();
+const FiltersAccordionComponent = React.forwardRef(({children,filters,filteredColumns,context,label,testID:cTestID,filterTitle:customFilterTitle,visible:customVisible,orOperator,andOperator,onToggleFilters,...rest},ref)=>{
     const testID = defaultStr(testID,"RN_AccordionFilters");
     const [visibleColumns,setVisibleColumns] = React.useState(filteredColumns);
     const [visible,setVisible] = React.useState(defaultBool(customVisible,false));

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

@@ -456,8 +456,13 @@ const DatagridFactory = (Factory)=>{
                         {this.isFilterable() ? <View>
                             <FiltersAccordionComponent
                                 testID={testID+"_HeaderFilters"}
+                                isLoading = {isLoading}
+                                filters = {headerFilters}
+                                visibleColumns = {visibleColumnsNames}
                                 orOperator = {filterOrOperator}
                                 andOperator = {filterAndOperator}
+                                filteredColumns = {filteredColumns}
+                                context = {this}
                             />
                         </View> : null}
                         <View pointerEvents={pointerEvents} testID={testID+"_HeaderPagination"} style = {styles.paginationItem}>

package/src/components/Datagrid/{Table → Filters}/Filter.js

@@ -35,29 +35,21 @@ export default function DatagridTableFilterComponent({columnField,visible:cVisib
         delete filteredProps.value;
     }
     label = label || text;
-    const left = React.isValidElement(label,true) ? (p)=>{
-        <Label style={[styles.filterLabel]}>
-            {label} 
-        </Label>
-    }:undefined;
-    return <Filter
-        {...rest}
-        {...filteredProps}
-        withLabel={false}
-        containerProps = {{
-            style : [styles.filterContainer]
-        }}
-        testID={testID+"_DatagridFilterComponent_"+columnField}
-        anchorProps = {{size:20,style:[theme.styles.noMargin,theme.styles.noPadding]}}
-        left = {left}
-        inputProps = {{left}}
-    />
     return <View testID={testID+"_DatagridFilterTableContainer"} style={[styles.filter,getMenuStyle(),!visible && styles.hidden]}>
         <View testID={testID+"_DatagridTableFilterContent"} style={[theme.styles.row,theme.styles.alignItemsCenter,theme.styles.justifyContentStart,!visible && styles.hidden]}>
             {React.isValidElement(label,true) ? <Label style={[styles.filterLabel]}>
                 {label} 
             </Label>:null}
-            
+            <Filter
+                {...rest}
+                {...filteredProps}
+                withLabel={false}
+                containerProps = {{
+                    style : [styles.filterContainer]
+                }}
+                testID={testID+"_DatagridFilterComponent_"+columnField}
+                anchorProps = {{size:20,style:[theme.styles.noMargin,theme.styles.noPadding]}}
+            />
         </View>
     </View>;
 }

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

@@ -15,7 +15,7 @@ import Footer from "../Footer/Footer";
 import theme from "$theme";
 import Table,{styles as tableStyles} from "$ecomponents/Table";
 import DatagridProvider from "../hooks/Provider";
-import Filters from "./Filters";
+import Filters from "../Filters";
 
 
 const DatagridFactory = (Factory)=>{
@@ -298,13 +298,6 @@ const DatagridFactory = (Factory)=>{
                             /> : null}
                             {rPagination}
                             {progressBar}  
-                            {/**
-                                <Filters
-                                testID={testID+"_DatagridTableHeaderFilters"}
-                                orOperator = {this.props.filterOrOperator}
-                                andOperator = {this.props.filterAndOperator}
-                            />
-                            */}
                         </View>
                         {canRenderChart ?
                             <View testID={testID+"_ChartContainer"} {...chartContainerProps} style={[theme.styles.w100,chartContainerProps.style]}>