Skip to content

[pull] master from facebook:master #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Aug 16, 2018
+0 −8
Merged

[pull] master from facebook:master #63

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions packages/react-dom/src/client/ReactDOMFiberSelect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import warning from 'shared/warning';

import ReactControlledValuePropTypes from '../shared/ReactControlledValuePropTypes';
import {getToStringValue, toString} from './ToStringValue';
import type {ToStringValue} from './ToStringValue';

let didWarnValueDefaultValue;

Expand All @@ -23,7 +22,6 @@ if (__DEV__) {

type SelectWithWrapperState = HTMLSelectElement & {
_wrapperState: {
initialValue: ?ToStringValue,
wasMultiple: boolean,
},
};
Expand Down Expand Up @@ -148,9 +146,7 @@ export function initWrapperState(element: Element, props: Object) {
checkSelectPropTypes(props);
}

const value = props.value;
node._wrapperState = {
initialValue: value != null ? value : props.defaultValue,
wasMultiple: !!props.multiple,
};

Expand Down Expand Up @@ -186,10 +182,6 @@ export function postMountWrapper(element: Element, props: Object) {

export function postUpdateWrapper(element: Element, props: Object) {
const node = ((element: any): SelectWithWrapperState);
// After the initial mount, we control selected-ness manually so don't pass
// this value down
node._wrapperState.initialValue = undefined;

const wasMultiple = node._wrapperState.wasMultiple;
node._wrapperState.wasMultiple = !!props.multiple;

Expand Down