Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,9 @@ class TouchableOpacity extends React.Component<
accessibilityState={_accessibilityState}
accessibilityActions={this.props.accessibilityActions}
onAccessibilityAction={this.props.onAccessibilityAction}
onAccessibilityTap={this.props.onAccessibilityTap}
onAccessibilityEscape={this.props.onAccessibilityEscape}
onMagicTap={this.props.onMagicTap}
accessibilityValue={accessibilityValue}
importantForAccessibility={
this.props['aria-hidden'] === true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1421,7 +1421,11 @@ - (BOOL)shouldGroupAccessibilityChildren
- (BOOL)accessibilityActivate
{
if (_eventEmitter && _props->onAccessibilityTap) {
_eventEmitter->onAccessibilityTap();
auto emitter = std::static_pointer_cast<const ViewEventEmitter>(_eventEmitter);

emitter->experimental_flushSync([&emitter]() {
emitter->onAccessibilityTap();
});
return YES;
} else {
return NO;
Expand All @@ -1431,7 +1435,11 @@ - (BOOL)accessibilityActivate
- (BOOL)accessibilityPerformMagicTap
{
if (_eventEmitter && _props->onAccessibilityMagicTap) {
_eventEmitter->onAccessibilityMagicTap();
auto emitter = std::static_pointer_cast<const ViewEventEmitter>(_eventEmitter);

emitter->experimental_flushSync([&emitter]() {
emitter->onAccessibilityMagicTap();
});
return YES;
} else {
return NO;
Expand All @@ -1441,7 +1449,10 @@ - (BOOL)accessibilityPerformMagicTap
- (BOOL)accessibilityPerformEscape
{
if (_eventEmitter && _props->onAccessibilityEscape) {
_eventEmitter->onAccessibilityEscape();
auto emitter = std::static_pointer_cast<const ViewEventEmitter>(_eventEmitter);
emitter->experimental_flushSync([&emitter]() {
emitter->onAccessibilityEscape();
});
return YES;
} else {
return NO;
Expand All @@ -1451,21 +1462,35 @@ - (BOOL)accessibilityPerformEscape
- (void)accessibilityIncrement
{
if (_eventEmitter && _props->onAccessibilityAction) {
_eventEmitter->onAccessibilityAction("increment");
auto emitter = std::static_pointer_cast<const ViewEventEmitter>(_eventEmitter);

// Dispatch the event synchronously - JS will run and update props immediately
emitter->experimental_flushSync([&emitter]() {
emitter->onAccessibilityAction("increment");
});
}
}

- (void)accessibilityDecrement
{
if (_eventEmitter && _props->onAccessibilityAction) {
_eventEmitter->onAccessibilityAction("decrement");
auto emitter = std::static_pointer_cast<const ViewEventEmitter>(_eventEmitter);

// Dispatch the event synchronously - JS will run and update props immediately
emitter->experimental_flushSync([&emitter]() {
emitter->onAccessibilityAction("decrement");
});
}
}

- (BOOL)didActivateAccessibilityCustomAction:(UIAccessibilityCustomAction *)action
{
if (_eventEmitter && _props->onAccessibilityAction) {
_eventEmitter->onAccessibilityAction(RCTStringFromNSString(action.name));
auto emitter = std::static_pointer_cast<const ViewEventEmitter>(_eventEmitter);

emitter->experimental_flushSync([&emitter, &action]() {
emitter->onAccessibilityAction(RCTStringFromNSString(action.name));
});
return YES;
} else {
return NO;
Expand Down
Loading