Skip to content

Commit 4e6dbfd

Browse files
AslemammadAslemammad
committed
Merge remote-tracking branch 'upstream/next' into feat/pkg.pr.new
2 parents 92e211e + 7b632ea commit 4e6dbfd

33 files changed

+589
-360
lines changed

‎docs/data/material/components/table/DataTable.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ export default function DataTable() {
4646
}}
4747
pageSizeOptions={[5, 10]}
4848
checkboxSelection
49+
sx={{ overflow: 'clip' }}
4950
/>
5051
</div>
5152
);

‎docs/data/material/components/table/DataTable.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ export default function DataTable() {
4646
}}
4747
pageSizeOptions={[5, 10]}
4848
checkboxSelection
49+
sx={{ overflow: 'clip' }}
4950
/>
5051
</div>
5152
);

‎docs/data/material/components/table/DataTable.tsx.preview

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@
88
}}
99
pageSizeOptions={[5, 10]}
1010
checkboxSelection
11+
sx={{ overflow: 'clip' }}
1112
/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ 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-
{{"demo": "DataTable.js", "bg": "inline"}}
36+
{{"demo": "DataTable.js", "bg": "outlined"}}
3737

3838
## Dense table
3939

‎docs/nextConfigDocsInfra.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@ function withDocsInfra(nextConfig) {
7171
NETLIFY_DEPLOY_URL: process.env.DEPLOY_URL,
7272
// Name of the site, its Netlify subdomain; for example, material-ui-docs
7373
NETLIFY_SITE_NAME: process.env.SITE_NAME,
74-
// The ratio of ads display reported to Google Analytics. Used to avoid an exceed on the Google Analytics quotas.
75-
GA_ADS_DISPLAY_RATIO: 0.1,
7674
},
7775
experimental: {
7876
scrollRestoration: true,

‎docs/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@
129129
"@types/react-transition-group": "^4.4.10",
130130
"@types/react-window": "^1.8.8",
131131
"@types/stylis": "^4.2.0",
132-
"@types/gtag.js": "^0.0.20",
133132
"chai": "^4.4.1",
134133
"cross-fetch": "^4.0.0",
135134
"gm": "^1.25.0",

‎docs/pages/_app.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,7 @@ function AppWrapper(props) {
329329
</NextHead>
330330
<DocsProvider
331331
config={config}
332+
adConfig={{ GADisplayRatio: 0.1 }}
332333
defaultUserLanguage={pageProps.userLanguage}
333334
translations={pageProps.translations}
334335
>

‎docs/pages/experiments/website/branding-theme-test.tsx

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,25 @@ import Section from 'docs/src/layouts/Section';
1111
import AppFooter from 'docs/src/layouts/AppFooter';
1212
import GitHubIcon from '@mui/icons-material/GitHub';
1313
import { Link } from '@mui/docs/Link';
14+
import FormControl from '@mui/material/FormControl';
15+
import InputLabel from '@mui/material/InputLabel';
16+
import Select, { SelectChangeEvent } from '@mui/material/Select';
17+
import MenuItem from '@mui/material/MenuItem';
18+
import Checkbox from '@mui/material/Checkbox';
19+
import Card from '@mui/material/Card';
20+
import CardActions from '@mui/material/CardActions';
21+
import CardContent from '@mui/material/CardContent';
22+
import CardMedia from '@mui/material/CardMedia';
23+
import Typography from '@mui/material/Typography';
24+
25+
const label = { inputProps: { 'aria-label': 'Checkbox demo' } };
1426

1527
export default function BrandingThemeTest() {
28+
const [age, setAge] = React.useState('');
29+
30+
const handleChange = (event: SelectChangeEvent) => {
31+
setAge(event.target.value as string);
32+
};
1633
return (
1734
<BrandingCssVarsProvider>
1835
<Head title="MUI Branding Theme Test" description="" />
@@ -63,6 +80,116 @@ export default function BrandingThemeTest() {
6380
<GitHubIcon fontSize="small" />
6481
</IconButton>
6582
</Stack>
83+
<Stack direction="column" spacing={2} useFlexGap sx={{ width: 'fit-content', mt: 8 }}>
84+
<Button variant="contained" size="large" color="primary">
85+
Large
86+
</Button>
87+
<Button variant="contained" size="medium" color="primary">
88+
Medium
89+
</Button>
90+
<Button variant="contained" size="small" color="primary">
91+
Small
92+
</Button>
93+
</Stack>
94+
<Stack direction="row" spacing={2} useFlexGap sx={{ width: 'fit-content', mt: 8 }}>
95+
<FormControl sx={{ width: 120 }}>
96+
<InputLabel id="demo-simple-select-label">Age</InputLabel>
97+
<Select
98+
labelId="demo-simple-select-label"
99+
id="demo-simple-select"
100+
value={age}
101+
label="Age"
102+
onChange={handleChange}
103+
>
104+
<MenuItem value={10}>Ten</MenuItem>
105+
<MenuItem value={20}>Twenty</MenuItem>
106+
<MenuItem value={30}>Thirty</MenuItem>
107+
</Select>
108+
</FormControl>
109+
<FormControl sx={{ width: 120 }}>
110+
<InputLabel id="demo-simple-select-label">Age</InputLabel>
111+
<Select
112+
labelId="demo-simple-select-label"
113+
id="demo-simple-select"
114+
value={age}
115+
label="Age"
116+
size="small"
117+
onChange={handleChange}
118+
>
119+
<MenuItem value={10}>Ten</MenuItem>
120+
<MenuItem value={20}>Twenty</MenuItem>
121+
<MenuItem value={30}>Thirty</MenuItem>
122+
</Select>
123+
</FormControl>
124+
</Stack>
125+
<Stack direction="row" spacing={2} useFlexGap sx={{ width: 'fit-content', mt: 8 }}>
126+
<Checkbox {...label} defaultChecked />
127+
<Checkbox {...label} />
128+
<Checkbox {...label} disabled />
129+
<Checkbox {...label} disabled checked />
130+
</Stack>
131+
<Stack direction="row" spacing={2} useFlexGap sx={{ width: 'fit-content', mt: 8 }}>
132+
<Card sx={{ maxWidth: 345 }}>
133+
<CardMedia
134+
sx={{ height: 140 }}
135+
image="/static/images/cards/contemplative-reptile.jpg"
136+
title="green iguana"
137+
/>
138+
<CardContent>
139+
<Typography gutterBottom variant="h6">
140+
Lizard
141+
</Typography>
142+
<Typography variant="body2">
143+
Lizards are a widespread group of squamate reptiles, with over 6,000 species,
144+
ranging across all continents except Antarctica
145+
</Typography>
146+
</CardContent>
147+
<CardActions>
148+
<Button size="small">Share</Button>
149+
<Button size="small">Learn More</Button>
150+
</CardActions>
151+
</Card>
152+
<Card variant="elevation" sx={{ maxWidth: 345 }}>
153+
<CardMedia
154+
sx={{ height: 140 }}
155+
image="/static/images/cards/contemplative-reptile.jpg"
156+
title="green iguana"
157+
/>
158+
<CardContent>
159+
<Typography gutterBottom variant="h6">
160+
Lizard
161+
</Typography>
162+
<Typography variant="body2">
163+
Lizards are a widespread group of squamate reptiles, with over 6,000 species,
164+
ranging across all continents except Antarctica
165+
</Typography>
166+
</CardContent>
167+
<CardActions>
168+
<Button size="small">Share</Button>
169+
<Button size="small">Learn More</Button>
170+
</CardActions>
171+
</Card>
172+
<Card variant="outlined" sx={{ maxWidth: 345 }}>
173+
<CardMedia
174+
sx={{ height: 140 }}
175+
image="/static/images/cards/contemplative-reptile.jpg"
176+
title="green iguana"
177+
/>
178+
<CardContent>
179+
<Typography gutterBottom variant="h6">
180+
Lizard
181+
</Typography>
182+
<Typography variant="body2">
183+
Lizards are a widespread group of squamate reptiles, with over 6,000 species,
184+
ranging across all continents except Antarctica
185+
</Typography>
186+
</CardContent>
187+
<CardActions>
188+
<Button size="small">Share</Button>
189+
<Button size="small">Learn More</Button>
190+
</CardActions>
191+
</Card>
192+
</Stack>
66193
</Section>
67194
<Divider />
68195
</main>

‎docs/src/components/footer/EmailSubscribe.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ export default function EmailSubscribe({ sx }: { sx?: SxProps<Theme> }) {
108108
typography: 'body1',
109109
flexGrow: 1,
110110
minWidth: 220,
111-
borderRadius: '8px',
111+
borderRadius: '10px',
112112
border: '1px solid',
113113
borderColor: 'grey.300',
114114
bgcolor: '#FFF',

0 commit comments

Comments
 (0)