Skip to content

Fix DimensionValue props crashing ViewManagers on Android #58039

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
dennytosp wants to merge 1 commit into from
+42 −0
Closed

Fix DimensionValue props crashing ViewManagers on Android #58039

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
12 changes: 12 additions & 0 deletions ...tive/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@ import android.content.Context
import android.view.View
import com.facebook.common.logging.FLog
import com.facebook.react.bridge.ColorPropConverter
import com.facebook.react.bridge.DimensionPropConverter
import com.facebook.react.bridge.Dynamic
import com.facebook.react.bridge.DynamicFromObject
import com.facebook.react.bridge.JSApplicationIllegalArgumentException
import com.facebook.react.bridge.ReadableArray
import com.facebook.react.bridge.ReadableMap
import com.facebook.react.uimanager.annotations.ReactProp
import com.facebook.react.uimanager.annotations.ReactPropGroup
import com.facebook.yoga.YogaValue
import java.lang.reflect.Method

/**
Expand Down Expand Up @@ -192,6 +194,15 @@ internal object ViewManagersPropertyCache {
}
}

private class DimensionPropSetter(prop: ReactProp, setter: Method) :
PropSetter(prop, "mixed", setter) {

// A DimensionValue arrives from JS as either a number (points) or a string
// (e.g. "100%"), and is nullable, so the conversion is delegated wholesale.
override fun getValueOrDefault(value: Any?, context: Context): Any? =
DimensionPropConverter.getDimension(value)
}

private class BooleanPropSetter(
prop: ReactProp,
setter: Method,
Expand Down Expand Up @@ -399,6 +410,7 @@ internal object ViewManagersPropertyCache {
}
ReadableArray::class.java -> ArrayPropSetter(annotation, method)
ReadableMap::class.java -> MapPropSetter(annotation, method)
YogaValue::class.java -> DimensionPropSetter(annotation, method)
else ->
throw RuntimeException(
"Unrecognized type: $propTypeClass for method: ${method.declaringClass.name}#${method.name}",
Expand Down
30 changes: 30 additions & 0 deletions .../ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropAnnotationSetterTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ import com.facebook.react.bridge.ReadableMap
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests
import com.facebook.react.uimanager.annotations.ReactProp
import com.facebook.react.uimanager.annotations.ReactPropGroup
import com.facebook.yoga.YogaUnit
import com.facebook.yoga.YogaValue
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
Expand All @@ -41,6 +43,8 @@ class ReactPropAnnotationSetterTest {

fun onBoxedIntSetterCalled(value: Int?)

fun onDimensionSetterCalled(value: YogaValue?)

fun onArraySetterCalled(value: ReadableArray?)

fun onMapSetterCalled(value: ReadableMap?)
Expand Down Expand Up @@ -128,6 +132,11 @@ class ReactPropAnnotationSetterTest {
viewManagerUpdatesReceiver.onBoxedIntSetterCalled(value)
}

@ReactProp(name = "dimensionProp")
fun setDimensionProp(v: View?, value: YogaValue?) {
viewManagerUpdatesReceiver.onDimensionSetterCalled(value)
}

@ReactProp(name = "arrayProp")
fun setArrayProp(v: View?, value: ReadableArray?) {
viewManagerUpdatesReceiver.onArraySetterCalled(value)
Expand Down Expand Up @@ -314,6 +323,27 @@ class ReactPropAnnotationSetterTest {
Mockito.reset(updatesReceiverMock)
}

@Test
fun testDimensionSetter() {
viewManager.updateProperties(targetView, buildStyles("dimensionProp", 10.5))
Mockito.verify(updatesReceiverMock).onDimensionSetterCalled(YogaValue(10.5f, YogaUnit.POINT))
Mockito.verifyNoMoreInteractions(updatesReceiverMock)
Mockito.reset(updatesReceiverMock)
viewManager.updateProperties(targetView, buildStyles("dimensionProp", "100%"))
Mockito.verify(updatesReceiverMock).onDimensionSetterCalled(YogaValue(100f, YogaUnit.PERCENT))
Mockito.verifyNoMoreInteractions(updatesReceiverMock)
Mockito.reset(updatesReceiverMock)
viewManager.updateProperties(targetView, buildStyles("dimensionProp", null))
Mockito.verify(updatesReceiverMock).onDimensionSetterCalled(null)
Mockito.verifyNoMoreInteractions(updatesReceiverMock)
Mockito.reset(updatesReceiverMock)
}

@Test(expected = JSApplicationIllegalArgumentException::class)
fun testFailToUpdateDimensionPropWithArray() {
viewManager.updateProperties(targetView, buildStyles("dimensionProp", JavaOnlyArray()))
}

@Test
fun testArraySetter() {
val array: ReadableArray = JavaOnlyArray()
Expand Down
Loading