[pull] main from facebook:main

fixtures/dom/src/components/fixtures/fragment-refs/ScrollIntoViewCase.js

@@ -55,11 +55,11 @@ export default function ScrollIntoViewCase() {
   const scrollContainerRef = useRef(null);
 
   const scrollVertical = () => {
-    fragmentRef.current.experimental_scrollIntoView(alignToTop);
+    fragmentRef.current.scrollIntoView(alignToTop);
   };
 
   const scrollVerticalNoChildren = () => {
-    noChildRef.current.experimental_scrollIntoView(alignToTop);
+    noChildRef.current.scrollIntoView(alignToTop);
   };
 
   useEffect(() => {

fixtures/view-transition/src/components/App.js

@@ -3,7 +3,7 @@ import React, {
   useLayoutEffect,
   useEffect,
   useState,
-  unstable_addTransitionType as addTransitionType,
+  addTransitionType,
 } from 'react';
 
 import Chrome from './Chrome.js';

fixtures/view-transition/src/components/Page.js

@@ -1,6 +1,6 @@
 import React, {
-  unstable_addTransitionType as addTransitionType,
-  unstable_ViewTransition as ViewTransition,
+  addTransitionType,
+  ViewTransition,
   Activity,
   useLayoutEffect,
   useEffect,

packages/react-devtools-shared/src/__tests__/storeComponentFilters-test.js

@@ -251,7 +251,8 @@ describe('Store component filters', () => {
   });
 
   it('should filter ViewTransition', async () => {
-    const ViewTransition = React.unstable_ViewTransition;
+    const ViewTransition =
+      React.ViewTransition || React.unstable_ViewTransition;
 
     if (ViewTransition != null) {
       await actAsync(async () =>

packages/react-dom-bindings/src/client/ReactFiberConfigDOM.js

@@ -3341,13 +3341,13 @@ function validateDocumentPositionWithFiberTree(
 
 if (enableFragmentRefsScrollIntoView) {
   // $FlowFixMe[prop-missing]
-  FragmentInstance.prototype.experimental_scrollIntoView = function (
+  FragmentInstance.prototype.scrollIntoView = function (
     this: FragmentInstanceType,
     alignToTop?: boolean,
   ): void {
     if (typeof alignToTop === 'object') {
       throw new Error(
-        'FragmentInstance.experimental_scrollIntoView() does not support ' +
+        'FragmentInstance.scrollIntoView() does not support ' +
           'scrollIntoViewOptions. Use the alignToTop boolean instead.',
       );
     }

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

@@ -40,7 +40,7 @@ describe('ReactDOMFizzViewTransition', () => {
     Stream = require('stream');
 
     Suspense = React.Suspense;
-    ViewTransition = React.unstable_ViewTransition;
+    ViewTransition = React.ViewTransition;
 
     // Test Environment
     const jsdom = new JSDOM(

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

@@ -1960,9 +1960,9 @@ describe('FragmentRefs', () => {
       });
 
       expect(() => {
-        fragmentRef.current.experimental_scrollIntoView({block: 'start'});
+        fragmentRef.current.scrollIntoView({block: 'start'});
       }).toThrowError(
-        'FragmentInstance.experimental_scrollIntoView() does not support ' +
+        'FragmentInstance.scrollIntoView() does not support ' +
           'scrollIntoViewOptions. Use the alignToTop boolean instead.',
       );
     });
@@ -1996,11 +1996,11 @@ describe('FragmentRefs', () => {
         });
 
         // Default call
-        fragmentRef.current.experimental_scrollIntoView();
+        fragmentRef.current.scrollIntoView();
         expectLast(logs, 'childA');
         logs = [];
         // alignToTop=true
-        fragmentRef.current.experimental_scrollIntoView(true);
+        fragmentRef.current.scrollIntoView(true);
         expectLast(logs, 'childA');
       });
 
@@ -2027,7 +2027,7 @@ describe('FragmentRefs', () => {
           logs.push('childB');
         });
 
-        fragmentRef.current.experimental_scrollIntoView(false);
+        fragmentRef.current.scrollIntoView(false);
         expectLast(logs, 'childB');
       });
 
@@ -2068,7 +2068,7 @@ describe('FragmentRefs', () => {
         });
 
         // Default call
-        fragmentRef.current.experimental_scrollIntoView();
+        fragmentRef.current.scrollIntoView();
         expectLast(logs, 'childA');
       });
 
@@ -2157,7 +2157,7 @@ describe('FragmentRefs', () => {
         });
 
         // Default call
-        fragmentRef.current.experimental_scrollIntoView();
+        fragmentRef.current.scrollIntoView();
         expectLast(logs, 'header');
 
         childARef.current.scrollIntoView.mockClear();
@@ -2167,7 +2167,7 @@ describe('FragmentRefs', () => {
         logs = [];
 
         // // alignToTop=false
-        fragmentRef.current.experimental_scrollIntoView(false);
+        fragmentRef.current.scrollIntoView(false);
         expectLast(logs, 'C');
       });
     });
@@ -2195,14 +2195,14 @@ describe('FragmentRefs', () => {
         siblingBRef.current.scrollIntoView = jest.fn();
 
         // Default call
-        fragmentRef.current.experimental_scrollIntoView();
+        fragmentRef.current.scrollIntoView();
         expect(siblingARef.current.scrollIntoView).toHaveBeenCalledTimes(0);
         expect(siblingBRef.current.scrollIntoView).toHaveBeenCalledTimes(1);
 
         siblingBRef.current.scrollIntoView.mockClear();
 
         // alignToTop=true
-        fragmentRef.current.experimental_scrollIntoView(true);
+        fragmentRef.current.scrollIntoView(true);
         expect(siblingARef.current.scrollIntoView).toHaveBeenCalledTimes(0);
         expect(siblingBRef.current.scrollIntoView).toHaveBeenCalledTimes(1);
       });
@@ -2239,7 +2239,7 @@ describe('FragmentRefs', () => {
         siblingBRef.current.scrollIntoView = jest.fn();
 
         // alignToTop=false
-        fragmentRef.current.experimental_scrollIntoView(false);
+        fragmentRef.current.scrollIntoView(false);
         expect(siblingARef.current.scrollIntoView).toHaveBeenCalledTimes(1);
         expect(siblingBRef.current.scrollIntoView).toHaveBeenCalledTimes(0);
       });
@@ -2260,7 +2260,7 @@ describe('FragmentRefs', () => {
         });
 
         parentRef.current.scrollIntoView = jest.fn();
-        fragmentRef.current.experimental_scrollIntoView();
+        fragmentRef.current.scrollIntoView();
         expect(parentRef.current.scrollIntoView).toHaveBeenCalledTimes(1);
       });
     });

packages/react-reconciler/src/__tests__/ReactErrorStacks-test.js

@@ -29,7 +29,7 @@ describe('ReactFragment', () => {
     React = require('react');
     Suspense = React.Suspense;
     Activity = React.Activity;
-    ViewTransition = React.unstable_ViewTransition;
+    ViewTransition = React.ViewTransition;
     ReactNoop = require('react-noop-renderer');
     const InternalTestUtils = require('internal-test-utils');
     waitForAll = InternalTestUtils.waitForAll;

packages/react-reconciler/src/__tests__/ReactLazy-test.internal.js

@@ -941,7 +941,7 @@ describe('ReactLazy', () => {
 
   // @gate enableViewTransition
   it('throws with a useful error when wrapping ViewTransition with lazy()', async () => {
-    const BadLazy = lazy(() => fakeImport(React.unstable_ViewTransition));
+    const BadLazy = lazy(() => fakeImport(React.ViewTransition));
 
     const root = ReactTestRenderer.create(
       <Suspense fallback={<Text text="Loading..." />}>
@@ -954,7 +954,7 @@ describe('ReactLazy', () => {
 
     await waitForAll(['Loading...']);
 
-    await resolveFakeImport(React.unstable_ViewTransition);
+    await resolveFakeImport(React.ViewTransition);
     root.update(
       <Suspense fallback={<Text text="Loading..." />}>
         <BadLazy />

packages/react-reconciler/src/__tests__/ViewTransitionReactServer-test.js

@@ -23,7 +23,7 @@ describe('ViewTransitionReactServer', () => {
     jest.resetModules();
     jest.mock('react', () => require('react/react.react-server'));
     ReactServer = require('react');
-    ViewTransition = ReactServer.unstable_ViewTransition;
+    ViewTransition = ReactServer.ViewTransition;
     ReactNoopFlightServer = require('react-noop-renderer/flight-server');
 
     jest.resetModules();

packages/react/index.development.js

@@ -45,6 +45,8 @@ export {
   startTransition,
   unstable_LegacyHidden,
   Activity,
+  ViewTransition,
+  addTransitionType,
   unstable_Scope,
   unstable_SuspenseList,
   unstable_TracingMarker,

packages/react/index.experimental.development.js

@@ -33,9 +33,9 @@ export {
   unstable_postpone,
   unstable_getCacheForType,
   unstable_SuspenseList,
-  unstable_ViewTransition,
+  ViewTransition,
   unstable_startGestureTransition,
-  unstable_addTransitionType,
+  addTransitionType,
   unstable_useCacheRefresh,
   useId,
   useCallback,

packages/react/index.experimental.js

@@ -34,9 +34,9 @@ export {
   unstable_postpone,
   unstable_getCacheForType,
   unstable_SuspenseList,
-  unstable_ViewTransition,
+  ViewTransition,
   unstable_startGestureTransition,
-  unstable_addTransitionType,
+  addTransitionType,
   unstable_useCacheRefresh,
   useId,
   useCallback,

packages/react/index.fb.js

@@ -39,9 +39,11 @@ export {
   unstable_LegacyHidden,
   unstable_Scope,
   unstable_SuspenseList,
-  unstable_ViewTransition,
+  ViewTransition,
+  ViewTransition as unstable_ViewTransition,
   unstable_TracingMarker,
-  unstable_addTransitionType,
+  addTransitionType,
+  addTransitionType as unstable_addTransitionType,
   unstable_useCacheRefresh,
   use,
   useActionState,

packages/react/index.js

@@ -48,8 +48,8 @@ export {
   unstable_Scope,
   unstable_SuspenseList,
   unstable_TracingMarker,
-  unstable_ViewTransition,
-  unstable_addTransitionType,
+  ViewTransition,
+  addTransitionType,
   unstable_getCacheForType,
   unstable_useCacheRefresh,
   useId,

packages/react/index.stable.development.js

@@ -18,6 +18,8 @@ export {
   PureComponent,
   StrictMode,
   Suspense,
+  ViewTransition,
+  addTransitionType,
   cloneElement,
   createContext,
   createElement,

packages/react/index.stable.js

@@ -18,6 +18,8 @@ export {
   PureComponent,
   StrictMode,
   Suspense,
+  ViewTransition,
+  addTransitionType,
   cloneElement,
   createContext,
   createElement,

packages/react/src/ReactClient.js

@@ -125,8 +125,8 @@ export {
   // enableTransitionTracing
   REACT_TRACING_MARKER_TYPE as unstable_TracingMarker,
   // enableViewTransition
-  REACT_VIEW_TRANSITION_TYPE as unstable_ViewTransition,
-  addTransitionType as unstable_addTransitionType,
+  REACT_VIEW_TRANSITION_TYPE as ViewTransition,
+  addTransitionType as addTransitionType,
   // enableGestureTransition
   startGestureTransition as unstable_startGestureTransition,
   // DEV-only

packages/react/src/ReactServer.experimental.development.js

@@ -63,6 +63,7 @@ export {
   REACT_PROFILER_TYPE as Profiler,
   REACT_STRICT_MODE_TYPE as StrictMode,
   REACT_SUSPENSE_TYPE as Suspense,
+  REACT_VIEW_TRANSITION_TYPE as ViewTransition,
   cloneElement,
   createElement,
   createRef,
@@ -83,6 +84,5 @@ export {
   version,
   // Experimental
   REACT_SUSPENSE_LIST_TYPE as unstable_SuspenseList,
-  REACT_VIEW_TRANSITION_TYPE as unstable_ViewTransition,
   captureOwnerStack, // DEV-only
 };

packages/react/src/ReactServer.experimental.js

@@ -62,6 +62,7 @@ export {
   REACT_PROFILER_TYPE as Profiler,
   REACT_STRICT_MODE_TYPE as StrictMode,
   REACT_SUSPENSE_TYPE as Suspense,
+  REACT_VIEW_TRANSITION_TYPE as ViewTransition,
   cloneElement,
   createElement,
   createRef,
@@ -82,5 +83,4 @@ export {
   version,
   // Experimental
   REACT_SUSPENSE_LIST_TYPE as unstable_SuspenseList,
-  REACT_VIEW_TRANSITION_TYPE as unstable_ViewTransition,
 };

packages/react/src/ReactServer.fb.js

@@ -53,6 +53,8 @@ export {
   REACT_PROFILER_TYPE as Profiler,
   REACT_STRICT_MODE_TYPE as StrictMode,
   REACT_SUSPENSE_TYPE as Suspense,
+  REACT_VIEW_TRANSITION_TYPE as ViewTransition,
+  REACT_VIEW_TRANSITION_TYPE as unstable_ViewTransition,
   cloneElement,
   createElement,
   createRef,
@@ -71,5 +73,4 @@ export {
   captureOwnerStack, // DEV-only
   // Experimental
   REACT_SUSPENSE_LIST_TYPE as unstable_SuspenseList,
-  REACT_VIEW_TRANSITION_TYPE as unstable_ViewTransition,
 };

packages/react/src/ReactServer.js

@@ -16,6 +16,7 @@ import {
   REACT_PROFILER_TYPE,
   REACT_STRICT_MODE_TYPE,
   REACT_SUSPENSE_TYPE,
+  REACT_VIEW_TRANSITION_TYPE,
 } from 'shared/ReactSymbols';
 import {
   cloneElement,
@@ -46,6 +47,7 @@ export {
   REACT_PROFILER_TYPE as Profiler,
   REACT_STRICT_MODE_TYPE as StrictMode,
   REACT_SUSPENSE_TYPE as Suspense,
+  REACT_VIEW_TRANSITION_TYPE as ViewTransition,
   cloneElement,
   createElement,
   createRef,

packages/shared/ReactFeatureFlags.js

@@ -84,7 +84,7 @@ export const enablePostpone = __EXPERIMENTAL__;
 
 export const enableHalt: boolean = true;
 
-export const enableViewTransition = __EXPERIMENTAL__;
+export const enableViewTransition: boolean = true;
 
 export const enableGestureTransition = __EXPERIMENTAL__;
 
@@ -145,8 +145,8 @@ export const transitionLaneExpirationMs = 5000;
  */
 export const enableInfiniteRenderLoopDetection: boolean = false;
 
-export const enableFragmentRefs = __EXPERIMENTAL__;
-export const enableFragmentRefsScrollIntoView = __EXPERIMENTAL__;
+export const enableFragmentRefs: boolean = true;
+export const enableFragmentRefsScrollIntoView: boolean = true;
 
 // -----------------------------------------------------------------------------
 // Ready for next major.

packages/shared/forks/ReactFeatureFlags.native-oss.js

@@ -62,7 +62,7 @@ export const enableHydrationLaneScheduling: boolean = true;
 export const enableYieldingBeforePassive: boolean = false;
 
 export const enableThrottledScheduling: boolean = false;
-export const enableViewTransition: boolean = false;
+export const enableViewTransition: boolean = true;
 export const enableGestureTransition: boolean = false;
 export const enableScrollEndPolyfill: boolean = true;
 export const enableSuspenseyImages: boolean = false;
@@ -72,7 +72,7 @@ export const enableHydrationChangeEvent: boolean = false;
 export const enableDefaultTransitionIndicator: boolean = false;
 export const ownerStackLimit = 1e4;
 
-export const enableFragmentRefs: boolean = false;
+export const enableFragmentRefs: boolean = true;
 export const enableFragmentRefsScrollIntoView: boolean = false;
 
 // Profiling Only

packages/shared/forks/ReactFeatureFlags.test-renderer.js

@@ -73,8 +73,8 @@ export const enableHydrationChangeEvent: boolean = false;
 export const enableDefaultTransitionIndicator: boolean = false;
 export const ownerStackLimit = 1e4;
 
-export const enableFragmentRefs: boolean = false;
-export const enableFragmentRefsScrollIntoView: boolean = false;
+export const enableFragmentRefs: boolean = true;
+export const enableFragmentRefsScrollIntoView: boolean = true;
 
 // TODO: This must be in sync with the main ReactFeatureFlags file because
 // the Test Renderer's value must be the same as the one used by the