From be5b2c7e96b8973bf922c369d7f8bb76ef250d90 Mon Sep 17 00:00:00 2001
From: Adrian Carolli <adrian.carolli1@gmail.com>
Date: Sat, 9 Dec 2017 14:28:49 -0500
Subject: [PATCH 1/5] Deduplication of warn selected on option

- Wrote a failing test
- Deduplication when selected is set on option
---
 .../src/__tests__/ReactDOMSelect-test.js      | 19 +++++++++++++++++++
 .../src/client/ReactDOMFiberOption.js         |  5 ++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMSelect-test.js b/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
index c3c7de9a93f..525aa2ba81a 100644
--- a/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
@@ -556,6 +556,25 @@ describe('ReactDOMSelect', () => {
       expect(console.error.calls.count()).toBe(1);
     }
   });
+  
+  it('should warn if selected is set on <option>', () => {
+    spyOnDev(console, 'error');
+  
+    ReactTestUtils.renderIntoDocument(
+      <select>
+        <option selected={true} />
+        <option selected={true} />
+      </select>,
+    );
+    if (__DEV__) {
+      expect(console.error.calls.argsFor(0)[0]).toContain(
+        'Use the `defaultValue` or `value` props on <select> instead of ' +
+          'setting `selected` on <option>.',
+      );
+      // Test deduplication
+      expect(console.error.calls.count()).toBe(1);
+    }
+  });
 
   it('should warn if value is null and multiple is true', () => {
     spyOnDev(console, 'error');
diff --git a/packages/react-dom/src/client/ReactDOMFiberOption.js b/packages/react-dom/src/client/ReactDOMFiberOption.js
index 63151ad0d9d..e5780246de3 100644
--- a/packages/react-dom/src/client/ReactDOMFiberOption.js
+++ b/packages/react-dom/src/client/ReactDOMFiberOption.js
@@ -10,6 +10,8 @@
 import React from 'react';
 import warning from 'fbjs/lib/warning';
 
+let didWarnSelectedSetOnOption = false;
+
 function flattenChildren(children) {
   let content = '';
 
@@ -35,12 +37,13 @@ function flattenChildren(children) {
 
 export function validateProps(element: Element, props: Object) {
   // TODO (yungsters): Remove support for `selected` in <option>.
-  if (__DEV__) {
+  if (__DEV__ && !didWarnSelectedSetOnOption) {
     warning(
       props.selected == null,
       'Use the `defaultValue` or `value` props on <select> instead of ' +
         'setting `selected` on <option>.',
     );
+    didWarnSelectedSetOnOption = true;
   }
 }
 

From 0f1ad41db51d1418fad7739a29eaf23c221b70e3 Mon Sep 17 00:00:00 2001
From: Adrian Carolli <adrian.carolli1@gmail.com>
Date: Sat, 9 Dec 2017 14:35:26 -0500
Subject: [PATCH 2/5] Ran yarn preitter

---
 packages/react-dom/src/__tests__/ReactDOMSelect-test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMSelect-test.js b/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
index 525aa2ba81a..37de473e198 100644
--- a/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
@@ -556,10 +556,10 @@ describe('ReactDOMSelect', () => {
       expect(console.error.calls.count()).toBe(1);
     }
   });
-  
+
   it('should warn if selected is set on <option>', () => {
     spyOnDev(console, 'error');
-  
+
     ReactTestUtils.renderIntoDocument(
       <select>
         <option selected={true} />

From c5137d5f6aa4888d78731709a702749714ca591c Mon Sep 17 00:00:00 2001
From: Adrian Carolli <adrian.carolli1@gmail.com>
Date: Sat, 9 Dec 2017 16:29:46 -0500
Subject: [PATCH 3/5] Fixed PR request

- Moved dedupe test to above
- Moved && case to seperate if to seperate static and dynamic things
- Render'd component twice
---
 .../src/__tests__/ReactDOMSelect-test.js         | 13 +++++++++++--
 .../react-dom/src/client/ReactDOMFiberOption.js  | 16 +++++++++-------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMSelect-test.js b/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
index 37de473e198..76d4a1e0a3c 100644
--- a/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
@@ -560,6 +560,17 @@ describe('ReactDOMSelect', () => {
   it('should warn if selected is set on <option>', () => {
     spyOnDev(console, 'error');
 
+    ReactTestUtils.renderIntoDocument(
+      <select>
+        <option selected={true} />
+        <option selected={true} />
+      </select>,
+    );
+    if (__DEV__) {
+      // Test deduplication
+      expect(console.error.calls.count()).toBe(1);
+    }
+
     ReactTestUtils.renderIntoDocument(
       <select>
         <option selected={true} />
@@ -571,8 +582,6 @@ describe('ReactDOMSelect', () => {
         'Use the `defaultValue` or `value` props on <select> instead of ' +
           'setting `selected` on <option>.',
       );
-      // Test deduplication
-      expect(console.error.calls.count()).toBe(1);
     }
   });
 
diff --git a/packages/react-dom/src/client/ReactDOMFiberOption.js b/packages/react-dom/src/client/ReactDOMFiberOption.js
index e5780246de3..834733e7721 100644
--- a/packages/react-dom/src/client/ReactDOMFiberOption.js
+++ b/packages/react-dom/src/client/ReactDOMFiberOption.js
@@ -37,13 +37,15 @@ function flattenChildren(children) {
 
 export function validateProps(element: Element, props: Object) {
   // TODO (yungsters): Remove support for `selected` in <option>.
-  if (__DEV__ && !didWarnSelectedSetOnOption) {
-    warning(
-      props.selected == null,
-      'Use the `defaultValue` or `value` props on <select> instead of ' +
-        'setting `selected` on <option>.',
-    );
-    didWarnSelectedSetOnOption = true;
+  if (__DEV__) {
+    if (!didWarnSelectedSetOnOption) {
+      warning(
+        props.selected == null,
+        'Use the `defaultValue` or `value` props on <select> instead of ' +
+          'setting `selected` on <option>.',
+      );
+      didWarnSelectedSetOnOption = true;
+    }
   }
 }
 

From e3b5a2b70ad50bb4e1253d5f18a634c6444af168 Mon Sep 17 00:00:00 2001
From: Adrian Carolli <adrian.carolli1@gmail.com>
Date: Sat, 9 Dec 2017 17:41:03 -0500
Subject: [PATCH 4/5] Actually check for deduplication

---
 packages/react-dom/src/__tests__/ReactDOMSelect-test.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMSelect-test.js b/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
index 76d4a1e0a3c..c3edfe4a09f 100644
--- a/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
@@ -567,7 +567,6 @@ describe('ReactDOMSelect', () => {
       </select>,
     );
     if (__DEV__) {
-      // Test deduplication
       expect(console.error.calls.count()).toBe(1);
     }
 
@@ -582,6 +581,8 @@ describe('ReactDOMSelect', () => {
         'Use the `defaultValue` or `value` props on <select> instead of ' +
           'setting `selected` on <option>.',
       );
+      // Test deduplication
+      expect(console.error.calls.count()).toBe(1);
     }
   });
 

From 4ebcbfed39b55bafbffeb42adea2f0962df2785a Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Sat, 9 Dec 2017 22:45:47 +0000
Subject: [PATCH 5/5] Minor nits

---
 packages/react-dom/src/__tests__/ReactDOMSelect-test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMSelect-test.js b/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
index c3edfe4a09f..198e142d4b2 100644
--- a/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
@@ -540,6 +540,7 @@ describe('ReactDOMSelect', () => {
       </select>,
     );
     if (__DEV__) {
+      expect(console.error.calls.count()).toBe(1);
       expect(console.error.calls.argsFor(0)[0]).toContain(
         '`value` prop on `select` should not be null. ' +
           'Consider using an empty string to clear the component or `undefined` ' +
@@ -577,12 +578,11 @@ describe('ReactDOMSelect', () => {
       </select>,
     );
     if (__DEV__) {
+      expect(console.error.calls.count()).toBe(1);
       expect(console.error.calls.argsFor(0)[0]).toContain(
         'Use the `defaultValue` or `value` props on <select> instead of ' +
           'setting `selected` on <option>.',
       );
-      // Test deduplication
-      expect(console.error.calls.count()).toBe(1);
     }
   });