RichText: Remove 'Footnotes' when interactive formatting is disabled #53474
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Mamaduka
added
[Type] Bug
Mamaduka
commented
Aug 9, 2023
| ) { | ||
| return false; | ||
| } | ||
|
|
||
| return true; | ||
| } ); | ||
| }, [ allFormatTypes, allowedFormats, interactiveContentTags ] ); | ||
| }, [ allFormatTypes, allowedFormats, withoutInteractiveFormatting ] ); |
There was a problem hiding this comment.
Fixes the useMemo dependencies unrelated to the bug fix.
- The
interactiveContentTagsset won't change during the render. - The
withoutInteractiveFormattingis a boolean and used inside the memo function.
|
Size Change: +434 B (0%) Total Size: 1.5 MB
ℹ️ View Unchanged
|
ellatrix
reviewed
Aug 9, 2023
| if ( | ||
| withoutInteractiveFormatting && | ||
| interactiveContentTags.has( tagName ) | ||
| ( name === 'core/footnote' || | ||
| interactiveContentTags.has( tagName ) ) |
There was a problem hiding this comment.
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).
There was a problem hiding this comment.
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 👍
There was a problem hiding this comment.
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.
Mamaduka
requested review from
ellatrix and
andrewserong
and removed request for
ajitbohra
ellatrix
approved these changes
Aug 10, 2023
|
Oh, Ella beat me to it with the fast review! For what it's worth, this looks great to me, too, thanks for the follow-up! |
tellthemachines
pushed a commit
that referenced
this pull request
Aug 14, 2023
…53474) Introduce a new 'interactive' setting for format types
|
I just cherry-picked this PR to the update/bugfixes-6-3-1 branch to get it included in the next release: 9c23d2f |
tellthemachines
removed
the
Backport to WP Minor Release
tellthemachines
pushed a commit
that referenced
this pull request
Aug 31, 2023
…53474) Introduce a new 'interactive' setting for format types
tellthemachines
added a commit
that referenced
this pull request
Sep 1, 2023
* Update document title buttons radius (#53221) * Fix: Sync status overlaps for some languages in Patterns post type page (#53243) * Image block: Fix stretched images constrained by max-width (#53274) * Fix dragging to resize from stretching image in the frontend * Add image block v7 deprecation * Update deprecation comment * Prevent image losing its aspect ratio at smaller window dimensions * Revert "Prevent image losing its aspect ratio at smaller window dimensions" This reverts commit 8ac9f8c. --------- Co-authored-by: scruffian <ben@scruffian.com> * Image Block: Don't render `DimensionsTool` if it is not resizable (#53181) * Fix missing Replace button in content-locked Image blocks (#53410) * Revert "don't display BlockContextualToolbar at all in contentonly locking (#53110)" This reverts commit 5efce0e. * Alternative fix to hide BlockContextualToolbar when there are no controls * fix the go to for non pages by showing it only for pages (#53408) * Site Editor: Fix document actions label helper method (#52974) * Site Editor: Fix document actions label helper method * Add missing useSelect dep * Fix e2e tests * Move the label map at the file level to avoid recreating the object on every render * Image: Clear aspect ratio when wide aligned (#53439) * RichText: Remove 'Footnotes' when interactive formatting is disabled (#53474) Introduce a new 'interactive' setting for format types * Preserve block style variations when securing theme json (#53466) * Preserve block style variations when securing theme json Valid and safe block style variations were being removed by `WP_Theme_JSON_Gutenberg::remove_insecure_properties` when securing the theme.json. When this was a problem varied depending upon site configuration, but out-of-the-box it was a problem for administrators on multi-site installs. This change adds explicit processing of variations in `remove_insecure_properties` so that they won't get removed. * Add another variation sanitisation test This test checks that when removing insecure properties an unknown/unsupported property is removed from the variation. * Site editor: add missing i18n in `HomeTemplateDetails` (#53543) * Site editor: add missing i18n in `HomeTemplateDetails` * Lint fix * Fix: Snack bar not fixed on certain pages in the Site Editor (#53207) * Fix document title alignment in command palette button (#53224) * Fallback to default max viewport if layout wide size is fluid. (#53551) * Link Control: persist advanced settings toggle state to preferences if available (#52799) * Link Control: Create a preference for whether the advanced section is open * move the useSelect to the component that uses it * Supply preference setter via settings * Pass setter to Post Editor * Provide local state fallbacks in absence of preference store settings * Conditionalise display of settings drawer to “edit” mode only * Extract to constant to improve comprehension * Fix bug in preferences resolution * Improve comments * Add e2e scaffold * Fix e2e test to correctly assert on feature * Remove focused test * Reinstate original logic to hide settings when not required * Scaffold documentation * Revert providing prefs via settings * Refactor to use `core/block-editor` as preference scope * Update docs * Reinstate remaining original conditional * tentative fix for the e2e test * Try a different syntax for shiftAlt * another attempt to fix the e2e test --------- Co-authored-by: Dave Smith <getdavemail@gmail.com> Co-authored-by: MaggieCabrera <maggie.cabrera@automattic.com> * Add tests for fluid layout + typography (#53554) * Fix support of sticky position in non-iframed post editor (#53540) * Fix support of sticky position in non-iframed post editor * Revert "Footnotes: Fix recursion into updating attributes when attributes is not an object (#53257)" This reverts commit ab04074. * Fix: indicator style when block moving mode (#53972) * Fix post editor top toolbar with custom fields in Safari (#53688) * Set top toolbar size dynamically (#53526) * fix the top toolbar size in the space remaining after plugin items are pinned * only resize above the tablet breakpoint * fix fixed block toolbar collapse button when icon labels are shown * Update height and scroll behavior * move the layout effect to the affected component, fixes for fullscreen, no block selected, icon labels height --------- Co-authored-by: jasmussen <joen@automattic.com> * Roll back camelCase change in 96b6b1e --------- Co-authored-by: James Koster <james@jameskoster.co.uk> Co-authored-by: Aki Hamano <54422211+t-hamano@users.noreply.github.com> Co-authored-by: Alex Lende <alex+github.com@lende.xyz> Co-authored-by: scruffian <ben@scruffian.com> Co-authored-by: Robert Anderson <robert@noisysocks.com> Co-authored-by: Andrei Draganescu <me@andreidraganescu.info> Co-authored-by: George Mamadashvili <georgemamadashvili@gmail.com> Co-authored-by: Dean Sas <dean.sas@automattic.com> Co-authored-by: Pascal Birchler <pascalb@google.com> Co-authored-by: Dave Smith <getdavemail@gmail.com> Co-authored-by: MaggieCabrera <maggie.cabrera@automattic.com> Co-authored-by: Mitchell Austin <mr.fye@oneandthesame.net> Co-authored-by: jasmussen <joen@automattic.com> Co-authored-by: ramon <ramonjd@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What?
PR updates the
useFormatTypeshook to exclude the 'Footnote' format whenwithoutInteractiveFormattingis set to true.Why?
The blocks using this flag with the
RichTextcomponent already render interactive content tags. Inserting the 'Footnote' format could result in non-valid HTML markup. E.g., the Button block renders as a link (a), and adding a format marker means nesting link tags.Blocks using
withoutInteractiveFormattingflag: https://github.com/search?q=repo%3AWordPress%2Fgutenberg+withoutInteractiveFormatting+path%3A%2F%5Epackages%5C%2Fblock-library%5C%2Fsrc%5C%2F%2F&type=codeHow?
I added a special handler for the 'Footnote' format.interactivesetting which could indicate the format's interactivity aside from the tag name.Testing Instructions