@fto-consult/expo-ui 2.3.5 → 2.4.0

package/package.json

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

package/src/components/Dialog/Dialog.js

@@ -20,6 +20,7 @@ import {ACTION_ICON_SIZE} from "$ecomponents/AppBar";
 import DialogFooter from "./DialogFooter";
 import { Dimensions } from "react-native";
 import Surface from "$ecomponents/Surface";
+import stableHash from "stable-hash";
 
 export const FOOTER_HEIGHT = 50;
 export const HEADER_HEIGHT = 50;
@@ -307,14 +308,14 @@ DialogComponent.propTypes= {
 }
 
 
-export const DialogControlledComponent = React.forwardRef((props,ref)=>{
-    const [visible,setVisible] = React.useStateIfMounted(defaultBool(props.visible,false));
+export const DialogControlledComponent = React.forwardRef(({visible:dVisible,...props},ref)=>{
+    const [visible,setVisible] = React.useStateIfMounted(defaultBool(dVisible,false));
     const {onDismiss,onClose,onVisibilityChanged,...rest} = props;
     React.useEffect(()=>{
-        if(typeof props.visible =='boolean' && props.visible !== visible){
-            setVisible(props.visible);
+        if(typeof dVisible =='boolean' && dVisible !== visible){
+            setVisible(dVisible);
         }
-    },[props])
+    },[dVisible])
     const close = x=> setVisible(false);
     const open = x => setVisible(true);
     const isOpen=x=>visible,isClosed = x=>!visible;

package/src/components/Filter/index.js

@@ -88,6 +88,12 @@ export default class Filter extends AppComponent {
     Object.defineProperties(this,{
       fireFilterSearch : {
          value : this.filterValidationTimeout ? debounce(this.fireValueChanged.bind(this),this.filterValidationTimeout) : this.fireValueChanged.bind(this),
+      },
+      isInitializedRef : {
+        value : {current:false}
+      },
+      previousRef : {
+        value : {current : null}
       }
     })
     extendObj(this.state,{
@@ -134,7 +140,7 @@ export default class Filter extends AppComponent {
      if(JSON.stringify(this.state.defaultValue) === JSON.stringify(arg.value)){
         return;
      }
-     this.setState({prevDefaultValue:this.state.defaultValue,defaultValue:arg.value},()=>{
+     this.setState({defaultValue:arg.value},()=>{
        this.callOnValidate(arg);
        if(!isNumber(this.filterValidationTimeout)){
           this.filterValidationTimeout = 0;
@@ -178,7 +184,7 @@ export default class Filter extends AppComponent {
   }
   fireValueChanged (forceRun){
       if(this.willRunManually() && !forceRun) return;
-      let {defaultValue:value,prevDefaultValue,action,ignoreCase,operator} = this.state;
+      let {defaultValue:value,action,ignoreCase,operator} = this.state;
       let force = forceRun ===true ? true : false;
       if(!isObjOrArray(value) && (isNullOrEmpty(value,true) || value ==='undefined') ){
           value = undefined;
@@ -189,18 +195,17 @@ export default class Filter extends AppComponent {
       if(action =="$today" || action =='$yesterday'){
          force = true;
       }
-      let prev = JSON.stringify(defaultObj(this.previousObj)),//{value:this.previousValue,operator:this.previousOperator,action:this.previousAction}
-          current = {value,operator,action,ignoreCase};
+      const prev = JSON.stringify(defaultObj(this.previousRef.current)), current = {value,operator,action,ignoreCase};
           let tV = isArray(value) && value.length <= 0 ? undefined : value;
-      let isFilterInitialized = this.props.dynamicRendered || this.isFilterInitialized;
-      if(prev == "{}" && (isNullOrEmpty(tV) || value === 0) && (!isFilterInitialized) && (force !== true))  {
+      this.isInitializedRef.current = this.props.dynamicRendered || this.isInitializedRef.current;
+      if(prev == "{}" && (isNullOrEmpty(tV) || value === 0) && (!this.isInitializedRef.current) && (force !== true))  {
         return this;
       }
       if(prev == JSON.stringify(current) && (force !== true)){
           return this;
       }
-      this.isFilterInitialized = true;
-      this.previousObj = current;
+      this.isInitializedRef.current = true;
+      this.previousRef.current = current;
       if(isFunction(this.props.onChange)){
           let selector = {};
           selector[this.props.field] = action;
@@ -353,7 +358,7 @@ export default class Filter extends AppComponent {
       })
   }
   clearFilter(event){
-    this.setState({defaultValue:undefined,prevDefaultValue:this.state.defaultValue},()=>{
+    this.setState({defaultValue:undefined},()=>{
       this.callOnValidate();
       this.fireValueChanged(true);
       let {onClearFilter,onResetFilter} = this.props;

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

@@ -21,6 +21,7 @@ const FormDataDialogProvider = React.forwardRef((props,innerRef)=>{
     const {closeAction,onDismiss} = props;
     const context = {
         open : (props)=>{
+            if(state.visible) return;
             let sData = {};
             if(formRef.current && formRef.current.formDataContext && formRef.current.formDataContext.getData){
                 sData.data = formRef.current.formDataContext.getData();
@@ -28,6 +29,7 @@ const FormDataDialogProvider = React.forwardRef((props,innerRef)=>{
             return setState({...state,...sData,onDismiss:undefined,...defaultObj(props),visible:true})
         },
         close : (props)=>{
+            if(!state.visible) return;
             setState({...state,...defaultObj(props),visible:false});
         },
     };