Implement keepOffset prop for DatePicker and TimePicker

jannikbuschke · Dec 15, 2020 · 7ec9fd8 · 7ec9fd8
1 parent d49d7b3
commit 7ec9fd8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/date-picker/index.tsx b/src/date-picker/index.tsx
@@ -17,13 +17,15 @@ const {
   WeekPicker: $WeekPicker,
 } = $DatePicker
 
-export type DatePickerProps = $DatePickerProps & FormikFieldProps
+export type DatePickerProps = $DatePickerProps &
+  FormikFieldProps & { keepOffset?: boolean }
 
 export const DatePicker = ({
   name,
   validate,
   onChange,
   fast,
+  keepOffset,
   ...restProps
 }: DatePickerProps) => (
   <Field name={name} validate={validate} fast={fast}>
@@ -34,7 +36,7 @@ export const DatePicker = ({
       <$DatePicker
         value={value ? moment(value) : undefined}
         onChange={(date, dateString) => {
-          setFieldValue(name, date ? date.toISOString() : null)
+          setFieldValue(name, date ? date.toISOString(keepOffset) : null)
           setFieldTouched(name, true, false)
           onChange && onChange(date, dateString)
         }}
@@ -50,6 +52,7 @@ DatePicker.MonthPicker = ({
   name,
   validate,
   onChange,
+  keepOffset,
   ...restProps
 }: MonthPickerProps) => (
   <Field name={name} validate={validate}>
@@ -60,7 +63,7 @@ DatePicker.MonthPicker = ({
       <$MonthPicker
         value={value ? moment(value) : undefined}
         onChange={(date, dateString) => {
-          setFieldValue(name, date ? date.toISOString() : null)
+          setFieldValue(name, date ? date.toISOString(keepOffset) : null)
           setFieldTouched(name, true, false)
           onChange && onChange(date, dateString)
         }}
@@ -122,4 +125,5 @@ DatePicker.WeekPicker = ({
 
 export type WeekPickerProps = FormikFieldProps & $WeekPickerProps
 export type RangePickerProps = FormikFieldProps & $RangePickerProps
-export type MonthPickerProps = FormikFieldProps & $MonthPickerProps
+export type MonthPickerProps = FormikFieldProps &
+  $MonthPickerProps & { keepOffset?: boolean }
diff --git a/src/time-picker/index.tsx b/src/time-picker/index.tsx
@@ -6,13 +6,15 @@ import { FormikFieldProps } from '../FieldProps'
 import Field from '../field'
 import { TimePickerProps as $TimePickerProps } from 'antd/lib/time-picker'
 
-export type TimePickerProps = FormikFieldProps & $TimePickerProps
+export type TimePickerProps = FormikFieldProps &
+  $TimePickerProps & { keepOffset?: boolean }
 
 export const TimePicker = ({
   name,
   validate,
   fast,
   onChange,
+  keepOffset,
   ...restProps
 }: TimePickerProps) => (
   <Field name={name} validate={validate} fast={fast}>
@@ -23,7 +25,7 @@ export const TimePicker = ({
       <$TimePicker
         value={value ? moment(value) : undefined}
         onChange={(time, timeString) => {
-          setFieldValue(name, time ? time.toISOString() : null)
+          setFieldValue(name, time ? time.toISOString(keepOffset) : null)
           setFieldTouched(name, true, false)
           onChange && onChange(time, timeString)
         }}