diff --git a/src/panelWebView/components/Fields/DateTimeField.tsx b/src/panelWebView/components/Fields/DateTimeField.tsx index 9d6e06af..c9c0f152 100644 --- a/src/panelWebView/components/Fields/DateTimeField.tsx +++ b/src/panelWebView/components/Fields/DateTimeField.tsx @@ -40,11 +40,13 @@ export const DateTimeField: React.FunctionComponent = ({ const onDateChange = React.useCallback((date: Date) => { setDateValue(date); if (format) { + // Always use DateHelper.formatInTimezone when a format is provided onChange(DateHelper.formatInTimezone(date, format, timezone) || ""); } else { + // Only fallback to ISO string if no format is provided onChange(date.toISOString()); } - }, [format, onChange]); + }, [format, timezone, onChange]); const showRequiredState = useMemo(() => { return required && !dateValue;