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
Next Next commit
Add filter prop to slot fills
  • Loading branch information
@jeryj
jeryj committed Sep 5, 2025
commit 9d99bdd01d57ff0056c5c7d11959b121a048a740
7 changes: 5 additions & 2 deletions packages/components/src/slot-fill/slot.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function Slot( props: Omit< SlotComponentProps, 'bubblesVirtually' > ) {
const registry = useContext( SlotFillContext );
const instanceRef = useRef( {} );

const { name, children, fillProps = {} } = props;
const { name, children, fillProps = {}, filter } = props;

useLayoutEffect( () => {
const instance = instanceRef.current;
Expand All @@ -68,7 +68,10 @@ function Slot( props: Omit< SlotComponentProps, 'bubblesVirtually' > ) {
fills = [];
}

const renderedFills = fills
// Apply filter function if provided
const filteredFills = filter ? fills.filter( filter ) : fills;

const renderedFills = filteredFills
.map( ( fill ) => {
const fillChildren = isFunction( fill.children )
? fill.children( fillProps )
Expand Down
17 changes: 17 additions & 0 deletions packages/components/src/slot-fill/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ type SlotPropBase = {
fillProps?: FillProps;
};

export type FillFilter = ( fill: {
instance: FillInstance;
children: FillChildren;
} ) => boolean;

export type SlotComponentProps =
| ( SlotPropBase & {
/**
Expand All @@ -56,6 +61,12 @@ export type SlotComponentProps =
* Supported only when `bubblesVirtually` is `true`.
*/
style?: React.CSSProperties;

/**
* Optional filter function to control which fills are rendered.
* Returns true to include the fill, false to exclude it.
*/
filter?: FillFilter;
} )
| ( SlotPropBase & {
/**
Expand All @@ -82,6 +93,12 @@ export type SlotComponentProps =
* Supported only when `bubblesVirtually` is `true`.
*/
style?: never;

/**
* Optional filter function to control which fills are rendered.
* Returns true to include the fill, false to exclude it.
*/
filter?: FillFilter;
} );

export type FillChildren =
Expand Down