Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[docs] Add polish to the date-picker playground #11869

Merged
merged 7 commits into from
Feb 29, 2024
Merged

[docs] Add polish to the date-picker playground #11869

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b5b7e0f
Fine-tuning the playground
zanivan Jan 30, 2024
658f1d0
Tweaks to information architecture and hierarchy
zanivan Feb 2, 2024
a40b3a6
Merge remote-tracking branch 'upstream/next' into mui-x-docs-tweaks
zanivan Feb 7, 2024
3007c0f
Merge remote-tracking branch 'upstream/next' into mui-x-docs-tweaks
zanivan Feb 13, 2024
7e7a5bc
Nora's feedback
zanivan Feb 13, 2024
53a4534
fix CI
noraleonte Feb 15, 2024
0930b5e
Merge remote-tracking branch 'upstream/next' into mui-x-docs-tweaks
zanivan Feb 29, 2024
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
3 changes: 2 additions & 1 deletion docs/data/date-pickers/date-picker/CustomizationExamplesNoSnap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,14 @@ export default function CustomizationExamplesNoSnap() {

return (
<LocalizationProvider dateAdapter={AdapterDayjs}>
<Stack spacing={2} sx={{ mb: 2, width: '100%' }}>
<Stack spacing={2} sx={{ mb: 2, width: '100%', px: { xs: 2, sm: 0 } }}>
<BrandingProvider>
<ToggleButtonGroup
value={selectedPicker}
exclusive
onChange={handleSelectedPickerChange}
aria-label="date picker components"
sx={{}}
zanivan marked this conversation as resolved.
Show resolved Hide resolved
>
{pickerExamples.map(({ name }, index) => (
<ToggleButton value={index} aria-label={name} key={name}>
Expand Down
99 changes: 61 additions & 38 deletions docs/src/modules/components/CustomizationPlayground.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import MenuItem from '@mui/material/MenuItem';
import FormControl from '@mui/material/FormControl';
import Select from '@mui/material/Select';
import Alert from '@mui/material/Alert';
import { grey } from '@mui/material/colors';
import pick from 'lodash/pick';
import {
useCustomizationPlayground,
Expand All @@ -35,8 +34,9 @@ import {

const PlaygroundWrapper = styled('div')(({ theme }) => ({
display: 'flex',
border: '1px solid',
borderColor: alpha(theme.palette.grey[500], 0.2),
borderRadius: theme.shape.borderRadius,
border: `1px solid ${grey[200]}`,
padding: theme.spacing(2),
gap: theme.spacing(2),
justifyContent: 'space-between',
Expand All @@ -54,7 +54,8 @@ const PlaygroundDemoArea = styled('div')(({ theme }) => ({
const PlaygroundConfigArea = styled('div')(({ theme }) => ({
padding: theme.spacing(2),
backgroundColor: alpha(theme.palette.primary.light, 0.05),
border: `1px solid ${grey[200]}`,
border: '1px solid',
borderColor: alpha(theme.palette.grey[500], 0.2),
borderRadius: '4px',
[theme.breakpoints.down('lg')]: {
display: 'flex',
Expand All @@ -74,45 +75,48 @@ const ConfigSectionWrapper = styled('div')(({ theme }) => ({
}));

const ConfigLabel = styled(Typography)(({ theme }) => ({
marginTop: theme.spacing(2),
marginTop: theme.spacing(4),
marginBottom: theme.spacing(1),
fontWeight: theme.typography.fontWeightBold,
fontSize: theme.typography.pxToRem(12),
textTransform: 'uppercase',
fontSize: theme.typography.pxToRem(14),
letterSpacing: '.08rem',
'&:first-of-type': {
marginTop: theme.spacing(1),
},
'&:last-of-type': {
marginTop: theme.spacing(4),
},
}));

const ConfigItemLabel = styled(Typography)(({ theme }) => ({
...theme.typography.caption,
letterSpacing: '.08rem',
textTransform: 'uppercase',
color: theme.palette.text.secondary,
fontSize: theme.typography.pxToRem(11),
fontSize: theme.typography.pxToRem(12),
fontweight: 600,
}));

const SlotItemsWrapper = styled('div')(({ theme }) => ({
display: 'flex',
gap: theme.spacing(0.5),
gap: theme.spacing(1),
flexWrap: 'wrap',
}));

const SlotItem = styled(Button)(({ theme }) => ({
borderWidth: 1,
borderRadius: theme.spacing(2),
borderRadius: '99px',
textTransform: 'none',
padding: theme.spacing(0.1, 1),
}));

const TabsWrapper = styled('div')(({ theme }) => ({
display: 'flex',
alignItems: 'center',
alignItems: 'end',
justifyContent: 'space-between',
marginBottom: theme.spacing(1),
gap: theme.spacing(1),
[theme.breakpoints.down('sm')]: {
flexDirection: 'column',
alignItems: 'flex-start',
gap: theme.spacing(4),
},
}));

Expand All @@ -124,13 +128,32 @@ type TabsProps = {

function StylingApproachTabs({ value, onChange, options }: TabsProps) {
return (
<Box sx={{ borderBottom: 1, borderColor: 'divider' }}>
<Tabs value={value} onChange={onChange} aria-label="Customization option">
<div>
<Tabs
value={value}
onChange={onChange}
aria-label="Customization option"
TabIndicatorProps={{ children: <span className="MuiTabs-indicatorSpan" /> }}
sx={{
mt: 1,
mb: '-16px',
'& .MuiTabs-indicator': {
display: 'flex',
justifyContent: 'center',
backgroundColor: 'transparent',
},
'& .MuiTabs-indicatorSpan': {
maxWidth: '60%',
width: '100%',
backgroundColor: theme.palette.primary.main,
},
}}
>
{(Object.keys(options) as Array<keyof typeof options>)?.map((option) => (
<Tab value={option} key={option} label={options[option]} />
))}
</Tabs>
</Box>
</div>
);
}

Expand All @@ -154,7 +177,7 @@ function StylingRecommendation({

if (isMobile) {
return (
<Alert severity={type} sx={{ width: '100%', p: 0.5 }}>
<Alert severity={type} sx={{ p: 1 }}>
{displayedMessage}
</Alert>
);
Expand All @@ -163,7 +186,7 @@ function StylingRecommendation({

return (
<Tooltip title={displayedMessage}>
<Chip color={type} label={labels[type]} />
<Chip size="small" color={type} label={labels[type]} />
</Tooltip>
);
}
Expand Down Expand Up @@ -268,6 +291,7 @@ function NumericTokensSlider({
max={20}
marks
step={1}
valueLabelDisplay="auto"
/>
</React.Fragment>
))}
Expand Down Expand Up @@ -308,25 +332,6 @@ const CustomizationPlayground = function CustomizationPlayground({

return (
<Box sx={{ flexGrow: 1 }}>
{selectedDemo && customizationOptions && selectedCustomizationOption && (
<BrandingProvider>
<TabsWrapper>
<StylingApproachTabs
onChange={(_e, newValue) => {
setSelectedCustomizationOption(newValue);
}}
value={selectedCustomizationOption}
options={customizationOptions}
/>
{selectedExample && (
<StylingRecommendation
type={selectedExample.type}
message={selectedExample?.comments}
/>
)}
</TabsWrapper>{' '}
</BrandingProvider>
)}
<PlaygroundWrapper>
<PlaygroundDemoArea>
<StyledChild sx={{ width: 'fit-content', minHeight: '390px' }}>
Expand Down Expand Up @@ -400,7 +405,25 @@ const CustomizationPlayground = function CustomizationPlayground({
</BrandingProvider>
)}
</PlaygroundWrapper>

{selectedDemo && customizationOptions && selectedCustomizationOption && (
<BrandingProvider>
<TabsWrapper>
<StylingApproachTabs
onChange={(_e, newValue) => {
setSelectedCustomizationOption(newValue);
}}
value={selectedCustomizationOption}
options={customizationOptions}
/>
{selectedExample && (
<StylingRecommendation
type={selectedExample.type}
message={selectedExample?.comments}
/>
)}
</TabsWrapper>{' '}
zanivan marked this conversation as resolved.
Show resolved Hide resolved
</BrandingProvider>
)}
{shouldBeInteractive && (
<HighlightedCode code={codeExample} language="js" sx={{ overflowX: 'hidden' }} />
)}
Expand Down
2 changes: 2 additions & 0 deletions typescript
View file
Open in desktop
zanivan marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Script started on Fri Feb 2 15:55:10 2024
% victorzanivan@MacBook-Pro mui-x % [?2004h
Expand Down
Loading