Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pickers] Fix AdapterDateFnsV3 generated method types #13464

Merged
merged 4 commits into from
Jun 17, 2024
+202 −200
Merged

[pickers] Fix AdapterDateFnsV3 generated method types #13464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e43d8bb
Fix date-fns-v3 related adapters generating wrong types furig build
alexey-kozlenkov Jun 12, 2024
e3b8610
Fix getYearRange return type for date-fns-v3-jalali adapter
alexey-kozlenkov Jun 12, 2024
e375906
Add explicit types for date-fns v2 adapters
alexey-kozlenkov Jun 16, 2024
88f6b25
Fix prettier
alexey-kozlenkov Jun 16, 2024
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
98 changes: 49 additions & 49 deletions packages/x-date-pickers/src/AdapterDateFns/AdapterDateFns.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,31 +96,31 @@ export class AdapterDateFns
super({ locale: locale ?? defaultLocale, formats, longFormatters });
}

public parse = (value: string, format: string) => {
public parse = (value: string, format: string): Date | null => {
if (value === '') {
return null;
}

return dateFnsParse(value, format, new Date(), { locale: this.locale });
};

public isValid = (value: Date | null) => {
public isValid = (value: Date | null): boolean => {
if (value == null) {
return false;
}

return isValid(value);
};

public format = (value: Date, formatKey: keyof AdapterFormats) => {
public format = (value: Date, formatKey: keyof AdapterFormats): string => {
return this.formatByString(value, this.formats[formatKey]);
};

public formatByString = (value: Date, formatString: string) => {
public formatByString = (value: Date, formatString: string): string => {
return dateFnsFormat(value, formatString, { locale: this.locale });
};

public isEqual = (value: Date | null, comparing: Date | null) => {
public isEqual = (value: Date | null, comparing: Date | null): boolean => {
if (value === null && comparing === null) {
return true;
}
Expand All @@ -132,171 +132,171 @@ export class AdapterDateFns
return isEqual(value, comparing);
};

public isSameYear = (value: Date, comparing: Date) => {
public isSameYear = (value: Date, comparing: Date): boolean => {
return isSameYear(value, comparing);
};

public isSameMonth = (value: Date, comparing: Date) => {
public isSameMonth = (value: Date, comparing: Date): boolean => {
return isSameMonth(value, comparing);
};

public isSameDay = (value: Date, comparing: Date) => {
public isSameDay = (value: Date, comparing: Date): boolean => {
return isSameDay(value, comparing);
};

public isSameHour = (value: Date, comparing: Date) => {
public isSameHour = (value: Date, comparing: Date): boolean => {
return isSameHour(value, comparing);
};

public isAfter = (value: Date, comparing: Date) => {
public isAfter = (value: Date, comparing: Date): boolean => {
return isAfter(value, comparing);
};

public isAfterYear = (value: Date, comparing: Date) => {
public isAfterYear = (value: Date, comparing: Date): boolean => {
return isAfter(value, endOfYear(comparing));
};

public isAfterDay = (value: Date, comparing: Date) => {
public isAfterDay = (value: Date, comparing: Date): boolean => {
return isAfter(value, endOfDay(comparing));
};

public isBefore = (value: Date, comparing: Date) => {
public isBefore = (value: Date, comparing: Date): boolean => {
return isBefore(value, comparing);
};

public isBeforeYear = (value: Date, comparing: Date) => {
public isBeforeYear = (value: Date, comparing: Date): boolean => {
return isBefore(value, this.startOfYear(comparing));
};

public isBeforeDay = (value: Date, comparing: Date) => {
public isBeforeDay = (value: Date, comparing: Date): boolean => {
return isBefore(value, this.startOfDay(comparing));
};

public isWithinRange = (value: Date, [start, end]: [Date, Date]) => {
public isWithinRange = (value: Date, [start, end]: [Date, Date]): boolean => {
return isWithinInterval(value, { start, end });
};

public startOfYear = (value: Date) => {
public startOfYear = (value: Date): Date => {
return startOfYear(value);
};

public startOfMonth = (value: Date) => {
public startOfMonth = (value: Date): Date => {
return startOfMonth(value);
};

public startOfWeek = (value: Date) => {
public startOfWeek = (value: Date): Date => {
return startOfWeek(value, { locale: this.locale });
};

public startOfDay = (value: Date) => {
public startOfDay = (value: Date): Date => {
return startOfDay(value);
};

public endOfYear = (value: Date) => {
public endOfYear = (value: Date): Date => {
return endOfYear(value);
};

public endOfMonth = (value: Date) => {
public endOfMonth = (value: Date): Date => {
return endOfMonth(value);
};

public endOfWeek = (value: Date) => {
public endOfWeek = (value: Date): Date => {
return endOfWeek(value, { locale: this.locale });
};

public endOfDay = (value: Date) => {
public endOfDay = (value: Date): Date => {
return endOfDay(value);
};

public addYears = (value: Date, amount: number) => {
public addYears = (value: Date, amount: number): Date => {
return addYears(value, amount);
};

public addMonths = (value: Date, amount: number) => {
public addMonths = (value: Date, amount: number): Date => {
return addMonths(value, amount);
};

public addWeeks = (value: Date, amount: number) => {
public addWeeks = (value: Date, amount: number): Date => {
return addWeeks(value, amount);
};

public addDays = (value: Date, amount: number) => {
public addDays = (value: Date, amount: number): Date => {
return addDays(value, amount);
};

public addHours = (value: Date, amount: number) => {
public addHours = (value: Date, amount: number): Date => {
return addHours(value, amount);
};

public addMinutes = (value: Date, amount: number) => {
public addMinutes = (value: Date, amount: number): Date => {
return addMinutes(value, amount);
};

public addSeconds = (value: Date, amount: number) => {
public addSeconds = (value: Date, amount: number): Date => {
return addSeconds(value, amount);
};

public getYear = (value: Date) => {
public getYear = (value: Date): number => {
return getYear(value);
};

public getMonth = (value: Date) => {
public getMonth = (value: Date): number => {
return getMonth(value);
};

public getDate = (value: Date) => {
public getDate = (value: Date): number => {
return getDate(value);
};

public getHours = (value: Date) => {
public getHours = (value: Date): number => {
return getHours(value);
};

public getMinutes = (value: Date) => {
public getMinutes = (value: Date): number => {
return getMinutes(value);
};

public getSeconds = (value: Date) => {
public getSeconds = (value: Date): number => {
return getSeconds(value);
};

public getMilliseconds = (value: Date) => {
public getMilliseconds = (value: Date): number => {
return getMilliseconds(value);
};

public setYear = (value: Date, year: number) => {
public setYear = (value: Date, year: number): Date => {
return setYear(value, year);
};

public setMonth = (value: Date, month: number) => {
public setMonth = (value: Date, month: number): Date => {
return setMonth(value, month);
};

public setDate = (value: Date, date: number) => {
public setDate = (value: Date, date: number): Date => {
return setDate(value, date);
};

public setHours = (value: Date, hours: number) => {
public setHours = (value: Date, hours: number): Date => {
return setHours(value, hours);
};

public setMinutes = (value: Date, minutes: number) => {
public setMinutes = (value: Date, minutes: number): Date => {
return setMinutes(value, minutes);
};

public setSeconds = (value: Date, seconds: number) => {
public setSeconds = (value: Date, seconds: number): Date => {
return setSeconds(value, seconds);
};

public setMilliseconds = (value: Date, milliseconds: number) => {
public setMilliseconds = (value: Date, milliseconds: number): Date => {
return setMilliseconds(value, milliseconds);
};

public getDaysInMonth = (value: Date) => {
public getDaysInMonth = (value: Date): number => {
return getDaysInMonth(value);
};

public getWeekArray = (value: Date) => {
public getWeekArray = (value: Date): Date[][] => {
const start = this.startOfWeek(this.startOfMonth(value));
const end = this.endOfWeek(this.endOfMonth(value));

Expand All @@ -316,11 +316,11 @@ export class AdapterDateFns
return nestedWeeks;
};

public getWeekNumber = (value: Date) => {
public getWeekNumber = (value: Date): number => {
return getWeek(value, { locale: this.locale });
};

public getYearRange = ([start, end]: [Date, Date]) => {
public getYearRange = ([start, end]: [Date, Date]): Date[] => {
const startDate = this.startOfYear(start);
const endDate = this.endOfYear(end);
const years: Date[] = [];
Expand Down
Loading
Loading