Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when PlatformColor is used as backgroundColor

Browse Source 
Summary:
@public

When PlatformColor is used with backgroundColor, this line would throw, as the object type is not convertible to int.

Changelog:
[Android][Fixed] - Fix Crash in ViewProps.isLayoutOnly

Reviewed By: JoshuaGross

Differential Revision: D29430151

fbshipit-source-id: a1fe801925430dad3a17871bdebb79d942775280
This commit is contained in:
Pieter De Baets
2021-06-30 01:18:43 -07:00
committed by Facebook GitHub Bot
parent 8c746dfc7e
commit e6b9508f12
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ReactAndroid/src/main/java/com/facebook/react/uimanager/interfaces/ViewProps.java
+9 -4
View File
@@ -9,6 +9,7 @@ package com.facebook.react.uimanager;
import android.graphics.Color;
import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.bridge.ReadableType;
import java.util.Arrays;
import java.util.HashSet;
@@ -258,10 +259,14 @@ public class ViewProps {
// Ignore if explicitly set to default opacity.
return map.isNull(OPACITY) || map.getDouble(OPACITY) == 1d;
case BORDER_RADIUS: // Without a background color or border width set, a border won't show.
if (map.hasKey(BACKGROUND_COLOR)
&& !map.isNull(BACKGROUND_COLOR)
&& map.getInt(BACKGROUND_COLOR) != Color.TRANSPARENT) {
return false;
if (map.hasKey(BACKGROUND_COLOR)) {
ReadableType valueType = map.getType(BACKGROUND_COLOR);
if (valueType == ReadableType.Number
&& map.getInt(BACKGROUND_COLOR) != Color.TRANSPARENT) {
return false;
} else if (valueType != ReadableType.Null) {
return false;
}
}
if (map.hasKey(BORDER_WIDTH)
&& !map.isNull(BORDER_WIDTH)