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

[joy-ui][docs] Remove wrong CSS prop from the Sign-in-side template #41383

Merged
merged 8 commits into from
Mar 8, 2024
Merged

[joy-ui][docs] Remove wrong CSS prop from the Sign-in-side template #41383

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
69d74f9
[joy-ui][docs] Remove wrong css prop
cipherlogs Mar 6, 2024
41423bb
[joy-ui][docs] Remove hacky use of clamp
cipherlogs Mar 6, 2024
7c4a173
Remove unused css var '--Divider-lineColor'
cipherlogs Mar 6, 2024
09aa7e6
[joy-ui][docs] Fix divider visibility issue on light-mode
cipherlogs Mar 6, 2024
d9ff4a3
[joy-ui][docs] Refactor FormLabel asterisks visibility
cipherlogs Mar 6, 2024
d4e4355
[joy-ui][docs] Simplify ColorSchemeToggle()
cipherlogs Mar 6, 2024
dc4237d
Fix code style | pnpm prettier
cipherlogs Mar 6, 2024
7f3bd71
Merge branch 'master' into pr/41383
danilo-leal Mar 8, 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
42 changes: 12 additions & 30 deletions docs/data/joy/getting-started/templates/sign-in-side/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Button from '@mui/joy/Button';
import Checkbox from '@mui/joy/Checkbox';
import Divider from '@mui/joy/Divider';
import FormControl from '@mui/joy/FormControl';
import FormLabel, { formLabelClasses } from '@mui/joy/FormLabel';
import FormLabel from '@mui/joy/FormLabel';
import IconButton, { IconButtonProps } from '@mui/joy/IconButton';
import Link from '@mui/joy/Link';
import Input from '@mui/joy/Input';
Expand All @@ -31,28 +31,20 @@ function ColorSchemeToggle(props: IconButtonProps) {
const { onClick, ...other } = props;
const { mode, setMode } = useColorScheme();
const [mounted, setMounted] = React.useState(false);
React.useEffect(() => {
setMounted(true);
}, []);
if (!mounted) {
return <IconButton size="sm" variant="outlined" color="neutral" disabled />;
}

React.useEffect(() => setMounted(true), []);

return (
<IconButton
id="toggle-mode"
aria-label="toggle light/dark mode"
size="sm"
variant="outlined"
color="neutral"
aria-label="toggle light/dark mode"
{...other}
disabled={!mounted}
onClick={(event) => {
if (mode === 'light') {
setMode('dark');
} else {
setMode('light');
}
setMode(mode === 'light' ? 'dark' : 'light');
onClick?.(event);
}}
{...other}
>
{mode === 'light' ? <DarkModeRoundedIcon /> : <LightModeRoundedIcon />}
</IconButton>
Expand All @@ -66,17 +58,14 @@ export default function JoySignInSideTemplate() {
<GlobalStyles
styles={{
':root': {
'--Collapsed-breakpoint': '769px', // form will stretch when viewport is below `769px`
'--Cover-width': '50vw', // must be `vw` only
'--Form-maxWidth': '800px',
'--Transition-duration': '0.4s', // set to `none` to disable transition
},
}}
/>
<Box
sx={(theme) => ({
width:
'clamp(100vw - var(--Cover-width), (var(--Collapsed-breakpoint) - 100vw) * 999, 100vw)',
width: { xs: '100%', md: '50vw' },
transition: 'width var(--Transition-duration)',
transitionDelay: 'calc(var(--Transition-duration) + 0.1s)',
position: 'relative',
Expand All @@ -95,9 +84,7 @@ export default function JoySignInSideTemplate() {
display: 'flex',
flexDirection: 'column',
minHeight: '100dvh',
width:
'clamp(var(--Form-maxWidth), (var(--Collapsed-breakpoint) - 100vw) * 999, 100%)',
maxWidth: '100%',
width: '100%',
px: 2,
}}
>
Expand All @@ -106,7 +93,6 @@ export default function JoySignInSideTemplate() {
sx={{
py: 3,
display: 'flex',
alignItems: 'left',
justifyContent: 'space-between',
}}
>
Expand Down Expand Up @@ -136,7 +122,7 @@ export default function JoySignInSideTemplate() {
flexDirection: 'column',
gap: 2,
},
[`& .${formLabelClasses.asterisk}`]: {
[`& .MuiFormLabel-asterisk`]: {
visibility: 'hidden',
},
}}
Expand Down Expand Up @@ -166,10 +152,6 @@ export default function JoySignInSideTemplate() {
sx={(theme) => ({
[theme.getColorSchemeSelector('light')]: {
color: { xs: '#FFF', md: 'text.tertiary' },
'--Divider-lineColor': {
xs: '#FFF',
md: 'var(--joy-palette-divider)',
},
},
})}
>
Expand Down Expand Up @@ -230,7 +212,7 @@ export default function JoySignInSideTemplate() {
right: 0,
top: 0,
bottom: 0,
left: 'clamp(0px, (100vw - var(--Collapsed-breakpoint)) * 999, 100vw - var(--Cover-width))',
left: { xs: 0, md: '50vw' },
transition:
'background-image var(--Transition-duration), left var(--Transition-duration) !important',
transitionDelay: 'calc(var(--Transition-duration) + 0.1s)',
Expand Down
Loading