Theme: Restore public ThemeProvider export

packages/boot/src/components/root/index.tsx

@@ -20,7 +20,7 @@ import { useState, useEffect, useMemo } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { Page, getAdminThemeColors } from '@wordpress/admin-ui';
 import { Tooltip } from '@wordpress/ui';
-import { privateApis as themePrivateApis } from '@wordpress/theme';
+import { ThemeProvider } from '@wordpress/theme';
 
 /**
  * Internal dependencies
@@ -34,7 +34,6 @@ import type { CanvasData } from '../../store/types';
 import './style.scss';
 
 const { useLocation, useMatches, Outlet } = unlock( routePrivateApis );
-const { ThemeProvider } = unlock( themePrivateApis );
 
 export default function Root() {
 	const matches = useMatches();

packages/boot/src/components/root/single-page.tsx

@@ -11,7 +11,7 @@ import { SnackbarNotices } from '@wordpress/notices';
 import { SlotFillProvider } from '@wordpress/components';
 import { useMemo } from '@wordpress/element';
 import { getAdminThemeColors } from '@wordpress/admin-ui';
-import { privateApis as themePrivateApis } from '@wordpress/theme';
+import { ThemeProvider } from '@wordpress/theme';
 
 /**
  * Internal dependencies
@@ -24,7 +24,6 @@ import './style.scss';
 import useRouteTitle from '../app/use-route-title';
 
 const { useMatches, Outlet } = unlock( routePrivateApis );
-const { ThemeProvider } = unlock( themePrivateApis );
 
 /**
  * Root component for single page mode (no sidebar).

packages/edit-site/src/components/layout/index.js

@@ -28,7 +28,7 @@ import {
 	privateApis as editorPrivateApis,
 } from '@wordpress/editor';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
-import { privateApis as themePrivateApis } from '@wordpress/theme';
+import { ThemeProvider } from '@wordpress/theme';
 import { PluginArea } from '@wordpress/plugins';
 import { SnackbarNotices, store as noticesStore } from '@wordpress/notices';
 import { useDispatch, useSelect } from '@wordpress/data';
@@ -50,7 +50,6 @@ import SavePanel from '../save-panel';
 
 const { useLocation } = unlock( routerPrivateApis );
 const { useStyle, UploadProgressSnackbar } = unlock( editorPrivateApis );
-const { ThemeProvider } = unlock( themePrivateApis );
 
 const ANIMATION_DURATION = 0.3;
 const CONTENT_COLOR = { background: '#ffffff' };

packages/theme/CHANGELOG.md

@@ -4,7 +4,7 @@
 
 ### Breaking Changes
 
--   Remove `ThemeProvider` from the public package exports and restore access through `privateApis` ([#79594](https://github.com/WordPress/gutenberg/pull/79594)).
+-   Remove the root `CornerRadiusPreset` type export. Derive it from `ThemeProvider`'s `cornerRadius` prop instead ([#79620](https://github.com/WordPress/gutenberg/pull/79620)).
 
 ### New Features
 
@@ -14,6 +14,10 @@
 
 -   Mark the published `design-tokens.css` file as side-effectful so downstream bundlers preserve the documented CSS import ([#79551](https://github.com/WordPress/gutenberg/pull/79551)).
 
+### Internal
+
+-   Temporarily restore previously removed private APIs to allow for an easier consumer migration before they are removed in WordPress 7.3 ([#79594](https://github.com/WordPress/gutenberg/pull/79594), [#79620](https://github.com/WordPress/gutenberg/pull/79620)).
+
 ## 0.16.0 (2026-06-24)
 
 ### Breaking Changes

packages/theme/package.json

@@ -86,6 +86,7 @@
 	],
 	"dependencies": {
 		"@wordpress/compose": "file:../compose",
+		"@wordpress/deprecated": "file:../deprecated",
 		"@wordpress/element": "file:../element",
 		"@wordpress/private-apis": "file:../private-apis",
 		"@wordpress/style-runtime": "file:../style-runtime",

packages/theme/src/index.ts

@@ -1,4 +1,3 @@
 export { privateApis } from './private-apis';
+export { ThemeProvider } from './theme-provider';
 export type * from './prebuilt/ts/token-types';
-export { type ThemeProvider } from './theme-provider';
-export type { CornerRadiusPreset } from './types';

packages/theme/src/private-apis.ts

@@ -1,9 +1,37 @@
+import deprecated from '@wordpress/deprecated';
 import { lock } from './lock-unlock';
 import { ThemeProvider } from './theme-provider';
 import { useThemeProviderStyles } from './use-theme-provider-styles';
 
+function warnPrivateApi(
+	apiName: string,
+	options: { alternative?: string; hint?: string } = {}
+) {
+	deprecated( `\`privateApis.${ apiName }\` from \`@wordpress/theme\``, {
+		since: '7.1',
+		version: '7.3',
+		...options,
+	} );
+}
+
+/**
+ * @deprecated Private `@wordpress/theme` APIs will be removed in WordPress 7.3.
+ * Use public `@wordpress/theme` APIs for supported theming use cases.
+ */
 export const privateApis = {};
 lock( privateApis, {
-	ThemeProvider,
-	useThemeProviderStyles,
+	get ThemeProvider() {
+		warnPrivateApi( 'ThemeProvider', {
+			alternative: '`ThemeProvider` from `@wordpress/theme`',
+		} );
+		return ThemeProvider;
+	},
+	get useThemeProviderStyles() {
+		warnPrivateApi( 'useThemeProviderStyles', {
+			alternative:
+				'`ThemeProvider` from `@wordpress/theme` for supported theming use cases',
+			hint: '`useThemeProviderStyles` has no public replacement.',
+		} );
+		return useThemeProviderStyles;
+	},
 } );

