Skip to content

POC: Filter toolbar items by prop in contentOnly #71469

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

Open
wants to merge 13 commits into
base: trunk
Choose a base branch
from
+68 −51
Open

POC: Filter toolbar items by prop in contentOnly #71469

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9d99bdd
Add filter prop to slot fills
jeryj Sep 2, 2025
eec43dc
Use filtering in block controls slots
jeryj Sep 2, 2025
c16e98b
Make filtering on slot fills private
jeryj Sep 2, 2025
be7e1b2
Simplify slot fill ts definition
jeryj Sep 2, 2025
ee6b550
Remove alignment control from write mode
jeryj Sep 3, 2025
e79ee55
Remove unneeded category=content from toolbaritem
jeryj Sep 3, 2025
2c48aee
Filter block tools in fill wrapper
jeryj Sep 3, 2025
b15e32e
Revert changes to slot fill - remove slot fill filtering from slot co…
jeryj Sep 3, 2025
e28f37b
Simplify fill filtering
jeryj Sep 3, 2025
a85db5e
Revert block-controls/slot.js
jeryj Sep 3, 2025
49024a8
Really revert slot.js
jeryj Sep 3, 2025
4232366
Use React's Children.toArray
jeryj Sep 4, 2025
df2028f
Use fillProps for filtering contentOnly block tools
jeryj Sep 4, 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
Simplify fill filtering
  • Loading branch information
@jeryj
jeryj committed Sep 5, 2025
commit e28f37bcb9cfaf2c59a3ca78ab7e3b7c8e1350d7
81 changes: 0 additions & 81 deletions packages/block-editor/src/components/block-controls/content-only-filter.js
View file
Open in desktop

This file was deleted.

16 changes: 13 additions & 3 deletions packages/block-editor/src/components/block-controls/fill.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
* Internal dependencies
*/
import useBlockControlsFill from './hook';
import { ContentOnlyFilter } from './content-only-filter';
import { useBlockEditingMode } from '../block-editing-mode';

export default function BlockControlsFill( {
group = 'default',
Expand All @@ -22,14 +22,24 @@ export default function BlockControlsFill( {
group,
__experimentalShareWithChildBlocks
);
const blockEditingMode = useBlockEditingMode();

if ( ! Fill ) {
return null;
}

// Filter children in content-only mode
let filteredChildren = children;
if ( blockEditingMode === 'contentOnly' && Array.isArray( children ) ) {
filteredChildren = children.filter( ( child ) => {
Copy link
Contributor

@getdave getdave Sep 3, 2025

Choose a reason for hiding this comment

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

This filter will always create a new Array. For perf reasons I wonder if there's a way to avoid that 🤔

Copy link
Contributor

@getdave getdave Sep 3, 2025

Choose a reason for hiding this comment

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

We can certainly look to memoize.

Copy link
Contributor Author

@jeryj jeryj Sep 3, 2025

Choose a reason for hiding this comment

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

I had the AI write a performance test case to compare:

Memoized - 5 items: 0.188ms average (1000 iterations)
Non-memoized - 5 items: 0.132ms average (1000 iterations)
Difference: 0.055ms (41.7%)

This is significant! The memoized version is actually 41.7% slower than the non-memoized version for small arrays (5 items).

Copy link
Member

@jsnajdr jsnajdr Sep 4, 2025

Choose a reason for hiding this comment

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

Instead of the Array.isArray check it's better to use React.Children.toArray, which is a targeted helper that converts children to a valid array.

I wouldn't worry about copying children at all. Every React render creates a tremendous amount of arrays and objects and then dumps them after the render is finished.

Also, the fill is typically used as:

<BlockControlsFill>
  <SomeItem />
  <SomeOther Item />
</BlockControlsFill>

Where the children is a new array on every render. It's quite rare that children would stay constant between renders.

return child?.props?.category === 'content';
} );
}

const innerMarkup = (
<>
{ group === 'default' && <ToolbarGroup controls={ controls } /> }
{ children }
{ filteredChildren }
</>
);

Expand All @@ -44,7 +54,7 @@ export default function BlockControlsFill( {
( inner, [ Provider, props ] ) => (
<Provider { ...props }>{ inner }</Provider>
),
<ContentOnlyFilter>{ innerMarkup }</ContentOnlyFilter>
innerMarkup
);
} }
</Fill>
Expand Down