Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions src/calendar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,23 +56,27 @@ import YearDropdown from "./year_dropdown";
import type { ClickOutsideHandler } from "./click_outside_wrapper";
import type { Day } from "date-fns";

interface YearDropdownProps
extends React.ComponentPropsWithoutRef<typeof YearDropdown> {}
interface YearDropdownProps extends React.ComponentPropsWithoutRef<
typeof YearDropdown
> {}

interface MonthDropdownProps
extends React.ComponentPropsWithoutRef<typeof MonthDropdown> {}
interface MonthDropdownProps extends React.ComponentPropsWithoutRef<
typeof MonthDropdown
> {}

interface MonthYearDropdownProps
extends React.ComponentPropsWithoutRef<typeof MonthYearDropdown> {}
interface MonthYearDropdownProps extends React.ComponentPropsWithoutRef<
typeof MonthYearDropdown
> {}

interface YearProps extends React.ComponentPropsWithoutRef<typeof Year> {}

interface MonthProps extends React.ComponentPropsWithoutRef<typeof Month> {}

interface TimeProps extends React.ComponentPropsWithoutRef<typeof Time> {}

interface InputTimeProps
extends React.ComponentPropsWithoutRef<typeof InputTime> {}
interface InputTimeProps extends React.ComponentPropsWithoutRef<
typeof InputTime
> {}

