@@ -80,6 +80,7 @@ import warnValidStyle from '../shared/warnValidStyle';
8080import { validateProperties as validateARIAProperties } from '../shared/ReactDOMInvalidARIAHook' ;
8181import { validateProperties as validateInputProperties } from '../shared/ReactDOMNullInputValuePropHook' ;
8282import { validateProperties as validateUnknownProperties } from '../shared/ReactDOMUnknownPropertyHook' ;
83+ import assign from 'shared/assign' ;
8384import hasOwnProperty from 'shared/hasOwnProperty' ;
8485
8586// Based on reading the React.Children implementation. TODO: type this somewhere?
@@ -563,7 +564,7 @@ function resolve(
563564 }
564565
565566 if ( partialState != null ) {
566- inst . state = Object . assign ( { } , inst . state , partialState ) ;
567+ inst . state = assign ( { } , inst . state , partialState ) ;
567568 }
568569 }
569570 } else {
@@ -695,9 +696,9 @@ function resolve(
695696 if ( partialState != null ) {
696697 if ( dontMutate ) {
697698 dontMutate = false ;
698- nextState = Object . assign ( { } , nextState , partialState ) ;
699+ nextState = assign ( { } , nextState , partialState ) ;
699700 } else {
700- Object . assign ( nextState , partialState ) ;
701+ assign ( nextState , partialState ) ;
701702 }
702703 }
703704 }
@@ -745,7 +746,7 @@ function resolve(
745746 }
746747 }
747748 if ( childContext ) {
748- context = Object . assign ( { } , context , childContext ) ;
749+ context = assign ( { } , context , childContext ) ;
749750 }
750751 }
751752 }
@@ -1192,7 +1193,7 @@ class ReactDOMServerRenderer {
11921193 const nextChildren = [
11931194 React . createElement (
11941195 elementType . type ,
1195- Object . assign ( { ref : element . ref } , element . props ) ,
1196+ assign ( { ref : element . ref } , element . props ) ,
11961197 ) ,
11971198 ] ;
11981199 const frame : Frame = {
@@ -1291,7 +1292,7 @@ class ReactDOMServerRenderer {
12911292 const nextChildren = [
12921293 React . createElement (
12931294 result ,
1294- Object . assign ( { ref : element . ref } , element . props ) ,
1295+ assign ( { ref : element . ref } , element . props ) ,
12951296 ) ,
12961297 ] ;
12971298 const frame : Frame = {
@@ -1413,7 +1414,7 @@ class ReactDOMServerRenderer {
14131414 }
14141415 }
14151416
1416- props = Object . assign (
1417+ props = assign (
14171418 {
14181419 type : undefined ,
14191420 } ,
@@ -1485,7 +1486,7 @@ class ReactDOMServerRenderer {
14851486 if ( __DEV__ ) {
14861487 checkFormFieldValueStringCoercion ( initialValue ) ;
14871488 }
1488- props = Object . assign ( { } , props , {
1489+ props = assign ( { } , props , {
14891490 value : undefined ,
14901491 children : '' + initialValue ,
14911492 } ) ;
@@ -1531,7 +1532,7 @@ class ReactDOMServerRenderer {
15311532 }
15321533 this . currentSelectValue =
15331534 props . value != null ? props . value : props . defaultValue ;
1534- props = Object . assign ( { } , props , {
1535+ props = assign ( { } , props , {
15351536 value : undefined ,
15361537 } ) ;
15371538 } else if ( tag === 'option' ) {
@@ -1577,7 +1578,7 @@ class ReactDOMServerRenderer {
15771578 selected = '' + selectValue === value ;
15781579 }
15791580
1580- props = Object . assign (
1581+ props = assign (
15811582 {
15821583 selected : undefined ,
15831584 } ,
0 commit comments