Skip to content

Fix accessibilityLabelledBy crash on empty array (#57029) #57029

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

Closed
rozele wants to merge 1 commit into from
+33 −2
Closed

Fix accessibilityLabelledBy crash on empty array (#57029) #57029

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
6 changes: 4 additions & 2 deletions ...react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,15 +309,17 @@ public void setNativeId(@NonNull T view, @Nullable String nativeId) {

@ReactProp(name = ViewProps.ACCESSIBILITY_LABELLED_BY)
public void setAccessibilityLabelledBy(@NonNull T view, @Nullable Dynamic nativeId) {
if (nativeId.isNull()) {
if (nativeId == null || nativeId.isNull()) {
view.setTag(R.id.labelled_by, null);
return;
}
if (nativeId.getType() == ReadableType.String) {
view.setTag(R.id.labelled_by, nativeId.asString());
} else if (nativeId.getType() == ReadableType.Array) {
// On Android, this takes a single View as labeledBy. If an array is specified, set the first
// element in the tag.
view.setTag(R.id.labelled_by, nativeId.asArray().getString(0));
ReadableArray array = nativeId.asArray();
view.setTag(R.id.labelled_by, array.size() > 0 ? array.getString(0) : null);
}
}

Expand Down
29 changes: 29 additions & 0 deletions ...act-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ package com.facebook.react.uimanager
import android.view.View.OnFocusChangeListener
import com.facebook.react.R
import com.facebook.react.bridge.BridgeReactContext
import com.facebook.react.bridge.DynamicFromObject
import com.facebook.react.bridge.JavaOnlyArray
import com.facebook.react.bridge.JavaOnlyMap
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests
import com.facebook.react.views.view.ReactViewGroup
Expand Down Expand Up @@ -101,4 +103,31 @@ class BaseViewManagerTest {
verify(originalFocusListener, times(2)).onFocusChange(view, true)
Assertions.assertThat(originalFocusListener).isEqualTo(view.onFocusChangeListener)
}

@Test
fun testAccessibilityLabelledByString() {
viewManager.setAccessibilityLabelledBy(view, DynamicFromObject("target_id"))
Assertions.assertThat(view.getTag(R.id.labelled_by)).isEqualTo("target_id")
}

@Test
fun testAccessibilityLabelledByArray() {
val array = JavaOnlyArray.of("first_id", "second_id")
viewManager.setAccessibilityLabelledBy(view, DynamicFromObject(array))
Assertions.assertThat(view.getTag(R.id.labelled_by)).isEqualTo("first_id")
}

@Test
fun testAccessibilityLabelledByNullClearsTag() {
view.setTag(R.id.labelled_by, "stale_id")
viewManager.setAccessibilityLabelledBy(view, DynamicFromObject(null))
Assertions.assertThat(view.getTag(R.id.labelled_by)).isNull()
}

@Test
fun testAccessibilityLabelledByEmptyArrayDoesNotCrash() {
view.setTag(R.id.labelled_by, "stale_id")
viewManager.setAccessibilityLabelledBy(view, DynamicFromObject(JavaOnlyArray()))
Assertions.assertThat(view.getTag(R.id.labelled_by)).isNull()
}
}
Loading