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] Improve Base component demos #30884

Merged
merged 23 commits into from
Feb 10, 2022
Merged

[docs] Improve Base component demos #30884

Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
3947c8c
logo refinement
danilo-leal Jan 4, 2022
cfc72e2
Merge branch 'master' of https://github.com/mui-org/material-ui
danilo-leal Jan 20, 2022
4f60ae6
Merge branch 'master' of https://github.com/mui-org/material-ui
danilo-leal Feb 1, 2022
db1d0d7
tweaks to the switch and input - initiating the select
danilo-leal Feb 2, 2022
18a228e
upgrade select demo styles
danilo-leal Feb 2, 2022
155022f
update the tsx files
danilo-leal Feb 2, 2022
917a0c9
remaining tsx files
danilo-leal Feb 2, 2022
7d5b72d
reverse leaked logo changes
danilo-leal Feb 2, 2022
fd2fce1
docs:typescript:formatted
danilo-leal Feb 2, 2022
230f653
fix lint
danilo-leal Feb 2, 2022
65ad7e0
fix one demo broken on mobile
danilo-leal Feb 3, 2022
e8c9144
fix focus state
danilo-leal Feb 3, 2022
82ffcef
tweak padding on listbox
danilo-leal Feb 3, 2022
76455ef
fix types
danilo-leal Feb 3, 2022
30be99c
little details
danilo-leal Feb 3, 2022
c7d83f9
docs:typescript:formatted
danilo-leal Feb 3, 2022
241632f
Merge branch 'master' of https://github.com/mui-org/material-ui into …
danilo-leal Feb 4, 2022
1a5920c
remove focus from listbox
danilo-leal Feb 7, 2022
a20837c
fix lint
danilo-leal Feb 7, 2022
0ec791e
outline: 0px;
danilo-leal Feb 7, 2022
01010c1
polishing up after a few days of chewing on it
danilo-leal Feb 9, 2022
6a1746c
yarn docs:typescript:formatted
danilo-leal Feb 9, 2022
132a538
make text-field outline style consistent with the select
danilo-leal Feb 10, 2022
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
114 changes: 78 additions & 36 deletions docs/data/material/components/selects/UnstyledSelectControlled.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,53 @@ import OptionUnstyled, { optionUnstyledClasses } from '@mui/base/OptionUnstyled'
import PopperUnstyled from '@mui/base/PopperUnstyled';
import { styled } from '@mui/system';

const StyledButton = styled('button')`
const blue = {
100: '#DAECFF',
200: '#99CCF3',
400: '#3399FF',
500: '#007FFF',
600: '#0072E5',
900: '#003A75',
};

const grey = {
100: '#E7EBF0',
200: '#E0E3E7',
300: '#CDD2D7',
400: '#B2BAC2',
500: '#A0AAB4',
600: '#6F7E8C',
700: '#3E5060',
800: '#2D3843',
900: '#1A2027',
};

const StyledButton = styled('button')(
({ theme }) => `
font-family: IBM Plex Sans, sans-serif;
font-size: 0.875rem;
box-sizing: border-box;
min-height: calc(1.5em + 22px);
min-width: 200px;
background: #fff;
border: 1px solid #ccc;
min-width: 320px;
background: ${theme.palette.mode === 'dark' ? grey[900] : '#fff'};
border: 1px solid ${theme.palette.mode === 'dark' ? grey[800] : grey[300]};
border-radius: 0.75em;
margin: 0.5em;
margin-top: 0.5em;
padding: 10px;
text-align: left;
line-height: 1.5;
color: #000;
color: ${theme.palette.mode === 'dark' ? grey[300] : grey[900]};

&:hover {
background: ${theme.palette.mode === 'dark' ? '' : grey[100]};
border-color: ${theme.palette.mode === 'dark' ? grey[700] : grey[400]};
}

&.${selectUnstyledClasses.focusVisible} {
outline: 4px solid rgba(100, 100, 100, 0.3);
outline: 3px solid ${theme.palette.mode === 'dark' ? blue[600] : blue[100]};
}

