Skip to content
Merged
Show file tree
Hide file tree
Changes from 32 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
c67b3f9
WIP
noraleonte Jul 17, 2025
cf9bdab
Merge branch 'master' of github.com:noraleonte/mui-x into add-all-day…
noraleonte Jul 23, 2025
2eaab10
display all day events
noraleonte Jul 24, 2025
00dd816
Map inside one selector
noraleonte Jul 25, 2025
2af27d1
conditionally render time fields
noraleonte Jul 28, 2025
108129d
remove comment
noraleonte Jul 28, 2025
f4e7be0
Merge branch 'master' of github.com:noraleonte/mui-x into add-all-day…
noraleonte Jul 28, 2025
e98b1f2
disable time fields instead of conditional rendering
noraleonte Jul 28, 2025
8937114
Proposal to improve the data management of the events
flaviendelangle Jul 29, 2025
c96525e
Fix test
flaviendelangle Jul 29, 2025
5a4a37a
Merge
flaviendelangle Jul 29, 2025
532187d
WIP
noraleonte Jul 30, 2025
b4eac25
fix column spanning
noraleonte Jul 30, 2025
12021e7
Merge branch 'master' of github.com:noraleonte/mui-x into add-all-day…
noraleonte Jul 30, 2025
ab2cce3
edit data
noraleonte Jul 30, 2025
d2714e4
Merge branch 'master' of github.com:noraleonte/mui-x into add-all-day…
noraleonte Jul 31, 2025
298a43d
conditionally render fields
noraleonte Jul 31, 2025
eaa688c
fix borders
noraleonte Jul 31, 2025
70cf034
Apply suggestions from code review - Rita
noraleonte Jul 31, 2025
b0813b7
review - Rita
noraleonte Jul 31, 2025
9ec9c4b
Merge branch 'add-all-day-events' of github.com:noraleonte/mui-x into…
noraleonte Jul 31, 2025
01ff3c7
compact all day events
noraleonte Jul 31, 2025
2fce235
fixes
noraleonte Jul 31, 2025
809f762
fix rows logic
noraleonte Aug 1, 2025
e1dcb91
update event rendering logic
noraleonte Aug 4, 2025
dfb7827
Merge branch 'master' of github.com:noraleonte/mui-x into add-all-day…
noraleonte Aug 4, 2025
491c83f
fixes
noraleonte Aug 4, 2025
e541fe1
tiny fix
noraleonte Aug 4, 2025
0f3805a
fix
noraleonte Aug 4, 2025
88d6af6
fix
noraleonte Aug 5, 2025
36fc730
add to agenda view
noraleonte Aug 5, 2025
e364e77
attempt to fix the scrolling bug
noraleonte Aug 5, 2025
16dee84
refactor based on Rita's review
noraleonte Aug 6, 2025
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
64 changes: 64 additions & 0 deletions docs/data/scheduler/datasets/palette-demo.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,70 @@ export const defaultVisibleDate = DateTime.fromISO('2025-07-01T00:00:00');
const START_OF_FIRST_WEEK = defaultVisibleDate.startOf('week');

