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

[base-ui][Switch] Refine demos #39822

Merged
merged 4 commits into from
Nov 10, 2023
Merged

[base-ui][Switch] Refine demos #39822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fce2c50
Stray fixes to demos
zanivan Nov 9, 2023
cba0f47
run yarn docs:typescript:formatted
zanivan Nov 9, 2023
d831bda
fix shadow on tailwind demo
mnajdova Nov 10, 2023
c849195
Tiny consistency fix
zanivan Nov 10, 2023
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
1 change: 1 addition & 0 deletions docs/data/base/components/switch/UnstyledSwitchIntroduction/css/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ function Styles() {
}

.CustomSwitchIntroduction-thumb {
border: 1px solid ${isDarkMode ? grey[800] : grey[200]};
display: block;
width: 16px;
height: 16px;
Expand Down
1 change: 1 addition & 0 deletions docs/data/base/components/switch/UnstyledSwitchIntroduction/css/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ function Styles() {
}

.CustomSwitchIntroduction-thumb {
border: 1px solid ${isDarkMode ? grey[800] : grey[200]};
display: block;
width: 16px;
height: 16px;
Expand Down
1 change: 1 addition & 0 deletions docs/data/base/components/switch/UnstyledSwitchIntroduction/system/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ const Root = styled('span')(
}

& .${switchClasses.thumb} {
border: 1px solid ${theme.palette.mode === 'dark' ? grey[800] : grey[200]};
display: block;
width: 16px;
height: 16px;
Expand Down
1 change: 1 addition & 0 deletions docs/data/base/components/switch/UnstyledSwitchIntroduction/system/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ const Root = styled('span')(
}

& .${switchClasses.thumb} {
border: 1px solid ${theme.palette.mode === 'dark' ? grey[800] : grey[200]};
display: block;
width: 16px;
height: 16px;
Expand Down
8 changes: 4 additions & 4 deletions docs/data/base/components/switch/UnstyledSwitchIntroduction/tailwind/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const Switch = React.forwardRef((props, ref) => {
return {
...resolvedSlotProps,
className: clsx(
`relative inline-block w-[38px] h-[24px] m-2.5 ${
`group relative inline-block w-[38px] h-[24px] m-2.5 ${
ownerState.disabled
? 'cursor-not-allowed opacity-40'
: 'cursor-pointer'
Expand Down Expand Up @@ -73,10 +73,10 @@ const Switch = React.forwardRef((props, ref) => {
return {
...resolvedSlotProps,
className: clsx(
`absolute block w-full h-full transition rounded-full border border-solid outline-none border-slate-300 dark:border-gray-700 shadow-[inset_0_1_1_rgb(0_0_0_/_0.05)] dark:shadow-[inset_0_1_1_rgb(0_0_0_/_0.5)] focus:shadow-purple-200 dark:focus:shadow-purple-600
`absolute block w-full h-full transition rounded-full border border-solid outline-none border-slate-300 dark:border-gray-700 group-[.Mui-focusVisible]:shadow-outline-switch
${
ownerState.checked
? 'bg-purple-500 border-none'
? 'bg-purple-500'
: 'bg-slate-100 dark:bg-slate-900 hover:bg-slate-200 dark:hover:bg-slate-800'
} `,
resolvedSlotProps?.className,
Expand All @@ -93,7 +93,7 @@ const Switch = React.forwardRef((props, ref) => {
className: clsx(
`block w-4 h-4 top-1 rounded-2xl border border-solid outline-none border-slate-300 dark:border-gray-700 transition shadow-[0_1px_2px_rgb(0_0_0_/_0.1)] dark:shadow-[0_1px_2px_rgb(0_0_0_/_0.25)] ${
ownerState.checked
? 'left-[18px] bg-white border-none shadow-[0_0_0_rgb(0_0_0_/_0.3)]'
? 'left-[18px] bg-white shadow-[0_0_0_rgb(0_0_0_/_0.3)]'
: 'left-[4px] bg-white'
} relative transition-all`,
resolvedSlotProps?.className,
Expand Down
8 changes: 4 additions & 4 deletions docs/data/base/components/switch/UnstyledSwitchIntroduction/tailwind/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const Switch = React.forwardRef<HTMLSpanElement, SwitchProps>((props, ref) => {
return {
...resolvedSlotProps,
className: clsx(
`relative inline-block w-[38px] h-[24px] m-2.5 ${
`group relative inline-block w-[38px] h-[24px] m-2.5 ${
ownerState.disabled
? 'cursor-not-allowed opacity-40'
: 'cursor-pointer'
Expand Down Expand Up @@ -73,10 +73,10 @@ const Switch = React.forwardRef<HTMLSpanElement, SwitchProps>((props, ref) => {
return {
...resolvedSlotProps,
className: clsx(
`absolute block w-full h-full transition rounded-full border border-solid outline-none border-slate-300 dark:border-gray-700 shadow-[inset_0_1_1_rgb(0_0_0_/_0.05)] dark:shadow-[inset_0_1_1_rgb(0_0_0_/_0.5)] focus:shadow-purple-200 dark:focus:shadow-purple-600
`absolute block w-full h-full transition rounded-full border border-solid outline-none border-slate-300 dark:border-gray-700 group-[.Mui-focusVisible]:shadow-outline-switch
${
ownerState.checked
? 'bg-purple-500 border-none'
? 'bg-purple-500'
: 'bg-slate-100 dark:bg-slate-900 hover:bg-slate-200 dark:hover:bg-slate-800'
} `,
resolvedSlotProps?.className,
Expand All @@ -93,7 +93,7 @@ const Switch = React.forwardRef<HTMLSpanElement, SwitchProps>((props, ref) => {
className: clsx(
`block w-4 h-4 top-1 rounded-2xl border border-solid outline-none border-slate-300 dark:border-gray-700 transition shadow-[0_1px_2px_rgb(0_0_0_/_0.1)] dark:shadow-[0_1px_2px_rgb(0_0_0_/_0.25)] ${
ownerState.checked
? 'left-[18px] bg-white border-none shadow-[0_0_0_rgb(0_0_0_/_0.3)]'
? 'left-[18px] bg-white shadow-[0_0_0_rgb(0_0_0_/_0.3)]'
: 'left-[4px] bg-white'
} relative transition-all`,
resolvedSlotProps?.className,
Expand Down
12 changes: 8 additions & 4 deletions docs/data/base/components/switch/UseSwitchesBasic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ function BasicSwitch(props) {
const blue = {
200: '#99CCF3',
500: '#007FFF',
700: '#0059B2',
};

const grey = {
Expand Down Expand Up @@ -70,7 +71,7 @@ const BasicSwitchRoot = styled('span')(
}

&.Switch-focusVisible {
box-shadow: 0 0 0 3px ${theme.palette.mode === 'dark' ? grey[700] : blue[200]};
box-shadow: 0 0 0 3px ${theme.palette.mode === 'dark' ? blue[700] : blue[200]};
}

&.Switch-disabled {
Expand All @@ -79,11 +80,14 @@ const BasicSwitchRoot = styled('span')(
}

&.Switch-checked {
border: 1px solid transparent;
border: 1px solid ${theme.palette.mode === 'dark' ? grey[800] : grey[200]};
background: ${blue[500]};
box-shadow: inset 0px 1px 1px ${
theme.palette.mode === 'dark' ? 'rgba(0, 0, 0, 0.2)' : 'rgba(0, 0, 0, 0.05)'
};
&.Switch-focusVisible {
box-shadow: 0 0 0 3px ${theme.palette.mode === 'dark' ? blue[700] : blue[200]};
}
}

`,
Expand All @@ -110,7 +114,7 @@ const BasicSwitchThumb = styled('span')(
left: 2px;
border-radius: 16px;
background-color: #fff;
border: 1px solid ${theme.palette.mode === 'dark' ? grey[700] : grey[200]};
border: 1px solid ${theme.palette.mode === 'dark' ? grey[800] : grey[200]};
position: relative;
transition-property: all;
transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
Expand All @@ -121,7 +125,7 @@ const BasicSwitchThumb = styled('span')(
&.Switch-checked {
left: 17px;
background-color: #fff;
border: 1px solid transparent;
border: 1px solid ${theme.palette.mode === 'dark' ? grey[800] : grey[200]};
}
`,
);
12 changes: 8 additions & 4 deletions docs/data/base/components/switch/UseSwitchesBasic.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ function BasicSwitch(props: UseSwitchParameters) {
const blue = {
200: '#99CCF3',
500: '#007FFF',
700: '#0059B2',
};

const grey = {
Expand Down Expand Up @@ -70,7 +71,7 @@ const BasicSwitchRoot = styled('span')(
}

&.Switch-focusVisible {
box-shadow: 0 0 0 3px ${theme.palette.mode === 'dark' ? grey[700] : blue[200]};
box-shadow: 0 0 0 3px ${theme.palette.mode === 'dark' ? blue[700] : blue[200]};
}

&.Switch-disabled {
Expand All @@ -79,11 +80,14 @@ const BasicSwitchRoot = styled('span')(
}

&.Switch-checked {
border: 1px solid transparent;
border: 1px solid ${theme.palette.mode === 'dark' ? grey[800] : grey[200]};
background: ${blue[500]};
box-shadow: inset 0px 1px 1px ${
theme.palette.mode === 'dark' ? 'rgba(0, 0, 0, 0.2)' : 'rgba(0, 0, 0, 0.05)'
};
&.Switch-focusVisible {
box-shadow: 0 0 0 3px ${theme.palette.mode === 'dark' ? blue[700] : blue[200]};
}
}

`,
Expand All @@ -110,7 +114,7 @@ const BasicSwitchThumb = styled('span')(
left: 2px;
border-radius: 16px;
background-color: #fff;
border: 1px solid ${theme.palette.mode === 'dark' ? grey[700] : grey[200]};
border: 1px solid ${theme.palette.mode === 'dark' ? grey[800] : grey[200]};
position: relative;
transition-property: all;
transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
Expand All @@ -121,7 +125,7 @@ const BasicSwitchThumb = styled('span')(
&.Switch-checked {
left: 17px;
background-color: #fff;
border: 1px solid transparent;
border: 1px solid ${theme.palette.mode === 'dark' ? grey[800] : grey[200]};
}
`,
);
2 changes: 1 addition & 1 deletion docs/src/modules/sandbox/CreateReactApp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export const getHtml = ({
'outline-purple': '0 0 0 4px rgba(192, 132, 252, 0.25)',
'outline-purple-light': '0 0 0 4px rgba(245, 208, 254, 0.25)',
'outline-purple-xs': '0 0 0 1px rgba(192, 132, 252, 0.25)',
'outline-switch': '0 0 1px 8px rgba(168, 85, 247, 0.35)',
'outline-switch': '0 0 1px 3px rgba(168, 85, 247, 0.35)',
},
cursor: {
inherit: 'inherit',
Expand Down
2 changes: 1 addition & 1 deletion docs/tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module.exports = {
'outline-purple': '0 0 0 4px rgba(192, 132, 252, 0.25)',
'outline-purple-light': '0 0 0 4px rgba(245, 208, 254, 0.25)',
'outline-purple-xs': '0 0 0 1px rgba(192, 132, 252, 0.25)',
'outline-switch': '0 0 1px 8px rgba(168, 85, 247, 0.35)',
'outline-switch': '0 0 1px 3px rgba(168, 85, 247, 0.35)',
},
cursor: {
inherit: 'inherit',
Expand Down