&.${selectUnstyledClasses.expanded} {
border-radius: 0.75em 0.75em 0 0;

&::after {
content: '▴';
}
Expand All @@ -36,59 +61,76 @@ const StyledButton = styled('button')`
content: '▾';
float: right;
}
`;
`,
);

const StyledListbox = styled('ul')`
const StyledListbox = styled('ul')(
({ theme }) => `
font-family: IBM Plex Sans, sans-serif;
font-size: 0.875rem;
box-sizing: border-box;
padding: 0;
margin: 0;
background-color: #fff;
min-width: 200px;
border: 1px solid #ccc;
border-top: none;
color: #000;
`;

const StyledOption = styled(OptionUnstyled)`
padding: 5px;
margin: 10px 0;
min-width: 320px;
background: ${theme.palette.mode === 'dark' ? grey[900] : '#fff'};
border: 1px solid ${theme.palette.mode === 'dark' ? grey[800] : grey[300]};
border-radius: 0.75em;
color: ${theme.palette.mode === 'dark' ? grey[300] : grey[900]};
overflow: auto;
outline: 0px;
`,
);

const StyledOption = styled(OptionUnstyled)(
({ theme }) => `
list-style: none;
padding: 4px 10px;
margin: 0;
border-bottom: 1px solid #ddd;
padding: 8px;
border-radius: 0.45em;
cursor: default;

&:last-of-type {
border-bottom: none;
}

&.${optionUnstyledClasses.disabled} {
color: #888;
}

&.${optionUnstyledClasses.selected} {
background-color: rgba(25, 118, 210, 0.08);
background-color: ${theme.palette.mode === 'dark' ? blue[900] : blue[100]};
color: ${theme.palette.mode === 'dark' ? blue[100] : blue[900]};
}

&.${optionUnstyledClasses.highlighted} {
background-color: #16d;
color: #fff;
background-color: ${theme.palette.mode === 'dark' ? grey[800] : grey[100]};
color: ${theme.palette.mode === 'dark' ? grey[300] : grey[900]};
}

&.${optionUnstyledClasses.highlighted}.${optionUnstyledClasses.selected} {
background-color: #05e;
color: #fff;
background-color: ${theme.palette.mode === 'dark' ? blue[900] : blue[100]};
color: ${theme.palette.mode === 'dark' ? blue[100] : blue[900]};
}

&.${optionUnstyledClasses.disabled} {
color: ${theme.palette.mode === 'dark' ? grey[700] : grey[400]};
}

&:hover:not(.${optionUnstyledClasses.disabled}) {
background-color: #39e;
background-color: ${theme.palette.mode === 'dark' ? grey[800] : grey[100]};
color: ${theme.palette.mode === 'dark' ? grey[300] : grey[900]};
}
`;
`,
);

const StyledPopper = styled(PopperUnstyled)`
z-index: 1;
`;

const Paragraph = styled('p')(
({ theme }) => `
font-family: IBM Plex Sans, sans-serif;
font-size: 0.875rem;
margin: 10px 0;
color: ${theme.palette.mode === 'dark' ? grey[400] : grey[700]};
`,
);

function CustomSelect(props) {
const components = {
Root: StyledButton,
Expand Down Expand Up @@ -123,7 +165,7 @@ export default function UnstyledSelectsMultiple() {
<StyledOption value={30}>Thirty</StyledOption>
</CustomSelect>

<p>Selected value: {value}</p>
<Paragraph>Selected value: {value}</Paragraph>
</div>
);
}
114 changes: 78 additions & 36 deletions docs/data/material/components/selects/UnstyledSelectControlled.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,53 @@ import OptionUnstyled, { optionUnstyledClasses } from '@mui/base/OptionUnstyled'
import PopperUnstyled from '@mui/base/PopperUnstyled';
import { styled } from '@mui/system';

const StyledButton = styled('button')`
const blue = {
100: '#DAECFF',
200: '#99CCF3',
400: '#3399FF',
500: '#007FFF',
600: '#0072E5',
900: '#003A75',
};

const grey = {
100: '#E7EBF0',
200: '#E0E3E7',
300: '#CDD2D7',
400: '#B2BAC2',
500: '#A0AAB4',
600: '#6F7E8C',
700: '#3E5060',
800: '#2D3843',
900: '#1A2027',
};

const StyledButton = styled('button')(
({ theme }) => `
font-family: IBM Plex Sans, sans-serif;
font-size: 0.875rem;
box-sizing: border-box;
min-height: calc(1.5em + 22px);
min-width: 200px;
background: #fff;
border: 1px solid #ccc;
min-width: 320px;
background: ${theme.palette.mode === 'dark' ? grey[900] : '#fff'};
border: 1px solid ${theme.palette.mode === 'dark' ? grey[800] : grey[300]};
border-radius: 0.75em;
margin: 0.5em;
margin-top: 0.5em;
padding: 10px;
text-align: left;
line-height: 1.5;
color: #000;
color: ${theme.palette.mode === 'dark' ? grey[300] : grey[900]};

&:hover {
background: ${theme.palette.mode === 'dark' ? '' : grey[100]};
border-color: ${theme.palette.mode === 'dark' ? grey[700] : grey[400]};
}

&.${selectUnstyledClasses.focusVisible} {
outline: 4px solid rgba(100, 100, 100, 0.3);
outline: 3px solid ${theme.palette.mode === 'dark' ? blue[600] : blue[100]};
}

&.${selectUnstyledClasses.expanded} {
border-radius: 0.75em 0.75em 0 0;

&::after {
content: '▴';
}
Expand All @@ -38,59 +63,76 @@ const StyledButton = styled('button')`
content: '▾';
float: right;
}
`;
`,
);

const StyledListbox = styled('ul')`
const StyledListbox = styled('ul')(
({ theme }) => `
font-family: IBM Plex Sans, sans-serif;
font-size: 0.875rem;
box-sizing: border-box;
padding: 0;
margin: 0;
background-color: #fff;
min-width: 200px;
border: 1px solid #ccc;
border-top: none;
color: #000;
`;

const StyledOption = styled(OptionUnstyled)`
padding: 5px;
margin: 10px 0;
min-width: 320px;
background: ${theme.palette.mode === 'dark' ? grey[900] : '#fff'};
border: 1px solid ${theme.palette.mode === 'dark' ? grey[800] : grey[300]};
border-radius: 0.75em;
color: ${theme.palette.mode === 'dark' ? grey[300] : grey[900]};
overflow: auto;
outline: 0px;
`,
);

const StyledOption = styled(OptionUnstyled)(
({ theme }) => `
list-style: none;
padding: 4px 10px;
margin: 0;
border-bottom: 1px solid #ddd;
padding: 8px;
border-radius: 0.45em;
cursor: default;

&:last-of-type {
border-bottom: none;
}

&.${optionUnstyledClasses.disabled} {
color: #888;
}

&.${optionUnstyledClasses.selected} {
background-color: rgba(25, 118, 210, 0.08);
background-color: ${theme.palette.mode === 'dark' ? blue[900] : blue[100]};
color: ${theme.palette.mode === 'dark' ? blue[100] : blue[900]};
}

&.${optionUnstyledClasses.highlighted} {
background-color: #16d;
color: #fff;
background-color: ${theme.palette.mode === 'dark' ? grey[800] : grey[100]};
color: ${theme.palette.mode === 'dark' ? grey[300] : grey[900]};
}

&.${optionUnstyledClasses.highlighted}.${optionUnstyledClasses.selected} {
background-color: #05e;
color: #fff;
background-color: ${theme.palette.mode === 'dark' ? blue[900] : blue[100]};
color: ${theme.palette.mode === 'dark' ? blue[100] : blue[900]};
}

&.${optionUnstyledClasses.disabled} {
color: ${theme.palette.mode === 'dark' ? grey[700] : grey[400]};
}

&:hover:not(.${optionUnstyledClasses.disabled}) {
background-color: #39e;
background-color: ${theme.palette.mode === 'dark' ? grey[800] : grey[100]};
color: ${theme.palette.mode === 'dark' ? grey[300] : grey[900]};
}
`;
`,
);

const StyledPopper = styled(PopperUnstyled)`
z-index: 1;
`;

const Paragraph = styled('p')(
({ theme }) => `
font-family: IBM Plex Sans, sans-serif;
font-size: 0.875rem;
margin: 10px 0;
color: ${theme.palette.mode === 'dark' ? grey[400] : grey[700]};
`,
);

function CustomSelect(props: SelectUnstyledProps<number>) {
const components: SelectUnstyledProps<number>['components'] = {
Root: StyledButton,
Expand All @@ -112,7 +154,7 @@ export default function UnstyledSelectsMultiple() {
<StyledOption value={30}>Thirty</StyledOption>
</CustomSelect>

<p>Selected value: {value}</p>
<Paragraph>Selected value: {value}</Paragraph>
</div>
);
}
2 changes: 1 addition & 1 deletion docs/data/material/components/selects/UnstyledSelectControlled.tsx.preview
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
<StyledOption value={30}>Thirty</StyledOption>
</CustomSelect>

<p>Selected value: {value}</p>
<Paragraph>Selected value: {value}</Paragraph>
Loading