From bc57056cc3263431d54982426d890ba60b4cadb7 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Wed, 21 Jul 2021 00:13:46 -0700 Subject: [PATCH] Refactor AndroidTextInput.AndroidTextInput.color prop to use SharedColor instead of int Summary: This diff refactors the AndroidTextInput.AndroidTextInput.color prop to use SharedColor instead of int The purpose of this change is avoid a crash when using PlatformColor on TextInput changelog: [intenral] internal Reviewed By: JoshuaGross Differential Revision: D29810595 fbshipit-source-id: 2a5a9c5ae66e8d5de8adb1c89ea62489190a91ee --- .../components/androidtextinput/AndroidTextInputProps.cpp | 2 +- .../components/androidtextinput/AndroidTextInputProps.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp index c3907cd9a70d4f..54329d635e7d31 100644 --- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp +++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp @@ -332,7 +332,7 @@ folly::dynamic AndroidTextInputProps::getDynamic() const { props["textShadowOffset"] = toDynamic(textShadowOffset); props["lineHeight"] = lineHeight; props["textTransform"] = textTransform; - props["color"] = color; + props["color"] = toDynamic(color); props["letterSpacing"] = letterSpacing; props["fontSize"] = fontSize; props["textAlign"] = textAlign; diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.h b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.h index 18f0bcf4ac60a1..d102df19431346 100644 --- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.h +++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.h @@ -141,7 +141,7 @@ class AndroidTextInputProps final : public ViewProps, public BaseTextProps { const AndroidTextInputTextShadowOffsetStruct textShadowOffset{}; const Float lineHeight{0.0}; const std::string textTransform{}; - const int color{0}; + const SharedColor color{0}; const Float letterSpacing{0.0}; const Float fontSize{0.0}; const std::string textAlign{};