From b5327dd388239ce94bb9c91b9c8d816e12793acc Mon Sep 17 00:00:00 2001
From: "Andrew Y. Chen" <ayc@fb.com>
Date: Thu, 6 Apr 2017 21:21:45 -0700
Subject: [PATCH] Set the enabled state on disabled button views

Reviewed By: AaaChiuuu

Differential Revision: D4722513

fbshipit-source-id: f4a4e6304594235b5da4e5be36358331e43bdbee
---
 Libraries/Components/Button.js                              | 2 +-
 .../__tests__/__snapshots__/TouchableHighlight-test.js.snap | 1 +
 Libraries/Text/Text.js                                      | 6 ++++++
 .../com/facebook/react/views/text/ReactTextViewManager.java | 5 +++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Libraries/Components/Button.js b/Libraries/Components/Button.js
index 8c0fd50429c..eea0b1ffcd2 100644
--- a/Libraries/Components/Button.js
+++ b/Libraries/Components/Button.js
@@ -124,7 +124,7 @@ class Button extends React.Component {
         disabled={disabled}
         onPress={onPress}>
         <View style={buttonStyles}>
-          <Text style={textStyles}>{formattedTitle}</Text>
+          <Text style={textStyles} disabled={disabled}>{formattedTitle}</Text>
         </View>
       </Touchable>
     );
diff --git a/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableHighlight-test.js.snap b/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableHighlight-test.js.snap
index a24b4c1521c..29f7478ffaf 100644
--- a/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableHighlight-test.js.snap
+++ b/Libraries/Components/Touchable/__tests__/__snapshots__/TouchableHighlight-test.js.snap
@@ -30,6 +30,7 @@ exports[`TouchableHighlight renders correctly 1`] = `
   <Text
     accessible={true}
     allowFontScaling={true}
+    disabled={false}
     ellipsizeMode="tail"
   >
     Touchable
diff --git a/Libraries/Text/Text.js b/Libraries/Text/Text.js
index db3a22e878e..2401589e9b0 100644
--- a/Libraries/Text/Text.js
+++ b/Libraries/Text/Text.js
@@ -202,12 +202,18 @@ const Text = React.createClass({
      * @platform ios
      */
     minimumFontScale: PropTypes.number,
+    /**
+     * Specifies the disabled state of the text view for testing purposes
+     * @platform android
+     */
+    disabled: PropTypes.bool,
   },
   getDefaultProps(): Object {
     return {
       accessible: true,
       allowFontScaling: true,
       ellipsizeMode: 'tail',
+      disabled: false,
     };
   },
   getInitialState: function(): Object {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java
index 09515a8fee2..77591a8153d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java
@@ -157,6 +157,11 @@ public class ReactTextViewManager extends BaseViewManager<ReactTextView, ReactTe
     view.setIncludeFontPadding(includepad);
   }
 
+  @ReactProp(name = "disabled", defaultBoolean = false)
+  public void setDisabled(ReactTextView view, boolean disabled) {
+    view.setEnabled(!disabled);
+  }
+
   @Override
   public void updateExtraData(ReactTextView view, Object extraData) {
     ReactTextUpdate update = (ReactTextUpdate) extraData;