packages/theme/src/test/private-apis.test.ts

@@ -0,0 +1,44 @@
+import { unlock } from '../lock-unlock';
+import { privateApis } from '../private-apis';
+import { ThemeProvider } from '../theme-provider';
+import { useThemeProviderStyles } from '../use-theme-provider-styles';
+
+describe( 'privateApis', () => {
+	it( 'warns when accessing useThemeProviderStyles through private APIs', () => {
+		const warn = jest
+			.spyOn( console, 'warn' )
+			.mockImplementation( () => {} );
+
+		const unlockedPrivateApis = unlock< {
+			useThemeProviderStyles: typeof useThemeProviderStyles;
+		} >( privateApis );
+
+		expect( unlockedPrivateApis.useThemeProviderStyles ).toBe(
+			useThemeProviderStyles
+		);
+
+		expect( warn ).toHaveBeenCalledWith(
+			'`privateApis.useThemeProviderStyles` from `@wordpress/theme` is deprecated since version 7.1 and will be removed in version 7.3. Please use `ThemeProvider` from `@wordpress/theme` for supported theming use cases instead. Note: `useThemeProviderStyles` has no public replacement.'
+		);
+
+		warn.mockRestore();
+	} );
+
+	it( 'warns when accessing ThemeProvider through private APIs', () => {
+		const warn = jest
+			.spyOn( console, 'warn' )
+			.mockImplementation( () => {} );
+
+		const unlockedPrivateApis = unlock< {
+			ThemeProvider: typeof ThemeProvider;
+		} >( privateApis );
+
+		expect( unlockedPrivateApis.ThemeProvider ).toBe( ThemeProvider );
+
+		expect( warn ).toHaveBeenCalledWith(
+			'`privateApis.ThemeProvider` from `@wordpress/theme` is deprecated since version 7.1 and will be removed in version 7.3. Please use `ThemeProvider` from `@wordpress/theme` instead.'
+		);
+
+		warn.mockRestore();
+	} );
+} );

packages/theme/tsconfig.src.json

