Skip to content

Fix nullable float props crashing ViewManagers on Android#58038

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
+36 −0
Closed

Fix nullable float props crashing ViewManagers on Android #58038

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
13 changes: 13 additions & 0 deletions ...tive/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -259,6 +259,18 @@ internal object ViewManagersPropertyCache {
}
}

private class BoxedFloatPropSetter(prop: ReactProp, setter: Method) :
PropSetter(prop, "number", setter) {

override fun getValueOrDefault(value: Any?, context: Context): Any? {
if (value != null) {
// All numbers from JS are Doubles which can't be simply cast to Float
return if (value is Double) value.toFloat() else value as Float
}
return null
}
}

private class BoxedIntPropSetter : PropSetter {

constructor(prop: ReactProp, setter: Method) : super(prop, "number", setter)
Expand DownExpand Up@@ -391,6 +403,7 @@ internal object ViewManagersPropertyCache {
DoublePropSetter(annotation, method, annotation.defaultDouble)
String::class.java -> StringPropSetter(annotation, method)
java.lang.Boolean::class.java -> BoxedBooleanPropSetter(annotation, method)
java.lang.Float::class.java -> BoxedFloatPropSetter(annotation, method)
java.lang.Integer::class.java ->
if ("Color" == annotation.customType) {
BoxedColorPropSetter(annotation, method)
Expand Down
23 changes: 23 additions & 0 deletions .../ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactPropAnnotationSetterTest.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,8 @@ class ReactPropAnnotationSetterTest {

fun onBoxedBooleanSetterCalled(value: Boolean?)

fun onBoxedFloatSetterCalled(value: Float?)

fun onBoxedIntSetterCalled(value: Int?)

fun onArraySetterCalled(value: ReadableArray?)
Expand DownExpand Up@@ -128,6 +130,11 @@ class ReactPropAnnotationSetterTest {
viewManagerUpdatesReceiver.onBoxedIntSetterCalled(value)
}

@ReactProp(name = "boxedFloatProp")
fun setBoxedFloatProp(v: View?, value: Float?) {
viewManagerUpdatesReceiver.onBoxedFloatSetterCalled(value)
}

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

@Test
fun testBoxedFloatSetter() {
viewManager.updateProperties(targetView, buildStyles("boxedFloatProp", 3.5))
Mockito.verify(updatesReceiverMock).onBoxedFloatSetterCalled(3.5f)
Mockito.verifyNoMoreInteractions(updatesReceiverMock)
Mockito.reset(updatesReceiverMock)
viewManager.updateProperties(targetView, buildStyles("boxedFloatProp", -7.0))
Mockito.verify(updatesReceiverMock).onBoxedFloatSetterCalled(-7.0f)
Mockito.verifyNoMoreInteractions(updatesReceiverMock)
Mockito.reset(updatesReceiverMock)
viewManager.updateProperties(targetView, buildStyles("boxedFloatProp", null))
Mockito.verify(updatesReceiverMock).onBoxedFloatSetterCalled(null)
Mockito.verifyNoMoreInteractions(updatesReceiverMock)
Mockito.reset(updatesReceiverMock)
}

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