Cleanup disableDefaultPropsExceptForClasses flag

Author: kassens

packages/react-debug-tools/src/__tests__/ReactHooksInspectionIntegration-test.js

@@ -14,7 +14,6 @@ let React;
 let ReactTestRenderer;
 let ReactDebugTools;
 let act;
-let assertConsoleErrorDev;
 let useMemoCache;
 
 function normalizeSourceLoc(tree) {
@@ -34,7 +33,7 @@ describe('ReactHooksInspectionIntegration', () => {
     jest.resetModules();
     React = require('react');
     ReactTestRenderer = require('react-test-renderer');
-    ({act, assertConsoleErrorDev} = require('internal-test-utils'));
+    ({act} = require('internal-test-utils'));
     ReactDebugTools = require('react-debug-tools');
     useMemoCache = require('react/compiler-runtime').c;
   });
@@ -2321,57 +2320,6 @@ describe('ReactHooksInspectionIntegration', () => {
     });
   });
 
-  // @gate !disableDefaultPropsExceptForClasses
-  it('should support defaultProps and lazy', async () => {
-    const Suspense = React.Suspense;
-
-    function Foo(props) {
-      const [value] = React.useState(props.defaultValue.slice(0, 3));
-      return <div>{value}</div>;
-    }
-    Foo.defaultProps = {
-      defaultValue: 'default',
-    };
-
-    async function fakeImport(result) {
-      return {default: result};
-    }
-
-    const LazyFoo = React.lazy(() => fakeImport(Foo));
-
-    const renderer = ReactTestRenderer.create(
-      <Suspense fallback="Loading...">
-        <LazyFoo />
-      </Suspense>,
-    );
-
-    await act(async () => await LazyFoo);
-    assertConsoleErrorDev([
-      'Foo: Support for defaultProps will be removed from function components in a future major release. Use JavaScript default parameters instead.',
-    ]);
-
-    const childFiber = renderer.root._currentFiber();
-    const tree = ReactDebugTools.inspectHooksOfFiber(childFiber);
-    expect(normalizeSourceLoc(tree)).toMatchInlineSnapshot(`
-      [
-        {
-          "debugInfo": null,
-          "hookSource": {
-            "columnNumber": 0,
-            "fileName": "**",
-            "functionName": "Foo",
-            "lineNumber": 0,
-          },
-          "id": 0,
-          "isStateEditable": true,
-          "name": "State",
-          "subHooks": [],
-          "value": "def",
-        },
-      ]
-    `);
-  });
-
   // This test case is based on an open source bug report:
   // https://github.com/facebookincubator/redux-react-hook/issues/34#issuecomment-466693787
   it('should properly advance the current hook for useContext', async () => {

packages/react-dom/src/__tests__/ReactDeprecationWarnings-test.js

@@ -205,27 +205,6 @@ describe('ReactFunctionComponent', () => {
     ]);
   });
 
