@dvrd/dvr-controls 1.0.66 → 1.0.68

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dvrd/dvr-controls",
-  "version": "1.0.66",
+  "version": "1.0.68",
   "description": "Custom web controls",
   "main": "index.ts",
   "files": [

package/src/js/date/dvrdDatePicker.tsx

@@ -104,7 +104,7 @@ export default function DvrdDatePicker(props: Props) {
                         alwaysShowArrows={alwaysShowArrows} max={max} min={min}/>
             {!!timeMode &&
                 <TimePicker onChange={onChangeTimePicker} onClose={onClosePicker} value={value}
-                            open={timePickerOpen} timeMode={timeMode}/>}
+                            open={timePickerOpen} timeMode={timeMode} closeOnChange={closeOnChange}/>}
             <label className='error-label'>{error}</label>
         </div>
     )
@@ -432,6 +432,7 @@ interface TimePickerProps {
     value: IDate | null;
     open: boolean;
     timeMode: DatePickerTimeMode;
+    closeOnChange?: boolean;
 }
 
 type TimePartValues = [string, string, string, string, string, string];
@@ -450,7 +451,7 @@ function timePartsToNumber(part1: string, part2: string): number {
 }
 
 function TimePicker(props: TimePickerProps) {
-    const {onChange, value, open, onClose, timeMode} = props;
+    const {onChange, value, open, onClose, timeMode, closeOnChange} = props;
     const [timeParts, setTimeParts] = useState<TimePartValues>(dateToTimeParts(value));
     const secondHourMax = useMemo(() => {
         if (Number(timeParts[0]) === 2) return 3;
@@ -460,14 +461,14 @@ function TimePicker(props: TimePickerProps) {
 
     function onClickNow() {
         setTimeParts(dateToTimeParts(new IDate()));
+        if (closeOnChange)
+            onSubmit();
     }
 
     function onSubmit() {
-        console.log(timeParts);
         const hours = timePartsToNumber(timeParts[0], timeParts[1]);
         const minutes = timePartsToNumber(timeParts[2], timeParts[3]);
         const seconds = timePartsToNumber(timeParts[4], timeParts[5]);
-        console.log(hours, minutes, seconds);
         const _value = value?.clone() ?? new IDate();
         onChange(_value.set({hours, minutes, seconds}));
         onClose();

package/src/js/loader/loader.tsx

@@ -48,7 +48,7 @@ export default function Loader(props: Props) {
         }
         if (!!thickness)
             style.borderWidth = thickness;
-        return {...style, ...loaderStyle};
+        return {...style, ...(loaderStyle ?? {})};
     }, [baseColor, contextStyle.contrastColor, trackColor, size, thickness, loaderStyle]);
 
     function renderLabel() {

package/src/js/loader/loaderController.tsx

@@ -40,6 +40,7 @@ export default function LoaderController(props: Props) {
         <Loader baseColor={baseColor} trackColor={defaultProps.trackColor!} className={defaultProps.className}
                 loaderClassName={defaultProps.loaderClassName} labelClassName={defaultProps.labelClassName}
                 contextStyle={context} disableBackground={defaultProps.disableBackground}
-                loaderStyle={defaultProps.loaderStyle} position={defaultProps.position!}/>
+                loaderStyle={defaultProps.loaderStyle} position={defaultProps.position!} size={defaultProps.size}
+                thickness={defaultProps.thickness} label={defaultProps.label}/>
     )
 }