Properly enable Pressable after disabled prop reset (#58799)

Summary:
JSI drops `undefined` keys, so reseting `disabled` from `true` to `undefined` on Touchables/Pressables never runs `setEnabled(true)`

There is props diffing feature flag that fixes this, which is off by default

Also added safety check against explicit `null` & reset on recycling

Fixes https://github.com/react/react-native/issues/56777 and supersedes https://github.com/react/react-native/issues/58795

## Changelog:

[ANDROID] [FIXED] - Properly enable Pressable after `disabled` prop resets from `true`

Pull Request resolved: https://github.com/react/react-native/pull/58799

Test Plan:
Added BaseViewManagerTest as well as videos of testing it on Pressable:

https://github.com/user-attachments/assets/e9a7dcd2-46d5-4cdc-88a3-728bff22e76b

https://github.com/user-attachments/assets/043150ae-64f2-47c9-b13c-abfec5b61747

Reviewed By: javache

Differential Revision: D122872380

Pulled By: zeyap

fbshipit-source-id: f3f1cad378f36f006bbb6c7f3f2e4f9aa8e61541
This commit is contained in:
bigcupcoffee authored and meta-codesync[bot] committed 2026-10-02 09:43:06 -07:00
1 parent 7c007b3430
commit 357b6998c4
4 files changed
+104 -2

No files matched your search

@@ -88,6 +88,8 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
view.setTag(R.id.accessibility_actions, null);
view.setTag(R.id.accessibility_value, null);
view.setTag(R.id.accessibility_state_expanded, null);
view.setTag(R.id.accessibility_state_disabled, null);
view.setEnabled(true);
view.setTag(R.id.view_clipped, null);
// This indirectly calls (and resets):
@@ -364,6 +366,7 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
@ReactProp(name = ViewProps.ACCESSIBILITY_STATE)
public void setViewState(@NonNull T view, @Nullable ReadableMap accessibilityState) {
if (accessibilityState == null) {
resetDisabledFromAccessibilityState(view);
return;
}
if (accessibilityState.hasKey("expanded")) {
@@ -385,8 +388,12 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
view.setSelected(false);
}
view.setTag(R.id.accessibility_state, accessibilityState);
if (accessibilityState.hasKey("disabled")) {
view.setEnabled(!accessibilityState.getBoolean("disabled"));
if (accessibilityState.hasKey("disabled") && !accessibilityState.isNull("disabled")) {
boolean disabled = accessibilityState.getBoolean("disabled");
view.setEnabled(!disabled);
view.setTag(R.id.accessibility_state_disabled, disabled);
} else {
resetDisabledFromAccessibilityState(view);
}
// For states which don't have corresponding methods in
@@ -413,6 +420,13 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
}
}
private static void resetDisabledFromAccessibilityState(@NonNull View view) {
if (Boolean.TRUE.equals(view.getTag(R.id.accessibility_state_disabled))) {
view.setEnabled(true);
}
view.setTag(R.id.accessibility_state_disabled, null);
}
private void updateViewContentDescription(@NonNull T view) {
final String accessibilityLabel = (String) view.getTag(R.id.accessibility_label);
final ReadableMap accessibilityState = (ReadableMap) view.getTag(R.id.accessibility_state);
@@ -36,6 +36,9 @@
<!--tag is used to store accessibilityStateExpanded -->
<item type="id" name="accessibility_state_expanded"/>
<!--tag is used to store whether accessibilityState.disabled disabled the view -->
<item type="id" name="accessibility_state_disabled"/>
<!--tag is used to store accessibilityLabel tag-->
<item type="id" name="accessibility_label"/>
@@ -71,6 +71,38 @@ class BaseViewManagerTest {
Assertions.assertThat(view.isSelected).isEqualTo(true)
}
@Test
fun testAccessibilityStateDisabledRemovedReenablesView() {
viewManager.setViewState(view, JavaOnlyMap.of("disabled", true))
Assertions.assertThat(view.isEnabled).isFalse()
viewManager.setViewState(view, JavaOnlyMap())
Assertions.assertThat(view.isEnabled).isTrue()
}
@Test
fun testAccessibilityStateNullReenablesView() {
viewManager.setViewState(view, JavaOnlyMap.of("disabled", true))
viewManager.setViewState(view, null)
Assertions.assertThat(view.isEnabled).isTrue()
}
@Test
fun testAccessibilityStateDisabledNullDoesNotCrash() {
viewManager.setViewState(view, JavaOnlyMap.of("disabled", true))
viewManager.setViewState(view, JavaOnlyMap.of("disabled", null))
Assertions.assertThat(view.isEnabled).isTrue()
}
@Test
fun testAccessibilityStateWithoutDisabledKeepsViewDisabledByOtherProps() {
view.isEnabled = false
viewManager.setViewState(view, JavaOnlyMap())
Assertions.assertThat(view.isEnabled).isFalse()
viewManager.setViewState(view, null)
Assertions.assertThat(view.isEnabled).isFalse()
}
@Test
fun testRoleList() {
viewManager.setRole(view, "list")
@@ -255,7 +255,17 @@ function PressableNativeMethods() {
);
}
const DISABLED_OPTIONS: Array<{label: string, value: ?boolean}> = [
{label: 'true', value: true},
{label: 'false', value: false},
{label: 'undefined', value: undefined},
{label: 'null', value: null},
];
function PressableDisabled() {
const [disabled, setDisabled] = useState<?boolean>(true);
const [timesPressed, setTimesPressed] = useState(0);
return (
<>
<Pressable disabled={true} style={[styles.row, styles.block]}>
@@ -271,6 +281,33 @@ function PressableDisabled() {
]}>
<Text style={styles.button}>Enabled Pressable</Text>
</Pressable>
<View style={[styles.row, styles.block]}>
{DISABLED_OPTIONS.map(option => (
<Pressable
key={option.label}
onPress={() => setDisabled(option.value)}
style={[
styles.disabledOption,
disabled === option.value && styles.disabledOptionSelected,
]}>
<Text>{option.label}</Text>
</Pressable>
))}
</View>
<Pressable
disabled={disabled}
onPress={() => setTimesPressed(current => current + 1)}
style={({pressed}) => [
{opacity: pressed ? 0.5 : 1},
styles.row,
styles.block,
styles.disabledToggleTarget,
]}>
<Text style={disabled === true ? styles.disabledButton : styles.button}>
{`disabled={${String(disabled)}}`} pressed {timesPressed} times
</Text>
</Pressable>
</>
);
}
@@ -296,6 +333,22 @@ const styles = StyleSheet.create({
color: '#007AFF',
opacity: 0.5,
},
disabledOption: {
paddingHorizontal: 8,
paddingVertical: 4,
marginHorizontal: 4,
borderRadius: 4,
borderWidth: StyleSheet.hairlineWidth,
borderColor: '#007AFF',
},
disabledOptionSelected: {
backgroundColor: '#cce4ff',
},
disabledToggleTarget: {
padding: 20,
borderWidth: StyleSheet.hairlineWidth,
borderColor: '#007AFF',
},
hitSlopButton: {
color: 'white',
},