From adf5a323bca62365358ad732f62348b34ede77ae Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 1 Apr 2020 21:52:43 +0100
Subject: [PATCH 1/2] Revert "Fix email cursor jump (#18379)"

This reverts commit 9b88b78b3d61e8fe81968d59b74592d5a53540b7.
---
 fixtures/dom/src/components/Header.js         |  1 -
 .../EmailDisabledAttributesTestCase.js        | 39 -----------
 .../EmailEnabledAttributesTestCase.js         | 48 -------------
 .../email-inputs/JumpingCursorTestCase.js     | 39 -----------
 .../components/fixtures/email-inputs/index.js | 68 -------------------
 .../react-dom/src/client/ReactDOMInput.js     |  4 +-
 .../react-dom/src/events/ChangeEventPlugin.js |  8 +--
 7 files changed, 4 insertions(+), 203 deletions(-)
 delete mode 100644 fixtures/dom/src/components/fixtures/email-inputs/EmailDisabledAttributesTestCase.js
 delete mode 100644 fixtures/dom/src/components/fixtures/email-inputs/EmailEnabledAttributesTestCase.js
 delete mode 100644 fixtures/dom/src/components/fixtures/email-inputs/JumpingCursorTestCase.js
 delete mode 100644 fixtures/dom/src/components/fixtures/email-inputs/index.js

