From 287251a06a08f7338a0516b1648a25118a1c410b Mon Sep 17 00:00:00 2001
From: Nicolas Gallagher <nicolasgallagher@gmail.com>
Date: Sat, 21 Dec 2019 16:57:11 +0000
Subject: [PATCH] [change] Remove 'placeholderTextColor' from 'createElement'
 props

TextInput converts the 'placeholderTextColor' prop to a style.
---
 packages/react-native-web/src/exports/TextInput/index.js   | 7 ++++++-
 .../react-native-web/src/modules/createDOMProps/index.js   | 6 +-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/react-native-web/src/exports/TextInput/index.js b/packages/react-native-web/src/exports/TextInput/index.js
index 72056122..78d2cec0 100644
--- a/packages/react-native-web/src/exports/TextInput/index.js
+++ b/packages/react-native-web/src/exports/TextInput/index.js
@@ -18,6 +18,7 @@ import css from '../StyleSheet/css';
 import filterSupportedProps from '../View/filterSupportedProps';
 import findNodeHandle from '../findNodeHandle';
 import React from 'react';
+import StyleSheet from '../StyleSheet';
 import TextInputState from '../../modules/TextInputState';
 
 const isAndroid = canUseDOM && /Android/i.test(navigator && navigator.userAgent);
@@ -111,6 +112,7 @@ class TextInput extends React.Component<TextInputProps> {
       returnKeyType,
       secureTextEntry = false,
       spellCheck,
+      style,
       value
     } = this.props;
 
@@ -163,10 +165,13 @@ class TextInput extends React.Component<TextInputProps> {
       onKeyPress: this._handleKeyPress,
       onSelect: normalizeEventHandler(this._handleSelectionChange),
       placeholder,
-      placeholderTextColor,
       readOnly: !editable,
       ref: this._setNode,
       spellCheck: spellCheck != null ? spellCheck : autoCorrect,
+      style: StyleSheet.compose(
+        style,
+        placeholderTextColor && { placeholderTextColor }
+      ),
       value
     });
 
diff --git a/packages/react-native-web/src/modules/createDOMProps/index.js b/packages/react-native-web/src/modules/createDOMProps/index.js
index 129320ec..2e0980dd 100644
--- a/packages/react-native-web/src/modules/createDOMProps/index.js
+++ b/packages/react-native-web/src/modules/createDOMProps/index.js
@@ -70,7 +70,6 @@ const createDOMProps = (component, props, styleResolver) => {
     disabled: providedDisabled,
     importantForAccessibility,
     nativeID,
-    placeholderTextColor,
     pointerEvents,
     style: providedStyle,
     testID,
@@ -171,10 +170,7 @@ const createDOMProps = (component, props, styleResolver) => {
   // STYLE
   const reactNativeStyle = StyleSheet.compose(
     pointerEvents && pointerEventsStyles[pointerEvents],
-    StyleSheet.compose(
-      providedStyle,
-      placeholderTextColor && { placeholderTextColor }
-    )
+    providedStyle
   );
 
   // Additional style resets for interactive elements