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

Jump to bottom

[Progress][RadioGroup][Tabs] Unify text direction (LTR/RTL) handling #885

Merged
merged 6 commits into from
Nov 30, 2024
Merged

[Progress][RadioGroup][Tabs] Unify text direction (LTR/RTL) handling #885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
10f9cc2
Add rtl RadioGroup test
mj12albert Nov 28, 2024
fb36f2b
Update tabs
mj12albert Nov 28, 2024
faf67fa
Update progress
mj12albert Nov 28, 2024
3adec4e
Fix cross-orientation arrow key on Tabs
mj12albert Nov 28, 2024
bdee765
Fix comments
mj12albert Nov 29, 2024
19f646c
Merge remote-tracking branch 'upstream/master' into feat/standardize-rtl
mj12albert Nov 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
4 changes: 0 additions & 4 deletions docs/data/api/progress-root.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
"aria-labelledby": { "type": { "name": "string" } },
"aria-valuetext": { "type": { "name": "string" } },
"className": { "type": { "name": "union", "description": "func<br>&#124;&nbsp;string" } },
"direction": {
"type": { "name": "enum", "description": "'ltr'<br>&#124;&nbsp;'rtl'" },
"default": "'ltr'"
},
"getAriaLabel": {
"type": { "name": "func" },
"signature": {
Expand Down
4 changes: 0 additions & 4 deletions docs/data/api/tabs-root.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
"props": {
"className": { "type": { "name": "union", "description": "func<br>&#124;&nbsp;string" } },
"defaultValue": { "type": { "name": "any" }, "default": "0" },
"direction": {
"type": { "name": "enum", "description": "'ltr'<br>&#124;&nbsp;'rtl'" },
"default": "'ltr'"
},
"onValueChange": { "type": { "name": "func" } },
"orientation": {
"type": { "name": "enum", "description": "'horizontal'<br>&#124;&nbsp;'vertical'" },
Expand Down
83 changes: 14 additions & 69 deletions docs/data/components/progress/IndeterminateProgress.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,76 +1,21 @@
'use client';
import * as React from 'react';
import { Progress as BaseProgress } from '@base-ui-components/react/progress';
import { Box, styled, keyframes, css } from '@mui/system';
import { Progress } from '@base-ui-components/react/progress';
import classes from './styles.module.css';

export default function IndeterminateProgress() {
return (
<Box sx={{ width: 320, p: 2 }}>
<Progress value={null} aria-labelledby="ProgressLabel">
<span className="Progress-label" id="ProgressLabel">
Uploading files
</span>
<ProgressTrack>
<ProgressIndicator />
</ProgressTrack>
</Progress>
</Box>
<Progress.Root
value={null}
aria-labelledby="ProgressLabel"
className={classes.progress}
>
<span className={classes.label} id="ProgressLabel">
Uploading files
</span>
<Progress.Track className={classes.track}>
<Progress.Indicator className={classes.indicator} />
</Progress.Track>
</Progress.Root>
);
}

const Progress = styled(BaseProgress.Root)`
display: flex;
flex-flow: column nowrap;
gap: 1rem;
`;

const ProgressTrack = styled(BaseProgress.Track)(
({ theme }) => `
position: relative;
width: 100%;
height: 4px;
border-radius: 9999px;
background-color: ${theme.palette.mode === 'dark' ? grey[400] : grey[400]};
display: flex;
overflow: hidden;
`,
);

const indeterminateProgress = keyframes`
from {
transform: translateX(-100%);
}
to {
transform: translateX(20rem);
}
`;

const ProgressIndicator = styled(BaseProgress.Indicator)(
({ theme }) => css`
background-color: ${theme.palette.mode === 'dark' ? BLUE400 : BLUE500};
border-radius: inherit;
&[data-indeterminate] {
width: 25%;
animation: ${indeterminateProgress} 1.5s infinite ease-in-out;
will-change: transform;
}
`,
);

const grey = {
50: '#F3F6F9',
100: '#E5EAF2',
200: '#DAE2ED',
300: '#C7D0DD',
400: '#B0B8C4',
500: '#9DA8B7',
600: '#6B7A90',
700: '#434D5B',
800: '#303740',
900: '#1C2025',
};

const BLUE400 = '#3399FF';
const BLUE500 = '#007FFF';
83 changes: 14 additions & 69 deletions docs/data/components/progress/IndeterminateProgress.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,76 +1,21 @@
'use client';
import * as React from 'react';
import { Progress as BaseProgress } from '@base-ui-components/react/progress';
import { Box, styled, keyframes, css } from '@mui/system';
import { Progress } from '@base-ui-components/react/progress';
import classes from './styles.module.css';

export default function IndeterminateProgress() {
return (
<Box sx={{ width: 320, p: 2 }}>
<Progress value={null} aria-labelledby="ProgressLabel">
<span className="Progress-label" id="ProgressLabel">
Uploading files
</span>
<ProgressTrack>
<ProgressIndicator />
</ProgressTrack>
</Progress>
</Box>
<Progress.Root
value={null}
aria-labelledby="ProgressLabel"
className={classes.progress}
>
<span className={classes.label} id="ProgressLabel">
Uploading files
</span>
<Progress.Track className={classes.track}>
<Progress.Indicator className={classes.indicator} />
</Progress.Track>
</Progress.Root>
);
}

const Progress = styled(BaseProgress.Root)`
display: flex;
flex-flow: column nowrap;
gap: 1rem;
`;

const ProgressTrack = styled(BaseProgress.Track)(
({ theme }) => `
position: relative;
width: 100%;
height: 4px;
border-radius: 9999px;
background-color: ${theme.palette.mode === 'dark' ? grey[400] : grey[400]};
display: flex;
overflow: hidden;
`,
);

const indeterminateProgress = keyframes`
from {
transform: translateX(-100%);
}
to {
transform: translateX(20rem);
}
`;

const ProgressIndicator = styled(BaseProgress.Indicator)(
({ theme }) => css`
background-color: ${theme.palette.mode === 'dark' ? BLUE400 : BLUE500};
border-radius: inherit;
&[data-indeterminate] {
width: 25%;
animation: ${indeterminateProgress} 1.5s infinite ease-in-out;
will-change: transform;
}
`,
);

const grey = {
50: '#F3F6F9',
100: '#E5EAF2',
200: '#DAE2ED',
300: '#C7D0DD',
400: '#B0B8C4',
500: '#9DA8B7',
600: '#6B7A90',
700: '#434D5B',
800: '#303740',
900: '#1C2025',
};

const BLUE400 = '#3399FF';
const BLUE500 = '#007FFF';
16 changes: 10 additions & 6 deletions docs/data/components/progress/IndeterminateProgress.tsx.preview
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
<Progress value={null} aria-labelledby="ProgressLabel">
<span className="Progress-label" id="ProgressLabel">
<Progress.Root
value={null}
aria-labelledby="ProgressLabel"
className={classes.progress}
>
<span className={classes.label} id="ProgressLabel">
Uploading files
</span>
<ProgressTrack>
<ProgressIndicator />
</ProgressTrack>
</Progress>
<Progress.Track className={classes.track}>
<Progress.Indicator className={classes.indicator} />
</Progress.Track>
</Progress.Root>
67 changes: 15 additions & 52 deletions docs/data/components/progress/RtlProgress.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,60 +1,23 @@
'use client';
import * as React from 'react';
import { Progress as BaseProgress } from '@base-ui-components/react/progress';
import { Box, styled } from '@mui/system';
import { Progress } from '@base-ui-components/react/progress';
import classes from './styles.module.css';

export default function RtlProgress() {
return (
<Box sx={{ width: 320, p: 2 }}>
<Progress value={65} aria-labelledby="RtlProgressLabel" dir="rtl">
<span className="Progress-label" id="RtlProgressLabel">
Uploading files (RTL)
<div dir="rtl">
<Progress.Root
value={65}
aria-labelledby="RtlProgressLabel"
className={classes.progress}
>
<span className={classes.label} id="RtlProgressLabel">
تحميل الملفات (RTL)
</span>
<ProgressTrack>
<ProgressIndicator />
</ProgressTrack>
</Progress>
</Box>
<Progress.Track className={classes.track}>
<Progress.Indicator className={classes.indicator} />
</Progress.Track>
</Progress.Root>
</div>
);
}

const Progress = styled(BaseProgress.Root)`
display: flex;
flex-flow: column nowrap;
gap: 1rem;
`;

const ProgressTrack = styled(BaseProgress.Track)(
({ theme }) => `
position: relative;
width: 100%;
height: 4px;
border-radius: 9999px;
background-color: ${theme.palette.mode === 'dark' ? grey[400] : grey[400]};
display: flex;
overflow: hidden;
`,
);

const ProgressIndicator = styled(BaseProgress.Indicator)(
({ theme }) => `
background-color: ${theme.palette.mode === 'dark' ? BLUE400 : BLUE500};
border-radius: inherit;
`,
);

const grey = {
50: '#F3F6F9',
100: '#E5EAF2',
200: '#DAE2ED',
300: '#C7D0DD',
400: '#B0B8C4',
500: '#9DA8B7',
600: '#6B7A90',
700: '#434D5B',
800: '#303740',
900: '#1C2025',
};

const BLUE400 = '#3399FF';
const BLUE500 = '#007FFF';
67 changes: 15 additions & 52 deletions docs/data/components/progress/RtlProgress.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,60 +1,23 @@
'use client';
import * as React from 'react';
import { Progress as BaseProgress } from '@base-ui-components/react/progress';
import { Box, styled } from '@mui/system';
import { Progress } from '@base-ui-components/react/progress';
import classes from './styles.module.css';

export default function RtlProgress() {
return (
<Box sx={{ width: 320, p: 2 }}>
<Progress value={65} aria-labelledby="RtlProgressLabel" dir="rtl">
<span className="Progress-label" id="RtlProgressLabel">
Uploading files (RTL)
<div dir="rtl">
<Progress.Root
value={65}
aria-labelledby="RtlProgressLabel"
className={classes.progress}
>
<span className={classes.label} id="RtlProgressLabel">
تحميل الملفات (RTL)
</span>
<ProgressTrack>
<ProgressIndicator />
</ProgressTrack>
</Progress>
</Box>
<Progress.Track className={classes.track}>
<Progress.Indicator className={classes.indicator} />
</Progress.Track>
</Progress.Root>
</div>
);
}

const Progress = styled(BaseProgress.Root)`
display: flex;
flex-flow: column nowrap;
gap: 1rem;
`;

const ProgressTrack = styled(BaseProgress.Track)(
({ theme }) => `
position: relative;
width: 100%;
height: 4px;
border-radius: 9999px;
background-color: ${theme.palette.mode === 'dark' ? grey[400] : grey[400]};
display: flex;
overflow: hidden;
`,
);

const ProgressIndicator = styled(BaseProgress.Indicator)(
({ theme }) => `
background-color: ${theme.palette.mode === 'dark' ? BLUE400 : BLUE500};
border-radius: inherit;
`,
);

const grey = {
50: '#F3F6F9',
100: '#E5EAF2',
200: '#DAE2ED',
300: '#C7D0DD',
400: '#B0B8C4',
500: '#9DA8B7',
600: '#6B7A90',
700: '#434D5B',
800: '#303740',
900: '#1C2025',
};

const BLUE400 = '#3399FF';
const BLUE500 = '#007FFF';
18 changes: 11 additions & 7 deletions docs/data/components/progress/RtlProgress.tsx.preview
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
<Progress value={65} aria-labelledby="RtlProgressLabel" dir="rtl">
<span className="Progress-label" id="RtlProgressLabel">
Uploading files (RTL)
<Progress.Root
value={65}
aria-labelledby="RtlProgressLabel"
className={classes.progress}
>
<span className={classes.label} id="RtlProgressLabel">
تحميل الملفات (RTL)
</span>
<ProgressTrack>
<ProgressIndicator />
</ProgressTrack>
</Progress>
<Progress.Track className={classes.track}>
<Progress.Indicator className={classes.indicator} />
</Progress.Track>
</Progress.Root>
Loading