@@ -9,6 +9,7 @@
 	"files": [ "global.d.ts" ],
 	"references": [
 		{ "path": "../compose" },
+		{ "path": "../deprecated" },
 		{ "path": "../element" },
 		{ "path": "../private-apis" },
 		{ "path": "../style-runtime" }

packages/ui/CHANGELOG.md

@@ -8,7 +8,7 @@
 
 ### Internal
 
--   Restore private API access for `@wordpress/theme`'s `ThemeProvider` ([#79594](https://github.com/WordPress/gutenberg/pull/79594)).
+-   Add a temporary `@wordpress/theme` `ThemeProvider` compatibility fallback for older WordPress runtimes ([#79620](https://github.com/WordPress/gutenberg/pull/79620)).
 -   Enforce CSS Module class selector naming for component-library packages ([#79504](https://github.com/WordPress/gutenberg/pull/79504)).
 -   Update `@base-ui/react` from `1.5.0` to [`1.6.0`](https://github.com/mui/base-ui/releases/tag/v1.6.0) ([#79408](https://github.com/WordPress/gutenberg/pull/79408)).
 

packages/ui/src/alert-dialog/popup.tsx

@@ -3,10 +3,6 @@ import clsx from 'clsx';
 import { forwardRef, useContext } from '@wordpress/element';
 import { useMergeRefs } from '@wordpress/compose';
 import { __ } from '@wordpress/i18n';
-import {
-	type ThemeProvider as ThemeProviderType,
-	privateApis as themePrivateApis,
-} from '@wordpress/theme';
 
 import { renderSlotWithChildren } from '../utils/render-slot-with-children';
 import { Button } from '../button';
@@ -18,17 +14,14 @@ import {
 	SCROLL_CONTAINER_ATTR,
 	useOverlayScrollStateAttributes,
 } from '../utils/use-overlay-scroll-state-attributes';
-import { unlock } from '../lock-unlock';
+import { ThemeProvider } from '../utils/theme-provider';
 import { Stack } from '../stack';
 import { Text } from '../text';
 import { AlertDialogContext } from './context';
 import { Portal } from './portal';
 import alertDialogStyles from './style.module.css';
 import type { PopupProps } from './types';
 
-const ThemeProvider: typeof ThemeProviderType =
-	unlock( themePrivateApis ).ThemeProvider;
-
 const Popup = forwardRef< HTMLDivElement, PopupProps >(
 	function AlertDialogPopup(
 		{

packages/ui/src/dialog/popup.tsx

@@ -2,22 +2,15 @@ import { Dialog as _Dialog } from '@base-ui/react/dialog';
 import clsx from 'clsx';
 import { forwardRef } from '@wordpress/element';
 import { useMergeRefs } from '@wordpress/compose';
-import {
-	type ThemeProvider as ThemeProviderType,
-	privateApis as themePrivateApis,
-} from '@wordpress/theme';
-import { unlock } from '../lock-unlock';
 import { useDeprioritizedInitialFocus } from '../utils/use-deprioritized-initial-focus';
 import { SCROLL_CONTAINER_ATTR } from '../utils/use-overlay-scroll-state-attributes';
 import { renderSlotWithChildren } from '../utils/render-slot-with-children';
+import { ThemeProvider } from '../utils/theme-provider';
 import { DialogValidationProvider, useDialogModal } from './context';
 import { Portal } from './portal';
 import styles from './style.module.css';
 import type { PopupProps } from './types';
 
-const ThemeProvider: typeof ThemeProviderType =
-	unlock( themePrivateApis ).ThemeProvider;
-
 const CLOSE_ICON_ATTR = 'data-wp-ui-dialog-close-icon';
 
 /**

packages/ui/src/drawer/popup.tsx

@@ -2,22 +2,15 @@ import { Drawer as _Drawer } from '@base-ui/react/drawer';
 import clsx from 'clsx';
 import { forwardRef } from '@wordpress/element';
 import { useMergeRefs } from '@wordpress/compose';
-import {
-	type ThemeProvider as ThemeProviderType,
-	privateApis as themePrivateApis,
-} from '@wordpress/theme';
-import { unlock } from '../lock-unlock';
 import { useDeprioritizedInitialFocus } from '../utils/use-deprioritized-initial-focus';
 import { SCROLL_CONTAINER_ATTR } from '../utils/use-overlay-scroll-state-attributes';
 import { renderSlotWithChildren } from '../utils/render-slot-with-children';
+import { ThemeProvider } from '../utils/theme-provider';
 import { DrawerValidationProvider, useDrawerModal } from './context';
 import { Portal } from './portal';
 import styles from './style.module.css';
 import type { PopupProps } from './types';
 
-const ThemeProvider: typeof ThemeProviderType =
-	unlock( themePrivateApis ).ThemeProvider;
-
 const CLOSE_ICON_ATTR = 'data-wp-ui-drawer-close-icon';
 
 /**

packages/ui/src/form/primitives/autocomplete/popup.tsx

@@ -1,20 +1,13 @@
 import { Autocomplete as _Autocomplete } from '@base-ui/react/autocomplete';
 import clsx from 'clsx';
 import { forwardRef } from '@wordpress/element';
-import {
-	type ThemeProvider as ThemeProviderType,
-	privateApis as themePrivateApis,
-} from '@wordpress/theme';
-import { unlock } from '../../../lock-unlock';
 import { renderSlotWithChildren } from '../../../utils/render-slot-with-children';
+import { ThemeProvider } from '../../../utils/theme-provider';
 import itemPopupStyles from '../../../utils/css/item-popup.module.css';
 import { Portal } from './portal';
 import { Positioner } from './positioner';
 import type { AutocompletePopupProps } from './types';
 
-const ThemeProvider: typeof ThemeProviderType =
-	unlock( themePrivateApis ).ThemeProvider;
-
 export const Popup = forwardRef< HTMLDivElement, AutocompletePopupProps >(
 	function Popup( { className, portal, positioner, ...restProps }, ref ) {
 		const popupContent = (

packages/ui/src/form/primitives/combobox/popup.tsx

@@ -1,20 +1,13 @@
 import { Combobox as _Combobox } from '@base-ui/react/combobox';
 import clsx from 'clsx';
 import { forwardRef } from '@wordpress/element';
-import {
-	type ThemeProvider as ThemeProviderType,
-	privateApis as themePrivateApis,
-} from '@wordpress/theme';
-import { unlock } from '../../../lock-unlock';
 import { Portal } from './portal';
 import { Positioner } from './positioner';
 import { renderSlotWithChildren } from '../../../utils/render-slot-with-children';
+import { ThemeProvider } from '../../../utils/theme-provider';
 import itemPopupStyles from '../../../utils/css/item-popup.module.css';
 import type { ComboboxPopupProps } from './types';
 
-const ThemeProvider: typeof ThemeProviderType =
-	unlock( themePrivateApis ).ThemeProvider;
-
 export const Popup = forwardRef< HTMLDivElement, ComboboxPopupProps >(
 	function Popup( { className, portal, positioner, ...restProps }, ref ) {
 		const popupContent = (

packages/ui/src/form/primitives/select/popup.tsx

@@ -1,20 +1,13 @@
 import { Select as _Select } from '@base-ui/react/select';
 import clsx from 'clsx';
 import { forwardRef } from '@wordpress/element';
-import {
-	type ThemeProvider as ThemeProviderType,
-	privateApis as themePrivateApis,
-} from '@wordpress/theme';
-import { unlock } from '../../../lock-unlock';
 import { Portal } from './portal';
 import { Positioner } from './positioner';
 import { renderSlotWithChildren } from '../../../utils/render-slot-with-children';
+import { ThemeProvider } from '../../../utils/theme-provider';
 import itemPopupStyles from '../../../utils/css/item-popup.module.css';
 import type { SelectPopupProps } from './types';
 
-const ThemeProvider: typeof ThemeProviderType =
-	unlock( themePrivateApis ).ThemeProvider;
-
 export const Popup = forwardRef< HTMLDivElement, SelectPopupProps >(
 	function Popup(
 		{ className, portal, positioner, children, ...restProps },

packages/ui/src/popover/popup.tsx

@@ -2,22 +2,15 @@ import { Popover as _Popover } from '@base-ui/react/popover';
 import clsx from 'clsx';
 import { forwardRef } from '@wordpress/element';
 import { useMergeRefs } from '@wordpress/compose';
-import {
-	type ThemeProvider as ThemeProviderType,
-	privateApis as themePrivateApis,
-} from '@wordpress/theme';
-import { unlock } from '../lock-unlock';
 import { useDeprioritizedInitialFocus } from '../utils/use-deprioritized-initial-focus';
 import { renderSlotWithChildren } from '../utils/render-slot-with-children';
+import { ThemeProvider } from '../utils/theme-provider';
 import { PopoverValidationProvider } from './context';
 import { Portal } from './portal';
 import { Positioner } from './positioner';
 import styles from './style.module.css';
 import type { PopupProps } from './types';
 
-const ThemeProvider: typeof ThemeProviderType =
-	unlock( themePrivateApis ).ThemeProvider;
-
 const CLOSE_ATTR = 'data-wp-ui-popover-close';
 
 /**

packages/ui/src/stack/types.ts

@@ -1,4 +1,4 @@
-import { type GapSize } from '@wordpress/theme';
+import type { GapSize } from '@wordpress/theme';
 import { type ComponentProps } from '../utils/types';
 
 export interface StackProps extends ComponentProps< 'div' > {

packages/ui/src/tooltip/popup.tsx

@@ -1,20 +1,13 @@
 import clsx from 'clsx';
 import { Tooltip as _Tooltip } from '@base-ui/react/tooltip';
 import { forwardRef } from '@wordpress/element';
-import {
-	type ThemeProvider as ThemeProviderType,
-	privateApis as themePrivateApis,
-} from '@wordpress/theme';
 import type { PopupProps } from './types';
-import { unlock } from '../lock-unlock';
 import { Portal } from './portal';
 import { Positioner } from './positioner';
 import { renderSlotWithChildren } from '../utils/render-slot-with-children';
+import { ThemeProvider } from '../utils/theme-provider';
 import styles from './style.module.css';
 
-const ThemeProvider: typeof ThemeProviderType =
-	unlock( themePrivateApis ).ThemeProvider;
-
 /*
  * This should ideally use whatever dark color makes sense, and not be
  * hardcoded to #1e1e1e. The solutions would be to: