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

Fix android talkback issue #2875

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fix android talkback issue #2875

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 34 additions & 7 deletions packages/react/slider/src/Slider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,14 @@ const SliderHorizontal = React.forwardRef<SliderHorizontalElement, SliderHorizon
return value(pointerPosition - rect.left);
}

function getValueFromEvent(event: React.PointerEvent | React.TouchEvent) {
const pointerPosition =
'changedTouches' in event && event.changedTouches && event.changedTouches.length > 0
? event.changedTouches[0].clientX
: event.clientX;
return getValueFromPointer(pointerPosition);
}

return (
<SliderOrientationProvider
scope={props.__scopeSlider}
Expand All @@ -280,11 +288,11 @@ const SliderHorizontal = React.forwardRef<SliderHorizontalElement, SliderHorizon
['--radix-slider-thumb-transform' as any]: 'translateX(-50%)',
}}
onSlideStart={(event) => {
const value = getValueFromPointer(event.clientX);
const value = getValueFromEvent(event);
onSlideStart?.(value);
}}
onSlideMove={(event) => {
const value = getValueFromPointer(event.clientX);
const value = getValueFromEvent(event);
onSlideMove?.(value);
}}
onSlideEnd={() => {
Expand Down Expand Up @@ -336,6 +344,14 @@ const SliderVertical = React.forwardRef<SliderVerticalElement, SliderVerticalPro
return value(pointerPosition - rect.top);
}

function getValueFromEvent(event: React.PointerEvent | React.TouchEvent) {
const pointerPosition =
'changedTouches' in event && event.changedTouches && event.changedTouches.length > 0
? event.changedTouches[0].clientY
: event.clientY;
return getValueFromPointer(pointerPosition);
}

return (
<SliderOrientationProvider
scope={props.__scopeSlider}
Expand All @@ -353,11 +369,11 @@ const SliderVertical = React.forwardRef<SliderVerticalElement, SliderVerticalPro
['--radix-slider-thumb-transform' as any]: 'translateY(50%)',
}}
onSlideStart={(event) => {
const value = getValueFromPointer(event.clientY);
const value = getValueFromEvent(event);
onSlideStart?.(value);
}}
onSlideMove={(event) => {
const value = getValueFromPointer(event.clientY);
const value = getValueFromEvent(event);
onSlideMove?.(value);
}}
onSlideEnd={() => {
Expand All @@ -382,9 +398,9 @@ const SliderVertical = React.forwardRef<SliderVerticalElement, SliderVerticalPro
type SliderImplElement = React.ElementRef<typeof Primitive.span>;
type PrimitiveDivProps = Radix.ComponentPropsWithoutRef<typeof Primitive.div>;
type SliderImplPrivateProps = {
onSlideStart(event: React.PointerEvent): void;
onSlideMove(event: React.PointerEvent): void;
onSlideEnd(event: React.PointerEvent): void;
onSlideStart(event: React.PointerEvent | React.TouchEvent): void;
onSlideMove(event: React.PointerEvent | React.TouchEvent): void;
onSlideEnd(event: React.PointerEvent | React.TouchEvent): void;
onHomeKeyDown(event: React.KeyboardEvent): void;
onEndKeyDown(event: React.KeyboardEvent): void;
onStepKeyDown(event: React.KeyboardEvent): void;
Expand Down Expand Up @@ -448,6 +464,17 @@ const SliderImpl = React.forwardRef<SliderImplElement, SliderImplProps>(
onSlideEnd(event);
}
})}
onTouchMove={composeEventHandlers(props.onTouchMove, (event) => {
event.preventDefault();
onSlideMove(event);
})}
onTouchStart={composeEventHandlers(props.onTouchStart, (event) => {
event.preventDefault();
onSlideStart(event);
})}
onTouchEnd={composeEventHandlers(props.onTouchEnd, (event) => {
onSlideEnd(event);
})}
/>
);
}
Expand Down