-  // @gate !disableDefaultPropsExceptForClasses
-  it('should support default props', async () => {
-    function Child(props) {
-      return <div>{props.test}</div>;
-    }
-    Child.defaultProps = {test: 2};
-
-    const container = document.createElement('div');
-    const root = ReactDOMClient.createRoot(container);
-
-    await act(() => {
-      root.render(<Child />);
-    });
-    expect(container.textContent).toBe('2');
-    assertConsoleErrorDev([
-      'Child: Support for defaultProps will be removed from function components in a future major release. ' +
-        'Use JavaScript default parameters instead.\n' +
-        '    in Child (at **)',
-    ]);
-  });
-
   // @gate !disableLegacyContext && !disableLegacyContextForFunctionComponents
   it('should receive context', async () => {
     class Parent extends React.Component {

packages/react-dom/src/__tests__/ReactFunctionComponent-test.js

@@ -117,7 +117,6 @@ import {
   enableCPUSuspense,
   enablePostpone,
   disableLegacyMode,
-  disableDefaultPropsExceptForClasses,
   enableHydrationLaneScheduling,
   enableViewTransition,
   enableFragmentRefs,
@@ -258,7 +257,6 @@ import {
   updateClassInstance,
   resolveClassComponentProps,
 } from './ReactFiberClassComponent';
-import {resolveDefaultPropsOnNonClassComponent} from './ReactFiberLazyComponent';
 import {
   createFiberFromTypeAndProps,
   createFiberFromFragment,
@@ -327,7 +325,6 @@ let didWarnAboutGetDerivedStateOnFunctionComponent;
 export let didWarnAboutReassigningProps: boolean;
 let didWarnAboutRevealOrder;
 let didWarnAboutTailOptions;
-let didWarnAboutDefaultPropsOnFunctionComponent;
 let didWarnAboutClassNameOnViewTransition;
 
 if (__DEV__) {
@@ -338,7 +335,6 @@ if (__DEV__) {
   didWarnAboutReassigningProps = false;
   didWarnAboutRevealOrder = ({}: {[string]: boolean});
   didWarnAboutTailOptions = ({}: {[string]: boolean});
-  didWarnAboutDefaultPropsOnFunctionComponent = ({}: {[string]: boolean});
   didWarnAboutClassNameOnViewTransition = ({}: {[string]: boolean});
 }
 
@@ -482,13 +478,7 @@ function updateMemoComponent(
 ): null | Fiber {
   if (current === null) {
     const type = Component.type;
-    if (
-      isSimpleFunctionComponent(type) &&
-      Component.compare === null &&
-      // SimpleMemoComponent codepath doesn't resolve outer props either.
-      (disableDefaultPropsExceptForClasses ||
-        Component.defaultProps === undefined)
-    ) {
+    if (isSimpleFunctionComponent(type) && Component.compare === null) {
       let resolvedType = type;
       if (__DEV__) {
         resolvedType = resolveFunctionForHotReloading(type);
@@ -509,21 +499,6 @@ function updateMemoComponent(
         renderLanes,
       );
     }
-    if (!disableDefaultPropsExceptForClasses) {
-      if (__DEV__) {
-        if (Component.defaultProps !== undefined) {
-          const componentName = getComponentNameFromType(type) || 'Unknown';
-          if (!didWarnAboutDefaultPropsOnFunctionComponent[componentName]) {
-            console.error(
-              '%s: Support for defaultProps will be removed from memo components ' +
-                'in a future major release. Use JavaScript default parameters instead.',
-              componentName,
-            );
-            didWarnAboutDefaultPropsOnFunctionComponent[componentName] = true;
-          }
-        }
-      }
-    }
     const child = createFiberFromTypeAndProps(
       Component.type,
       null,
@@ -1495,7 +1470,6 @@ function updateFunctionComponent(
 export function replayFunctionComponent(
   current: Fiber | null,
   workInProgress: Fiber,
-  nextProps: any,
   Component: any,
   secondArg: any,
   renderLanes: Lanes,
@@ -1512,7 +1486,7 @@ export function replayFunctionComponent(
     current,
     workInProgress,
     Component,
-    nextProps,
+    workInProgress.pendingProps,
     secondArg,
   );
   const hasId = checkDidRenderIdHook();
@@ -2072,9 +2046,6 @@ function mountLazyComponent(
         renderLanes,
       );
     } else {
-      const resolvedProps = disableDefaultPropsExceptForClasses
-        ? props
-        : resolveDefaultPropsOnNonClassComponent(Component, props);
       workInProgress.tag = FunctionComponent;
       if (__DEV__) {
         validateFunctionComponentInDev(workInProgress, Component);
@@ -2085,16 +2056,13 @@ function mountLazyComponent(
         null,
         workInProgress,
         Component,
-        resolvedProps,
+        props,
         renderLanes,
       );
     }
   } else if (Component !== undefined && Component !== null) {
     const $$typeof = Component.$$typeof;
     if ($$typeof === REACT_FORWARD_REF_TYPE) {
-      const resolvedProps = disableDefaultPropsExceptForClasses
-        ? props
-        : resolveDefaultPropsOnNonClassComponent(Component, props);
       workInProgress.tag = ForwardRef;
       if (__DEV__) {
         workInProgress.type = Component =
@@ -2104,24 +2072,16 @@ function mountLazyComponent(
         null,
         workInProgress,
         Component,
-        resolvedProps,
+        props,
         renderLanes,
       );
     } else if ($$typeof === REACT_MEMO_TYPE) {
-      const resolvedProps = disableDefaultPropsExceptForClasses
-        ? props
-        : resolveDefaultPropsOnNonClassComponent(Component, props);
       workInProgress.tag = MemoComponent;
       return updateMemoComponent(
         null,
         workInProgress,
         Component,
-        disableDefaultPropsExceptForClasses
-          ? resolvedProps
-          : resolveDefaultPropsOnNonClassComponent(
-              Component.type,
-              resolvedProps,
-            ), // The inner type can have defaults too
+        props,
         renderLanes,
       );
     }
@@ -2198,22 +2158,6 @@ function validateFunctionComponentInDev(workInProgress: Fiber, Component: any) {
       );
     }
 
-    if (
-      !disableDefaultPropsExceptForClasses &&
-      Component.defaultProps !== undefined
-    ) {
-      const componentName = getComponentNameFromType(Component) || 'Unknown';
-
-      if (!didWarnAboutDefaultPropsOnFunctionComponent[componentName]) {
-        console.error(
-          '%s: Support for defaultProps will be removed from function components ' +
-            'in a future major release. Use JavaScript default parameters instead.',
-          componentName,
-        );
-        didWarnAboutDefaultPropsOnFunctionComponent[componentName] = true;
-      }
-    }
-
     if (typeof Component.getDerivedStateFromProps === 'function') {
       const componentName = getComponentNameFromType(Component) || 'Unknown';
 
@@ -4176,11 +4120,7 @@ function beginWork(
     case FunctionComponent: {
       const Component = workInProgress.type;
       const unresolvedProps = workInProgress.pendingProps;
-      const resolvedProps =
-        disableDefaultPropsExceptForClasses ||
-        workInProgress.elementType === Component
-          ? unresolvedProps
-          : resolveDefaultPropsOnNonClassComponent(Component, unresolvedProps);
+      const resolvedProps = unresolvedProps;
       return updateFunctionComponent(
         current,
         workInProgress,
@@ -4226,18 +4166,11 @@ function beginWork(
     case HostPortal:
       return updatePortalComponent(current, workInProgress, renderLanes);
     case ForwardRef: {
-      const type = workInProgress.type;
-      const unresolvedProps = workInProgress.pendingProps;
-      const resolvedProps =
-        disableDefaultPropsExceptForClasses ||
-        workInProgress.elementType === type
-          ? unresolvedProps
-          : resolveDefaultPropsOnNonClassComponent(type, unresolvedProps);
       return updateForwardRef(
         current,
         workInProgress,
-        type,
-        resolvedProps,
+        workInProgress.type,
+        workInProgress.pendingProps,
         renderLanes,
       );
     }
@@ -4252,20 +4185,11 @@ function beginWork(
     case ContextConsumer:
       return updateContextConsumer(current, workInProgress, renderLanes);
     case MemoComponent: {
-      const type = workInProgress.type;
-      const unresolvedProps = workInProgress.pendingProps;
-      // Resolve outer props first, then resolve inner props.
-      let resolvedProps = disableDefaultPropsExceptForClasses
-        ? unresolvedProps
-        : resolveDefaultPropsOnNonClassComponent(type, unresolvedProps);
-      resolvedProps = disableDefaultPropsExceptForClasses
-        ? resolvedProps
-        : resolveDefaultPropsOnNonClassComponent(type.type, resolvedProps);
       return updateMemoComponent(
         current,
         workInProgress,
-        type,
-        resolvedProps,
+        workInProgress.type,
+        workInProgress.pendingProps,
         renderLanes,
       );
     }