chore: rename DateFormatTime to prevent key generation (#87)

adaptui · Oct 12, 2020 · f8f72fd · f8f72fd
1 parent 759e100
commit f8f72fd
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 22 deletions.
diff --git a/src/calendar/CalendarHeader.ts b/src/calendar/CalendarHeader.ts
@@ -4,11 +4,11 @@ import { createComponent, createHook } from "reakit-system";
 import { CALENDAR_HEADER_KEYS } from "./__keys";
 import { useDateFormatter } from "@react-aria/i18n";
 import { CalendarStateReturn } from "./CalendarState";
-import { DateTimeFormatOptions } from "../utils/types";
+import { DateTimeFormatOpts } from "../utils/types";
 
 export type CalendarHeaderOptions = BoxOptions &
   Pick<CalendarStateReturn, "calendarId" | "currentMonth"> & {
-    format?: DateTimeFormatOptions;
+    format?: DateTimeFormatOpts;
   };
 
 export type CalendarHeaderHTMLProps = BoxHTMLProps;

diff --git a/src/datepicker/DatePickerState.ts b/src/datepicker/DatePickerState.ts
@@ -14,15 +14,11 @@ import * as React from "react";
 import { isValid } from "date-fns";
 import { useControllableState } from "@chakra-ui/hooks";
 
-import {
-  DateTimeFormatOptions,
-  DateValue,
-  RangeValueBase,
-} from "../utils/types";
 import { useSegmentState } from "../segment";
 import { useCalendarState } from "../calendar";
 import { setTime, isInvalid } from "./__utils";
 import { PickerBaseInitialState, usePickerBaseState } from "../picker-base";
+import { DateTimeFormatOpts, DateValue, RangeValueBase } from "../utils/types";
 
 export interface DatePickerInitialState
   extends PickerBaseInitialState,
@@ -31,7 +27,7 @@ export interface DatePickerInitialState
     ValueBase<DateValue>,
     RangeValueBase<DateValue> {
   placeholderDate?: DateValue;
-  formatOptions?: DateTimeFormatOptions;
+  formatOptions?: DateTimeFormatOpts;
 }
 
 export const useDatePickerState = (props: DatePickerInitialState = {}) => {

diff --git a/src/segment/SegmentState.ts b/src/segment/SegmentState.ts
@@ -9,7 +9,7 @@ import { useCompositeState } from "reakit";
 import { useDateFormatter } from "@react-aria/i18n";
 import { useControlledState } from "@react-stately/utils";
 
-import { DateTimeFormatOptions } from "../utils/types";
+import { DateTimeFormatOpts } from "../utils/types";
 import { add, setSegment, convertValue, getSegmentLimits } from "./__utils";
 
 export interface IDateSegment {
@@ -48,7 +48,7 @@ const TYPE_MAPPING = {
 export interface SegmentStateProps {
   value?: Date;
   defaultValue?: Date;
-  formatOptions?: DateTimeFormatOptions;
+  formatOptions?: DateTimeFormatOpts;
   placeholderDate?: Date;
   onChange?: (value: Date, ...args: any[]) => void;
 }

diff --git a/src/segment/__utils.ts b/src/segment/__utils.ts
@@ -14,7 +14,7 @@ import {
   setYear,
 } from "date-fns";
 
-import { DateTimeFormatOptions, DateValue } from "../utils/types";
+import { DateTimeFormatOpts, DateValue } from "../utils/types";
 
 export function convertValue(value: DateValue | undefined): Date | undefined {
   if (!value) {
@@ -27,7 +27,7 @@ export function convertValue(value: DateValue | undefined): Date | undefined {
 export function getSegmentLimits(
   date: Date,
   type: string,
-  options: DateTimeFormatOptions,
+  options: DateTimeFormatOpts,
 ) {
   let value, minValue, maxValue;
   switch (type) {

diff --git a/src/timepicker/TimePickerState.ts b/src/timepicker/TimePickerState.ts
@@ -3,17 +3,17 @@ import { useControllableState } from "@chakra-ui/hooks";
 import { ValueBase, FocusableProps } from "@react-types/shared";
 
 import { useSegmentState } from "../segment";
-import { DateTimeFormatOptions } from "../utils/types";
+import { DateTimeFormatOpts } from "../utils/types";
+import { stringifyTime, parseTime } from "./__utils";
 import { useTimePickerColumnState } from "./TimePickerColumnState";
 import { PickerBaseInitialState, usePickerBaseState } from "../picker-base";
-import { stringifyTime, parseTime } from "./__utils";
 
 // TODO: Voice Overing all button on dialog open
 export interface TimePickerStateProps
   extends PickerBaseInitialState,
     FocusableProps,
     ValueBase<string> {
-  formatOptions?: DateTimeFormatOptions;
+  formatOptions?: DateTimeFormatOpts;
   placeholderDate?: Date;
 }
 

diff --git a/src/utils/__keys.ts b/src/utils/__keys.ts
diff --git a/src/utils/types.ts b/src/utils/types.ts
@@ -1,5 +1,4 @@
-import { RangeValue } from "@react-types/shared";
-export type DateTimeFormatOptions = Intl.DateTimeFormatOptions & {
+export type DateTimeFormatOpts = Intl.DateTimeFormatOptions & {
   timeStyle?: string;
   dateStyle?: string;
 };

diff --git a/src/utils/useSpinButton.ts b/src/utils/useSpinButton.ts
@@ -14,10 +14,10 @@
 import { AriaButtonProps } from "@react-types/button";
 import { HTMLAttributes, useCallback, useEffect, useRef } from "react";
 import {
+  ValueBase,
   InputBase,
-  RangeInputBase,
   Validation,
-  ValueBase,
+  RangeInputBase,
 } from "@react-types/shared";
 
 export interface SpinButtonProps
@@ -60,7 +60,6 @@ export function useSpinButton(props: SpinButtonProps): SpinbuttonAria {
 
   const clearAsync = () => clearTimeout(_async.current);
 
-  // eslint-disable-next-line arrow-body-style
   useEffect(() => {
     return () => clearAsync();
   }, []);