Remove now dead argument from resolveClassComponentProps (#33682)
No longer used after https://github.com/facebook/react/pull/33648
Jan Kassens committed
Jul 2, 2025 at 10:45 UTC
73aa744b7029556430f409ec3887a714940698ba
3 files changed
+3
-23
packages/react-reconciler/src/ReactFiberBeginWork.js
+1
-4
@@ -2033,7 +2033,7 @@ function mountLazyComponent(
2033
2034
if (typeof Component === 'function') {
2035
if (isFunctionClassComponent(Component)) {
2036
- const resolvedProps = resolveClassComponentProps(Component, props, false);
2036
+ const resolvedProps = resolveClassComponentProps(Component, props);
2037
workInProgress.tag = ClassComponent;
2038
if (__DEV__) {
2039
workInProgress.type = Component =
@@ -4134,7 +4134,6 @@ function beginWork(
4134
const resolvedProps = resolveClassComponentProps(
4135
Component,
4136
unresolvedProps,
4137
- workInProgress.elementType === Component,
4137
);
4138
return updateClassComponent(
4139
current,
@@ -4210,7 +4209,6 @@ function beginWork(
4209
const resolvedProps = resolveClassComponentProps(
4210
Component,
4211
unresolvedProps,
4213
- workInProgress.elementType === Component,
4212
);
4213
return mountIncompleteClassComponent(
4214
current,
@@ -4229,7 +4227,6 @@ function beginWork(
4227
const resolvedProps = resolveClassComponentProps(
4228
Component,
4229
unresolvedProps,
4232
- workInProgress.elementType === Component,
4230
);
4231
return mountIncompleteFunctionComponent(
4232
current,
packages/react-reconciler/src/ReactFiberClassComponent.js
+2
-16
@@ -858,11 +858,7 @@ function resumeMountClassInstance(
858
const instance = workInProgress.stateNode;
859
860
const unresolvedOldProps = workInProgress.memoizedProps;
861
- const oldProps = resolveClassComponentProps(
862
- ctor,
863
- unresolvedOldProps,
864
- workInProgress.type === workInProgress.elementType,
865
- );
861
+ const oldProps = resolveClassComponentProps(ctor, unresolvedOldProps);
862
instance.props = oldProps;
863
864
const oldContext = instance.context;
@@ -1017,11 +1013,7 @@ function updateClassInstance(
1013
cloneUpdateQueue(current, workInProgress);
1014
1015
const unresolvedOldProps = workInProgress.memoizedProps;
1020
- const oldProps = resolveClassComponentProps(
1021
- ctor,
1022
- unresolvedOldProps,
1023
- workInProgress.type === workInProgress.elementType,
1024
- );
1016
+ const oldProps = resolveClassComponentProps(ctor, unresolvedOldProps);
1017
instance.props = oldProps;
1018
const unresolvedNewProps = workInProgress.pendingProps;
1019
@@ -1192,12 +1184,6 @@ function updateClassInstance(
1184
export function resolveClassComponentProps(
1185
Component: any,
1186
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,
1187
): Object {
1188
let newProps = baseProps;
1189
packages/react-reconciler/src/ReactFiberCommitEffects.js
-3
@@ -410,7 +410,6 @@ export function commitClassLayoutLifecycles(
410
const prevProps = resolveClassComponentProps(
411
finishedWork.type,
412
current.memoizedProps,
413
- finishedWork.elementType === finishedWork.type,
413
);
414
const prevState = current.memoizedState;
415
// We could update instance props and state here,
@@ -671,7 +670,6 @@ export function commitClassSnapshot(finishedWork: Fiber, current: Fiber) {
670
const resolvedPrevProps = resolveClassComponentProps(
671
finishedWork.type,
672
prevProps,
674
- finishedWork.elementType === finishedWork.type,
673
);
674
let snapshot;
675
if (__DEV__) {
@@ -716,7 +714,6 @@ export function safelyCallComponentWillUnmount(
714
instance.props = resolveClassComponentProps(
715
current.type,
716
current.memoizedProps,
719
- current.elementType === current.type,
717
);
718
instance.state = current.memoizedState;
719
if (shouldProfile(current)) {