Skip to content

Writing Flow: Avoid auto-focus on nested blocks #5092

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

Closed
aduth wants to merge 1 commit into from
Closed

Writing Flow: Avoid auto-focus on nested blocks #5092

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions editor/components/writing-flow/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,14 @@ class WritingFlow extends Component {
const blockContainer = this.container.querySelector( `[data-block="${ this.props.selectedBlockUID }"]` );
if ( blockContainer && ! blockContainer.contains( document.activeElement ) ) {
const target = this.getInnerTabbable( blockContainer, this.props.initialPosition === -1 );

// Avoid selecting the target if it's:
// - The default block appender (or generally uneditable)
// - Within a nested block
if ( target.readOnly || target.closest( '[data-block]' ) !== blockContainer ) {
Copy link
Contributor

@youknowriad youknowriad Feb 16, 2018

Choose a reason for hiding this comment

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

This breaks some behaviors:

  • splitting inside container blocks like "columns".
  • selecting an image and hitting Enter inside container blocks

Copy link
Member Author

@aduth aduth Feb 16, 2018

Choose a reason for hiding this comment

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

Hmm, I can confirm this, though I wouldn't have expected it, since these behaviors should be finding inputs within the selected block, at which point it should be finding the selected nested's inputs correctly. Will investigate...

return;
}

target.focus();
if ( this.props.initialPosition === -1 ) {
// Special casing RichText components because the two functions at the bottom are not working as expected.
Expand Down