const DROPDOWN_FOCUS_CLASSNAMES = [
"react-datepicker__year-select",
Expand Down Expand Up @@ -217,8 +221,7 @@ type CalendarProps = React.PropsWithChildren<
>;

interface CalendarState
extends Pick<YearProps, "selectingDate">,
Pick<MonthProps, "selectingDate"> {
extends Pick<YearProps, "selectingDate">, Pick<MonthProps, "selectingDate"> {
date: Required<YearProps>["date"];
monthContainer: TimeProps["monthRef"];
isRenderAriaLiveMessage: boolean;
Expand Down
5 changes: 3 additions & 2 deletions src/calendar_container.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import React, { type HTMLAttributes } from "react";

export interface CalendarContainerProps
extends React.PropsWithChildren<HTMLAttributes<HTMLDivElement>> {
export interface CalendarContainerProps extends React.PropsWithChildren<
HTMLAttributes<HTMLDivElement>
> {
showTimeSelectOnly?: boolean;
showTime?: boolean;
inline?: boolean;
Expand Down
9 changes: 4 additions & 5 deletions src/date_utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,10 @@ import {
import type { Locale as DateFnsLocale, Day } from "date-fns";

export type DateNumberType = Day;
interface LocaleObj
extends Pick<
DateFnsLocale,
"options" | "formatLong" | "localize" | "match"
> {}
interface LocaleObj extends Pick<
DateFnsLocale,
"options" | "formatLong" | "localize" | "match"
> {}

export type Locale = string | LocaleObj;

Expand Down
23 changes: 11 additions & 12 deletions src/day.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,17 @@ import {
KeyType,
} from "./date_utils";

interface DayProps
extends Pick<
DateFilterOptionsWithDisabled,
| "minDate"
| "maxDate"
| "excludeDates"
| "excludeDateIntervals"
| "includeDateIntervals"
| "includeDates"
| "filterDate"
| "disabled"
> {
interface DayProps extends Pick<
DateFilterOptionsWithDisabled,
| "minDate"
| "maxDate"
| "excludeDates"
| "excludeDateIntervals"
| "includeDateIntervals"
| "includeDates"
| "filterDate"
| "disabled"
> {
ariaLabelPrefixWhenEnabled?: string;
ariaLabelPrefixWhenDisabled?: string;
disabledKeyboardNavigation?: boolean;
Expand Down
10 changes: 6 additions & 4 deletions src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,15 @@ interface Holiday {

type CalendarProps = React.ComponentPropsWithoutRef<typeof Calendar>;

interface CalendarIconProps
extends React.ComponentPropsWithoutRef<typeof CalendarIcon> {}
interface CalendarIconProps extends React.ComponentPropsWithoutRef<
typeof CalendarIcon
> {}

interface PortalProps extends React.ComponentPropsWithoutRef<typeof Portal> {}

interface PopperComponentProps
extends React.ComponentPropsWithoutRef<typeof PopperComponent> {}
interface PopperComponentProps extends React.ComponentPropsWithoutRef<
typeof PopperComponent
> {}

// see https://github.com/microsoft/TypeScript/issues/31501
// eslint-disable-next-line @typescript-eslint/no-explicit-any
Expand Down
27 changes: 13 additions & 14 deletions src/month.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -90,20 +90,19 @@ function getMonthColumnsLayout(

interface WeekProps extends React.ComponentPropsWithoutRef<typeof Week> {}

interface MonthProps
extends Omit<
WeekProps,
| "ariaLabelPrefix"
| "chooseDayAriaLabelPrefix"
| "day"
| "disabledDayAriaLabelPrefix"
| "month"
| "onDayClick"
| "onDayMouseEnter"
| "preSelection"
| "selected"
| "showWeekNumber"
> {
interface MonthProps extends Omit<
WeekProps,
| "ariaLabelPrefix"
| "chooseDayAriaLabelPrefix"
| "day"
| "disabledDayAriaLabelPrefix"
| "month"
| "onDayClick"
| "onDayMouseEnter"
| "preSelection"
| "selected"
| "showWeekNumber"
> {
monthClassName?: (date: Date) => string;
onDayClick?: (
date: Date,
Expand Down
14 changes: 7 additions & 7 deletions src/month_dropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ import {
} from "./date_utils";
import MonthDropdownOptions from "./month_dropdown_options";

interface MonthDropdownOptionsProps
extends React.ComponentPropsWithoutRef<typeof MonthDropdownOptions> {}
interface MonthDropdownOptionsProps extends React.ComponentPropsWithoutRef<
typeof MonthDropdownOptions
> {}

interface MonthDropdownProps
extends Omit<
MonthDropdownOptionsProps,
"monthNames" | "onChange" | "onCancel"
> {
interface MonthDropdownProps extends Omit<
MonthDropdownOptionsProps,
"monthNames" | "onChange" | "onCancel"
> {
dropdownMode: "scroll" | "select";
locale?: Locale;
onChange: (month: number) => void;
Expand Down
11 changes: 7 additions & 4 deletions src/month_year_dropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,14 @@ import {
} from "./date_utils";
import MonthYearDropdownOptions from "./month_year_dropdown_options";

interface MonthYearDropdownOptionsProps
extends React.ComponentPropsWithoutRef<typeof MonthYearDropdownOptions> {}
interface MonthYearDropdownOptionsProps extends React.ComponentPropsWithoutRef<
typeof MonthYearDropdownOptions
> {}

interface MonthYearDropdownProps
extends Omit<MonthYearDropdownOptionsProps, "onChange" | "onCancel"> {
interface MonthYearDropdownProps extends Omit<
MonthYearDropdownOptionsProps,
"onChange" | "onCancel"
> {
dropdownMode: "scroll" | "select";
onChange: (monthYear: Date) => void;
locale?: Locale;
Expand Down
16 changes: 9 additions & 7 deletions src/popper_component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,17 @@ import withFloating from "./with_floating";
import type { FloatingProps } from "./with_floating";
import type { ReactNode } from "react";

interface PortalProps
extends Omit<React.ComponentPropsWithoutRef<typeof Portal>, "children"> {}
interface TabLoopProps
extends Omit<React.ComponentPropsWithoutRef<typeof TabLoop>, "children"> {}
interface PortalProps extends Omit<
React.ComponentPropsWithoutRef<typeof Portal>,
"children"
> {}
interface TabLoopProps extends Omit<
React.ComponentPropsWithoutRef<typeof TabLoop>,
"children"
> {}

interface PopperComponentProps
extends Omit<PortalProps, "portalId">,
TabLoopProps,
FloatingProps {
extends Omit<PortalProps, "portalId">, TabLoopProps, FloatingProps {
className?: string;
wrapperClassName?: string;
popperComponent: React.ReactNode;
Expand Down
10 changes: 6 additions & 4 deletions src/test/calendar_test.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,13 @@ const DATE_FORMAT = "MM/dd/yyyy";

type CalendarProps = React.ComponentProps<typeof Calendar>;

interface YearDropdownProps
extends React.ComponentPropsWithoutRef<typeof YearDropdown> {}
interface YearDropdownProps extends React.ComponentPropsWithoutRef<
typeof YearDropdown
> {}

interface MonthYearDropdownProps
extends React.ComponentPropsWithoutRef<typeof MonthYearDropdown> {}
interface MonthYearDropdownProps extends React.ComponentPropsWithoutRef<
typeof MonthYearDropdown
> {}

interface YearProps extends React.ComponentPropsWithoutRef<typeof Year> {}

Expand Down
5 changes: 2 additions & 3 deletions src/test/date_utils_test.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1665,9 +1665,8 @@ describe("date_utils", () => {
});

try {
const { isDayInRange: mockedIsDayInRange } = await import(
"../date_utils"
);
const { isDayInRange: mockedIsDayInRange } =
await import("../date_utils");

expect(
mockedIsDayInRange(
Expand Down
9 changes: 4 additions & 5 deletions src/time.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,10 @@ import {
KeyType,
} from "./date_utils";

interface TimeProps
extends Pick<
TimeFilterOptions,
"minTime" | "maxTime" | "excludeTimes" | "includeTimes" | "filterTime"
> {
interface TimeProps extends Pick<
TimeFilterOptions,
"minTime" | "maxTime" | "excludeTimes" | "includeTimes" | "filterTime"
> {
format?: string;
intervals?: number;
selected?: Date | null;
Expand Down
8 changes: 5 additions & 3 deletions src/week.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,13 @@ import WeekNumber from "./week_number";

interface DayProps extends React.ComponentPropsWithoutRef<typeof Day> {}

interface WeekNumberProps
extends React.ComponentPropsWithoutRef<typeof WeekNumber> {}
interface WeekNumberProps extends React.ComponentPropsWithoutRef<
typeof WeekNumber
> {}

interface WeekProps
extends Omit<
extends
Omit<
DayProps,
| "ariaLabelPrefixWhenEnabled"
| "ariaLabelPrefixWhenDisabled"
Expand Down
19 changes: 9 additions & 10 deletions src/year.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,15 @@ import {

const VERTICAL_NAVIGATION_OFFSET = 3;

interface YearProps
extends Pick<
DateFilterOptionsWithDisabled,
| "minDate"
| "maxDate"
| "excludeDates"
| "includeDates"
| "filterDate"
| "disabled"
> {
interface YearProps extends Pick<
DateFilterOptionsWithDisabled,
| "minDate"
| "maxDate"
| "excludeDates"
| "includeDates"
| "filterDate"
| "disabled"
> {
clearSelectingDate?: VoidFunction;
date?: Date;
disabledKeyboardNavigation?: boolean;
Expand Down
11 changes: 7 additions & 4 deletions src/year_dropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@ import React, { Component } from "react";
import { getYear } from "./date_utils";
import YearDropdownOptions from "./year_dropdown_options";

interface YearDropdownOptionsProps
extends React.ComponentPropsWithoutRef<typeof YearDropdownOptions> {}
interface YearDropdownOptionsProps extends React.ComponentPropsWithoutRef<
typeof YearDropdownOptions
> {}

interface YearDropdownProps
extends Omit<YearDropdownOptionsProps, "onChange" | "onCancel"> {
interface YearDropdownProps extends Omit<
YearDropdownOptionsProps,
"onChange" | "onCancel"
> {
adjustDateOnChange?: boolean;
dropdownMode: "scroll" | "select";
onChange: (year: number) => void;
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9450,11 +9450,11 @@ __metadata:
linkType: hard

"prettier@npm:^3.4.2":
version: 3.6.2
resolution: "prettier@npm:3.6.2"
version: 3.7.1
resolution: "prettier@npm:3.7.1"
bin:
prettier: bin/prettier.cjs
checksum: 10c0/488cb2f2b99ec13da1e50074912870217c11edaddedeadc649b1244c749d15ba94e846423d062e2c4c9ae683e2d65f754de28889ba06e697ac4f988d44f45812
checksum: 10c0/a6610043ee0a64a3251a948bf82fad3e59d984a8e8dea206400cfa190585417e3343b32c1f6ae7d8f40798a9b4bd91affc08fa7795dd99a9dec5c9bccdf31500
languageName: node
linkType: hard

Expand Down
Loading