{"patch":"diff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMTextarea-test.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMTextarea-test.js\nindex ac40d1e230..92d1142f5b 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMTextarea-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMTextarea-test.js\n@@ -19,6 +19,8 @@ describe('ReactDOMTextarea', () => {\n \n let renderTextarea;\n \n+ const ReactFeatureFlags = require('shared\/ReactFeatureFlags');\n+\n beforeEach(() => {\n jest.resetModules();\n \n@@ -287,23 +289,58 @@ describe('ReactDOMTextarea', () => {\n }\n });\n \n- it('should treat children like `defaultValue`', () => {\n- const container = document.createElement('div');\n- let stub =

giraffe<\/textarea>;\n-    let node;\n+  if (ReactFeatureFlags.disableTextareaChildren) {\n+    it('should ignore children content', () => {\n+      const container = document.createElement('div');\n+      let stub = <textarea>giraffe<\/textarea>;\n+      let node;\n \n-    expect(() => {\n-      node = renderTextarea(stub, container);\n-    }).toErrorDev(\n-      'Use the `defaultValue` or `value` props instead of setting children on <textarea>.',\n-    );\n+      expect(() => {\n+        node = renderTextarea(stub, container);\n+      }).toErrorDev(\n+        'Use the `defaultValue` or `value` props instead of setting children on <textarea>.',\n+      );\n+      expect(node.value).toBe('');\n+      \/\/ Changing children should do nothing, it functions like `defaultValue`.\n+      stub = ReactDOM.render(<textarea>gorilla<\/textarea>, container);\n+      expect(node.value).toEqual('');\n+    });\n+  }\n \n-    expect(node.value).toBe('giraffe');\n+  if (ReactFeatureFlags.disableTextareaChildren) {\n+    it('should receive defaultValue and still ignore children content', () => {\n+      let node;\n \n-    \/\/ Changing children should do nothing, it functions like `defaultValue`.\n-    stub = ReactDOM.render(<textarea>gorilla<\/textarea>, container);\n-    expect(node.value).toEqual('giraffe');\n-  });\n+      expect(() => {\n+        node = renderTextarea(\n+          <textarea defaultValue=\"dragon\">monkey<\/textarea>,\n+        );\n+      }).toErrorDev(\n+        'Use the `defaultValue` or `value` props instead of setting children on <textarea>.',\n+      );\n+      expect(node.value).toBe('dragon');\n+    });\n+  }\n+\n+  if (!ReactFeatureFlags.disableTextareaChildren) {\n+    it('should treat children like `defaultValue`', () => {\n+      const container = document.createElement('div');\n+      let stub = <textarea>giraffe<\/textarea>;\n+      let node;\n+\n+      expect(() => {\n+        node = renderTextarea(stub, container);\n+      }).toErrorDev(\n+        'Use the `defaultValue` or `value` props instead of setting children on <textarea>.',\n+      );\n+\n+      expect(node.value).toBe('giraffe');\n+\n+      \/\/ Changing children should do nothing, it functions like `defaultValue`.\n+      stub = ReactDOM.render(<textarea>gorilla<\/textarea>, container);\n+      expect(node.value).toEqual('giraffe');\n+    });\n+  }\n \n   it('should keep value when switching to uncontrolled element if not changed', () => {\n     const container = document.createElement('div');\n@@ -342,71 +379,120 @@ describe('ReactDOMTextarea', () => {\n     expect(node.value).toEqual('puppies');\n   });\n \n-  it('should allow numbers as children', () => {\n-    let node;\n-    expect(() => {\n-      node = renderTextarea(<textarea>{17}<\/textarea>);\n-    }).toErrorDev(\n-      'Use the `defaultValue` or `value` props instead of setting children on <textarea>.',\n-    );\n-    expect(node.value).toBe('17');\n-  });\n-\n-  it('should allow booleans as children', () => {\n-    let node;\n-    expect(() => {\n-      node = renderTextarea(<textarea>{false}<\/textarea>);\n-    }).toErrorDev(\n-      'Use the `defaultValue` or `value` props instead of setting children on <textarea>.',\n-    );\n-    expect(node.value).toBe('false');\n-  });\n-\n-  it('should allow objects as children', () => {\n-    const obj = {\n-      toString: function() {\n-        return 'sharkswithlasers';\n-      },\n-    };\n-    let node;\n-    expect(() => {\n-      node = renderTextarea(<textarea>{obj}<\/textarea>);\n-    }).toErrorDev(\n-      'Use the `defaultValue` or `value` props instead of setting children on <textarea>.',\n-    );\n-    expect(node.value).toBe('sharkswithlasers');\n-  });\n-\n-  it('should throw with multiple or invalid children', () => {\n-    expect(() => {\n-      expect(() =>\n-        ReactTestUtils.renderIntoDocument(\n-          <textarea>\n-            {'hello'}\n-            {'there'}\n-          <\/textarea>,\n-        ),\n-      ).toThrow('<textarea> can only have at most one child');\n-    }).toErrorDev(\n-      'Use the `defaultValue` or `value` props instead of setting children on <textarea>.',\n-    );\n+  if (ReactFeatureFlags.disableTextareaChildren) {\n+    it('should ignore numbers as children', () => {\n+      let node;\n+      expect(() => {\n+        node = renderTextarea(<textarea>{17}<\/textarea>);\n+      }).toErrorDev(\n+        'Use the `defaultValue` or `value` props instead of setting children on <textarea>.',\n+      );\n+      expect(node.value).toBe('');\n+    });\n+  }\n+\n+  if (!ReactFeatureFlags.disableTextareaChildren) {\n+    it('should allow numbers as children', () => {\n+      let node;\n+      expect(() => {\n+        node = renderTextarea(<textarea>{17}<\/textarea>);\n+      }).toErrorDev(\n+        'Use the `defaultValue` or `value` props instead of setting children on <textarea>.',\n+      );\n+      expect(node.value).toBe('17');\n+    });\n+  }\n+\n+  if (ReactFeatureFlags.disableTextareaChildren) {\n+    it('should ignore booleans as children', () => {\n+      let node;\n+      expect(() => {\n+        node = renderTextarea(<textarea>{false}<\/textarea>);\n+      }).toErrorDev(\n+        'Use the `defaultValue` or `value` props instead of setting children on <textarea>.',\n+      );\n+      expect(node.value).toBe('');\n+    });\n+  }\n+\n+  if (!ReactFeatureFlags.disableTextareaChildren) {\n+    it('should allow booleans as children', () => {\n+      let node;\n+      expect(() => {\n+        node = renderTextarea(<textarea>{false}<\/textarea>);\n+      }).toErrorDev(\n+        'Use the `defaultValue` or `value` props instead of setting children on <textarea>.',\n+      );\n+      expect(node.value).toBe('false');\n+    });\n+  }\n+\n+  if (ReactFeatureFlags.disableTextareaChildren) {\n+    it('should ignore objects as children', () => {\n+      const obj = {\n+        toString: function() {\n+          return 'sharkswithlasers';\n+        },\n+      };\n+      let node;\n+      expect(() => {\n+        node = renderTextarea(<textarea>{obj}<\/textarea>);\n+      }).toErrorDev(\n+        'Use the `defaultValue` or `value` props instead of setting children on <textarea>.',\n+      );\n+      expect(node.value).toBe('');\n+    });\n+  }\n+\n+  if (!ReactFeatureFlags.disableTextareaChildren) {\n+    it('should allow objects as children', () => {\n+      const obj = {\n+        toString: function() {\n+          return 'sharkswithlasers';\n+        },\n+      };\n+      let node;\n+      expect(() => {\n+        node = renderTextarea(<textarea>{obj}<\/textarea>);\n+      }).toErrorDev(\n+        'Use the `defaultValue` or `value` props instead of setting children on <textarea>.',\n+      );\n+      expect(node.value).toBe('sharkswithlasers');\n+    });\n+  }\n \n-    let node;\n-    expect(() => {\n-      expect(\n-        () =>\n-          (node = renderTextarea(\n+  if (!ReactFeatureFlags.disableTextareaChildren) {\n+    it('should throw with multiple or invalid children', () => {\n+      expect(() => {\n+        expect(() =>\n+          ReactTestUtils.renderIntoDocument(\n             <textarea>\n-              <strong \/>\n+              {'hello'}\n+              {'there'}\n             <\/textarea>,\n-          )),\n-      ).not.toThrow();\n-    }).toErrorDev(\n-      'Use the `defaultValue` or `value` props instead of setting children on <textarea>.',\n-    );\n+          ),\n+        ).toThrow('<textarea> can only have at most one child');\n+      }).toErrorDev(\n+        'Use the `defaultValue` or `value` props instead of setting children on <textarea>.',\n+      );\n \n-    expect(node.value).toBe('[object Object]');\n-  });\n+      let node;\n+      expect(() => {\n+        expect(\n+          () =>\n+            (node = renderTextarea(\n+              <textarea>\n+                <strong \/>\n+              <\/textarea>,\n+            )),\n+        ).not.toThrow();\n+      }).toErrorDev(\n+        'Use the `defaultValue` or `value` props instead of setting children on <textarea>.',\n+      );\n+\n+      expect(node.value).toBe('[object Object]');\n+    });\n+  }\n \n   it('should unmount', () => {\n     const container = document.createElement('div');\ndiff --git a\/packages\/react-dom\/src\/client\/ReactDOMTextarea.js b\/packages\/react-dom\/src\/client\/ReactDOMTextarea.js\nindex dc436d1b55..9c1505bac6 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOMTextarea.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOMTextarea.js\n@@ -14,6 +14,8 @@ import {getCurrentFiberOwnerNameInDevOrNull} from 'react-reconciler\/src\/ReactCur\n import {getToStringValue, toString} from '.\/ToStringValue';\n import type {ToStringValue} from '.\/ToStringValue';\n \n+import {disableTextareaChildren} from 'shared\/ReactFeatureFlags';\n+\n let didWarnValDefaultVal = false;\n \n type TextAreaWithWrapperState = HTMLTextAreaElement & {|\n@@ -85,9 +87,7 @@ export function initWrapperState(element: Element, props: Object) {\n \n   \/\/ Only bother fetching default value if we're going to use it\n   if (initialValue == null) {\n-    let defaultValue = props.defaultValue;\n-    \/\/ TODO (yungsters): Remove support for children content in <textarea>.\n-    let children = props.children;\n+    let {children, defaultValue} = props;\n     if (children != null) {\n       if (__DEV__) {\n         console.error(\n@@ -95,19 +95,21 @@ export function initWrapperState(element: Element, props: Object) {\n             'children on <textarea>.',\n         );\n       }\n-      invariant(\n-        defaultValue == null,\n-        'If you supply `defaultValue` on a <textarea>, do not pass children.',\n-      );\n-      if (Array.isArray(children)) {\n+      if (!disableTextareaChildren) {\n         invariant(\n-          children.length <= 1,\n-          '<textarea> can only have at most one child.',\n+          defaultValue == null,\n+          'If you supply `defaultValue` on a <textarea>, do not pass children.',\n         );\n-        children = children[0];\n+        if (Array.isArray(children)) {\n+          invariant(\n+            children.length <= 1,\n+            '<textarea> can only have at most one child.',\n+          );\n+          children = children[0];\n+        }\n+\n+        defaultValue = children;\n       }\n-\n-      defaultValue = children;\n     }\n     if (defaultValue == null) {\n       defaultValue = '';\ndiff --git a\/packages\/shared\/ReactFeatureFlags.js b\/packages\/shared\/ReactFeatureFlags.js\nindex 62feacf3d4..7a19c29ea8 100644\n--- a\/packages\/shared\/ReactFeatureFlags.js\n+++ b\/packages\/shared\/ReactFeatureFlags.js\n@@ -105,3 +105,6 @@ export const disableLegacyContext = false;\n \n \/\/ Disables React.createFactory\n export const disableCreateFactory = false;\n+\n+\/\/ Disables children for <textarea> elements\n+export const disableTextareaChildren = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js b\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\nindex 2c365a63e4..92790eb211 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\n@@ -46,6 +46,7 @@ export const disableSchedulerTimeoutBasedOnReactExpirationTime = false;\n export const enableTrainModelFix = false;\n export const enableTrustedTypesIntegration = false;\n export const disableCreateFactory = false;\n+export const disableTextareaChildren = false;\n \n \/\/ Only used in www builds.\n export function addUserTimingListener() {\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js b\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\nindex e1e4f6966f..9facb94125 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\n@@ -41,6 +41,7 @@ export const enableTrainModelFix = false;\n export const enableTrustedTypesIntegration = false;\n export const enableNativeTargetAsInstance = false;\n export const disableCreateFactory = false;\n+export const disableTextareaChildren = false;\n \n \/\/ Only used in www builds.\n export function addUserTimingListener() {\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.persistent.js b\/packages\/shared\/forks\/ReactFeatureFlags.persistent.js\nindex a96660ce96..53547ef390 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.persistent.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.persistent.js\n@@ -41,6 +41,7 @@ export const enableTrainModelFix = false;\n export const enableTrustedTypesIntegration = false;\n export const enableNativeTargetAsInstance = false;\n export const disableCreateFactory = false;\n+export const disableTextareaChildren = false;\n \n \/\/ Only used in www builds.\n export function addUserTimingListener() {\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\nindex 05bd491245..efb730ca7b 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\n@@ -41,6 +41,7 @@ export const enableTrainModelFix = false;\n export const enableTrustedTypesIntegration = false;\n export const enableNativeTargetAsInstance = false;\n export const disableCreateFactory = false;\n+export const disableTextareaChildren = false;\n \n \/\/ Only used in www builds.\n export function addUserTimingListener() {\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\nindex 18b6fa8438..7fb5145ea7 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\n@@ -39,6 +39,7 @@ export const enableTrainModelFix = false;\n export const enableTrustedTypesIntegration = false;\n export const enableNativeTargetAsInstance = false;\n export const disableCreateFactory = false;\n+export const disableTextareaChildren = false;\n \n \/\/ Only used in www builds.\n export function addUserTimingListener() {\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.www.js b\/packages\/shared\/forks\/ReactFeatureFlags.www.js\nindex 871f868ed9..1abc4719ca 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.www.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.www.js\n@@ -92,6 +92,8 @@ export const enableNativeTargetAsInstance = false;\n \n export const disableCreateFactory = false;\n \n+export const disableTextareaChildren = false;\n+\n \/\/ Flow magic to verify the exports of this file match the original version.\n \/\/ eslint-disable-next-line no-unused-vars\n type Check<_X, Y: _X, X: Y = _X> = null;\n","files":[{"path":"packages\/react-dom\/src\/__tests__\/ReactDOMTextarea-test.js","status":"M"},{"path":"packages\/react-dom\/src\/client\/ReactDOMTextarea.js","status":"M"},{"path":"packages\/shared\/ReactFeatureFlags.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.native-fb.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.native-oss.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.persistent.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.www.js","status":"M"}],"body":"","commit":{"shortRevision":"9fd760ce75","authorEmail":"trueadm@users.noreply.github.com","revision":"9fd760ce75fd76716888997852ca85394eeab49a","authoredAt":"2020-01-20T15:12:30+00:00","subject":"Add disable <textarea\/> children flag (#17874)","authorName":"Dominic Gannaway"},"parents":["a209a97ed742ced488d7edf4fc2dcbf316ba13cb"]}</article></body></html>

dillon1000/react

Files changed