Skip to content
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

Jump to bottom

RichText: Remove 'Footnotes' when interactive formatting is disabled #53474

Merged
merged 3 commits into from
Aug 10, 2023
Merged

RichText: Remove 'Footnotes' when interactive formatting is disabled #53474

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a0be77d
RichText: Remove 'Footnotes' when interactive formatting is disabled
Mamaduka Aug 9, 2023
f40f57e
Fix useMemo dependencies
Mamaduka Aug 9, 2023
638bac2
Introduce a new 'interactive' setting for format types
Mamaduka Aug 10, 2023
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
6 changes: 4 additions & 2 deletions packages/block-editor/src/components/rich-text/use-format-types.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,18 @@ export function useFormatTypes( {
return false;
}

// The "Footnote" format requires special handling due to its nested interactive content tag.
if (
withoutInteractiveFormatting &&
interactiveContentTags.has( tagName )
( name === 'core/footnote' ||
interactiveContentTags.has( tagName ) )
Copy link
Member

Choose a reason for hiding this comment

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

Maybe we should add a property to the format registration object to let formats declare themselves as interactive (in addition to checking the tag of course).

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes. I was also thinking about that after I pushed this PR. There could be other cases like this and we don’t want to maintain a separate list of format types.

I’ll update the code 👍

Copy link
Member Author

Choose a reason for hiding this comment

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

Updated in 638bac2.

Sidenote: It would be nice to document some "recent" additions to format-type settings like object, contentEditable and attributes. I know @fabiankaegy has requested this before - #40051.

) {
return false;
}

return true;
} );
}, [ allFormatTypes, allowedFormats, interactiveContentTags ] );
}, [ allFormatTypes, allowedFormats, withoutInteractiveFormatting ] );
Copy link
Member Author

Choose a reason for hiding this comment

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

Fixes the useMemo dependencies unrelated to the bug fix.

  • The interactiveContentTags set won't change during the render.
  • The withoutInteractiveFormatting is a boolean and used inside the memo function.

const keyedSelected = useSelect(
( select ) =>
formatTypes.reduce( ( accumulator, type ) => {
Expand Down
Loading