Skip to content

Commit 44c1962

Browse files
authored
Merge branch 'master' into plain-reorder-fix
2 parents 695ee71 + 4e4faf1 commit 44c1962

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1408
-944
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ default-job: &default-job
4646
COREPACK_ENABLE_DOWNLOAD_PROMPT: '0'
4747
working_directory: /tmp/mui
4848
docker:
49-
- image: cimg/node:22.16
49+
- image: cimg/node:22.18
5050
# CircleCI has disabled the cache across forks for security reasons.
5151
# Following their official statement, it was a quick solution, they
5252
# are working on providing this feature back with appropriate security measures.

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ jobs:
1515
name: Continuous releases
1616
uses: mui/mui-public/.github/workflows/ci-base.yml@master
1717
with:
18-
node-version: '22'
18+
node-version: '22.18.0'

docs/data/scheduler/overview/overview.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@ This package is not published yet.
2020
- [Day View](/x/react-scheduler/day-view/)
2121
- [Month View](/x/react-scheduler/month-view/)
2222
- [Agenda View](/x/react-scheduler/agenda-view/)
23+
- [Timeline View](/x/react-scheduler/timeline-view/)
2324
- [Primitives](/x/react-scheduler/primitives/)
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
import * as React from 'react';
2+
3+
import { StandaloneView } from '@mui/x-scheduler/material/standalone-view';
4+
import { TimelineView } from '@mui/x-scheduler/material/timeline-view';
5+
import {
6+
initialEvents,
7+
defaultVisibleDate,
8+
resources,
9+
} from '../datasets/personal-agenda';
10+
11+
export default function BasicTimelineView() {
12+
const [events, setEvents] = React.useState(initialEvents);
13+
14+
return (
15+
<div style={{ height: '500px', width: '100%' }}>
16+
<StandaloneView
17+
events={events}
18+
resources={resources}
19+
defaultVisibleDate={defaultVisibleDate}
20+
onEventsChange={setEvents}
21+
>
22+
<TimelineView />
23+
</StandaloneView>
24+
</div>
25+
);
26+
}
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
import * as React from 'react';
2+
import { CalendarEvent } from '@mui/x-scheduler/primitives/models';
3+
import { StandaloneView } from '@mui/x-scheduler/material/standalone-view';
4+
import { TimelineView } from '@mui/x-scheduler/material/timeline-view';
5+
import {
6+
initialEvents,
7+
defaultVisibleDate,
8+
resources,
9+
} from '../datasets/personal-agenda';
10+
11+
export default function BasicTimelineView() {
12+
const [events, setEvents] = React.useState<CalendarEvent[]>(initialEvents);
13+
14+
return (
15+
<div style={{ height: '500px', width: '100%' }}>
16+
<StandaloneView
17+
events={events}
18+
resources={resources}
19+
defaultVisibleDate={defaultVisibleDate}
20+
onEventsChange={setEvents}
21+
>
22+
<TimelineView />
23+
</StandaloneView>
24+
</div>
25+
);
26+
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<StandaloneView
2+
events={events}
3+
resources={resources}
4+
defaultVisibleDate={defaultVisibleDate}
5+
onEventsChange={setEvents}
6+
>
7+
<TimelineView />
8+
</StandaloneView>
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
productId: x-scheduler
3+
title: React Scheduler component
4+
packageName: '@mui/x-scheduler'
5+
githubLabel: 'scope: scheduler'
6+
---
7+
8+
# Scheduler - Timeline View
9+
10+
<p class="description">The Timeline View component lets users manage events in a timeline layout.</p>
11+
12+
{{"component": "@mui/docs/ComponentLinkHeader", "design": false}}
13+
14+
:::warning
15+
This package is not published yet.
16+
:::
17+
18+
## Basic example
19+
20+
{{"demo": "BasicTimelineView.js", "bg": "inline", "defaultCodeOpen": false}}

docs/next.config.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,6 @@ export default withDocsInfra({
207207
console.log('Considering only English for SSR');
208208
traverse(pages, 'en');
209209
} else {
210-
// eslint-disable-next-line no-console
211-
console.log('Considering various locales for SSR');
212210
LANGUAGES_SSR.forEach((userLanguage) => {
213211
traverse(pages, userLanguage);
214212
});

docs/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
"@mui/docs": "7.1.2",
2828
"@mui/icons-material": "catalog:",
2929
"@mui/joy": "^5.0.0-beta.52",
30-
"@mui/lab": "^7.0.0-beta.16",
30+
"@mui/lab": "^7.0.0-beta.17",
3131
"@mui/material": "catalog:",
32-
"@mui/material-nextjs": "^7.3.0",
32+
"@mui/material-nextjs": "^7.3.2",
3333
"@mui/stylis-plugin-rtl": "catalog:",
3434
"@mui/system": "catalog:",
3535
"@mui/utils": "catalog:",
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import * as React from 'react';
2+
import MarkdownDocs from 'docs/src/modules/components/MarkdownDocs';
3+
import * as pageProps from 'docsx/data/scheduler/timeline-view/timeline-view.md?muiMarkdown';
4+
5+
export default function Page() {
6+
return <MarkdownDocs {...pageProps} />;
7+
}

0 commit comments

Comments
 (0)