mirror of
https://github.com/facebook/react.git
synced 2026-11-18 20:15:56 +00:00
Do not fire getDerivedStateFromProps unless props or state have changed (#12802)
Fixes an oversight from #12600. getDerivedStateFromProps should fire if either props *or* state have changed, but not if *neither* have changed. This prevents a parent from re-rendering if a deep child receives an update.
This commit is contained in:
1 parent
0ba63aa141
commit
c5d3104fc0
2 files changed
+53
-21
No files matched your search
+20
-21
@@ -802,16 +802,6 @@ export default function(
|
||||
);
|
||||
newState = workInProgress.memoizedState;
|
||||
}
|
||||
|
||||
if (typeof getDerivedStateFromProps === 'function') {
|
||||
applyDerivedStateFromProps(
|
||||
workInProgress,
|
||||
getDerivedStateFromProps,
|
||||
newProps,
|
||||
);
|
||||
newState = workInProgress.memoizedState;
|
||||
}
|
||||
|
||||
if (
|
||||
oldProps === newProps &&
|
||||
oldState === newState &&
|
||||
@@ -829,6 +819,15 @@ export default function(
|
||||
return false;
|
||||
}
|
||||
|
||||
if (typeof getDerivedStateFromProps === 'function') {
|
||||
applyDerivedStateFromProps(
|
||||
workInProgress,
|
||||
getDerivedStateFromProps,
|
||||
newProps,
|
||||
);
|
||||
newState = workInProgress.memoizedState;
|
||||
}
|
||||
|
||||
const shouldUpdate = checkShouldComponentUpdate(
|
||||
workInProgress,
|
||||
oldProps,
|
||||
@@ -937,17 +936,6 @@ export default function(
|
||||
newState = workInProgress.memoizedState;
|
||||
}
|
||||
|
||||
if (typeof getDerivedStateFromProps === 'function') {
|
||||
if (fireGetDerivedStateFromPropsOnStateUpdates || oldProps !== newProps) {
|
||||
applyDerivedStateFromProps(
|
||||
workInProgress,
|
||||
getDerivedStateFromProps,
|
||||
newProps,
|
||||
);
|
||||
newState = workInProgress.memoizedState;
|
||||
}
|
||||
}
|
||||
|
||||
if (
|
||||
oldProps === newProps &&
|
||||
oldState === newState &&
|
||||
@@ -978,6 +966,17 @@ export default function(
|
||||
return false;
|
||||
}
|
||||
|
||||
if (typeof getDerivedStateFromProps === 'function') {
|
||||
if (fireGetDerivedStateFromPropsOnStateUpdates || oldProps !== newProps) {
|
||||
applyDerivedStateFromProps(
|
||||
workInProgress,
|
||||
getDerivedStateFromProps,
|
||||
newProps,
|
||||
);
|
||||
newState = workInProgress.memoizedState;
|
||||
}
|
||||
}
|
||||
|
||||
const shouldUpdate = checkShouldComponentUpdate(
|
||||
workInProgress,
|
||||
oldProps,
|
||||
|
||||
@@ -1464,6 +1464,39 @@ describe('ReactIncremental', () => {
|
||||
expect(instance.state).toEqual({foo: 'foo'});
|
||||
});
|
||||
|
||||
it('does not call getDerivedStateFromProps if neither state nor props have changed', () => {
|
||||
class Parent extends React.Component {
|
||||
state = {parentRenders: 0};
|
||||
static getDerivedStateFromProps(props, prevState) {
|
||||
ReactNoop.yield('getDerivedStateFromProps');
|
||||
return prevState.parentRenders + 1;
|
||||
}
|
||||
render() {
|
||||
ReactNoop.yield('Parent');
|
||||
return <Child parentRenders={this.state.parentRenders} ref={child} />;
|
||||
}
|
||||
}
|
||||
|
||||
class Child extends React.Component {
|
||||
render() {
|
||||
ReactNoop.yield('Child');
|
||||
return this.props.parentRenders;
|
||||
}
|
||||
}
|
||||
|
||||
const child = React.createRef(null);
|
||||
ReactNoop.render(<Parent />);
|
||||
expect(ReactNoop.flush()).toEqual([
|
||||
'getDerivedStateFromProps',
|
||||
'Parent',
|
||||
'Child',
|
||||
]);
|
||||
|
||||
// Schedule an update on the child. The parent should not re-render.
|
||||
child.current.setState({});
|
||||
expect(ReactNoop.flush()).toEqual(['Child']);
|
||||
});
|
||||
|
||||
it('does not call getDerivedStateFromProps for state-only updates if feature flag is disabled', () => {
|
||||
jest.resetModules();
|
||||
ReactFeatureFlags = require('shared/ReactFeatureFlags');
|
||||
|
||||
Reference in new issue
Block a user