From 8b0ccd2bdbe7cf39f36ddf24f87b60148fa4022c Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@fb.com>
Date: Tue, 3 Mar 2020 00:52:03 -0800
Subject: [PATCH] Fix RN Android codegen to support null values for Color typed
 props

Summary:
This diff fixes the RN Android codegen to support null values for Color typed props.
This was already supported but it recently changed as part of D20169335, when we added the new prop type "color".

changelog: [internal]

Reviewed By: TheSavior

Differential Revision: D20213689

fbshipit-source-id: 42d624de3d1296582f4dcc9c7decd0c02aacca98
---
 .../facebook/react/processing/ReactPropertyProcessor.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/processing/ReactPropertyProcessor.java b/ReactAndroid/src/main/java/com/facebook/react/processing/ReactPropertyProcessor.java
index 09de068f02a..5cee5dba148 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/processing/ReactPropertyProcessor.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/processing/ReactPropertyProcessor.java
@@ -398,11 +398,13 @@ public class ReactPropertyProcessor extends AbstractProcessor {
       switch (classInfo.getType()) {
         case VIEW_MANAGER:
           return builder.add(
-              "$T.getColor(value, view.getContext())",
+              "value == null ? $L : $T.getColor(value, view.getContext())",
+              info.mProperty.defaultInt(),
               com.facebook.react.bridge.ColorPropConverter.class);
         case SHADOW_NODE:
           return builder.add(
-              "$T.getColor(value, node.getThemedContext())",
+              "value == null ? $L : $T.getColor(value, node.getThemedContext())",
+              info.mProperty.defaultInt(),
               com.facebook.react.bridge.ColorPropConverter.class);
       }
     } else if (propertyType.equals(TypeName.INT)) {