From d149dba41278f8e850e7df001eb2396bde1e4d69 Mon Sep 17 00:00:00 2001 From: James Koster Date: Mon, 24 Jun 2024 13:19:31 +0100 Subject: [PATCH 1/2] Align naming modals --- packages/dataviews/src/item-actions.tsx | 2 ++ packages/edit-site/src/components/add-new-page/index.js | 7 ++++++- .../components/page-patterns/rename-category-menu-item.js | 2 ++ .../rename-modal.js | 7 ++++++- .../src/components/create-template-part-modal/index.js | 2 ++ .../src/components/create-template-part-modal/style.scss | 6 ------ packages/editor/src/components/post-actions/index.js | 2 ++ .../components/post-template/create-new-template-modal.js | 2 ++ packages/patterns/src/components/create-pattern-modal.js | 2 ++ packages/patterns/src/components/rename-pattern-modal.js | 8 +++++++- 10 files changed, 31 insertions(+), 9 deletions(-) diff --git a/packages/dataviews/src/item-actions.tsx b/packages/dataviews/src/item-actions.tsx index 370162130f1f2a..fa6aae3336464a 100644 --- a/packages/dataviews/src/item-actions.tsx +++ b/packages/dataviews/src/item-actions.tsx @@ -113,6 +113,8 @@ export function ActionModal< Item extends AnyItem >( { title={ action.modalHeader || label } __experimentalHideHeader={ !! action.hideModalHeader } onRequestClose={ closeModal ?? ( () => {} ) } + focusOnMount="firstContentElement" + size="small" overlayClassName={ `dataviews-action-modal dataviews-action-modal__${ kebabCase( action.id ) }` } diff --git a/packages/edit-site/src/components/add-new-page/index.js b/packages/edit-site/src/components/add-new-page/index.js index 41f5bf9bf9a5f2..9bd82fe217c606 100644 --- a/packages/edit-site/src/components/add-new-page/index.js +++ b/packages/edit-site/src/components/add-new-page/index.js @@ -82,7 +82,12 @@ export default function AddNewPageModal( { onSave, onClose } ) { } return ( - +
); } diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/rename-modal.js b/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/rename-modal.js index d290a40516bf0b..c80f1603eb75f3 100644 --- a/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/rename-modal.js +++ b/packages/edit-site/src/components/sidebar-navigation-screen-navigation-menu/rename-modal.js @@ -22,7 +22,12 @@ export default function RenameModal( { menuTitle, onClose, onSave } ) { titleHasChanged && notEmptyString( editedMenuTitle ); return ( - + diff --git a/packages/editor/src/components/create-template-part-modal/style.scss b/packages/editor/src/components/create-template-part-modal/style.scss index 907e42bf52ea47..85df0270e3a5a5 100644 --- a/packages/editor/src/components/create-template-part-modal/style.scss +++ b/packages/editor/src/components/create-template-part-modal/style.scss @@ -1,11 +1,5 @@ .editor-create-template-part-modal { z-index: z-index(".editor-create-template-part-modal"); - - .components-modal__frame { - @include break-small { - max-width: 500px; - } - } } .editor-create-template-part-modal__area-radio-group { diff --git a/packages/editor/src/components/post-actions/index.js b/packages/editor/src/components/post-actions/index.js index 503cb928c86fe5..00d256ef67eeef 100644 --- a/packages/editor/src/components/post-actions/index.js +++ b/packages/editor/src/components/post-actions/index.js @@ -123,6 +123,8 @@ function ActionWithModal( { action, item, ActionTrigger, onClose } ) { overlayClassName={ `editor-action-modal editor-action-modal__${ kebabCase( action.id ) }` } + focusOnMount="firstContentElement" + size="small" > diff --git a/packages/patterns/src/components/rename-pattern-modal.js b/packages/patterns/src/components/rename-pattern-modal.js index 9c6aef7116530e..db107841e78c21 100644 --- a/packages/patterns/src/components/rename-pattern-modal.js +++ b/packages/patterns/src/components/rename-pattern-modal.js @@ -88,7 +88,13 @@ export default function RenamePatternModal( { }; return ( - + Date: Tue, 25 Jun 2024 18:52:28 +0900 Subject: [PATCH 2/2] Fix e2e test --- test/e2e/specs/editor/various/writing-flow.spec.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/test/e2e/specs/editor/various/writing-flow.spec.js b/test/e2e/specs/editor/various/writing-flow.spec.js index 2eee3cad2b73ff..1af46a80896f07 100644 --- a/test/e2e/specs/editor/various/writing-flow.spec.js +++ b/test/e2e/specs/editor/various/writing-flow.spec.js @@ -1157,9 +1157,12 @@ test.describe( 'Writing Flow (@firefox, @webkit)', () => { await page.keyboard.type( 'synced' ); await editor.clickBlockOptionsMenuItem( 'Create pattern' ); - await page.keyboard.press( 'Tab' ); - await page.keyboard.press( 'Tab' ); - await page.keyboard.type( 'test' ); + const createPatternDialog = editor.page.getByRole( 'dialog', { + name: 'add new pattern', + } ); + await createPatternDialog + .getByRole( 'textbox', { name: 'Name' } ) + .fill( 'test' ); await page.keyboard.press( 'Enter' ); await expect(