BlockLockModal: restore focus on fallback toolbar button when original button is not rendered #51666
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
|
The current approach seems to work, although it occurred to me that we could also try to use the |
|
Size Change: +108 B (0%) Total Size: 1.44 MB
ℹ️ View Unchanged
|
ciampo
changed the title
|
Flaky tests detected in 53057a038c38cfd65eec5b3d28e46a41ff57f3f1. 🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/5319871786
|
|
@ciampo Your approach seems to fix the bug but I am wondering how we got ourselves into this mess in the first place. If you have to open the Options submenu to lock a block, why not to unlock a block? Having a dedicated Unlock button is why so many accessibility experts complain about React, Vue, etc. disappearing UI elements. I am sure its a design thing to save space but I am not a fan of all the work you had to do just to fix a bad UX issue. I think we should revisit the dedicated Unlock button as disappearing DOM elements continues to be a large problem in the editor. One that needs to stop. While the focus fix works, it will likely confuse users with the change in focus context. This is why I label this as more of a UX issue then just an accessibility one. Thanks. |
|
@alexstine I understand your point, but this is not a decision that I can make on my own. Can you please leave a comment in the original issue #51447 ? Thank you. |
|
Works well, for me it restores the focus to the first button in the block toolbar. |
ciampo
added
the
Backport to WP 6.7 Beta/RC
|
Does this fix an important bug? Just gauging the reason behind the backport label. If so, it'd be great to have to reviewed/merged soon before WordPress 6.3 Beta (Tuesday this week) |
alexstine
approved these changes
Jun 26, 2023
There was a problem hiding this comment.
@ciampo I tested this and it does solve the problem. I am not thrilled at how long it takes for the focus to actually happen, I guess that is from all the DOM searching to find a better focus area. I think this should go in since it at the very least is an improvement over total focus loss.
This is not to say that I am okay to leave things the way they are after this gets merged. I continue to be very unsatisfied that visual design trumps accessibility. The designs for this implementation need to be revisited so this problem does not exist in the first place. Appearing and disappearing buttons might be practical for the sighted, but not for everyone. It's okay if we do not get it right the first time. No one is perfect. I have a feeling trying to get any traction on revisiting this is going to be a real pain. Hopefully the Design Team proves me wrong.
🚢 👍
alexstine
added
[Type] Bug
|
Looks like this needs a quick refresh and hopefully it will be good to go in. |
ciampo
force-pushed
the
fix/toolbar-block-lock-modal-focus-return
branch
from
53057a0
to
0aba35e
Compare
…gic to the BlockLockToolbar instead
ciampo
force-pushed
the
fix/toolbar-block-lock-modal-focus-return
branch
from
0aba35e
to
cff16b3
Compare
|
I've pushed some changes that should simplify this PR, achieving the same result while avoiding pushing changes to the @mirka, what do you think about the latest approach? @alexstine @jasmussen and @ramonjd , could you give one last check to this PR before merging? |
alexstine
added
[Package] Block editor
ramonjd
added
the
Backport to Gutenberg RC
tellthemachines
pushed a commit
that referenced
this pull request
Jun 27, 2023
…l button is not rendered (#51666) * useFocusReturn: pass focus restoration default target to the onFocusReturn callback * Modal: pass onFocusReturn callback * BlockLockModal: restore focus to first focusable item when unlocking block from toolbar button * Add comments * Revert changes to `useFocusReturn` and `Modal` component, just add logic to the BlockLockToolbar instead * Comment
|
I just cherry-picked this PR to the release/16.1 branch to get it included in the next release: 1472d94 |
tellthemachines
removed
Backport to WP 6.7 Beta/RC
tellthemachines
added a commit
that referenced
this pull request
Jun 27, 2023
* Site Editor: Disable the revision button if there is no clickable menu (#51851) * Improve LinkControl Edit UI (#51712) * Move text above link * Change "URL" label to "Link" * Style tweaks * Add chevron based advanced settings button * Adapt logic for rendering actions and settings * Tweaks * Add proper i18n Co-authored-by: Ben Dwyer <[email protected]> * Remove commented out style Co-authored-by: Ben Dwyer <[email protected]> * Use $button-size-next-default-40px * Add showSettings, combine with new logic * Add additional translation context to advanced * Update toggle drawer name in tests * Standardise query for settings toggle * Update test to check for absence of cancel button during link creation * Fix cancellation tests * Ensure label is always “Link” but remains hidden when it’s the only visible control * Update tests to look for “Link” instead of “URL” name for input * Update empty value UI tests to only run for editing as opposed to creating links * Fix e2e test tabbing order * Use updated terms * Select settings toggle by text not aria label * Fix another tabbing order bug * Fix one more tabbing issue in e2e tests * Fix final tab ordering e2e test * Decouple conditions for showing action buttons from settings Settings may not be provided but action buttons are always needed * Tweak styling to account for action buttons when there are no settings provided * Fix test * Fix e2e test * Update name of the combobox * Fix test expecting Submit button on creation * Fix test by testing under edit rather than creation conditions * Rename URL to Link and avoid triggering command centre * move test earlier --------- Co-authored-by: Ben Dwyer <[email protected]> Co-authored-by: Dave Smith <[email protected]> * Update colors (#51856) * Library: Fix misalignment of description in custom template parts (#51868) * Backport adding the distraction free mode to the site editor (#51173) (#51932) * Fix toolbar overlap in site editor (#51810) * expand fixed toolbar to cover document title control * adds the z-index code back * Page Content Focus: Switch to Page panel when deselecting a block (#51881) * Don't show 'Back to page' notification when navigating away from page (#51880) * Add top margin to page details (#51858) * Keep framer-motion from updating minor version (#51894) * Keep framer-motion from updating minor version * Revert unnecessary package-lock changes * useBlockSync(): Reset inner blocks when component unmounts (#51783) * BlockLockModal: restore focus on fallback toolbar button when original button is not rendered (#51666) * useFocusReturn: pass focus restoration default target to the onFocusReturn callback * Modal: pass onFocusReturn callback * BlockLockModal: restore focus to first focusable item when unlocking block from toolbar button * Add comments * Revert changes to `useFocusReturn` and `Modal` component, just add logic to the BlockLockToolbar instead * Comment * Fix missing MenuGroup in header more menu (#51860) * Add `manage all custom patterns` command (#51845) * Add manage all custom patterns command * reorganise with useAdminNavigationCommands * Command center: Add another batch of commands to the site editor (#51832) Co-authored-by: Nik Tsekouras <[email protected]> * Fix delete shortcut incorrectly bound to non-user patterns (#51830) * `ConfirmDialog`: Fix affirmative action being triggered an extra time when selecting a button via keyboard (#51730) * Ensure the confirm dialog cannnot be submitted using enter when the cancel button is focused * Add test case * Add CHANGELOG entry * Add PR number to changelog * Also prevent double submission of Confirm button * Use actions in storybook example rather than outputting to a heading * Ensure there is always a Navigation available in the browse mode sidebar via fallback algorithm (#50321) * Normalize menu used in sidebar with fallback algorithm * Make fallback retrieval invalidate query cache for Navigation entities * Conditionally trigger fallback creation if no menus are found * Make code self documenting * Add image block aspect ratio control (#51545) * Simplify ImageSizeControl by using Auto as a placeholder * Rename imageWidth and imageHeight props to naturalWidth and naturalHeight * Convert NumberControl onChange values to Numbers * Simplify LatestPostsEdit to use updated ImageSizeControl * Add JSDoc types for debugging * Remove unnecessary noop * Fix possible undefined values in NumberControl onChange * Fix onChangeImage param type which may be undefined * Rename OnChange callback prop * Inline JSDoc props instead of new object * Simplify handing undefined and NaN in onChange * Revert prop name change since this isn't a private API * Add a privateApis export for experimental ImageSizeControl * Use the privateApis version of ImageSizeControl * Add deprecation notice to the original component * Revert image-size-control and create image-dimensions-control instead * Re-add deprecation notice to image-size-control * Try making a whole new component * Revert changes to image, latest-posts, and media-text blocks * Organize and update the dimensions tool panel item * Reword size help text * Reorganize into reusable components * Add stories for other individual tools * Update stories path * Remove SelectControl __next prop * Pass through isShownByDefault to ResolutionTool * Remove unused scss * Deprecate experimental ImageSizeControl * Simplify ScaleTool onChange * Add better defaults for value and onChange * Fix circular dependency * Update comment about auto and custom aspect ratios * Add JSDoc types for ScaleTool * Add JSDoc types for WidthHeightTool * Add default value and onChange for WidthHeightTool * Remove unused import * Add aspectRatio to image block attributes * Add scale to image block attributes * Update JSDoc comment * Add dimensions tool to image block * Rename naturalAspectRatio for clarity * Fix aspect-ratio-tool lint * Fix scale-tool lint * Fix width-height-tool lint * Fix dimensions-tool lint * Fix resolution-tool lint * Add @emption/styled to block-editor * Fix image block lint * Update components changelog * Fix AspectRatioTool reference * Support 'auto' in width-height-tool * Make null/undefined values mean 'auto' instead of defaultValue in aspectRatioTool * Add deprecation for image block * Fix ResizableBox interactions * Add comments for default values * Fix ResizableBox with auto w/h * Clear aspect-ratio on resize * Add TODO comment for ResolutionTool defaultValue * Move the scale hide/show into dimensions controls * Add first test * Fix scale being set after it was deleted * WIP writing tests * Update test * UI tweaks * Move alt text as ToolsPanelItem * Tweak default scale option help text * Only use contain and cover for image scale options * Update test * Test the remaining callback values * Add comment about toStrictEqual * Add test for setting custom aspect ratio and then resetting * Move custom scaleOptions to the image block * Remember last aspect ratio so it can be restored when with/height are unset then set * Remove unused import * Format code * Remove image w/h reset when a new image is added * Use UnitControl's default units instead of spacing.units * Provide the complete set of object-fit options by default * Update TODO that will be committed * Clean up evalAspectRatio and add docs * Someone can file a bug report if offsetWidth/offsetHeight causes issues * I couldn't figure out why height depended on having a custom border, but things seem to work without that * Update docs for image block * Update comment about default value * Fix redundant wording * I think the img width and height attributes can be removed if they're specified in the style attribute * Update package-lock.json with @emotion/styled dependency * Update mock calls for test example * Simplify test values * Consolidate mock calls expect * Require defaultScale and defaultAspectRatio for DimensionsTool * Add DimensionsTool tests for all custom transitions * Remove comment about matching aspect ratio options * Remove redundant check in tests * Add comments to defaultAspectRatio and defaultScale * Organize tests by which field is being updated * Fix type conversion * Add state diagram for last two tests * Refactor and fix some tests * Fix and simplify WidthHeightTool onChange * Remove default scale option in image block.json * Simplify DimensionsTool onChange logic * Update block deprecations with width and height * Revert image block width and height attributes to numbers since we only support px units for now * Revert "Update block deprecations with width and height" This reverts commit 941a81149ed4bc344ac2c0e183624069e33d75ad. * Prevent NaN width/height * Fix DimensionTool width/height units * Fix JSDoc Dimenstions width/height types * No default needed for ResolutionTool * Fix drag handle aspect ratio reset * Simplify null checks * Stop using pxWidth and pxHeight * Remove e2e tests that reference the scale button that was removed * Fix image scaling for small images * Try fixing aspectRatio only images * Update test to respect the new aspect ratio behavior --------- Co-authored-by: Alex Lende <[email protected]> Co-authored-by: Rich Tabor <[email protected]> Co-authored-by: Jerry Jones <[email protected]> * Site Editor: Make string to add Template parts & Patterns consistent and translatable (#51743) * Site Editor: Make Template Parts & Patterns Management dropdown translatable * Make strings consistent * Site Editor Sidebar: improvements to buttons (#51762) * Do not show tooltip from all "back" buttons * Avoid double button rendering in the patterns screen * Use as prop instead of classname * Add translation to strings * Fix more icons for high resolution devices (#51768) * Site tagline icon * Update align-none.js * Update position-left.js * Update position-right.js * Update position-center.js * Update button.js * Update buttons.js * Update media-and-text.js * Update spacer block icon * Update separator.js * Update stretch-full-width.js * Update stretch-wide.js * Update resize-corner-n-e.js * Update justify-center.js * Update align-left.js * Update align-center.js * Update align-right.js * Update snapshots * Hide block toolbar using CSS when it is empty (#51779) * Update the add template modal design (#51806) * Add icons * alignment * Custom descriptions * justify content * Style custom template button * Remove min-height * Don't display description when there isn't one * Reduce space between template + description * Style icon * Style custom template * increase button size * Add prompt * Update template icons * Make year dynamic * Remove short descriptions * Revert "Remove short descriptions" This reverts commit 7eb06e8ab845b9cda3975989456614df5b221c29. * re-instate descriptions but only show as a tooltip * simplify a bit --------- Co-authored-by: ntsekouras <[email protected]> * Buttons Block: Fix for orientation-based block movers (#51831) * Button: Introduce `size` prop (#51842) * Revert "Button: Add opt-in prop for larger `isSmall` size (#51012)" This reverts commit 19bcabf. # Conflicts: # packages/components/CHANGELOG.md * Add docs for `size` prop Also fixes type duplicate prop name issues in NumberControl and FontSizePicker * Add CSS * Fixup * Add TODO for deprecation * Add test for back compat * Fixup * Add changelog * Tweak description for "compact" * Note that the `size` prop takes precedence * Add test for prop priority * Stop leaking `spinButtonSize` prop for styling * Color (#51847) * Only show Page Content Focus commands when in edit mode (#51888) * Add UI commands to the post editor (#51900) Co-authored-by: ntsekouras <[email protected]> * ZStack: fix component bounding box to match children (#51836) * ZStack: rewrite using CSS grid * Use first-of-type instead of fist-child * CHANGELOG * Improve comment * Apply styles once in the parent wrapper * Avoid each child view from expanding to all available space * Remove unnecessary wrapeprs in storybook exmaple * Add view patterns plural label. (#51850) * Fix css styles in block.jsons. (#51866) * Update active item appearance in Library (#51848) * Color * Use aria-current * Fix Rename in Navigation on Browse Mode (#51791) * Ensure edits are passed to save * Ensure empty strings are invalid * Force break of long strings in menu titles * Fix ability to click through to Template Parts in Library (#51838) * ItemGroup: Update button focus styles to use `:focus-visible` (#51787) * Use focus-visible rather than focus on ItemGroup buttons * Update snapshot * Update Changelog * Update package-lock --------- Co-authored-by: Aki Hamano <[email protected]> Co-authored-by: Rich Tabor <[email protected]> Co-authored-by: Ben Dwyer <[email protected]> Co-authored-by: Dave Smith <[email protected]> Co-authored-by: James Koster <[email protected]> Co-authored-by: Héctor <[email protected]> Co-authored-by: Andrei Draganescu <[email protected]> Co-authored-by: Robert Anderson <[email protected]> Co-authored-by: Marco Ciampini <[email protected]> Co-authored-by: Nik Tsekouras <[email protected]> Co-authored-by: Riad Benguella <[email protected]> Co-authored-by: Daniel Richards <[email protected]> Co-authored-by: Alex Lende <[email protected]> Co-authored-by: Alex Lende <[email protected]> Co-authored-by: Jerry Jones <[email protected]> Co-authored-by: Lena Morita <[email protected]> Co-authored-by: Andrea Fercia <[email protected]> Co-authored-by: Jonny Harris <[email protected]> Co-authored-by: Sarah Norris <[email protected]>
sethrubenstein
pushed a commit
to pewresearch/gutenberg
that referenced
this pull request
Jul 13, 2023
…l button is not rendered (WordPress#51666) * useFocusReturn: pass focus restoration default target to the onFocusReturn callback * Modal: pass onFocusReturn callback * BlockLockModal: restore focus to first focusable item when unlocking block from toolbar button * Add comments * Revert changes to `useFocusReturn` and `Modal` component, just add logic to the BlockLockToolbar instead * Comment
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?
Improve focus restoration after un-locking a block via the lock button in the block toolbar
Partially addresses #51447
Why?
Currently, when unlocking a block via the block lock modal opened by pressing the "lock" toolbar button, the focus is not restored correctly, since the "lock icon" button gets removed from the toolbar. As described in #51447, this is not ideal, especially for assistive technology users.
How?
Added logic to the
BlockLockToolbarcomponent, so that the component moves focus to the first focusable button in the block toolbar when theBlockLockModalis closed and the button would otherwise disappearTesting Instructions
Check that focus restoration works as expected:
Check that the are no regressions on the other usage of "BlockLockModal" via the "more" dropdown:
Screenshots or screencast
Kapture.2023-06-19.at.22.59.19.mp4