Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
4 changes: 4 additions & 0 deletions packages/edit-site/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

### Bug Fixes

- Seed the root `ThemeProvider` with the admin color scheme primary color so portaled popovers and modals receive the scheme's accent colors ([#81653](https://github.com/WordPress/gutenberg/pull/81653)).

### Internal

- Stop rendering `EditorKeyboardShortcutsRegister`, which the editor provider now renders itself ([#81580](https://github.com/WordPress/gutenberg/pull/81580)).
Expand Down
12 changes: 10 additions & 2 deletions packages/edit-site/src/components/layout/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,16 @@ export default function LayoutWithGlobalStylesProvider( props ) {
<Tooltip.Provider>
{ /** This needs to be within the SlotFillProvider */ }
<PluginArea onError={ onPluginAreaError } />
<ThemeProvider color={ themeColors }>
<Layout { ...props } />
<ThemeProvider
isRoot
color={ {
primary: themeColors.primary,
...CONTENT_COLOR,
} }
>
<ThemeProvider color={ themeColors }>
<Layout { ...props } />
</ThemeProvider>
</ThemeProvider>
</Tooltip.Provider>
</SlotFillProvider>
Expand Down
Loading