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

Add onSlidingComplete callbacks when sliders adjusted via a11y #26600

Closed
wants to merge 1 commit into from
Closed

Add onSlidingComplete callbacks when sliders adjusted via a11y #26600

Show file tree
Hide file tree
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
20 changes: 20 additions & 0 deletions React/Views/RCTSlider.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,24 @@ - (UIImage *)thumbImage
return [self thumbImageForState:UIControlStateNormal];
}

- (void)accessibilityIncrement
{
[super accessibilityIncrement];
if (_onSlidingComplete) {
_onSlidingComplete(@{
@"value": @(self.value),
});
}
}

- (void)accessibilityDecrement
{
[super accessibilityDecrement];
if (_onSlidingComplete) {
_onSlidingComplete(@{
@"value": @(self.value),
});
}
}

@end
29 changes: 28 additions & 1 deletion ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,14 @@
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable;
import android.os.Bundle;
import android.view.View;
import android.view.ViewGroup;
import android.widget.SeekBar;
import androidx.annotation.Nullable;
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat;
import androidx.core.view.AccessibilityDelegateCompat;
import androidx.core.view.ViewCompat;
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.common.MapBuilder;
Expand Down Expand Up @@ -132,7 +136,9 @@ public Class getShadowNodeClass() {

@Override
protected ReactSlider createViewInstance(ThemedReactContext context) {
return new ReactSlider(context, null, STYLE);
final ReactSlider slider = new ReactSlider(context, null, STYLE);
ViewCompat.setAccessibilityDelegate(slider, sAccessibilityDelegate);
return slider;
}

@Override
Expand Down Expand Up @@ -256,4 +262,25 @@ public long measure(
protected ViewManagerDelegate<ReactSlider> getDelegate() {
return mDelegate;
}

protected static class ReactSliderAccessibilityDelegate extends AccessibilityDelegateCompat {
private static boolean isSliderAction(int action) {
return (action == AccessibilityActionCompat.ACTION_SCROLL_FORWARD.getId()) ||
(action == AccessibilityActionCompat.ACTION_SCROLL_BACKWARD.getId()) ||
(action == AccessibilityActionCompat.ACTION_SET_PROGRESS.getId());
}

@Override
public boolean performAccessibilityAction(View host, int action, Bundle args) {
if (isSliderAction(action)) {
ON_CHANGE_LISTENER.onStartTrackingTouch((SeekBar)host);
}
final boolean rv = super.performAccessibilityAction(host, action, args);
if (isSliderAction(action)) {
ON_CHANGE_LISTENER.onStopTrackingTouch((SeekBar)host);
}
return rv;
}
};
protected static ReactSliderAccessibilityDelegate sAccessibilityDelegate = new ReactSliderAccessibilityDelegate();
}