Skip to content

Commit 16cc874

Browse files
michaldudakmichaldudak
committed
Merge remote-tracking branch 'upstream/next' into api-docs-gen-hook-settings
2 parents 8eb392b + 47b624d commit 16cc874

File tree

130 files changed

+1540
-431
lines changed

Some content is hidden

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

130 files changed

+1540
-431
lines changed

‎apps/pigment-css-next-app/src/app/material-ui/react-progress/page.tsx

+100
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
'use client';
2+
import * as React from 'react';
3+
import CircularColor from '../../../../../../docs/data/material/components/progress/CircularColor';
4+
import CircularDeterminate from '../../../../../../docs/data/material/components/progress/CircularDeterminate';
5+
import CircularIndeterminate from '../../../../../../docs/data/material/components/progress/CircularIndeterminate';
6+
import CircularIntegration from '../../../../../../docs/data/material/components/progress/CircularIntegration';
7+
import CircularUnderLoad from '../../../../../../docs/data/material/components/progress/CircularUnderLoad';
8+
import CircularWithValueLabel from '../../../../../../docs/data/material/components/progress/CircularWithValueLabel';
9+
import CustomizedProgressBars from '../../../../../../docs/data/material/components/progress/CustomizedProgressBars';
10+
import DelayingAppearance from '../../../../../../docs/data/material/components/progress/DelayingAppearance';
11+
import LinearBuffer from '../../../../../../docs/data/material/components/progress/LinearBuffer';
12+
import LinearColor from '../../../../../../docs/data/material/components/progress/LinearColor';
13+
import LinearDeterminate from '../../../../../../docs/data/material/components/progress/LinearDeterminate';
14+
import LinearIndeterminate from '../../../../../../docs/data/material/components/progress/LinearIndeterminate';
15+
import LinearWithValueLabel from '../../../../../../docs/data/material/components/progress/LinearWithValueLabel';
16+
17+
export default function Progress() {
18+
return (
19+
<React.Fragment>
20+
<section>
21+
<h2> Circular Color</h2>
22+
<div className="demo-container">
23+
<CircularColor />
24+
</div>
25+
</section>
26+
<section>
27+
<h2> Circular Determinate</h2>
28+
<div className="demo-container">
29+
<CircularDeterminate />
30+
</div>
31+
</section>
32+
<section>
33+
<h2> Circular Indeterminate</h2>
34+
<div className="demo-container">
35+
<CircularIndeterminate />
36+
</div>
37+
</section>
38+
<section>
39+
<h2> Circular Integration</h2>
40+
<div className="demo-container">
41+
<CircularIntegration />
42+
</div>
43+
</section>
44+
<section>
45+
<h2> Circular Under Load</h2>
46+
<div className="demo-container">
47+
<CircularUnderLoad />
48+
</div>
49+
</section>
50+
<section>
51+
<h2> Circular With Value Label</h2>
52+
<div className="demo-container">
53+
<CircularWithValueLabel />
54+
</div>
55+
</section>
56+
<section>
57+
<h2> Customized Progress Bars</h2>
58+
<div className="demo-container">
59+
<CustomizedProgressBars />
60+
</div>
61+
</section>
62+
<section>
63+
<h2> Delaying Appearance</h2>
64+
<div className="demo-container">
65+
<DelayingAppearance />
66+
</div>
67+
</section>
68+
<section>
69+
<h2> Linear Buffer</h2>
70+
<div className="demo-container">
71+
<LinearBuffer />
72+
</div>
73+
</section>
74+
<section>
75+
<h2> Linear Color</h2>
76+
<div className="demo-container">
77+
<LinearColor />
78+
</div>
79+
</section>
80+
<section>
81+
<h2> Linear Determinate</h2>
82+
<div className="demo-container">
83+
<LinearDeterminate />
84+
</div>
85+
</section>
86+
<section>
87+
<h2> Linear Indeterminate</h2>
88+
<div className="demo-container">
89+
<LinearIndeterminate />
90+
</div>
91+
</section>
92+
<section>
93+
<h2> Linear With Value Label</h2>
94+
<div className="demo-container">
95+
<LinearWithValueLabel />
96+
</div>
97+
</section>
98+
</React.Fragment>
99+
);
100+
}

