Skip to content

[scroll area] Fix RTL horizontal scrollbar on Safari #2776

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

Merged
merged 4 commits into from
Sep 18, 2025
Merged

[scroll area] Fix RTL horizontal scrollbar on Safari #2776

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
ab50551
[scroll area] Fix RTL horizontal scrollbar on Safari
atomiks Sep 18, 2025
7710cdd
Merge branch 'master' into fix/scroll-area-rtl-safari-2
atomiks Sep 18, 2025
dbc4de1
lint
atomiks Sep 18, 2025
69bbb5d
fix
atomiks Sep 18, 2025
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
33 changes: 29 additions & 4 deletions docs/src/app/(private)/experiments/scroll-area/scroll-area-inset.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,34 @@ import styles from './scroll-area-inset.module.css';

export default function ScrollAreaInset() {
return (
<DirectionProvider direction="rtl">
<p>Scroll content is not clipped by inset scrollbars (user-defined paddings)</p>
<ScrollArea.Root className={styles.Root} style={{ direction: 'rtl' }}>
<div>
<h2>RTL</h2>
<DirectionProvider direction="rtl">
<p>Scroll content is not clipped by inset scrollbars (user-defined paddings)</p>
<ScrollArea.Root className={styles.Root} style={{ direction: 'rtl' }}>
<ScrollArea.Viewport className={styles.Viewport}>
<div className={styles.Content}>
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor
incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud
exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute
irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
pariatur.
</p>
</div>
</ScrollArea.Viewport>
<ScrollArea.Scrollbar className={styles.Scrollbar} orientation="vertical">
<ScrollArea.Thumb className={styles.Thumb} />
</ScrollArea.Scrollbar>
<ScrollArea.Scrollbar className={styles.Scrollbar} orientation="horizontal">
<ScrollArea.Thumb className={styles.Thumb} />
</ScrollArea.Scrollbar>
<ScrollArea.Corner />
</ScrollArea.Root>
</DirectionProvider>

<h2>LTR</h2>
<ScrollArea.Root className={styles.Root}>
<ScrollArea.Viewport className={styles.Viewport}>
<div className={styles.Content}>
<p>
Expand All @@ -26,6 +51,6 @@ export default function ScrollAreaInset() {
</ScrollArea.Scrollbar>
<ScrollArea.Corner />
</ScrollArea.Root>
</DirectionProvider>
</div>
);
}
13 changes: 10 additions & 3 deletions packages/react/src/scroll-area/utils/getOffset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,15 @@ export function getOffset(
}

const styles = getComputedStyle(element);
const start = axis === 'x' ? 'Left' : 'Top';
const end = axis === 'x' ? 'Right' : 'Bottom';
const propAxis = axis === 'x' ? 'Inline' : 'Block';

return parseFloat(styles[`${prop}${start}`]) + parseFloat(styles[`${prop}${end}`]);
// Safari misreports `marginInlineEnd` in RTL.
// We have to assume the start/end values are symmetrical, which is likely.
if (axis === 'x' && prop === 'margin') {
return parseFloat(styles[`${prop}InlineStart`]) * 2;
}

return (
parseFloat(styles[`${prop}${propAxis}Start`]) + parseFloat(styles[`${prop}${propAxis}End`])
);
}
Loading