@fto-consult/expo-ui 2.38.1 → 2.38.2

package/package.json

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

package/src/components/Chart/index.js

@@ -1,7 +1,6 @@
 import React from '$react'
 import PropTypes from 'prop-types'
-import {defaultStr,defaultVal,extendObj,defaultObj,uniqid,defaultNumber} from "$utils";
-import stableHash from 'stable-hash';
+import {defaultStr,defaultVal,defaultObj,uniqid} from "$utils";
 import Chart from "./appexChart";
 import theme from "$theme";
 import { destroyChart } from './appexChart/utils';
@@ -35,7 +34,7 @@ const ChartComponent = React.forwardRef(({options,onRender,style,height,width,ch
         chartContext.current.updateOptions(options);
       }
     }
-  },[stableHash(options)]);
+  },[(options)]);
   React.useOnRender(onRender);
   React.useEffect(()=>{
       return ()=>{

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

@@ -2883,7 +2883,6 @@ export default class CommonDatagridComponent extends AppComponent {
             delete this.filteredValues[i];
         })
         this.filters = filters;
-        console.log(this.filters," is fffff");
         this.refresh(true);
         this.isClearingAllFilters = false;
     }
@@ -3217,7 +3216,7 @@ export default class CommonDatagridComponent extends AppComponent {
         if(this.isRenderingRef.current === true){
             setTimeout(()=>{
                 this.isRenderingRef.current = false;
-                return this.setIsLoading(false);
+                return this.setIsLoading(false,undefined,undefined,"yes mannnnaaaaaa");
             },500);
         }
     }
@@ -3226,7 +3225,7 @@ export default class CommonDatagridComponent extends AppComponent {
      * @param {function | boolean} cb | enablePointerEvents
      * @param {boolean|function} enablePointerEvents
      */
-    setIsLoading (loading,cb,enablePointerEvents){
+    setIsLoading (loading,cb,enablePointerEvents,timeout){
         if(typeof cb =='boolean'){
             const t = enablePointerEvents;
             enablePointerEvents = cb;
@@ -3235,23 +3234,20 @@ export default class CommonDatagridComponent extends AppComponent {
         if(typeof enablePointerEvents =='boolean'){
             this.enablePointerEventsRef.current = enablePointerEvents;
         }
-        const timeout = 300;
-        setTimeout(()=>{
-           cb = typeof cb =='function'? cb : x=>true;
-            if(this.canSetIsLoading() && typeof loading =='boolean'){
-                if(loading === true){
-                    this.isRenderingRef.current = true;
-                } else if(this.isRenderingRef.current === true){
-                    return setTimeout(cb,timeout);;
-                }
-                return this.progressBarRef.current.setIsLoading(loading,()=>{
-                    setTimeout(cb,timeout);
-                });
-            } else {
+        timeout = typeof timeout =='number'? timeout : 500;
+        cb = typeof cb =='function'? cb : x=>true;
+        if(this.canSetIsLoading() && typeof loading =='boolean'){
+            if(loading === true){
+                this.isRenderingRef.current = true;
+            } else if(this.isRenderingRef.current === true){
+                  return setTimeout(cb,timeout);;
+              }
+               return this.progressBarRef.current.setIsLoading(loading,()=>{
                 setTimeout(cb,timeout);
-            }
-        },loading === false && enablePointerEvents === false ? timeout : 0);
-        return false;
+            });
+        } else {
+           setTimeout(cb,timeout);
+        }
     }
      /**** met à jour l'état de progression de la mise à jour du tableau */
      updateProgress(isLoading,cb){
@@ -3324,17 +3320,13 @@ export default class CommonDatagridComponent extends AppComponent {
         return false;
     }
     UNSAFE_componentWillReceiveProps(nextProps){
-        if(Object.size(nextProps.data) === Object.size(this.props.data) && (nextProps.data == this.props.data || stableHash(nextProps.data) === stableHash(this.props.data))) {
-            /*if( !this.isRenderingRef.current && typeof this.props.isLoading=='boolean' && nextProps.isLoading !== this.props.isLoading && typeof nextProps.isLoading =='boolean'){
-                this.setIsLoading(nextProps.isLoading)
-            }*/
+        if((stableHash(nextProps.data) === stableHash(this.props.data))) {
             return false;
         }
-        this.setIsLoading(true,()=>{
-            this.prepareData({...nextProps,force:true},(state)=>{
-                this.setState(state)
-            });
-        },true);
+        this.setIsLoading(true,true);
+        this.prepareData({...nextProps,force:true},(state)=>{
+            this.setState(state)
+        });
     }
     getDefaultPreloader(props){
         return CommonDatagridComponent.getDefaultPreloader();

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

@@ -187,7 +187,8 @@ export const formatValue = (value,format,abreviateValues)=>{
     if(typeof value =='boolean'){
         return value ? "Oui" : "Non";
     }
-    if(format && typeof format =='string' && format.toLowerCase() =='money'){
+    format = typeof format =='string'? format.toLowerCase().trim() : "";
+    if(format =='money'){
         return abreviateValues? value.abreviate2FormatMoney() : value.formatMoney();
     }
     return abreviateValues ? value.abreviate() : value.formatNumber();

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

@@ -165,7 +165,6 @@ const DatagridFactory = (Factory)=>{
             const hasFootersFields = this.hasFootersFields();
             const {columnsWidths:widths} = this.state;
             const showFooters = this.canShowFooters(), showFilters = this.canShowFilters();
-            const isLoading = this.isLoading();
             const progressBar = this.getProgressBar();
             const pointerEvents = this.getPointerEvents(); 
 
@@ -192,7 +191,7 @@ const DatagridFactory = (Factory)=>{
             }   
             const maxHeight = this.getMaxListHeight();
             const rPagination = showPagination ? <View style={[styles.paginationContainer]}>
-                <ScrollView horizontal showsHorizontalScrollIndicator={!isLoading} style={styles.paginationContainerStyle} contentContainerStyle={styles.minW100}>
+                <ScrollView horizontal  style={styles.paginationContainerStyle} contentContainerStyle={styles.minW100}>
                     <View style={[styles.paginationContent]}>
                         <View testID={testID+"_HeaderQueryLimit"}>
                             {this.renderQueryLimit(this.getStateDataSize().formatNumber())}

package/src/components/Table/List.js

@@ -132,37 +132,6 @@ VirtuosoListComponent.displayName = "VirtuosoListComponent";
 
 export default VirtuosoListComponent;
 
-function isScrollable (node){
-    if(!node) return false;
-    const dim = dimensions(node);
-    if(!dim) return false;
-    if(dim.scrollHeight>dim.clientHeight) return true;
-    if(dim.totalHeight > (dim.clientHeight+dim.scrollHeight+100)) return true;
-    return false;
- }
-function lookupForContent (node,level){
-    if(!node || !isDOMElement(node) || level>=5) return null;
-    if(typeof level !='number'){
-        level = 0;
-    }
-    console.log("looking for ",node,level,dimensions(node));
-    if(isScrollable(node)){
-        return node;
-    }
-    return lookupForContent(node.querySelector("div:first-child"),level+1)
-}
-
-function dimensions(el) {
-    if(!isDOMElement(el)) return null;
-    var elHeight = el.offsetHeight;
-    const marginBottom = parseInt(window.getComputedStyle(el).getPropertyValue('margin-bottom'));
-    const paddingBottom = parseInt(window.getComputedStyle(el).getPropertyValue('padding-bottom'));
-    return {
-        height:elHeight,marginBottom,paddingBottom,totalHeight : elHeight+marginBottom+paddingBottom,
-        width : el.offsetWidth,scrollHeight : el.scrollHeight,clientHeight  : el.clientHeight,
-    }
-}
-
 const normalizeEvent = (e)=>{
     return {
       nativeEvent: {