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

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
Remove caption and link settings for colors
  • Loading branch information
@jeryj @scruffian
jeryj authored and scruffian committed Nov 6, 2025
commit 02794d2e226fdad50a4f78cd9c3b6a8cd9444cfd
117 changes: 28 additions & 89 deletions 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 @@ -4,7 +4,6 @@
import { PanelBody } from '@wordpress/components';
import { __ } from '@wordpress/i18n';
import { useDispatch, useSelect } from '@wordpress/data';
import { useState, useEffect } from '@wordpress/element';

/**
* Internal dependencies
Expand All @@ -20,99 +19,34 @@ import { ColorToolsPanel } from '../global-styles/color-panel';
function SectionBlockControls( { blockName, clientId, contentClientIds } ) {
Copy link
Member

@ramonjd ramonjd Oct 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems fine to abstract these and not fill the hooks with too much section-specific logic. If more styles are required down the track we might revisit.

Copy link
Contributor Author

@jeryj jeryj Oct 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed. They were easily accessible one level up, so I thought passing them in would be easier for now.

const settings = useBlockSettings( blockName );
const { updateBlockAttributes } = useDispatch( blockEditorStore );
const [ defaultControls, setDefaultControls ] = useState( {
text: true,
background: true,
button: true,
heading: true,
caption: true,
link: true,
} );

const contentBlocks = useSelect(
const { hasButton, hasHeading } = useSelect(
Copy link
Member

@ramonjd ramonjd Oct 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice touch. I was initially thinking to just show a defined subset, but it's fancier to detect the block!

( select ) => {
const { getBlock } = select( blockEditorStore );

// Get only the content-exposed blocks
return contentClientIds
? contentClientIds
.map( ( id ) => getBlock( id ) )
.filter( Boolean )
: [];
},
[ contentClientIds ]
);

useEffect( () => {
let hasButton = false;
let hasHeading = false;
let hasCaption = false;
let hasLink = false;

for ( const block of contentBlocks ) {
// Check for button blocks
if ( block.name === 'core/button' ) {
hasButton = true;
}
// Check for heading blocks
if ( block.name === 'core/heading' ) {
hasHeading = true;
}

// Check for actual caption content
if (
block.name === 'core/image' ||
block.name === 'core/video' ||
block.name === 'core/audio' ||
block.name === 'core/gallery'
) {
const caption = block.attributes?.caption;
// Caption can be a string, array, or rich-text object
const hasCaptionContent =
caption &&
( ( typeof caption === 'string' &&
caption.trim() !== '' ) ||
( Array.isArray( caption ) && caption.length > 0 ) ||
( typeof caption === 'object' &&
caption.text &&
caption.text.trim() !== '' ) );
if ( hasCaptionContent ) {
hasCaption = true;
const { getBlockName } = select( blockEditorStore );
let foundButton = false;
let foundHeading = false;

for ( const contentClientId of contentClientIds ) {
Copy link
Member

@ramonjd ramonjd Oct 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if this is faster or slower, but an alternative could be

const blockNames =
    select( blockEditorStore ).getBlockNamesByClientId(
        contentClientIds
    );
return {
    hasButton: blockNames.includes( 'core/button' ),
    hasHeading: blockNames.includes( 'core/heading' ),
};

Copy link
Contributor Author

@jeryj jeryj Oct 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yours is way cleaner. I doubt there's much perf difference. Thanks for the refactor!

const name = getBlockName( contentClientId );
if ( name === 'core/heading' ) {
foundHeading = true;
}
if ( name === 'core/button' ) {
foundButton = true;
}
}

// Check for actual link content
let blockHasLink = false;

if ( block.name === 'core/paragraph' ) {
// Check if paragraph content contains anchor tags
blockHasLink =
block.attributes?.content &&
block.attributes.content.includes( '<a ' );
} else if ( block.name === 'core/heading' ) {
// Check if heading content contains anchor tags
blockHasLink =
block.attributes?.content &&
block.attributes.content.includes( '<a ' );
} else if ( block.name === 'core/button' ) {
// Buttons always have links
blockHasLink = !! block.attributes?.url;
}

if ( blockHasLink ) {
hasLink = true;
if ( foundHeading && foundButton ) {
break;
}
}
}

setDefaultControls( {
text: true,
background: true,
button: hasButton,
heading: hasHeading,
caption: hasCaption,
link: hasLink,
} );
}, [ contentBlocks ] );
return {
hasButton: foundButton,
hasHeading: foundHeading,
};
},
[ contentClientIds ]
);

const setAttributes = ( newAttributes ) => {
updateBlockAttributes( clientId, newAttributes );
Expand All @@ -126,7 +60,12 @@ function SectionBlockControls( { blockName, clientId, contentClientIds } ) {
setAttributes={ setAttributes }
asWrapper={ ColorToolsPanel }
label={ __( 'Color' ) }
defaultControls={ defaultControls }
defaultControls={ {
text: true,
background: true,
button: hasButton,
heading: hasHeading,
} }
/>
);
}
Expand Down