Skip to content

fix(s2): Fix ColorLoupe position in ColorSlider for RTL locales #8894

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 2 commits into from
Sep 22, 2025
+13 −4
Merged

fix(s2): Fix ColorLoupe position in ColorSlider for RTL locales #8894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
920b66b
fix(s2): Fix ColorLoupe position in ColorSlider for RTL locales
chirokas Sep 20, 2025
90e5358
Fix ColorArea in RTL locales
chirokas Sep 22, 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
12 changes: 10 additions & 2 deletions packages/@react-spectrum/s2/src/ColorArea.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
import {
ColorArea as AriaColorArea,
ColorAreaProps as AriaColorAreaProps,
ContextValue
ContextValue,
useLocale
} from 'react-aria-components';
import {ColorHandle} from './ColorHandle';
import {createContext, forwardRef} from 'react';
Expand All @@ -34,6 +35,7 @@ export const ColorArea = forwardRef(function ColorArea(props: ColorAreaProps, re
[props, ref] = useSpectrumContextProps(props, ref, ColorAreaContext);
let {UNSAFE_className = '', UNSAFE_style, styles} = props;
let containerRef = useDOMRef(ref);
let {direction} = useLocale();
return (
<AriaColorArea
{...props}
Expand Down Expand Up @@ -67,7 +69,13 @@ export const ColorArea = forwardRef(function ColorArea(props: ColorAreaProps, re
{({state}) =>
(<ColorHandle
containerRef={containerRef}
getPosition={() => state.getThumbPosition()} />)
getPosition={() => {
let {x, y} = state.getThumbPosition();
return {
x: direction === 'ltr' ? x : 1 - x,
y
};
}} />)
}
</AriaColorArea>
);
Expand Down
5 changes: 3 additions & 2 deletions packages/@react-spectrum/s2/src/ColorSlider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export const ColorSlider = forwardRef(function ColorSlider(props: ColorSliderPro
let {UNSAFE_className = '', UNSAFE_style, styles} = props;
let containerRef = useDOMRef(ref);
let trackRef = useRef(null);
let {locale} = useLocale();
let {direction, locale} = useLocale();

return (
<AriaColorSlider
Expand Down Expand Up @@ -133,7 +133,8 @@ export const ColorSlider = forwardRef(function ColorSlider(props: ColorSliderPro
<ColorHandle
containerRef={trackRef}
getPosition={() => {
let x = state.orientation === 'horizontal' ? state.getThumbPercent(0) : 0.5;
let thumbLeft = direction === 'ltr' ? state.getThumbPercent(0) : 1 - state.getThumbPercent(0);
let x = state.orientation === 'horizontal' ? thumbLeft : 0.5;
let y = state.orientation === 'horizontal' ? 0.5 : 1 - state.getThumbPercent(0);
return {x, y};
}} />
Expand Down