@@ -80,6 +80,7 @@ import warnValidStyle from '../shared/warnValidStyle';
80
80
import { validateProperties as validateARIAProperties } from '../shared/ReactDOMInvalidARIAHook' ;
81
81
import { validateProperties as validateInputProperties } from '../shared/ReactDOMNullInputValuePropHook' ;
82
82
import { validateProperties as validateUnknownProperties } from '../shared/ReactDOMUnknownPropertyHook' ;
83
+ import assign from 'shared/assign' ;
83
84
import hasOwnProperty from 'shared/hasOwnProperty' ;
84
85
85
86
// Based on reading the React.Children implementation. TODO: type this somewhere?
@@ -563,7 +564,7 @@ function resolve(
563
564
}
564
565
565
566
if ( partialState != null ) {
566
- inst . state = Object . assign ( { } , inst . state , partialState ) ;
567
+ inst . state = assign ( { } , inst . state , partialState ) ;
567
568
}
568
569
}
569
570
} else {
@@ -695,9 +696,9 @@ function resolve(
695
696
if ( partialState != null ) {
696
697
if ( dontMutate ) {
697
698
dontMutate = false ;
698
- nextState = Object . assign ( { } , nextState , partialState ) ;
699
+ nextState = assign ( { } , nextState , partialState ) ;
699
700
} else {
700
- Object . assign ( nextState , partialState ) ;
701
+ assign ( nextState , partialState ) ;
701
702
}
702
703
}
703
704
}
@@ -745,7 +746,7 @@ function resolve(
745
746
}
746
747
}
747
748
if ( childContext ) {
748
- context = Object . assign ( { } , context , childContext ) ;
749
+ context = assign ( { } , context , childContext ) ;
749
750
}
750
751
}
751
752
}
@@ -1192,7 +1193,7 @@ class ReactDOMServerRenderer {
1192
1193
const nextChildren = [
1193
1194
React . createElement (
1194
1195
elementType . type ,
1195
- Object . assign ( { ref : element . ref } , element . props ) ,
1196
+ assign ( { ref : element . ref } , element . props ) ,
1196
1197
) ,
1197
1198
] ;
1198
1199
const frame : Frame = {
@@ -1291,7 +1292,7 @@ class ReactDOMServerRenderer {
1291
1292
const nextChildren = [
1292
1293
React . createElement (
1293
1294
result ,
1294
- Object . assign ( { ref : element . ref } , element . props ) ,
1295
+ assign ( { ref : element . ref } , element . props ) ,
1295
1296
) ,
1296
1297
] ;
1297
1298
const frame : Frame = {
@@ -1413,7 +1414,7 @@ class ReactDOMServerRenderer {
1413
1414
}
1414
1415
}
1415
1416
1416
- props = Object . assign (
1417
+ props = assign (
1417
1418
{
1418
1419
type : undefined ,
1419
1420
} ,
@@ -1485,7 +1486,7 @@ class ReactDOMServerRenderer {
1485
1486
if ( __DEV__ ) {
1486
1487
checkFormFieldValueStringCoercion ( initialValue ) ;
1487
1488
}
1488
- props = Object . assign ( { } , props , {
1489
+ props = assign ( { } , props , {
1489
1490
value : undefined ,
1490
1491
children : '' + initialValue ,
1491
1492
} ) ;
@@ -1531,7 +1532,7 @@ class ReactDOMServerRenderer {
1531
1532
}
1532
1533
this . currentSelectValue =
1533
1534
props . value != null ? props . value : props . defaultValue ;
1534
- props = Object . assign ( { } , props , {
1535
+ props = assign ( { } , props , {
1535
1536
value : undefined ,
1536
1537
} ) ;
1537
1538
} else if ( tag === 'option' ) {
@@ -1577,7 +1578,7 @@ class ReactDOMServerRenderer {
1577
1578
selected = '' + selectValue === value ;
1578
1579
}
1579
1580
1580
- props = Object . assign (
1581
+ props = assign (
1581
1582
{
1582
1583
selected : undefined ,
1583
1584
} ,
0 commit comments