Skip to content

Improvements to use-focus-first-element and utils (dom) #39461

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

Merged
talldan merged 15 commits into from
Mar 28, 2022
Merged

Improvements to use-focus-first-element and utils (dom) #39461

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
fac5b03
Improve the way focus first element works for non-content editable bl…
alexstine Mar 15, 2022
33bdfc5
Some code fixes.
alexstine Mar 15, 2022
21b47b1
Merge branch 'trunk' of github.com:wordpress/gutenberg into fix/block…
alexstine Mar 15, 2022
e454097
Break off isFormElement function in to utils.js for reuse.
alexstine Mar 15, 2022
cbd79e6
Fix element class detection error.
alexstine Mar 15, 2022
4ffec9c
Merge branch 'trunk' of github.com:wordpress/gutenberg into improve/f…
alexstine Mar 15, 2022
14fd4ad
Try to fix test failures.
alexstine Mar 15, 2022
42ddba7
See if tests pass.
alexstine Mar 15, 2022
ee84ab2
Merge branch 'trunk' of github.com:wordpress/gutenberg into improve/f…
alexstine Mar 15, 2022
cd9df4a
Merge branch 'trunk' of github.com:wordpress/gutenberg into improve/f…
alexstine Mar 16, 2022
bb7a855
Now that tests are working again, try again with some fixes. JSDoc im…
alexstine Mar 16, 2022
fc14a9b
Merge branch 'trunk' of github.com:wordpress/gutenberg into improve/f…
alexstine Mar 16, 2022
c5dae59
Fix failing E2E tests.
alexstine Mar 17, 2022
6ed767d
Move isFormElement to wordpress/dom.
alexstine Mar 17, 2022
007d826
Code cleanup.
alexstine Mar 18, 2022
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
Try to fix test failures.
  • Loading branch information
@alexstine
alexstine committed Mar 15, 2022
commit 14fd4ad527fc1f44b014969e7e41b3ff86bd668d
8 changes: 4 additions & 4 deletions packages/block-editor/src/utils/dom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ export function isInSameBlock( a, b ) {
* its inner blocks or appender.
*/
export function isInsideRootBlock( blockElement, element ) {
if ( element.classList.contains( BLOCK_APPENDER_CLASS ) ) {
return false;
}
const parentBlock = element.closest(
[ BLOCK_SELECTOR, APPENDER_SELECTOR ].join( ',' )
);
return parentBlock === blockElement;
return (
parentBlock === blockElement &&
parentBlock.classList.contains( BLOCK_APPENDER_CLASS ) === false
);
}

/**
Expand Down