diff --git a/fixtures/dom/src/components/Header.js b/fixtures/dom/src/components/Header.js
index c2a8c8d9450..77c1ecfc30d 100644
--- a/fixtures/dom/src/components/Header.js
+++ b/fixtures/dom/src/components/Header.js
@@ -71,7 +71,6 @@ class Header extends React.Component {
                 <option value="/text-inputs">Text Inputs</option>
                 <option value="/number-inputs">Number Input</option>
                 <option value="/password-inputs">Password Input</option>
-                <option value="/email-inputs">Email Input</option>
                 <option value="/selects">Selects</option>
                 <option value="/textareas">Textareas</option>
                 <option value="/input-change-events">
diff --git a/fixtures/dom/src/components/fixtures/email-inputs/EmailDisabledAttributesTestCase.js b/fixtures/dom/src/components/fixtures/email-inputs/EmailDisabledAttributesTestCase.js
deleted file mode 100644
index a844578550e..00000000000
--- a/fixtures/dom/src/components/fixtures/email-inputs/EmailDisabledAttributesTestCase.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import Fixture from '../../Fixture';
-
-const React = window.React;
-
-class EmailDisabledAttributesTestCase extends React.Component {
-  state = {value: 'a@fb.com'};
-  onChange = event => {
-    this.setState({value: event.target.value});
-  };
-  render() {
-    return (
-      <Fixture>
-        <div>{this.props.children}</div>
-
-        <div className="control-box">
-          <fieldset>
-            <legend>Controlled</legend>
-            <input
-              type="email"
-              value={this.state.value}
-              onChange={this.onChange}
-            />
-            <span className="hint">
-              {' '}
-              Value: {JSON.stringify(this.state.value)}
-            </span>
-          </fieldset>
-
-          <fieldset>
-            <legend>Uncontrolled</legend>
-            <input type="email" defaultValue="" />
-          </fieldset>
-        </div>
-      </Fixture>
-    );
-  }
-}
-
-export default EmailDisabledAttributesTestCase;
diff --git a/fixtures/dom/src/components/fixtures/email-inputs/EmailEnabledAttributesTestCase.js b/fixtures/dom/src/components/fixtures/email-inputs/EmailEnabledAttributesTestCase.js
deleted file mode 100644
index e5448a2b9b9..00000000000
--- a/fixtures/dom/src/components/fixtures/email-inputs/EmailEnabledAttributesTestCase.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import Fixture from '../../Fixture';
-
-const React = window.React;
-
-class EmailAttributesTestCase extends React.Component {
-  state = {value: 'a@fb.com'};
-  onChange = event => {
-    this.setState({value: event.target.value});
-  };
-  render() {
-    return (
-      <Fixture>
-        <div>{this.props.children}</div>
-
-        <div className="control-box">
-          <fieldset>
-            <legend>Controlled</legend>
-            <input
-              type="email"
-              pattern=".+@fb.com"
-              maxlength={17}
-              multiple={true}
-              value={this.state.value}
-              onChange={this.onChange}
-            />
-            <span className="hint">
-              {' '}
-              Value: {JSON.stringify(this.state.value)}
-            </span>
-          </fieldset>
-
-          <fieldset>
-            <legend>Uncontrolled</legend>
-            <input
-              type="email"
-              defaultValue=""
-              pattern=".+@fb.com"
-              maxlength={17}
-              multiple={true}
-            />
-          </fieldset>
-        </div>
-      </Fixture>
-    );
-  }
-}
-
-export default EmailAttributesTestCase;
diff --git a/fixtures/dom/src/components/fixtures/email-inputs/JumpingCursorTestCase.js b/fixtures/dom/src/components/fixtures/email-inputs/JumpingCursorTestCase.js
deleted file mode 100644
index e9565396744..00000000000
--- a/fixtures/dom/src/components/fixtures/email-inputs/JumpingCursorTestCase.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import Fixture from '../../Fixture';
-
-const React = window.React;
-
-class JumpingCursorTestCase extends React.Component {
-  state = {value: ''};
-  onChange = event => {
-    this.setState({value: event.target.value});
-  };
-  render() {
-    return (
-      <Fixture>
-        <div>{this.props.children}</div>
-
-        <div className="control-box">
-          <fieldset>
-            <legend>Controlled</legend>
-            <input
-              type="email"
-              value={this.state.value}
-              onChange={this.onChange}
-            />
-            <span className="hint">
-              {' '}
-              Value: {JSON.stringify(this.state.value)}
-            </span>
-          </fieldset>
-
-          <fieldset>
-            <legend>Uncontrolled</legend>
-            <input type="email" defaultValue="" />
-          </fieldset>
-        </div>
-      </Fixture>
-    );
-  }
-}
-
-export default JumpingCursorTestCase;
diff --git a/fixtures/dom/src/components/fixtures/email-inputs/index.js b/fixtures/dom/src/components/fixtures/email-inputs/index.js
deleted file mode 100644
index 1af9d2b2fa5..00000000000
--- a/fixtures/dom/src/components/fixtures/email-inputs/index.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import FixtureSet from '../../FixtureSet';
-import TestCase from '../../TestCase';
-import JumpingCursorTestCase from './JumpingCursorTestCase';
-import EmailEnabledAttributesTestCase from './EmailEnabledAttributesTestCase';
-import EmailDisabledAttributesTestCase from './EmailDisabledAttributesTestCase';
-
-const React = window.React;
-
-function EmailInputs() {
-  return (
-    <FixtureSet title="Email inputs">
-      <TestCase
-        title="Spaces in email inputs"
-        description={`
-          Some browsers are trying to remove spaces from email inputs and after
-          doing this place cursor to the beginning.
-        `}
-        affectedBrowsers="Chrome">
-        <TestCase.Steps>
-          <li>Type space and character</li>
-          <li>Type character, space, character, delete last character</li>
-        </TestCase.Steps>
-
-        <TestCase.ExpectedResult>Cursor not moving.</TestCase.ExpectedResult>
-
-        <JumpingCursorTestCase />
-      </TestCase>
-
-      <TestCase
-        title="Attributes enabled"
-        description={`
-          Test enabled pattern, maxlength, multiple attributes.
-        `}>
-        <TestCase.Steps>
-          <li>Type after existing text ',b@tt.com'</li>
-          <li>Try to type spaces after typed text</li>
-        </TestCase.Steps>
-
-        <TestCase.ExpectedResult>
-          Spaces not added. When cursor hovered over input, popup "Please match
-          the requested format." is showed.
-        </TestCase.ExpectedResult>
-
-        <EmailEnabledAttributesTestCase />
-      </TestCase>
-
-      <TestCase
-        title="Attributes disabled"
-        description={`
-          Test disabled maxlength, multiple attributes.
-        `}>
-        <TestCase.Steps>
-          <li>Type after existing text ',b@tt.com'</li>
-          <li>Try to type spaces after typed text</li>
-        </TestCase.Steps>
-
-        <TestCase.ExpectedResult>
-          Spaces are added freely. When cursor hovered over input, popup "A part
-          following '@' should not contain the symbol ','." is showed.
-        </TestCase.ExpectedResult>
-
-        <EmailDisabledAttributesTestCase />
-      </TestCase>
-    </FixtureSet>
-  );
-}
-
-export default EmailInputs;
diff --git a/packages/react-dom/src/client/ReactDOMInput.js b/packages/react-dom/src/client/ReactDOMInput.js
index 77b908112a3..884c2ad9dfe 100644
--- a/packages/react-dom/src/client/ReactDOMInput.js
+++ b/packages/react-dom/src/client/ReactDOMInput.js
@@ -410,8 +410,8 @@ export function setDefaultValue(
   value: *,
 ) {
   if (
-    // Focused number and email inputs synchronize on blur. See ChangeEventPlugin.js
-    (type !== 'number' && type !== 'email') ||
+    // Focused number inputs synchronize on blur. See ChangeEventPlugin.js
+    type !== 'number' ||
     node.ownerDocument.activeElement !== node
   ) {
     if (value == null) {
diff --git a/packages/react-dom/src/events/ChangeEventPlugin.js b/packages/react-dom/src/events/ChangeEventPlugin.js
index d1c8259cbb1..372af140fba 100644
--- a/packages/react-dom/src/events/ChangeEventPlugin.js
+++ b/packages/react-dom/src/events/ChangeEventPlugin.js
@@ -236,17 +236,13 @@ function getTargetInstForInputOrChangeEvent(topLevelType, targetInst) {
 function handleControlledInputBlur(node) {
   const state = node._wrapperState;
 
-  if (
-    !state ||
-    !state.controlled ||
-    (node.type !== 'number' && node.type !== 'email')
-  ) {
+  if (!state || !state.controlled || node.type !== 'number') {
     return;
   }
 
   if (!disableInputAttributeSyncing) {
     // If controlled, assign the value attribute to the current value on blur
-    setDefaultValue(node, node.type, node.value);
+    setDefaultValue(node, 'number', node.value);
   }
 }
 

From a144fc32fe2f7f607a26231b4b8e7f27c911ab4d Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@me.com>
Date: Wed, 1 Apr 2020 22:44:25 +0100
Subject: [PATCH 2/2] Leave fixtures be

---
 fixtures/dom/src/components/Header.js         |  1 +
 .../EmailDisabledAttributesTestCase.js        | 39 +++++++++++
 .../EmailEnabledAttributesTestCase.js         | 48 +++++++++++++
 .../email-inputs/JumpingCursorTestCase.js     | 39 +++++++++++
 .../components/fixtures/email-inputs/index.js | 68 +++++++++++++++++++
 5 files changed, 195 insertions(+)
 create mode 100644 fixtures/dom/src/components/fixtures/email-inputs/EmailDisabledAttributesTestCase.js
 create mode 100644 fixtures/dom/src/components/fixtures/email-inputs/EmailEnabledAttributesTestCase.js
 create mode 100644 fixtures/dom/src/components/fixtures/email-inputs/JumpingCursorTestCase.js
 create mode 100644 fixtures/dom/src/components/fixtures/email-inputs/index.js

diff --git a/fixtures/dom/src/components/Header.js b/fixtures/dom/src/components/Header.js
index 77c1ecfc30d..c2a8c8d9450 100644
--- a/fixtures/dom/src/components/Header.js
+++ b/fixtures/dom/src/components/Header.js
@@ -71,6 +71,7 @@ class Header extends React.Component {
                 <option value="/text-inputs">Text Inputs</option>
                 <option value="/number-inputs">Number Input</option>
                 <option value="/password-inputs">Password Input</option>
+                <option value="/email-inputs">Email Input</option>
                 <option value="/selects">Selects</option>
                 <option value="/textareas">Textareas</option>
                 <option value="/input-change-events">
diff --git a/fixtures/dom/src/components/fixtures/email-inputs/EmailDisabledAttributesTestCase.js b/fixtures/dom/src/components/fixtures/email-inputs/EmailDisabledAttributesTestCase.js
new file mode 100644
index 00000000000..a844578550e
--- /dev/null
+++ b/fixtures/dom/src/components/fixtures/email-inputs/EmailDisabledAttributesTestCase.js
@@ -0,0 +1,39 @@
+import Fixture from '../../Fixture';
+
+const React = window.React;
+
+class EmailDisabledAttributesTestCase extends React.Component {
+  state = {value: 'a@fb.com'};
+  onChange = event => {
+    this.setState({value: event.target.value});
+  };
+  render() {
+    return (
+      <Fixture>
+        <div>{this.props.children}</div>
+
+        <div className="control-box">
+          <fieldset>
+            <legend>Controlled</legend>
+            <input
+              type="email"
+              value={this.state.value}
+              onChange={this.onChange}
+            />
+            <span className="hint">
+              {' '}
+              Value: {JSON.stringify(this.state.value)}
+            </span>
+          </fieldset>
+
+          <fieldset>
+            <legend>Uncontrolled</legend>
+            <input type="email" defaultValue="" />
+          </fieldset>
+        </div>
+      </Fixture>
+    );
+  }
+}
+
+export default EmailDisabledAttributesTestCase;
diff --git a/fixtures/dom/src/components/fixtures/email-inputs/EmailEnabledAttributesTestCase.js b/fixtures/dom/src/components/fixtures/email-inputs/EmailEnabledAttributesTestCase.js
new file mode 100644
index 00000000000..e5448a2b9b9
--- /dev/null
+++ b/fixtures/dom/src/components/fixtures/email-inputs/EmailEnabledAttributesTestCase.js
@@ -0,0 +1,48 @@
+import Fixture from '../../Fixture';
+
+const React = window.React;
+
+class EmailAttributesTestCase extends React.Component {
+  state = {value: 'a@fb.com'};
+  onChange = event => {
+    this.setState({value: event.target.value});
+  };
+  render() {
+    return (
+      <Fixture>
+        <div>{this.props.children}</div>
+
+        <div className="control-box">
+          <fieldset>
+            <legend>Controlled</legend>
+            <input
+              type="email"
+              pattern=".+@fb.com"
+              maxlength={17}
+              multiple={true}
+              value={this.state.value}
+              onChange={this.onChange}
+            />
+            <span className="hint">
+              {' '}
+              Value: {JSON.stringify(this.state.value)}
+            </span>
+          </fieldset>
+
+          <fieldset>
+            <legend>Uncontrolled</legend>
+            <input
+              type="email"
+              defaultValue=""
+              pattern=".+@fb.com"
+              maxlength={17}
+              multiple={true}
+            />
+          </fieldset>
+        </div>
+      </Fixture>
+    );
+  }
+}
+
+export default EmailAttributesTestCase;
diff --git a/fixtures/dom/src/components/fixtures/email-inputs/JumpingCursorTestCase.js b/fixtures/dom/src/components/fixtures/email-inputs/JumpingCursorTestCase.js
new file mode 100644
index 00000000000..e9565396744
--- /dev/null
+++ b/fixtures/dom/src/components/fixtures/email-inputs/JumpingCursorTestCase.js
@@ -0,0 +1,39 @@
+import Fixture from '../../Fixture';
+
+const React = window.React;
+
+class JumpingCursorTestCase extends React.Component {
+  state = {value: ''};
+  onChange = event => {
+    this.setState({value: event.target.value});
+  };
+  render() {
+    return (
+      <Fixture>
+        <div>{this.props.children}</div>
+
+        <div className="control-box">
+          <fieldset>
+            <legend>Controlled</legend>
+            <input
+              type="email"
+              value={this.state.value}
+              onChange={this.onChange}
+            />
+            <span className="hint">
+              {' '}
+              Value: {JSON.stringify(this.state.value)}
+            </span>
+          </fieldset>
+
+          <fieldset>
+            <legend>Uncontrolled</legend>
+            <input type="email" defaultValue="" />
+          </fieldset>
+        </div>
+      </Fixture>
+    );
+  }
+}
+
+export default JumpingCursorTestCase;
diff --git a/fixtures/dom/src/components/fixtures/email-inputs/index.js b/fixtures/dom/src/components/fixtures/email-inputs/index.js
new file mode 100644
index 00000000000..1af9d2b2fa5
--- /dev/null
+++ b/fixtures/dom/src/components/fixtures/email-inputs/index.js
@@ -0,0 +1,68 @@
+import FixtureSet from '../../FixtureSet';
+import TestCase from '../../TestCase';
+import JumpingCursorTestCase from './JumpingCursorTestCase';
+import EmailEnabledAttributesTestCase from './EmailEnabledAttributesTestCase';
+import EmailDisabledAttributesTestCase from './EmailDisabledAttributesTestCase';
+
+const React = window.React;
+
+function EmailInputs() {
+  return (
+    <FixtureSet title="Email inputs">
+      <TestCase
+        title="Spaces in email inputs"
+        description={`
+          Some browsers are trying to remove spaces from email inputs and after
+          doing this place cursor to the beginning.
+        `}
+        affectedBrowsers="Chrome">
+        <TestCase.Steps>
+          <li>Type space and character</li>
+          <li>Type character, space, character, delete last character</li>
+        </TestCase.Steps>
+
+        <TestCase.ExpectedResult>Cursor not moving.</TestCase.ExpectedResult>
+
+        <JumpingCursorTestCase />
+      </TestCase>
+
+      <TestCase
+        title="Attributes enabled"
+        description={`
+          Test enabled pattern, maxlength, multiple attributes.
+        `}>
+        <TestCase.Steps>
+          <li>Type after existing text ',b@tt.com'</li>
+          <li>Try to type spaces after typed text</li>
+        </TestCase.Steps>
+
+        <TestCase.ExpectedResult>
+          Spaces not added. When cursor hovered over input, popup "Please match
+          the requested format." is showed.
+        </TestCase.ExpectedResult>
+
+        <EmailEnabledAttributesTestCase />
+      </TestCase>
+
+      <TestCase
+        title="Attributes disabled"
+        description={`
+          Test disabled maxlength, multiple attributes.
+        `}>
+        <TestCase.Steps>
+          <li>Type after existing text ',b@tt.com'</li>
+          <li>Try to type spaces after typed text</li>
+        </TestCase.Steps>
+
+        <TestCase.ExpectedResult>
+          Spaces are added freely. When cursor hovered over input, popup "A part
+          following '@' should not contain the symbol ','." is showed.
+        </TestCase.ExpectedResult>
+
+        <EmailDisabledAttributesTestCase />
+      </TestCase>
+    </FixtureSet>
+  );
+}
+
+export default EmailInputs;