@fto-consult/expo-ui 6.55.1 → 6.55.3

package/package.json

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

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

@@ -42,6 +42,7 @@ import * as XLSX from "xlsx";
 import {convertToSQL} from "$ecomponents/Filter";
 import events from "../events";
 import {MORE_ICON} from "$ecomponents/Icon"
+import ActivityIndicator from "$ecomponents/ActivityIndicator";
 
 export const TIMEOUT = 100;
 
@@ -3648,7 +3649,7 @@ export default class CommonDatagridComponent extends AppComponent {
         },0);
     }
     getDefaultPreloader(props){
-        return CommonDatagridComponent.getDefaultPreloader();
+        return CommonDatagridComponent.getDefaultPreloader({isDashboard:this.isDashboard()});
     }
     isLoading (){
         if(this.state.isReady === false) return true;
@@ -3842,8 +3843,9 @@ export default class CommonDatagridComponent extends AppComponent {
 
 export const ProgressBar = CommonDatagridComponent.LinesProgressBar;
 
-CommonDatagridComponent.getDefaultPreloader = (props)=>{
-    return <Preloader {...defaultObj(props)}/>
+CommonDatagridComponent.getDefaultPreloader = (r)=>{
+    const {isDashboard,...props} = defaultObj(r);
+    return isDashboard? <ActivityIndicator size={"large"} {...props} style={[theme.styles.pb10,props.style]}/> : <Preloader {...props}/>
 }
 
 const chartDisplayType = PropTypes.oneOf(Object.keys(displayTypes).filter(type=>{

package/src/components/Datagrid/Footer/Footer.js

@@ -88,8 +88,7 @@ const formatValue = ({value,format,abreviate,aggregatorFunction})=>{
     }
     return abreviate? value.abreviate():value.formatNumber();
 }
-export default function DGGridFooterValue (props){
-    let {label,text,displayLabel,withLabel,abreviate,style,aggregatorFunctions,aggregatorFunction,format,testID,anchorProps} = props;
+export default function DGGridFooterValue ({label,text,displayLabel,isFooterCell,withLabel,abreviate,style,aggregatorFunctions,aggregatorFunction,format,testID,anchorProps,...props}){
     aggregatorFunctions = defaultObj(aggregatorFunctions);
     anchorProps = defaultObj(anchorProps);
     testID = defaultStr(testID,"RN_DatagridFooterComponent");

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

@@ -50,7 +50,7 @@ const DatagridFactory = (Factory)=>{
         }
         renderFooterCell(props){
             const {columnField,style} = props;
-            let footersValues = this.getFooterValues();
+            const footersValues = this.getFooterValues();
             const footerFields = this.getFootersFields();
             if(isObj(footerFields[columnField])){
                 return <Footer
@@ -59,7 +59,8 @@ const DatagridFactory = (Factory)=>{
                     displayLabel = {false}
                     style = {[style]}
                     aggregatorFunction = {this.getActiveAggregatorFunction().code}   
-                    aggregatorFunctions = {this.aggregatorFunctions}                               
+                    aggregatorFunctions = {this.aggregatorFunctions}   
+                    isFooterCell
                 />
             }
             return null;

package/src/components/Table/Header/CellWrapper.js

@@ -7,10 +7,10 @@ import Label from "$ecomponents/Label";
 import theme from "$theme";
 
 export default function HeaderCellWrapper({columnField,isFilter,isFooter}){
-    const {render,sortedColumn,filtersValues,...props} = useGetColumnProps({columnField,isFilter,isFooter});
+    const {render,sortedColumn,filtersValues,data,...props} = useGetColumnProps({columnField,isFilter,isFooter});
     const columnDef = props.columnDef;
     const isHeader = !isFilter && !isFooter;
-    const rProps = isHeader ? sortedColumn : undefined;
+    const rProps = isHeader ? sortedColumn : isFooter ? data : undefined;
     const width = props.width;
     const {containerProps} = props;
     return React.useMemo(()=>{

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

@@ -7,15 +7,14 @@ import {classNames} from "$cutils";
 
 const TableHeadersWrapperComponent = React.forwardRef(({className},ref)=>{
     const {testID,tableHeadId} = useTable();
-    const content = React.useMemo(()=><>
-        <Header isHeader={true} testID={testID+"_TableHeader"}/>
-        <Header isFilter={true} testID={testID+"_TableFilters"} style={[styles.header,styles.filters,theme.styles.pt0,theme.styles.pb0,theme.styles.ml0,theme.styles.mr0]}/>
-        <Header isFooter testID={testID+"_TableFooter"}  style={[styles.header,styles.footers,theme.styles.pt0,theme.styles.pb0,theme.styles.ml0,theme.styles.mr0]}/>
-    </>,[])
+    const filters = React.useMemo(()=><Header isFilter={true} testID={testID+"_TableFilters"} style={[styles.header,styles.filters,theme.styles.pt0,theme.styles.pb0,theme.styles.ml0,theme.styles.mr0]}/>,[])
     return <thead ref={ref} id={tableHeadId} className={classNames(className,"virtuoso-list-render-table-thead")}
-            style = {{zIndex:100, position: 'sticky', top: 0 ,width:"100%"}}
-    >
-        {content}    
+            style = {{zIndex:100, position: 'sticky', top: 0 ,width:"100%"}}>
+        <>
+            <Header isHeader={true} testID={testID+"_TableHeader"}/>
+            {filters}   
+            <Header isFooter testID={testID+"_TableFooter"}  style={[styles.header,styles.footers,theme.styles.pt0,theme.styles.pb0,theme.styles.ml0,theme.styles.mr0]}/>
+        </>
     </thead>
 });
 

package/src/components/Table/hooks.js

@@ -45,7 +45,7 @@ export const usePrepareColumns = ({columns,testID,columnsWidths,headerCellContai
 import useTable from "./useTable";
 
 export const useGetColumnProps = ({columnField,isFilter,isFooter})=>{
-  const {renderFilterCell,renderFooterCell,filtersValues,renderHeaderCell,sortedColumn,columns,filterCellContainerProps,footerCellContainerProps,headerCellContainerProps,testID,colsWidths} = useTable();
+  const {renderFilterCell,renderFooterCell,filtersValues,renderHeaderCell,data,sortedColumn,columns,filterCellContainerProps,footerCellContainerProps,headerCellContainerProps,testID,colsWidths} = useTable();
   const columnDef = columns[columnField];
   const props = isFilter ? {
     containerProps : defaultObj(filterCellContainerProps),
@@ -57,6 +57,7 @@ export const useGetColumnProps = ({columnField,isFilter,isFooter})=>{
     containerProps : defaultObj(headerCellContainerProps),
     render : renderHeaderCell
   }
+  props.data = data;
   props.width = colsWidths[columnField];
   props.columnField = columnField;
   props.columnDef = columnDef;