‎apps/pigment-css-vite-app/src/pages/material-ui/react-progress.tsx

+101
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
import * as React from 'react';
2+
import MaterialUILayout from '../../Layout';
3+
import CircularColor from '../../../../../docs/data/material/components/progress/CircularColor.tsx';
4+
import CircularDeterminate from '../../../../../docs/data/material/components/progress/CircularDeterminate.tsx';
5+
import CircularIndeterminate from '../../../../../docs/data/material/components/progress/CircularIndeterminate.tsx';
6+
import CircularIntegration from '../../../../../docs/data/material/components/progress/CircularIntegration.tsx';
7+
import CircularUnderLoad from '../../../../../docs/data/material/components/progress/CircularUnderLoad.tsx';
8+
import CircularWithValueLabel from '../../../../../docs/data/material/components/progress/CircularWithValueLabel.tsx';
9+
import CustomizedProgressBars from '../../../../../docs/data/material/components/progress/CustomizedProgressBars.tsx';
10+
import DelayingAppearance from '../../../../../docs/data/material/components/progress/DelayingAppearance.tsx';
11+
import LinearBuffer from '../../../../../docs/data/material/components/progress/LinearBuffer.tsx';
12+
import LinearColor from '../../../../../docs/data/material/components/progress/LinearColor.tsx';
13+
import LinearDeterminate from '../../../../../docs/data/material/components/progress/LinearDeterminate.tsx';
14+
import LinearIndeterminate from '../../../../../docs/data/material/components/progress/LinearIndeterminate.tsx';
15+
import LinearWithValueLabel from '../../../../../docs/data/material/components/progress/LinearWithValueLabel.tsx';
16+
17+
export default function Progress() {
18+
return (
19+
<MaterialUILayout>
20+
<h1>Progress</h1>
21+
<section>
22+
<h2> Circular Color</h2>
23+
<div className="demo-container">
24+
<CircularColor />
25+
</div>
26+
</section>
27+
<section>
28+
<h2> Circular Determinate</h2>
29+
<div className="demo-container">
30+
<CircularDeterminate />
31+
</div>
32+
</section>
33+
<section>
34+
<h2> Circular Indeterminate</h2>
35+
<div className="demo-container">
36+
<CircularIndeterminate />
37+
</div>
38+
</section>
39+
<section>
40+
<h2> Circular Integration</h2>
41+
<div className="demo-container">
42+
<CircularIntegration />
43+
</div>
44+
</section>
45+
<section>
46+
<h2> Circular Under Load</h2>
47+
<div className="demo-container">
48+
<CircularUnderLoad />
49+
</div>
50+
</section>
51+
<section>
52+
<h2> Circular With Value Label</h2>
53+
<div className="demo-container">
54+
<CircularWithValueLabel />
55+
</div>
56+
</section>
57+
<section>
58+
<h2> Customized Progress Bars</h2>
59+
<div className="demo-container">
60+
<CustomizedProgressBars />
61+
</div>
62+
</section>
63+
<section>
64+
<h2> Delaying Appearance</h2>
65+
<div className="demo-container">
66+
<DelayingAppearance />
67+
</div>
68+
</section>
69+
<section>
70+
<h2> Linear Buffer</h2>
71+
<div className="demo-container">
72+
<LinearBuffer />
73+
</div>
74+
</section>
75+
<section>
76+
<h2> Linear Color</h2>
77+
<div className="demo-container">
78+
<LinearColor />
79+
</div>
80+
</section>
81+
<section>
82+
<h2> Linear Determinate</h2>
83+
<div className="demo-container">
84+
<LinearDeterminate />
85+
</div>
86+
</section>
87+
<section>
88+
<h2> Linear Indeterminate</h2>
89+
<div className="demo-container">
90+
<LinearIndeterminate />
91+
</div>
92+
</section>
93+
<section>
94+
<h2> Linear With Value Label</h2>
95+
<div className="demo-container">
96+
<LinearWithValueLabel />
97+
</div>
98+
</section>
99+
</MaterialUILayout>
100+
);
101+
}

