fix: replace deprecated usage

gravity-ui · Jan 27, 2025 · f0ee1e9 · f0ee1e9
1 parent 7018420
commit f0ee1e9
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/src/components/DatePicker/DatePicker.tsx b/src/components/DatePicker/DatePicker.tsx
@@ -68,7 +68,7 @@ export function DatePicker({className, ...props}: DatePickerProps) {
                                 ) : (
                                     <Calendar {...calendarProps} />
                                 )}
-                                {state.hasTime && (
+                                {state.formatInfo.hasTime && (
                                     <div className={b('time-field-wrapper')}>
                                         <DateField {...timeInputProps} />
                                     </div>

diff --git a/src/components/DatePicker/MobileCalendar.tsx b/src/components/DatePicker/MobileCalendar.tsx
@@ -21,9 +21,9 @@ interface MobileCalendarProps {
 }
 export function MobileCalendar({props, state}: MobileCalendarProps) {
     let type: InputDateType = 'date';
-    if (state.hasTime && state.hasDate) {
+    if (state.formatInfo.hasTime && state.formatInfo.hasDate) {
         type = 'datetime-local';
-    } else if (state.hasTime) {
+    } else if (state.formatInfo.hasTime) {
         type = 'time';
     }
 
@@ -48,13 +48,13 @@ export function MobileCalendar({props, state}: MobileCalendarProps) {
                         format: getDateFormat(type),
                         timeZone: 'system',
                     }).timeZone(state.timeZone, true);
-                    let newDate = state.hasDate
+                    let newDate = state.formatInfo.hasDate
                         ? localDate
                         : createPlaceholderValue({
                               placeholderValue: props.placeholderValue?.timeZone(state.timeZone),
                               timeZone: state.timeZone,
                           });
-                    if (state.hasTime) {
+                    if (state.formatInfo.hasTime) {
                         newDate = mergeDateTime(newDate, localDate);
                     } else if (state.value) {
                         newDate = mergeDateTime(newDate, state.value.timeZone(state.timeZone));

diff --git a/src/components/DatePicker/hooks/datePickerStateFactory.ts b/src/components/DatePicker/hooks/datePickerStateFactory.ts
@@ -196,7 +196,7 @@ export function datePickerStateFactory<T, O extends DatePickerStateOptions<T>>({
             }
         };
 
-        if (dateFieldState.hasTime && !selectedTime) {
+        if (dateFieldState.formatInfo.hasTime && !selectedTime) {
             selectedTime = dateFieldState.displayValue;
         }
 

diff --git a/src/components/DatePicker/hooks/useDatePickerProps.ts b/src/components/DatePicker/hooks/useDatePickerProps.ts
@@ -157,7 +157,7 @@ export function useDatePickerProps<T extends DateTime | RangeValue<DateTime>>(
             readOnly: props.readOnly,
             onUpdate: (d) => {
                 state.setDateValue(d);
-                if (!state.hasTime) {
+                if (!state.formatInfo.hasTime) {
                     focusInput();
                 }
             },

diff --git a/src/components/RangeDatePicker/RangeDatePicker.tsx b/src/components/RangeDatePicker/RangeDatePicker.tsx
@@ -31,7 +31,7 @@ export function RangeDatePicker({className, ...props}: RangeDatePickerProps) {
     const {groupProps, fieldProps, calendarButtonProps, popupProps, calendarProps, timeInputProps} =
         useDatePickerProps(state, props);
 
-    const isOnlyTime = state.hasTime && !state.hasDate;
+    const isOnlyTime = state.formatInfo.hasTime && !state.formatInfo.hasDate;
 
     return (
         <div className={b(null, className)} {...groupProps}>
@@ -44,7 +44,7 @@ export function RangeDatePicker({className, ...props}: RangeDatePickerProps) {
                             ) : (
                                 <RangeCalendar {...calendarProps} value={state.value} />
                             )}
-                            {state.hasTime && (
+                            {state.formatInfo.hasTime && (
                                 <div className={b('time-field-wrapper')}>
                                     <RangeDateField {...timeInputProps} />
                                 </div>

diff --git a/src/components/RelativeDatePicker/RelativeDatePicker.tsx b/src/components/RelativeDatePicker/RelativeDatePicker.tsx
@@ -65,7 +65,8 @@ export function RelativeDatePicker(props: RelativeDatePickerProps) {
     const handleRef = useForkRef(anchorRef, groupProps.ref);
 
     const isMobile = useMobile();
-    const isOnlyTime = state.datePickerState.hasTime && !state.datePickerState.hasDate;
+    const isOnlyTime =
+        state.datePickerState.formatInfo.hasTime && !state.datePickerState.formatInfo.hasDate;
 
     return (
         <div {...groupProps} ref={handleRef} className={b(null, props.className)}>
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             };
-            if (dateFieldState.hasTime && !selectedTime) {
+            if (dateFieldState.formatInfo.hasTime && !selectedTime) {
                 selectedTime = dateFieldState.displayValue;
             }
@@ Expand Down @@