clean

Author: XingY

packages/components/src/internal/components/editable/DateInputCell.tsx

@@ -6,6 +6,7 @@ import { DatePickerInput } from '../forms/input/DatePickerInput';
 import {
     formatDate,
     formatDateTime,
+    getJsonTimeFormatString,
     getTimeValueFromDatePickerInput,
     isDateTimeCol
 } from '../../util/Date';
@@ -39,20 +40,22 @@ export const DateInputCell: FC<DateInputCellProps> = memo(props => {
     }, [colIdx, rowIdx, select]);
 
     const onDateInputChange = useCallback(
-        (newDate: Date | string, formatted?: string) => {
-            let display = formatted;
-            if (!display) {
-                if (newDate && typeof newDate === 'string') display = newDate;
-                else if (newDate && newDate instanceof Date) {
-                    display = col.isTimeColumn
-                        ? getTimeValueFromDatePickerInput(newDate, col)
-                        : isDateTimeCol(col)
-                          ? formatDateTime(newDate)
-                          : formatDate(newDate);
+        (newDate: Date | string) => {
+            let display, raw = newDate;
+            if (newDate && typeof newDate === 'string') display = newDate;
+            else if (newDate && newDate instanceof Date) {
+                if (col.isTimeColumn) {
+                    raw = getJsonTimeFormatString(newDate);
+                    display = getTimeValueFromDatePickerInput(newDate, col);
+                }
+                else {
+                    display = isDateTimeCol(col)
+                        ? formatDateTime(newDate)
+                        : formatDate(newDate);
                 }
             }
 
-            modifyCell(colIdx, rowIdx, [{ raw: col.isTimeColumn ? display : newDate, display }], MODIFICATION_TYPES.REPLACE, col);
+            modifyCell(colIdx, rowIdx, [{ raw, display }], MODIFICATION_TYPES.REPLACE, col);
         },
         [col, colIdx, modifyCell, rowIdx]
     );

packages/components/src/internal/components/forms/input/DatePickerInput.tsx

@@ -26,7 +26,6 @@ import {
     getPickerDateAndTimeFormat,
     isDateTimeCol,
     isRelativeDateFilterValue,
-    parseDate,
     parseTime,
 } from '../../../util/Date';
 
@@ -53,7 +52,7 @@ export interface DatePickerInputProps extends DisableableInputProps {
     name?: string;
     onBlur?: () => void;
     onCalendarClose?: () => void;
-    onChange?: (rawDate?: Date | string, dateStr?: string) => void;
+    onChange?: (rawDate?: Date | string) => void;
     onKeyDown?: (event: React.KeyboardEvent<HTMLElement>) => void;
     placeholderText?: string;
     queryColumn: QueryColumn;
@@ -168,7 +167,7 @@ export class DatePickerInputImpl extends DisableableInput<DatePickerInputImplPro
         this.setState({ selectedDate: date, invalid: false, invalidStart: false });
 
         if (this.state.relativeInputValue) {
-            this.props.onChange?.(this.state.relativeInputValue);
+            onChange?.(this.state.relativeInputValue);
         } else {
             onChange?.(date);