Skip to content

Commit 7f3bd71

Browse files
committed
Merge branch 'master' into pr/41383
2 parents dc4237d + 91193fa commit 7f3bd71

File tree

123 files changed

+2353
-551
lines changed

Some content is hidden

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

123 files changed

+2353
-551
lines changed

.circleci/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,7 @@ jobs:
385385
name: Test umd release
386386
command: pnpm test:umd
387387
test_e2e_website:
388+
# NOTE: This workflow runs after successful docs deploy. See /test/e2e-website/README.md#ci
388389
<<: *defaults
389390
docker:
390391
- image: mcr.microsoft.com/playwright:v1.42.1-focal

.codesandbox/ci.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"packages/mui-base",
1010
"packages/mui-codemod",
1111
"packages/mui-core-downloads-tracker",
12+
"packages/mui-docs",
1213
"packages/mui-icons-material",
1314
"packages/mui-joy",
1415
"packages/mui-lab",
@@ -28,6 +29,7 @@
2829
"@mui/base": "packages/mui-base/build",
2930
"@mui/codemod": "packages/mui-codemod/build",
3031
"@mui/core-downloads-tracker": "packages/mui-core-downloads-tracker/build",
32+
"@mui/docs": "packages/mui-docs/build",
3133
"@mui/icons-material": "packages/mui-icons-material/build",
3234
"@mui/internal-babel-macros": "packages/mui-babel-macros",
3335
"@mui/internal-markdown": "packages/markdown",

.eslintignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
/packages/pigment-react/processors/
2424
/packages/pigment-react/exports/
2525
/packages/pigment-react/theme/
26-
/packages/pigment-react/tests/fixtures/
26+
/packages/pigment-react/tests/**/fixtures
2727
/packages/pigment-nextjs-plugin/loader.js
2828
# Ignore fixtures
2929
/packages-internal/scripts/typescript-to-proptypes/test/*/*

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ _Mar 5, 2024_
99
A big thanks to the 21 contributors who made this release possible.
1010
This release was mostly about 🐛 bug fixes and 📚 documentation improvements.
1111

12+
### `@pigment-css/[email protected]`, `@pigment-css/[email protected]`, `@pigment-css/[email protected]`, & `@pigment-css/[email protected]`
13+
14+
- This is the first public release of our new zero-runtime CSS-in-JS library, Pigment CSS.
15+
1216
1317

1418
- &#8203;<!-- 52 -->Support props callback type in theme variants (#40946) @ZeeshanTamboli

docs/data/base/components/snackbar/TransitionComponentSnackbar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export default function TransitionComponentSnackbar() {
1010
const [exited, setExited] = React.useState(true);
1111
const nodeRef = React.useRef(null);
1212

13-
const handleClose = (_: any, reason: SnackbarCloseReason) => {
13+
const handleClose = (_: any, reason?: SnackbarCloseReason) => {
1414
if (reason === 'clickaway') {
1515
return;
1616
}

docs/data/base/components/snackbar/UnstyledSnackbarIntroduction/css/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export default function UnstyledSnackbarIntroduction() {
1111
const [exited, setExited] = React.useState(true);
1212
const nodeRef = React.useRef(null);
1313

14-
const handleClose = (_: any, reason: SnackbarCloseReason) => {
14+
const handleClose = (_: any, reason?: SnackbarCloseReason) => {
1515
if (reason === 'clickaway') {
1616
return;
1717
}

docs/data/base/components/snackbar/UnstyledSnackbarIntroduction/system/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export default function UnstyledSnackbarIntroduction() {
1111
const [exited, setExited] = React.useState(true);
1212
const nodeRef = React.useRef(null);
1313

14-
const handleClose = (_: any, reason: SnackbarCloseReason) => {
14+
const handleClose = (_: any, reason?: SnackbarCloseReason) => {
1515
if (reason === 'clickaway') {
1616
return;
1717
}

docs/data/base/components/snackbar/UnstyledSnackbarIntroduction/tailwind/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export default function UnstyledSnackbarIntroduction() {
1818
const [exited, setExited] = React.useState(true);
1919
const nodeRef = React.useRef(null);
2020

21-
const handleClose = (_: any, reason: SnackbarCloseReason) => {
21+
const handleClose = (_: any, reason?: SnackbarCloseReason) => {
2222
if (reason === 'clickaway') {
2323
return;
2424
}
Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
import * as React from 'react';
2-
import { useTheme } from '@mui/joy/styles';
32
import Stack from '@mui/joy/Stack';
43
import Person from '@mui/icons-material/Person';
54

65
export default function IconFontSizes() {
7-
const theme = useTheme();
86
return (
97
<Stack
108
spacing={2}
119
direction="row"
1210
sx={{ gridColumn: '1 / -1', alignItems: 'center', justifyContent: 'center' }}
1311
>
14-
{Object.keys(theme.fontSize).map((size) => (
15-
<Person key={size} fontSize={size} />
16-
))}
12+
<Person fontSize="xs" />
13+
<Person fontSize="sm" />
14+
<Person fontSize="md" />
15+
<Person fontSize="lg" />
16+
<Person fontSize="xl" />
17+
<Person fontSize="xl2" />
18+
<Person fontSize="xl3" />
19+
<Person fontSize="xl4" />
1720
</Stack>
1821
);
1922
}
Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
import * as React from 'react';
2-
import { useTheme } from '@mui/joy/styles';
32
import Stack from '@mui/joy/Stack';
43
import Person from '@mui/icons-material/Person';
54

65
export default function IconFontSizes() {
7-
const theme = useTheme();
86
return (
97
<Stack
108
spacing={2}
119
direction="row"
1210
sx={{ gridColumn: '1 / -1', alignItems: 'center', justifyContent: 'center' }}
1311
>
14-
{Object.keys(theme.fontSize).map((size) => (
15-
<Person key={size} fontSize={size} />
16-
))}
12+
<Person fontSize="xs" />
13+
<Person fontSize="sm" />
14+
<Person fontSize="md" />
15+
<Person fontSize="lg" />
16+
<Person fontSize="xl" />
17+
<Person fontSize="xl2" />
18+
<Person fontSize="xl3" />
19+
<Person fontSize="xl4" />
1720
</Stack>
1821
);
1922
}

0 commit comments

Comments
 (0)