Merge pull request #26695 from leeovictor/date-picker-fix

Controls: fix date picker control validation and input value assign
storybookjs · May 22, 2024 · 9226a94 · 9226a94
2 parents 0616c33 + 051b3ef
commit 9226a94
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/code/ui/blocks/src/controls/Date.tsx b/code/ui/blocks/src/controls/Date.tsx
@@ -74,15 +74,16 @@ export const DateControl: FC<DateProps> = ({ name, value, onChange, onFocus, onB
   useEffect(() => {
     if (valid !== false) {
       if (dateRef && dateRef.current) {
-        dateRef.current.value = formatDate(value);
+        dateRef.current.value = value ? formatDate(value) : '';
       }
       if (timeRef && timeRef.current) {
-        timeRef.current.value = formatTime(value);
+        timeRef.current.value = value ? formatTime(value) : '';
       }
     }
   }, [value]);
 
   const onDateChange = (e: ChangeEvent<HTMLInputElement>) => {
+    if (!e.target.value) return onChange();
     const parsed = parseDate(e.target.value);
     const result = new Date(value);
     result.setFullYear(parsed.getFullYear(), parsed.getMonth(), parsed.getDate());
@@ -92,6 +93,7 @@ export const DateControl: FC<DateProps> = ({ name, value, onChange, onFocus, onB
   };
 
   const onTimeChange = (e: ChangeEvent<HTMLInputElement>) => {
+    if (!e.target.value) return onChange();
     const parsed = parseTime(e.target.value);
     const result = new Date(value);
     result.setHours(parsed.getHours());

diff --git a/code/ui/blocks/src/controls/types.ts b/code/ui/blocks/src/controls/types.ts
@@ -5,7 +5,7 @@ export interface ControlProps<T> {
   value?: T;
   defaultValue?: T;
   argType?: ArgType;
-  onChange: (value: T) => T | void;
+  onChange: (value?: T) => T | void;
   onFocus?: (evt: any) => void;
   onBlur?: (evt: any) => void;
 }