Skip to content

Use color panel for contentOnly pattern editing #71982

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
merged 10 commits into from
Nov 6, 2025
Merged

Use color panel for contentOnly pattern editing #71982

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2b1d23f
Use color panel for contentOnly pattern editing
jeryj Sep 30, 2025
a2c05bd
show the elements in the sidebar
scruffian Oct 2, 2025
2ddd2f4
Dynamically show correct color controls
jeryj Oct 2, 2025
b095cbe
Undo some AI unnecessary refactoring
jeryj Oct 7, 2025
02794d2
Remove caption and link settings for colors
jeryj Oct 7, 2025
9c9b8b9
Regenerate fixtures
jeryj Oct 7, 2025
133a9a9
Refactor hasButton and hasHeading checks for simplicity
jeryj Oct 10, 2025
0364031
Show colors for all content only pattern top level section blocks, ev…
jeryj Oct 17, 2025
e864e25
always show the styles tab if the experiment is enabled
scruffian Oct 23, 2025
ffa1529
update the name of the controls and also add an experiment check just…
scruffian Nov 6, 2025
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
Prev Previous commit
Next Next commit
show the elements in the sidebar
  • Loading branch information
@scruffian
scruffian committed Nov 6, 2025
commit a2c05bdd9446893dab18f45372392e0339f226c9
16 changes: 15 additions & 1 deletion packages/block-editor/src/components/inspector-controls-tabs/styles-tab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,28 @@ function SectionBlockControls( { blockName, clientId } ) {
updateBlockAttributes( clientId, newAttributes );
};

// This is needed to force the captions setting to show
// but there's probably a right way to do it.
const newSettings = { ...settings };
newSettings.color.caption = true;

return (
<ColorEdit
clientId={ clientId }
name={ blockName }
settings={ settings }
settings={ newSettings }
setAttributes={ setAttributes }
asWrapper={ ColorToolsPanel }
label={ __( 'Color' ) }
defaultControls={ {
// TODO - this is duplicated in packages/block-editor/src/components/global-styles/color-panel.js
text: true,
background: true,
link: true,
heading: true,
button: true,
caption: true,
} }
/>
);
}
Expand Down
11 changes: 7 additions & 4 deletions packages/block-editor/src/hooks/color.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,7 @@ export function ColorEdit( {
settings,
asWrapper,
label,
defaultControls,
} ) {
const isEnabled = useHasColorPanel( settings );

Expand Down Expand Up @@ -296,10 +297,12 @@ export function ColorEdit( {
return null;
}

const defaultControls = getBlockSupport( name, [
COLOR_SUPPORT_KEY,
'__experimentalDefaultControls',
] );
defaultControls = defaultControls
? defaultControls
: getBlockSupport( name, [
COLOR_SUPPORT_KEY,
'__experimentalDefaultControls',
] );

const enableContrastChecking =
Platform.OS === 'web' &&
Expand Down