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

Inserter: Should receive focus on open #67754

Merged
merged 2 commits into from
Dec 9, 2024
Merged

Inserter: Should receive focus on open #67754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c3a08b
Set default tab to 'blocks' if none passed
jeryj Dec 9, 2024
e33629d
Add tests for focusing blocks tab and closing inserter on keypresses
jeryj Dec 9, 2024
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
2 changes: 2 additions & 0 deletions packages/block-editor/src/components/inserter/menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ function InserterMenu(
if ( isZoomOutMode ) {
return 'patterns';
}

return 'blocks';
Copy link
Member

Choose a reason for hiding this comment

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

Not sure why we missed this. The getInitialTab should always return value.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, I'm surprised we missed it too. I guess we know we're human :)

}
const [ selectedTab, setSelectedTab ] = useState( getInitialTab() );

Expand Down
53 changes: 36 additions & 17 deletions test/e2e/specs/site-editor/site-editor-inserter.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,32 +28,51 @@ test.describe( 'Site Editor Inserter', () => {
},
} );

// eslint-disable-next-line playwright/expect-expect
test( 'inserter toggle button should toggle global inserter', async ( {
InserterUtils,
page,
editor,
} ) => {
await InserterUtils.openBlockLibrary();
await InserterUtils.closeBlockLibrary();
} );

// A test for https://github.com/WordPress/gutenberg/issues/43090.
test( 'should close the inserter when clicking on the toggle button', async ( {
editor,
InserterUtils,
} ) => {
const beforeBlocks = await editor.getBlocks();
await test.step( 'should open the inserter via enter keypress on toggle button', async () => {
await InserterUtils.inserterButton.focus();
await page.keyboard.press( 'Enter' );
await expect( InserterUtils.blockLibrary ).toBeVisible();
} );

await InserterUtils.openBlockLibrary();
await InserterUtils.expectActiveTab( 'Blocks' );
await InserterUtils.blockLibrary
.getByRole( 'option', { name: 'Buttons' } )
.click();
await test.step( 'should set focus to the blocks tab when opening the inserter', async () => {
await expect(
InserterUtils.getBlockLibraryTab( 'Blocks' )
).toBeFocused();
} );

await test.step( 'should close the inserter via escape keypress', async () => {
await page.keyboard.press( 'Escape' );
await expect( InserterUtils.blockLibrary ).toBeHidden();
} );

await expect
.poll( editor.getBlocks )
.toMatchObject( [ ...beforeBlocks, { name: 'core/buttons' } ] );
await test.step( 'should focus inserter toggle button after closing the inserter via escape keypress', async () => {
await expect( InserterUtils.inserterButton ).toBeFocused();
} );

await InserterUtils.closeBlockLibrary();
// A test for https://github.com/WordPress/gutenberg/issues/43090.
await test.step( 'should close the inserter when clicking on the toggle button', async () => {
const beforeBlocks = await editor.getBlocks();

await InserterUtils.openBlockLibrary();
await InserterUtils.expectActiveTab( 'Blocks' );
await InserterUtils.blockLibrary
.getByRole( 'option', { name: 'Buttons' } )
.click();

await expect
.poll( editor.getBlocks )
.toMatchObject( [ ...beforeBlocks, { name: 'core/buttons' } ] );

await InserterUtils.closeBlockLibrary();
} );
Comment on lines +60 to +75
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Moving this into a step for better organization and saving a bit of time on e2e test runs.

} );

test.describe( 'Inserter Zoom Level UX', () => {
Expand Down
Loading