Skip to content

[pull] master from DefinitelyTyped:master #1707

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

Merged
pull merged 1 commit into from
Mar 29, 2026
+16 −1
Merged

[pull] master from DefinitelyTyped:master #1707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions types/event-calendar__core/event-calendar__core-tests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,10 @@ cal = createCalendar(target, plugins, {
customScrollbars: true,
date: "1997-04-12",
dateClick: (_info: Calendar.DateClickInfo) => {},
dateIncrement: { days: 7 },
datesAboveResources: false,
datesSet: (_info: Calendar.DatesSetInfo) => {},
dayCellContent: { html: "" },
dayCellFormat: dateFormat,
dayHeaderAriaLabelFormat: dateFormat,
dayHeaderFormat: dateFormat,
Expand Down Expand Up @@ -272,6 +274,7 @@ cal.setOption("buttonText", () => {
return customButtons;
})
.setOption("columnWidth", undefined)
.setOption("dayCellContent", (_arg: Calendar.DayCellContentArg) => "content")
.setOption("dayCellFormat", (_d: Date) => "content")
.setOption("dayHeaderAriaLabelFormat", (_d: Date) => "content")
.setOption("dayHeaderFormat", (_d: Date) => "content")
Expand Down Expand Up @@ -326,6 +329,7 @@ let validResource: Calendar.Resource = {
title: "content",
eventBackgroundColor: undefined,
eventTextColor: undefined,
expanded: true,
extendedProps: { a: 1, b: "two", c: [] },
};
const { title, ...rest } = validResource;
Expand Down
11 changes: 11 additions & 0 deletions types/event-calendar__core/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ export namespace Calendar {
title?: Content;
eventBackgroundColor?: string;
eventTextColor?: string;
expanded?: boolean;
extendedProps?: Record<string, unknown>;
children?: ResourceInput[];
}
Expand All @@ -87,6 +88,7 @@ export namespace Calendar {
title: Content;
eventBackgroundColor: string | undefined;
eventTextColor: string | undefined;
expanded: boolean;
extendedProps: Record<string, unknown>;
}

Expand Down Expand Up @@ -131,6 +133,13 @@ export namespace Calendar {
view: View;
}

interface DayCellContentArg {
allDay: boolean;
date: Date;
isToday: boolean;
resource: Resource;
}

interface EventClassNamesInfo {
event: Event;
view: View;
Expand Down Expand Up @@ -326,8 +335,10 @@ export namespace Calendar {
customScrollbars?: boolean;
date?: Date | string | undefined;
dateClick?: (info: DateClickInfo) => void;
dateIncrement?: DurationInput;
datesAboveResources?: boolean;
datesSet?: (info: DatesSetInfo) => void;
dayCellContent?: Content | ((arg: DayCellContentArg) => Content);
dayCellFormat?: Intl.DateTimeFormatOptions | ((d: Date) => Content);
dayHeaderAriaLabelFormat?: Intl.DateTimeFormatOptions | ((d: Date) => Content);
dayHeaderFormat?: Intl.DateTimeFormatOptions | ((d: Date) => Content);
Expand Down
2 changes: 1 addition & 1 deletion types/event-calendar__core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"private": true,
"type": "module",
"name": "@types/event-calendar__core",
"version": "5.5.9999",
"version": "5.6.9999",
"projects": [
"https://vkurko.github.io/calendar/"
],
Expand Down