@fto-consult/expo-ui 2.2.0 → 2.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -62,7 +62,7 @@
     "@expo/html-elements": "^0.2.0",
     "@expo/metro-config": "^0.4.0",
     "@expo/webpack-config": "^0.17.2",
-    "@fto-consult/common": "^1.11.1",
+    "@fto-consult/common": "^1.11.2",
     "@gorhom/portal": "^1.0.14",
     "@react-native-async-storage/async-storage": "~1.17.3",
     "@react-native-community/datetimepicker": "6.5.2",

package/src/components/Date/DateTime.js

@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 import Date from "./DatePickerInput";
-import Time from "./Time";
+import Time,{parseTime} from "./Time";
 import React from "$react";
 import PropTypes from "prop-types";
 import {defaultObj,isNumber,defaultNumber,defaultStr,defaultBool,isNonNullString} from "$utils";
@@ -17,8 +17,7 @@ export default function DateTimePickerComponent({left,withSeconds,right,format,d
     testID = defaultStr(testID,"RN_DateTimeComponent")
     const anchorTimeProps = defaultObj(timeProps.anchorProps);
     const timePropsContainerProps = defaultObj(timeProps.containerProps);
-    const defaultValueRef = React.useRef(toDateObj(defaultValue,format));
-    const dateObj = defaultValueRef.current;
+    const dateObj = toDateObj(defaultValue);
     if(isNonNullString(format)){
         format = format.trim().split(" ");
         if(!isNonNullString(dateFormat)){
@@ -28,9 +27,18 @@ export default function DateTimePickerComponent({left,withSeconds,right,format,d
             timeFormat = format[1].trim();
         }
     }
-    const changeDateArgsRef = React.useRef({});
-    const changedTimeArgsRef = React.useRef({});
+    const changeDateArgsRef = React.useRef({
+        date : dateObj,
+    });
+    const getTimeValue = (date)=>{
+        date = DateLib.isValid(date)? date : new Date();
+        const sqlTime = date.toSQLTimeFormat();
+        return sqlTime.substring(0,withSeconds ?sqlTime.length :5);
+    }
+    const timeDefaultValue = getTimeValue(dateObj);
+    const changedTimeArgsRef = React.useRef({...defaultObj(parseTime(timeDefaultValue,withSeconds))});
     withSeconds = defaultBool(timeProps.withSeconds,withSeconds,true);
+
     const maxWidth = 120;//withSeconds ? 120 : 120;
     const callOnChange = ()=>{
         if(onChange){
@@ -40,11 +48,12 @@ export default function DateTimePickerComponent({left,withSeconds,right,format,d
             const date = dObj.date;
             date.setHours(tObj.hours);
             date.setMinutes(tObj.minutes);
-            date.setSeconds(defaultNumber(tObj.seconds))
+            date.setSeconds(withSeconds?defaultNumber(tObj.seconds):0);
+            const sqlDate = date.toSQLDateFormat();
             const sqlTime = date.toSQLTimeFormat();
-            const time = sqlTime.substring(0,withSeconds ?sqlTime.length :5);
+            const time = getTimeValue(date);
             const value = date.toFormat(defaultStr(dateFormat,DateLib.SQLDateFormat))+" "+time;
-            const args = {...dObj,...tObj,dateObject:date,date,sqlDateTime:date.toSQLDateTimeFormat(),value,sqlTime,time};
+            const args = {...dObj,...tObj,dateObject:date,sqlDate,date,sqlDateTime:date.toSQLDateTimeFormat(),value,sqlTime,time};
             onChange(args);
         }
     }
@@ -67,7 +76,7 @@ export default function DateTimePickerComponent({left,withSeconds,right,format,d
             const r = typeof right =='function'? right(p): React.isValidElement(right)? right : null;
             return <>
                 <Time 
-                    defaultValue = {dateObj}
+                    defaultValue = {timeDefaultValue}
                     disabled = {disabled}
                     readOnly = {readOnly}       
                     testID={testID+"_Time"}    

package/src/components/Date/Time.js

@@ -7,15 +7,15 @@ import PropTypes from "prop-types";
 import theme,{styles} from "$theme";
 import { locale } from "./utils";
 import { TouchableRipple } from "react-native-paper";
-const getDate = (hours,minutes,seconds)=>{
+export const getDate = (hours,minutes,seconds)=>{
     return new Date(2000, 1, 1, defaultDecimal(hours), defaultDecimal(minutes),defaultDecimal(seconds))
 }
-const compareTimeState = (a,b,ignoreVisible)=>{ 
+export const compareTimeState = (a,b,ignoreVisible)=>{ 
     if(!a || !b) return false;
     if(ignoreVisible !== true && a.visible !== b.visible) return false;
     return a.hours === b.hours && a.minutes === b.minutes;
   }
-  const parseTime = (value,withSeconds)=>{
+export const parseTime = (value,withSeconds)=>{
     if(!isNonNullString(value)) return undefined;
     let split = value.trim().split(":");
     let ret = {
@@ -29,7 +29,7 @@ const compareTimeState = (a,b,ignoreVisible)=>{
     ret.value = timeToString(ret,withSeconds);
     return ret;
   }
-  const timeToString = (value,withSeconds)=>{
+export const timeToString = (value,withSeconds)=>{
      if(!isObj(value)) return undefined;
      let {hours,minutes,seconds} = value;
      if(hours ===undefined && minutes === undefined) return undefined;
@@ -43,7 +43,7 @@ const compareTimeState = (a,b,ignoreVisible)=>{
      }
      return value.substring(0,5);
   }
-  export default function TimePickerComponent (props){
+export default function TimePickerComponent (props){
     let {right:customRight,upper,anchorProps,dialogProps,withLabel,containerProps,mode,onChange,withSeconds,cancelLabel,confirmLabel,label,text,upperCase,defaultValue,disabled,editable,withModal,readOnly,...rest} = props;
     rest = defaultObj(rest);
     const isEditable = disabled !== true && readOnly !== true && editable !== false?true : false;

package/src/components/Filter/utils.js

@@ -386,7 +386,9 @@ export const prepareFilters = (filtersToPrepare,opts)=>{
             let sp = defaultStr(f.value);
             if(sp){
                 sp = sp.split("=>");
-                if(DateLib.isValidSQLDate(sp[0]) && DateLib.isValidSQLDate(sp[1])){
+                const isValid1 = DateLib.isValidSQLDate(sp[0]) || DateLib.isValidSQLDateTime(sp[0]);
+                const isValid2 = DateLib.isValidSQLDate(sp[1]) || DateLib.isValidSQLDateTime(sp[1]);
+                if(isValid1 && isValid2){
                     filters[f.operator].push({
                         [f.field] : {$gte:sp[0]}
                     })