From d29d972b3503600ca79149c14e0d763a67900e76 Mon Sep 17 00:00:00 2001
From: Baby Jesus <WreckedArrow@gmail.com>
Date: Sun, 12 Aug 2018 16:31:09 -0500
Subject: [PATCH 1/2] Fix TextField's disabled prop only affecting the Input
 component.

---
 packages/material-ui/src/TextField/TextField.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/material-ui/src/TextField/TextField.js b/packages/material-ui/src/TextField/TextField.js
index fd6bb10e1b0b61..dfad86282d8145 100644
--- a/packages/material-ui/src/TextField/TextField.js
+++ b/packages/material-ui/src/TextField/TextField.js
@@ -82,7 +82,6 @@ function TextField(props) {
       autoComplete={autoComplete}
       autoFocus={autoFocus}
       defaultValue={defaultValue}
-      disabled={disabled}
       fullWidth={fullWidth}
       multiline={multiline}
       name={name}
@@ -105,6 +104,7 @@ function TextField(props) {
     <FormControl
       aria-describedby={helperTextId}
       className={className}
+      disabled={disabled}
       error={error}
       fullWidth={fullWidth}
       required={required}

From 6b1fc19f5f69b5c348fe54244fbd9b523c46c251 Mon Sep 17 00:00:00 2001
From: Olivier Tassinari <olivier.tassinari@gmail.com>
Date: Mon, 13 Aug 2018 21:12:04 +0200
Subject: [PATCH 2/2] let's merge

---
 packages/material-ui/src/TextField/TextField.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/material-ui/src/TextField/TextField.js b/packages/material-ui/src/TextField/TextField.js
index dfad86282d8145..9df2722fd73083 100644
--- a/packages/material-ui/src/TextField/TextField.js
+++ b/packages/material-ui/src/TextField/TextField.js
@@ -44,7 +44,6 @@ function TextField(props) {
     children,
     className,
     defaultValue,
-    disabled,
     error,
     FormHelperTextProps,
     fullWidth,
@@ -104,7 +103,6 @@ function TextField(props) {
     <FormControl
       aria-describedby={helperTextId}
       className={className}
-      disabled={disabled}
       error={error}
       fullWidth={fullWidth}
       required={required}