Skip to content

Commit 73aa744

Browse files
authored
Remove now dead argument from resolveClassComponentProps (#33682)
No longer used after #33648
1 parent 602917c commit 73aa744

File tree

3 files changed

+3
-23
lines changed

3 files changed

+3
-23
lines changed

packages/react-reconciler/src/ReactFiberBeginWork.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2033,7 +2033,7 @@ function mountLazyComponent(
20332033

20342034
if (typeof Component === 'function') {
20352035
if (isFunctionClassComponent(Component)) {
2036-
const resolvedProps = resolveClassComponentProps(Component, props, false);
2036+
const resolvedProps = resolveClassComponentProps(Component, props);
20372037
workInProgress.tag = ClassComponent;
20382038
if (__DEV__) {
20392039
workInProgress.type = Component =
@@ -4134,7 +4134,6 @@ function beginWork(
41344134
const resolvedProps = resolveClassComponentProps(
41354135
Component,
41364136
unresolvedProps,
4137-
workInProgress.elementType === Component,
41384137
);
41394138
return updateClassComponent(
41404139
current,
@@ -4210,7 +4209,6 @@ function beginWork(
42104209
const resolvedProps = resolveClassComponentProps(
42114210
Component,
42124211
unresolvedProps,
4213-
workInProgress.elementType === Component,
42144212
);
42154213
return mountIncompleteClassComponent(
42164214
current,
@@ -4229,7 +4227,6 @@ function beginWork(
42294227
const resolvedProps = resolveClassComponentProps(
42304228
Component,
42314229
unresolvedProps,
4232-
workInProgress.elementType === Component,
42334230
);
42344231
return mountIncompleteFunctionComponent(
42354232
current,

packages/react-reconciler/src/ReactFiberClassComponent.js

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -858,11 +858,7 @@ function resumeMountClassInstance(
858858
const instance = workInProgress.stateNode;
859859

860860
const unresolvedOldProps = workInProgress.memoizedProps;
861-
const oldProps = resolveClassComponentProps(
862-
ctor,
863-
unresolvedOldProps,
864-
workInProgress.type === workInProgress.elementType,
865-
);
861+
const oldProps = resolveClassComponentProps(ctor, unresolvedOldProps);
866862
instance.props = oldProps;
867863

868864
const oldContext = instance.context;
@@ -1017,11 +1013,7 @@ function updateClassInstance(
10171013
cloneUpdateQueue(current, workInProgress);
10181014

10191015
const unresolvedOldProps = workInProgress.memoizedProps;
1020-
const oldProps = resolveClassComponentProps(
1021-
ctor,
1022-
unresolvedOldProps,
1023-
workInProgress.type === workInProgress.elementType,
1024-
);
1016+
const oldProps = resolveClassComponentProps(ctor, unresolvedOldProps);
10251017
instance.props = oldProps;
10261018
const unresolvedNewProps = workInProgress.pendingProps;
10271019

@@ -1192,12 +1184,6 @@ function updateClassInstance(
11921184
export function resolveClassComponentProps(
11931185
Component: any,
11941186
baseProps: Object,
1195-
// Only resolve default props if this is a lazy component. Otherwise, they
1196-
// would have already been resolved by the JSX runtime.
1197-
// TODO: We're going to remove default prop resolution from the JSX runtime
1198-
// and keep it only for class components. As part of that change, we should
1199-
// remove this extra check.
1200-
alreadyResolvedDefaultProps: boolean,
12011187
): Object {
12021188
let newProps = baseProps;
12031189

packages/react-reconciler/src/ReactFiberCommitEffects.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,6 @@ export function commitClassLayoutLifecycles(
410410
const prevProps = resolveClassComponentProps(
411411
finishedWork.type,
412412
current.memoizedProps,
413-
finishedWork.elementType === finishedWork.type,
414413
);
415414
const prevState = current.memoizedState;
416415
// We could update instance props and state here,
@@ -671,7 +670,6 @@ export function commitClassSnapshot(finishedWork: Fiber, current: Fiber) {
671670
const resolvedPrevProps = resolveClassComponentProps(
672671
finishedWork.type,
673672
prevProps,
674-
finishedWork.elementType === finishedWork.type,
675673
);
676674
let snapshot;
677675
if (__DEV__) {
@@ -716,7 +714,6 @@ export function safelyCallComponentWillUnmount(
716714
instance.props = resolveClassComponentProps(
717715
current.type,
718716
current.memoizedProps,
719-
current.elementType === current.type,
720717
);
721718
instance.state = current.memoizedState;
722719
if (shouldProfile(current)) {

0 commit comments

Comments
 (0)