export const initialEvents = [
{
id: 'allday-a1',
start: START_OF_FIRST_WEEK.set({ weekday: 1, hour: 9 }),
end: START_OF_FIRST_WEEK.set({ weekday: 3, hour: 9 }),
title: 'All day event A1',
allDay: true,
resource: 'a',
},
{
id: 'allday-a2',
start: START_OF_FIRST_WEEK.set({ weekday: 1, hour: 9 }),
end: START_OF_FIRST_WEEK.set({ weekday: 2, hour: 9 }),
title: 'All day event A2',
allDay: true,
resource: 'a',
},
{
id: 'allday-b1',
start: START_OF_FIRST_WEEK.set({ weekday: 2, hour: 9 }),
end: START_OF_FIRST_WEEK.set({ weekday: 4, hour: 9 }),
title: 'All day event B1',
allDay: true,
resource: 'b',
},
{
id: 'allday-c1',
start: START_OF_FIRST_WEEK.set({ weekday: 3, hour: 9 }),
end: START_OF_FIRST_WEEK.set({ weekday: 5, hour: 9 }),
title: 'All day event C1',
allDay: true,
resource: 'c',
},
{
id: 'allday-d1',
start: START_OF_FIRST_WEEK.set({ weekday: 3, hour: 9 }),
end: START_OF_FIRST_WEEK.set({ weekday: 4, hour: 9 }),
title: 'All day event D1',
allDay: true,
resource: 'd',
},
{
id: 'allday-d2',
start: START_OF_FIRST_WEEK.set({ weekday: 4, hour: 9 }),
end: START_OF_FIRST_WEEK.set({ weekday: 4, hour: 9 }),
title: 'All day event D2',
allDay: true,
resource: 'd',
},
{
id: 'allday-d3',
start: START_OF_FIRST_WEEK.set({ weekday: 4, hour: 9 }),
end: START_OF_FIRST_WEEK.set({ weekday: 4, hour: 9 }),
title: 'All day event D3',
allDay: true,
resource: 'd',
},
{
id: 'allday-e1',
start: START_OF_FIRST_WEEK.set({ weekday: 5, hour: 9 }),
end: START_OF_FIRST_WEEK.set({ weekday: 7, hour: 9 }),
title: 'All day event E1',
allDay: true,
resource: 'e',
},
{
id: 'a-1',
start: START_OF_FIRST_WEEK.set({ hour: 9 }),
Expand Down
64 changes: 64 additions & 0 deletions docs/data/scheduler/datasets/palette-demo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,70 @@ export const defaultVisibleDate = DateTime.fromISO('2025-07-01T00:00:00');
const START_OF_FIRST_WEEK = defaultVisibleDate.startOf('week');

export const initialEvents: CalendarEvent[] = [
{
id: 'allday-a1',
start: START_OF_FIRST_WEEK.set({ weekday: 1, hour: 9 }),
end: START_OF_FIRST_WEEK.set({ weekday: 3, hour: 9 }),
title: 'All day event A1',
allDay: true,
resource: 'a',
},
{
id: 'allday-a2',
start: START_OF_FIRST_WEEK.set({ weekday: 1, hour: 9 }),
end: START_OF_FIRST_WEEK.set({ weekday: 2, hour: 9 }),
title: 'All day event A2',
allDay: true,
resource: 'a',
},
{
id: 'allday-b1',
start: START_OF_FIRST_WEEK.set({ weekday: 2, hour: 9 }),
end: START_OF_FIRST_WEEK.set({ weekday: 4, hour: 9 }),
title: 'All day event B1',
allDay: true,
resource: 'b',
},
{
id: 'allday-c1',
start: START_OF_FIRST_WEEK.set({ weekday: 3, hour: 9 }),
end: START_OF_FIRST_WEEK.set({ weekday: 5, hour: 9 }),
title: 'All day event C1',
allDay: true,
resource: 'c',
},
{
id: 'allday-d1',
start: START_OF_FIRST_WEEK.set({ weekday: 3, hour: 9 }),
end: START_OF_FIRST_WEEK.set({ weekday: 4, hour: 9 }),
title: 'All day event D1',
allDay: true,
resource: 'd',
},
{
id: 'allday-d2',
start: START_OF_FIRST_WEEK.set({ weekday: 4, hour: 9 }),
end: START_OF_FIRST_WEEK.set({ weekday: 4, hour: 9 }),
title: 'All day event D2',
allDay: true,
resource: 'd',
},
{
id: 'allday-d3',
start: START_OF_FIRST_WEEK.set({ weekday: 4, hour: 9 }),
end: START_OF_FIRST_WEEK.set({ weekday: 4, hour: 9 }),
title: 'All day event D3',
allDay: true,
resource: 'd',
},
{
id: 'allday-e1',
start: START_OF_FIRST_WEEK.set({ weekday: 5, hour: 9 }),
end: START_OF_FIRST_WEEK.set({ weekday: 7, hour: 9 }),
title: 'All day event E1',
allDay: true,
resource: 'e',
},
{
id: 'a-1',
start: START_OF_FIRST_WEEK.set({ hour: 9 }),
Expand Down
68 changes: 65 additions & 3 deletions docs/data/scheduler/datasets/personal-agenda.js
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ export const initialEvents = [
end: DateTime.fromISO('2025-07-14T04:00:00'),
title: "Alice's Birthday",
resource: 'birthdays',
// @ts-expect-error
allDay: true,
},
{
Expand All @@ -174,7 +173,6 @@ export const initialEvents = [
end: DateTime.fromISO('2025-07-18T04:00:00'),
title: `Bob's Birthday`,
resource: 'birthdays',
// @ts-expect-error
allDay: true,
},
{
Expand All @@ -183,7 +181,6 @@ export const initialEvents = [
end: DateTime.fromISO('2025-07-25T04:00:00'),
title: `Richard's Birthday`,
resource: 'birthdays',
// @ts-expect-error
allDay: true,
},
// Personal events
Expand Down Expand Up @@ -244,6 +241,71 @@ export const initialEvents = [
title: 'Prescription Pickup',
resource: 'medical',
},
// all day events
{
id: 'allday-work-1',
start: START_OF_FIRST_WEEK.set({ weekday: 1, hour: 9 }),
end: START_OF_FIRST_WEEK.set({ weekday: 3, hour: 9 }),
title: 'All day Work Event 1',
allDay: true,
resource: 'work',
},
{
id: 'allday-work-2',
start: START_OF_FIRST_WEEK.set({ weekday: 1, hour: 9 }),
end: START_OF_FIRST_WEEK.set({ weekday: 2, hour: 9 }),
title: 'All day Work Event 2',
allDay: true,
resource: 'work',
},
{
id: 'allday-workout-1',
start: START_OF_FIRST_WEEK.set({ weekday: 2, hour: 9 }),
end: START_OF_FIRST_WEEK.set({ weekday: 4, hour: 9 }),
title: 'All day Workout Event 1',
allDay: true,
resource: 'workout',
},
{
id: 'allday-birthday-1',
start: START_OF_FIRST_WEEK.set({ weekday: 3, hour: 9 }),
end: START_OF_FIRST_WEEK.set({ weekday: 5, hour: 9 }),
title: 'All day Birthday Event 1',
allDay: true,
resource: 'birthdays',
},
{
id: 'allday-personal-1',
start: START_OF_FIRST_WEEK.set({ weekday: 3, hour: 9 }),
end: START_OF_FIRST_WEEK.set({ weekday: 4, hour: 9 }),
title: 'All day Personal Event 1',
allDay: true,
resource: 'personal',
},
{
id: 'allday-personal-2',
start: START_OF_FIRST_WEEK.set({ weekday: 4, hour: 9 }),
end: START_OF_FIRST_WEEK.set({ weekday: 4, hour: 9 }),
title: 'All day Personal Event 2',
allDay: true,
resource: 'personal',
},
{
id: 'allday-personal-3',
start: START_OF_FIRST_WEEK.set({ weekday: 4, hour: 9 }),
end: START_OF_FIRST_WEEK.set({ weekday: 4, hour: 9 }),
title: 'All day Personal Event 3',
allDay: true,
resource: 'personal',
},
{
id: 'allday-medical-1',
start: START_OF_FIRST_WEEK.set({ weekday: 5, hour: 9 }),
end: START_OF_FIRST_WEEK.set({ weekday: 7, hour: 9 }),
title: 'All day Medical Event 1',
allDay: true,
resource: 'medical',
},
];

export const resources = [
Expand Down
68 changes: 65 additions & 3 deletions docs/data/scheduler/datasets/personal-agenda.ts
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@ export const initialEvents: CalendarEvent[] = [
end: DateTime.fromISO('2025-07-14T04:00:00'),
title: "Alice's Birthday",
resource: 'birthdays',
// @ts-expect-error
allDay: true,
},
{
Expand All @@ -144,7 +143,6 @@ export const initialEvents: CalendarEvent[] = [
end: DateTime.fromISO('2025-07-18T04:00:00'),
title: `Bob's Birthday`,
resource: 'birthdays',
// @ts-expect-error
allDay: true,
},
{
Expand All @@ -153,7 +151,6 @@ export const initialEvents: CalendarEvent[] = [
end: DateTime.fromISO('2025-07-25T04:00:00'),
title: `Richard's Birthday`,
resource: 'birthdays',
// @ts-expect-error
allDay: true,
},

Expand Down Expand Up @@ -216,6 +213,71 @@ export const initialEvents: CalendarEvent[] = [
title: 'Prescription Pickup',
resource: 'medical',
},
// all day events
{
id: 'allday-work-1',
start: START_OF_FIRST_WEEK.set({ weekday: 1, hour: 9 }),
end: START_OF_FIRST_WEEK.set({ weekday: 3, hour: 9 }),
title: 'All day Work Event 1',
allDay: true,
resource: 'work',
},
{
id: 'allday-work-2',
start: START_OF_FIRST_WEEK.set({ weekday: 1, hour: 9 }),
end: START_OF_FIRST_WEEK.set({ weekday: 2, hour: 9 }),
title: 'All day Work Event 2',
allDay: true,
resource: 'work',
},
{
id: 'allday-workout-1',
start: START_OF_FIRST_WEEK.set({ weekday: 2, hour: 9 }),
end: START_OF_FIRST_WEEK.set({ weekday: 4, hour: 9 }),
title: 'All day Workout Event 1',
allDay: true,
resource: 'workout',
},
{
id: 'allday-birthday-1',
start: START_OF_FIRST_WEEK.set({ weekday: 3, hour: 9 }),
end: START_OF_FIRST_WEEK.set({ weekday: 5, hour: 9 }),
title: 'All day Birthday Event 1',
allDay: true,
resource: 'birthdays',
},
{
id: 'allday-personal-1',
start: START_OF_FIRST_WEEK.set({ weekday: 3, hour: 9 }),
end: START_OF_FIRST_WEEK.set({ weekday: 4, hour: 9 }),
title: 'All day Personal Event 1',
allDay: true,
resource: 'personal',
},
{
id: 'allday-personal-2',
start: START_OF_FIRST_WEEK.set({ weekday: 4, hour: 9 }),
end: START_OF_FIRST_WEEK.set({ weekday: 4, hour: 9 }),
title: 'All day Personal Event 2',
allDay: true,
resource: 'personal',
},
{
id: 'allday-personal-3',
start: START_OF_FIRST_WEEK.set({ weekday: 4, hour: 9 }),
end: START_OF_FIRST_WEEK.set({ weekday: 4, hour: 9 }),
title: 'All day Personal Event 3',
allDay: true,
resource: 'personal',
},
{
id: 'allday-medical-1',
start: START_OF_FIRST_WEEK.set({ weekday: 5, hour: 9 }),
end: START_OF_FIRST_WEEK.set({ weekday: 7, hour: 9 }),
title: 'All day Medical Event 1',
allDay: true,
resource: 'medical',
},
];

export const resources: CalendarResource[] = [
Expand Down
2 changes: 1 addition & 1 deletion docs/data/scheduler/event-calendar/FullEventCalendar.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
initialEvents,
defaultVisibleDate,
resources,
} from '../datasets/personal-agenda';
} from '../datasets/palette-demo';
import classes from './FullEventCalendar.module.css';

export default function FullEventCalendar() {
Expand Down
2 changes: 1 addition & 1 deletion docs/data/scheduler/event-calendar/FullEventCalendar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
initialEvents,
defaultVisibleDate,
resources,
} from '../datasets/personal-agenda';
} from '../datasets/palette-demo';
import classes from './FullEventCalendar.module.css';

export default function FullEventCalendar() {
Expand Down
Loading