@fto-consult/expo-ui 6.74.1 → 6.74.3

package/package.json

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

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

@@ -45,11 +45,13 @@ export const renderRowCell = (arg)=>{
         } else if(typeof columnDef.render === "function"){
             _render = columnDef.render.call(context,renderArgs);
         } else if(arrayValueExists( _type,["date","datetime","time"])){
-            const sqlFormat =_type === 'time'? undefined : _type ==="datetime" ? DateLib.SQLDateTimeFormat : DateLib.SQLDateFormat;
-            let _dd =DateLib.parse(rowData[columnField],sqlFormat);
-            if(DateLib.isDateObj(_dd)){
-                const eFormat = defaultStr(columnDef.format,(_type === 'time'?DateLib.defaultTimeFormat:DateLib.masks.defaultDate));
-                _render = DateLib.format(_dd,eFormat);
+            if(rowData[columnField]){
+                const sqlFormat =_type === 'time'? undefined : _type ==="datetime" ? DateLib.SQLDateTimeFormat : DateLib.SQLDateFormat;
+                let _dd =DateLib.parse(rowData[columnField],sqlFormat);
+                if(DateLib.isDateObj(_dd)){
+                    const eFormat = defaultStr(columnDef.format,(_type === 'time'?DateLib.defaultTimeFormat:DateLib.masks.defaultDate));
+                    _render = DateLib.format(_dd,eFormat);
+                }
             }
             if(!_render) _render = rowData[columnField]
         } else if(arrayValueExists(_type,['switch','checkbox'])){

package/src/components/Date/DatePickerInput/index.js

@@ -38,6 +38,7 @@ const DatePickerInput = React.forwardRef(({
     left : customLeft,
     helperText,
     format,
+    displayFormat,
     disabled,readOnly
     ,text,
     withLabel,
@@ -110,10 +111,10 @@ const DatePickerInput = React.forwardRef(({
     return {error,errorText};
   }
   React.useEffect(()=>{
-    const inputDate = toDateObj(defaultValue);
+    const inputDate = toDateObj(defaultValue,format);
     if(compareTwoDates(inputDate,prevInputDate)) return;
     setState({...state,inputDate});
-  },[defaultValue])
+  },[defaultValue,format]);
   const setEmptyValue = ()=>{
     setState({...state,inputDate:undefined});
   }

package/src/components/Date/DateTime.js

@@ -12,7 +12,7 @@ import DateLib from "$date";
 import { toDateObj } from "./utils";
 import PeriodActionComponent from "./PeriodAction";
 
-export default function DateTimePickerComponent({left,isPeriodAction,contentProps,withSeconds,right,format,dateFormat,timeFormat,defaultValue,onChange,testID,dateProps,disabled,readOnly,timeProps,...rest}){
+export default function DateTimePickerComponent({left,isPeriodAction,contentProps,withSeconds,right,format,displayDateFormat,displayTimeFormat,dateFormat,timeFormat,defaultValue,onChange,testID,dateProps,disabled,readOnly,timeProps,...rest}){
     if(!isPeriodAction){
         isPeriodAction = isNonNullString(defaultValue) && defaultValue.contains("=>");
     }
@@ -32,15 +32,6 @@ export default function DateTimePickerComponent({left,isPeriodAction,contentProp
     const anchorTimeProps = defaultObj(timeProps.anchorProps);
     const timePropsContainerProps = defaultObj(timeProps.containerProps);
     const dateObj = toDateObj(defaultValue);
-    if(isNonNullString(format)){
-        format = format.trim().split(" ");
-        if(!isNonNullString(dateFormat)){
-            dateFormat = format[0].trim();
-        }
-        if(!isNonNullString(timeFormat) && format[1]){
-            timeFormat = format[1].trim();
-        }
-    }
     const changeDateArgsRef = {current:{
         date : dateObj,
     }}
@@ -80,6 +71,7 @@ export default function DateTimePickerComponent({left,isPeriodAction,contentProp
         testID = {testID}
         {...rest}
         format = {dateFormat}
+        displayFormat = {displayDateFormat}
         {...dateProps}
         style = {dStyle}
         calendarIconBefore = {true}
@@ -97,6 +89,7 @@ export default function DateTimePickerComponent({left,isPeriodAction,contentProp
                     readOnly = {readOnly}       
                     testID={testID+"_Time"}    
                     format = {timeFormat}
+                    displayFormat = {displayTimeFormat}
                     {...timeProps}
                     onChange = {(args)=>{
                         changedTimeArgsRef.current = args;
@@ -130,6 +123,8 @@ DateTimePickerComponent.propTypes = {
     timeProps : PropTypes.object,
     dateFormat : PropTypes.string, //Le format de date
     timeFormat : PropTypes.string, //le format de time
+    displayDateFormat : PropTypes.string,//le format d'affichage de la date
+    displayTimeFormat : PropTypes.string, //le format d'affichage des heures
     defaultValue : PropTypes.oneOfType([
         PropTypes.string,
         PropTypes.object,

package/src/components/Drawer/DrawerItems/DrawerItem.js

@@ -13,7 +13,8 @@ import React from "$react";
 export default function DrawerItem(props){
     let {navigation,closeOnPress,routeName,routeParams,...rest} = props;
     const {drawerRef,isItemActive} = useDrawer();
-    const isActive = useIsScreenFocused(routeName) || isItemActive(props);
+    const isActive = isItemActive(props);
+    const isFocused = useIsScreenFocused(routeName);
     const [active,setActive] = React.useState(isActive);
     const isMounted = React.useIsMounted();
     const itemId = React.useState(uniqid("drawer-item-id"));
@@ -25,17 +26,26 @@ export default function DrawerItem(props){
         id:itemId,
         routeName
     });
-    if(active){
-        setActiveItem(context);
-    }
+    React.useEffect(()=>{
+        if(isMounted() && isNonNullString(routeName)){
+            if(isFocused !== active){
+                setActive(isFocused);
+            }
+        }
+    },[isFocused])
+    React.useEffect(()=>{
+        if(active && isMounted()){
+            setActiveItem(context);
+        }
+    },[active])
     const closeDrawer = (cb,force)=>{
         return nCloseDrawer(drawerRef,cb,force);
     }
     React.useEffect(()=>{
-        if(isActive !== active){
+        if(isMounted() && isActive !== active){
             setActive(isActive); 
         }
-    },[isActive])
+    },[isActive]);
     return <_DrawerItem 
         {...rest} 
         drawerRef = {drawerRef}

package/src/components/Filter/index.js

@@ -137,7 +137,7 @@ export default class Filter extends AppComponent {
       type = defaultStr(type,this.type,this.props.type).toLowerCase();
       if(type.contains('select')){
           return "$in";
-      } if(type !== 'date2time' && type !== 'time' && type !== 'number' && type !== 'decimal'){
+      } if(type !== 'date2time' && type !=="date" && type !== 'time' && type !== 'number' && type !== 'decimal'){
           return '$regexcontains';
       }
       return '$eq';

package/src/navigation/hooks.js

@@ -39,5 +39,5 @@ export const useIsScreenFocused = (screenName)=>{
             APP.off(APP.EVENTS.SCREEN_BLUR,onScreenBlur);
         }
     },[])
-    return useMemo(()=>isFocused,[isFocused]);
+    return useMemo(()=>isFocused,[isFocused,sanitizeName]);
 }