‎docs/data/docs-infra/pages.ts

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ const pages: readonly MuiPage[] = [
77
children: [
88
{ pathname: '/experiments/docs/headers' },
99
{ pathname: '/experiments/docs/markdown' },
10+
{ pathname: '/experiments/docs/og-card' },
1011
],
1112
},
1213
{

‎docs/data/material/components/table/table.md

-5
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@ This constraint makes building rich data tables challenging.
3333
The [`DataGrid` component](/x/react-data-grid/) is designed for use-cases that are focused on handling large amounts of tabular data.
3434
While it comes with a more rigid structure, in exchange, you gain more powerful features.
3535

36-
:::info
37-
The demo below uses the MUI X Data Grid v7, which is currently in beta.
38-
Visit [the documentation](https://next.mui.com/x/react-data-grid/) to learn more about it.
39-
:::
40-
4136
{{"demo": "DataTable.js", "bg": "inline"}}
4237

4338
## Dense table

‎docs/data/material/migration/migrating-from-deprecated-apis/migrating-from-deprecated-apis.md

+40
Original file line numberDiff line numberDiff line change
@@ -1012,3 +1012,43 @@ The StepLabel's `componentsProps` was deprecated in favor of `slotProps`:
10121012
+ slotProps={{ label: labelProps }}
10131013
/>
10141014
```
1015+
1016+
## StepConnector
1017+
1018+
Use the [codemod](https://github.com/mui/material-ui/tree/HEAD/packages/mui-codemod#step-connector-classes) below to migrate the code as described in the following sections:
1019+
1020+
```bash
1021+
npx @mui/codemod@next deprecations/step-connector-classes <path>
1022+
```
1023+
1024+
### Composed CSS classes
1025+
1026+
The CSS classes that composed the `line` CSS class and `orientation` prop values were removed.
1027+
1028+
Here's how to migrate:
1029+
1030+
```diff
1031+
- .MuiStepConnector-lineHorizontal
1032+
+.MuiStepConnector-horizontal > .MuiStepConnector-line
1033+
- .MuiStepConnector-lineVertical
1034+
+.MuiStepConnector-vertical > .MuiStepConnector-line
1035+
```
1036+
1037+
```diff
1038+
import { stepConnectorClasses } from '@mui/material/StepConnector';
1039+
1040+
MuiStepConnector: {
1041+
styleOverrides: {
1042+
root: {
1043+
- [`& .${stepConnectorClasses.lineHorizontal}`]: {
1044+
+ [`&.${stepConnectorClasses.horizontal} > .${stepConnectorClasses.line}`]: {
1045+
color: 'red',
1046+
},
1047+
- [`& .${stepConnectorClasses.lineVertical}`]: {
1048+
+ [`&.${stepConnectorClasses.vertical} > .${stepConnectorClasses.line}`]: {
1049+
color: 'red',
1050+
},
1051+
},
1052+
},
1053+
},
1054+
```

‎docs/pages/blog/2019-developer-survey-results.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Your feedback helps us to build better products. Here's what we lea
44
date: 2019-03-16T00:00:00.000Z
55
authors: ['oliviertassinari', 'mbrookes']
66
tags: ['Developer Survey']
7-
card: true
7+
manualCard: true
88
---
99

1010
While we are currently working on the upcoming release of Material UI v4, we need to prioritize our

‎docs/pages/blog/2019.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ date: 2020-01-25T00:00:00.000Z
44
description: 2019 was a great year for Material UI. It puts us on an exciting path to solve even greater challenges in the coming years!
55
authors: ['oliviertassinari']
66
tags: ['Company']
7-
card: true
7+
manualCard: true
88
---
99

1010
2019 was a great year for Material UI.

‎docs/pages/blog/2020-developer-survey-results.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Your feedback helps us to build better products. Here's what we lea
44
date: 2020-06-27T00:00:00.000Z
55
authors: ['mnajdova', 'oliviertassinari', 'mbrookes']
66
tags: ['Developer Survey']
7-
card: true
7+
manualCard: true
88
---
99

1010
Continuing the tradition from last year, we launched a Developer Survey a few months ago, to which we received 1488 responses. This is twice as many as last year (734), so we thank you all for your participation!

‎docs/pages/blog/2020-introducing-sketch.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Today, we're excited to announce the introduction of official Sketc
44
date: 2020-03-30T00:00:00.000Z
55
authors: ['oliviertassinari']
66
tags: ['Material UI', 'Product']
7-
card: true
7+
manualCard: true
88
---
99

1010
Today, we're excited to introduce the Sketch symbols 💎 for Material UI.

‎docs/pages/blog/2020-q1-update.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: An update on our mission for Q1 2020.
44
date: 2020-04-14T00:00:00.000Z
55
authors: ['oliviertassinari']
66
tags: ['Company']
7-
card: true
7+
manualCard: true
88
---
99

1010
Welcome to the new format of our mission update. We are moving from monthly to quarterly updates.

‎docs/pages/blog/2020-q2-update.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: An update on our mission for Q2 2020.
44
date: 2020-07-17T00:00:00.000Z
55
authors: ['oliviertassinari']
66
tags: ['Company']
7-
card: true
7+
manualCard: true
88
---
99

1010
This update covers our progress over the last three months, and what we aim to achieve in the coming months.

‎docs/pages/blog/2020-q3-update.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: An update on our mission for Q3 2020.
44
date: 2020-10-14T00:00:00.000Z
55
authors: ['oliviertassinari']
66
tags: ['Company']
7-
card: true
7+
manualCard: true
88
---
99

1010
This update covers our progress over the last three months, and what we aim to achieve in the coming months.

‎docs/pages/blog/2020.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: 2020 has been another great year, not only for MUI, but also for th
44
date: 2020-12-31T00:00:00.000Z
55
authors: ['oliviertassinari', 'mbrookes']
66
tags: ['Company']
7-
card: true
7+
manualCard: true
88
---
99

1010
2020 has been another great year, not only for MUI, but also for the ecosystem.

‎docs/pages/blog/2021-developer-survey-results.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Your feedback helps us to build better products. Here's what we lea
44
date: 2022-03-15T00:00:00.000Z
55
authors: ['danilo-leal', 'samuelsycamore', 'oliviertassinari']
66
tags: ['Developer Survey']
7-
card: true
7+
manualCard: true
88
---
99

1010
Keeping up with tradition, a few months ago we opened the 2021 MUI Developer Survey.

‎docs/pages/blog/2021-q1-update.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: An update on our mission for Q1 2021.
44
date: 2021-04-12T00:00:00.000Z
55
authors: ['oliviertassinari']
66
tags: ['Company']
7-
card: true
7+
manualCard: true
88
---
99

1010
This update covers our progress over the last three months, and what we aim to achieve in the months ahead.

‎docs/pages/blog/2021-q2-update.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: An update on our mission for Q2 2021.
44
date: 2021-07-12T00:00:00.000Z
55
authors: ['oliviertassinari', 'mbrookes']
66
tags: ['Company']
7-
card: true
7+
manualCard: true
88
---
99

1010
This update covers our progress over the last three months.

‎docs/pages/blog/2021-q3-update.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: An update on our mission for Q3 2021.
44
date: 2021-10-26T00:00:00.000Z
55
authors: ['oliviertassinari']
66
tags: ['Company']
7-
card: true
7+
manualCard: true
88
---
99

1010
This update covers our progress over the last three months.

‎docs/pages/blog/2021.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: 2021 has been another great year, not only for MUI but also for the
44
date: 2021-12-31T00:00:00.000Z
55
authors: ['oliviertassinari']
66
tags: ['Company']
7-
card: true
7+
manualCard: true
88
---
99

1010
<img src="/static/blog/2021/card.png" alt="" style="width: 100%; margin-bottom: 16px;" />

‎docs/pages/blog/2022-tenerife-retreat.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Our internationally distributed startup gathered on a remote island
44
date: 2022-07-28T00:00:00.000Z
55
authors: ['samuelsycamore']
66
tags: ['Company']
7-
card: true
7+
manualCard: true
88
---
99

1010
One of the toughest challenges to overcome as a fully remote team is fostering a supportive and inclusive company culture.

0 commit comments

Comments
 (0)