Skip to content

Widgets editor: Add ThemeProvider for admin color schemes #81173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
t-hamano merged 4 commits into from
Aug 5, 2026
Merged

Widgets editor: Add ThemeProvider for admin color schemes #81173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
19eac64
Add ThemeProvider to widgets editor for admin color schemes.
mirka Aug 4, 2026
6867c9a
Add changelog
mirka Aug 4, 2026
aafc045
Fix up
mirka Aug 4, 2026
3d993cb
Merge branch 'trunk' into edit-widgets-theme-provider
t-hamano Aug 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions packages/edit-widgets/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

### Enhancements

- Wrap the widgets editor layout in `ThemeProvider`, seeded with the active admin color scheme primary color ([#81173](https://github.com/WordPress/gutenberg/pull/81173)).

### Bug Fixes

- Header toolbar: Fix icon button focus styles to use the design system `outset-ring__focus` mixin ([#81176](https://github.com/WordPress/gutenberg/pull/81176)).
Expand Down
1 change: 1 addition & 0 deletions packages/edit-widgets/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
]
},
"dependencies": {
"@wordpress/admin-ui": "file:../admin-ui",
"@wordpress/api-fetch": "file:../api-fetch",
"@wordpress/base-styles": "file:../base-styles",
"@wordpress/block-editor": "file:../block-editor",
Expand Down
41 changes: 21 additions & 20 deletions packages/edit-widgets/src/components/layout/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
/**
* WordPress dependencies
*/
import { getAdminThemeColors } from '@wordpress/admin-ui';
import { __, sprintf } from '@wordpress/i18n';
import { useMemo } from '@wordpress/element';
import { useDispatch } from '@wordpress/data';
import { PluginArea } from '@wordpress/plugins';
import { store as noticesStore } from '@wordpress/notices';
import { __unstableUseNavigateRegions as useNavigateRegions } from '@wordpress/components';

/**
* Internal dependencies
*/
import { ThemeProvider } from '@wordpress/theme';
import ErrorBoundary from '../error-boundary';
import WidgetAreasBlockEditorProvider from '../widget-areas-block-editor-provider';
import Sidebar from '../sidebar';
Expand All @@ -33,21 +29,26 @@ function Layout( { blockEditorSettings } ) {
}

const navigateRegionsProps = useNavigateRegions();
const adminPrimary = useMemo( () => getAdminThemeColors().primary, [] );

return (
<ErrorBoundary>
<div { ...navigateRegionsProps }>
<WidgetAreasBlockEditorProvider
blockEditorSettings={ blockEditorSettings }
>
<Interface blockEditorSettings={ blockEditorSettings } />
<Sidebar />
<PluginArea onError={ onPluginAreaError } />
<UnsavedChangesWarning />
<WelcomeGuide />
</WidgetAreasBlockEditorProvider>
</div>
</ErrorBoundary>
<ThemeProvider isRoot color={ { primary: adminPrimary } }>
<ErrorBoundary>
<div { ...navigateRegionsProps }>
<WidgetAreasBlockEditorProvider
blockEditorSettings={ blockEditorSettings }
>
<Interface
blockEditorSettings={ blockEditorSettings }
/>
<Sidebar />
<PluginArea onError={ onPluginAreaError } />
<UnsavedChangesWarning />
<WelcomeGuide />
</WidgetAreasBlockEditorProvider>
</div>
</ErrorBoundary>
</ThemeProvider>
);
}

Expand Down
Loading