From d2888a7dea75b8837f7dc479ada960ef7e98ccac Mon Sep 17 00:00:00 2001
From: Sebastian Markbage <sema@fb.com>
Date: Thu, 17 Nov 2016 16:36:21 +0000
Subject: [PATCH] Get rid of server side support for <option />

We read the wrapper state during initial mount for server rendering support
but Fiber doesn't use it and we don't need it. We also can't because we
haven't yet completed the parent that has the selected.

I will need to remember to always insert children before setting the
selected value on the parent <select />. That way the DOM will deal with
the `selected` property of option properly.
---
 .../dom/fiber/wrappers/ReactDOMFiberOption.js | 51 +------------------
 .../dom/fiber/wrappers/ReactDOMFiberSelect.js |  6 ---
 2 files changed, 2 insertions(+), 55 deletions(-)

diff --git a/src/renderers/dom/fiber/wrappers/ReactDOMFiberOption.js b/src/renderers/dom/fiber/wrappers/ReactDOMFiberOption.js
index 32a6a7885d..43ec75db8a 100644
--- a/src/renderers/dom/fiber/wrappers/ReactDOMFiberOption.js
+++ b/src/renderers/dom/fiber/wrappers/ReactDOMFiberOption.js
@@ -16,7 +16,6 @@ import type { Fiber } from 'ReactFiber';
 
 var React = require('React');
 var ReactDOMComponentTree = require('ReactDOMComponentTree');
-var ReactDOMSelect = require('ReactDOMSelect');
 
 var warning = require('warning');
 var didWarnInvalidOptionChildren = false;
@@ -48,7 +47,7 @@ function flattenChildren(children) {
  * Implements an <option> host component that warns when `selected` is set.
  */
 var ReactDOMOption = {
-  mountWrapper: function(inst : Fiber, props : Object, hostParent : Fiber) {
+  mountWrapper: function(inst : Fiber, props : Object) {
     // TODO (yungsters): Remove support for `selected` in <option>.
     if (__DEV__) {
       warning(
@@ -57,46 +56,6 @@ var ReactDOMOption = {
         'setting `selected` on <option>.'
       );
     }
-
-    // Look up whether this option is 'selected'
-    var selectValue = null;
-    if (hostParent != null) {
-      var selectParent = hostParent;
-
-      if (selectParent._tag === 'optgroup') {
-        selectParent = selectParent._hostParent;
-      }
-
-      if (selectParent != null && selectParent._tag === 'select') {
-        selectValue = ReactDOMSelect.getSelectValueContext(selectParent);
-      }
-    }
-
-    // If the value is null (e.g., no specified value or after initial mount)
-    // or missing (e.g., for <datalist>), we don't change props.selected
-    var selected = null;
-    if (selectValue != null) {
-      var value;
-      if (props.value != null) {
-        value = props.value + '';
-      } else {
-        value = flattenChildren(props.children);
-      }
-      selected = false;
-      if (Array.isArray(selectValue)) {
-        // multiple
-        for (var i = 0; i < selectValue.length; i++) {
-          if ('' + selectValue[i] === value) {
-            selected = true;
-            break;
-          }
-        }
-      } else {
-        selected = ('' + selectValue === value);
-      }
-    }
-
-    inst._wrapperState = {selected: selected};
   },
 
   postMountWrapper: function(inst : Fiber, props : Object) {
@@ -108,13 +67,7 @@ var ReactDOMOption = {
   },
 
   getHostProps: function(inst : Fiber, props : Object) {
-    var hostProps = Object.assign({selected: undefined, children: undefined}, props);
-
-    // Read state only from initial mount because <select> updates value
-    // manually; we need the initial state only for server rendering
-    if (inst._wrapperState.selected != null) {
-      hostProps.selected = inst._wrapperState.selected;
-    }
+    var hostProps = Object.assign({children: undefined}, props);
 
     var content = flattenChildren(props.children);
 
diff --git a/src/renderers/dom/fiber/wrappers/ReactDOMFiberSelect.js b/src/renderers/dom/fiber/wrappers/ReactDOMFiberSelect.js
index 8df9af042b..a970755dc7 100644
--- a/src/renderers/dom/fiber/wrappers/ReactDOMFiberSelect.js
+++ b/src/renderers/dom/fiber/wrappers/ReactDOMFiberSelect.js
@@ -148,12 +148,6 @@ var ReactDOMSelect = {
     }
   },
 
-  getSelectValueContext: function(inst : Fiber) {
-    // ReactDOMOption looks at this initial value so the initial generated
-    // markup has correct `selected` attributes
-    return inst._wrapperState.initialValue;
-  },
-
   postUpdateWrapper: function(inst : Fiber, props : Object) {
     // After the initial mount, we control selected-ness manually so don't pass
     // this value down