Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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

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
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)).

## 6.51.0 (2026-07-14)

### Enhancements
Expand Down
1 change: 1 addition & 0 deletions packages/edit-widgets/package.json
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
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