diff --git a/docs/explanations/faq.md b/docs/explanations/faq.md index f9c6b059e133d9..4a365ce5b41d19 100644 --- a/docs/explanations/faq.md +++ b/docs/explanations/faq.md @@ -151,7 +151,7 @@ This is the canonical list of keyboard shortcuts: ⇧⌘Z - Show or hide the settings sidebar. + Show or hide the Settings sidebar. Ctrl+Shift+, ⇧⌘, diff --git a/packages/e2e-test-utils-playwright/src/editor/open-document-settings-sidebar.ts b/packages/e2e-test-utils-playwright/src/editor/open-document-settings-sidebar.ts index ac21dcbba0ed6e..a9ddffcd6cd5e3 100644 --- a/packages/e2e-test-utils-playwright/src/editor/open-document-settings-sidebar.ts +++ b/packages/e2e-test-utils-playwright/src/editor/open-document-settings-sidebar.ts @@ -24,7 +24,7 @@ export async function openDocumentSettingsSidebar( this: Editor ) { await toggleButton.click(); await this.page .getByRole( 'region', { name: 'Editor settings' } ) - .getByRole( 'button', { name: 'Close settings' } ) + .getByRole( 'button', { name: 'Close Settings' } ) .waitFor(); } } diff --git a/packages/e2e-test-utils-playwright/src/editor/site-editor.ts b/packages/e2e-test-utils-playwright/src/editor/site-editor.ts index a6fb454b912d44..b4c4ae1338d818 100644 --- a/packages/e2e-test-utils-playwright/src/editor/site-editor.ts +++ b/packages/e2e-test-utils-playwright/src/editor/site-editor.ts @@ -14,7 +14,7 @@ export async function saveSiteEditorEntities( this: Editor ) { ); // Second Save button in the entities panel. await this.page.click( - 'role=region[name="Save sidebar"i] >> role=button[name="Save"i]' + 'role=region[name="Save panel"i] >> role=button[name="Save"i]' ); await this.page.waitForSelector( 'role=region[name="Editor top bar"i] >> role=button[name="Save"i][disabled]' diff --git a/packages/e2e-tests/plugins/plugins-api/annotations-sidebar.js b/packages/e2e-tests/plugins/plugins-api/annotations-sidebar.js index 402f719729928c..f73ad5c68013b6 100644 --- a/packages/e2e-tests/plugins/plugins-api/annotations-sidebar.js +++ b/packages/e2e-tests/plugins/plugins-api/annotations-sidebar.js @@ -94,7 +94,7 @@ PluginSidebar, { name: 'annotations-sidebar', - title: __( 'Annotations Sidebar' ), + title: __( 'Annotations' ), }, el( SidebarContents, {} ) ), @@ -103,7 +103,7 @@ { target: 'annotations-sidebar', }, - __( 'Annotations Sidebar' ) + __( 'Annotations' ) ) ); } diff --git a/packages/e2e-tests/plugins/plugins-api/sidebar.js b/packages/e2e-tests/plugins/plugins-api/sidebar.js index a97a940d846b8a..01e0a80de78363 100644 --- a/packages/e2e-tests/plugins/plugins-api/sidebar.js +++ b/packages/e2e-tests/plugins/plugins-api/sidebar.js @@ -70,7 +70,7 @@ PluginSidebar, { name: 'title-sidebar', - title: __( 'Plugin sidebar title' ), + title: __( 'Plugin title' ), }, el( SidebarContents, {} ) ), @@ -79,7 +79,7 @@ { target: 'title-sidebar', }, - __( 'Plugin sidebar more menu title' ) + __( 'Plugin more menu title' ) ) ); } diff --git a/packages/e2e-tests/specs/editor/plugins/__snapshots__/plugins-api.test.js.snap b/packages/e2e-tests/specs/editor/plugins/__snapshots__/plugins-api.test.js.snap index 34c57bf11e7bc5..4cac5cd6893cda 100644 --- a/packages/e2e-tests/specs/editor/plugins/__snapshots__/plugins-api.test.js.snap +++ b/packages/e2e-tests/specs/editor/plugins/__snapshots__/plugins-api.test.js.snap @@ -2,6 +2,6 @@ exports[`Using Plugins API Document Setting Custom Panel Should render a custom panel inside Document Setting sidebar 1`] = `"My Custom Panel"`; -exports[`Using Plugins API Sidebar Medium screen Should open plugins sidebar using More Menu item and render content 1`] = `"
(no title)
Plugin sidebar title
"`; +exports[`Using Plugins API Sidebar Medium screen Should open plugins sidebar using More Menu item and render content 1`] = `"
(no title)
Plugin title
"`; -exports[`Using Plugins API Sidebar Should open plugins sidebar using More Menu item and render content 1`] = `"
(no title)
Plugin sidebar title
"`; +exports[`Using Plugins API Sidebar Should open plugins sidebar using More Menu item and render content 1`] = `"
(no title)
Plugin title
"`; diff --git a/packages/e2e-tests/specs/editor/plugins/annotations.test.js b/packages/e2e-tests/specs/editor/plugins/annotations.test.js index 0ab1fc0f99dfff..85265bf424abc5 100644 --- a/packages/e2e-tests/specs/editor/plugins/annotations.test.js +++ b/packages/e2e-tests/specs/editor/plugins/annotations.test.js @@ -100,7 +100,7 @@ describe( 'Annotations', () => { it( 'allows a block to be annotated', async () => { await page.keyboard.type( 'Title' + '\n' + 'Paragraph to annotate' ); - await clickOnMoreMenuItem( 'Annotations Sidebar' ); + await clickOnMoreMenuItem( 'Annotations' ); let annotations = await page.$$( ANNOTATIONS_SELECTOR ); expect( annotations ).toHaveLength( 0 ); @@ -128,7 +128,7 @@ describe( 'Annotations', () => { it( 'keeps the cursor in the same location when applying annotation', async () => { await page.keyboard.type( 'Title' + '\n' + 'ABC' ); - await clickOnMoreMenuItem( 'Annotations Sidebar' ); + await clickOnMoreMenuItem( 'Annotations' ); await annotateFirstBlock( 1, 2 ); @@ -146,7 +146,7 @@ describe( 'Annotations', () => { it( 'moves when typing before it', async () => { await page.keyboard.type( 'Title' + '\n' + 'ABC' ); - await clickOnMoreMenuItem( 'Annotations Sidebar' ); + await clickOnMoreMenuItem( 'Annotations' ); await annotateFirstBlock( 1, 2 ); @@ -168,7 +168,7 @@ describe( 'Annotations', () => { it( 'grows when typing inside it', async () => { await page.keyboard.type( 'Title' + '\n' + 'ABC' ); - await clickOnMoreMenuItem( 'Annotations Sidebar' ); + await clickOnMoreMenuItem( 'Annotations' ); await annotateFirstBlock( 1, 2 ); diff --git a/packages/e2e-tests/specs/editor/plugins/plugins-api.test.js b/packages/e2e-tests/specs/editor/plugins/plugins-api.test.js index 2e3f9758dc684a..4ad8d0e634204f 100644 --- a/packages/e2e-tests/specs/editor/plugins/plugins-api.test.js +++ b/packages/e2e-tests/specs/editor/plugins/plugins-api.test.js @@ -69,10 +69,10 @@ describe( 'Using Plugins API', () => { describe( 'Sidebar', () => { const SIDEBAR_PINNED_ITEM_BUTTON = - '.interface-pinned-items button[aria-label="Plugin sidebar title"]'; + '.interface-pinned-items button[aria-label="Plugin title"]'; const SIDEBAR_PANEL_SELECTOR = '.sidebar-title-plugin-panel'; it( 'Should open plugins sidebar using More Menu item and render content', async () => { - await clickOnMoreMenuItem( 'Plugin sidebar more menu title' ); + await clickOnMoreMenuItem( 'Plugin more menu title' ); const pluginSidebarContent = await page.$eval( '.edit-post-sidebar', @@ -105,7 +105,7 @@ describe( 'Using Plugins API', () => { await page.reload(); await page.waitForSelector( '.edit-post-layout' ); expect( await page.$( SIDEBAR_PINNED_ITEM_BUTTON ) ).toBeNull(); - await clickOnMoreMenuItem( 'Plugin sidebar more menu title' ); + await clickOnMoreMenuItem( 'Plugin more menu title' ); await page.click( 'button[aria-label="Pin to toolbar"]' ); expect( await page.$( SIDEBAR_PINNED_ITEM_BUTTON ) ).not.toBeNull(); await page.reload(); @@ -114,12 +114,12 @@ describe( 'Using Plugins API', () => { } ); it( 'Should close plugins sidebar using More Menu item', async () => { - await clickOnMoreMenuItem( 'Plugin sidebar more menu title' ); + await clickOnMoreMenuItem( 'Plugin more menu title' ); const pluginSidebarOpened = await page.$( '.edit-post-sidebar' ); expect( pluginSidebarOpened ).not.toBeNull(); - await clickOnMoreMenuItem( 'Plugin sidebar more menu title' ); + await clickOnMoreMenuItem( 'Plugin more menu title' ); const pluginSidebarClosed = await page.$( '.edit-post-sidebar' ); expect( pluginSidebarClosed ).toBeNull(); @@ -135,7 +135,7 @@ describe( 'Using Plugins API', () => { } ); it( 'Should open plugins sidebar using More Menu item and render content', async () => { - await clickOnMoreMenuItem( 'Plugin sidebar more menu title' ); + await clickOnMoreMenuItem( 'Plugin more menu title' ); const pluginSidebarContent = await page.$eval( '.edit-post-sidebar', diff --git a/packages/e2e-tests/specs/editor/various/preferences.test.js b/packages/e2e-tests/specs/editor/various/preferences.test.js index 59445ecbe55528..98249637c7e968 100644 --- a/packages/e2e-tests/specs/editor/various/preferences.test.js +++ b/packages/e2e-tests/specs/editor/various/preferences.test.js @@ -46,7 +46,7 @@ describe( 'preferences', () => { // Dismiss. await page.click( - '.edit-post-sidebar__panel-tabs [aria-label="Close settings"]' + '.edit-post-sidebar__panel-tabs [aria-label="Close Settings"]' ); expect( await getActiveSidebarTabText() ).toBe( null ); diff --git a/packages/e2e-tests/specs/site-editor/multi-entity-saving.test.js b/packages/e2e-tests/specs/site-editor/multi-entity-saving.test.js index fa039fb10fd2ed..d54f9c78dd8b89 100644 --- a/packages/e2e-tests/specs/site-editor/multi-entity-saving.test.js +++ b/packages/e2e-tests/specs/site-editor/multi-entity-saving.test.js @@ -275,7 +275,7 @@ describe( 'Multi-entity save flow', () => { '//a[contains(@class, "block-editor-list-view-block-select-button")][contains(., "header")]' ); headerTemplatePartListViewButton.click(); - await page.click( 'button[aria-label="Close List View Sidebar"]' ); + await page.click( 'button[aria-label="Close"]' ); // Insert something to dirty the editor. await insertBlock( 'Paragraph' ); diff --git a/packages/edit-post/src/components/keyboard-shortcuts/index.js b/packages/edit-post/src/components/keyboard-shortcuts/index.js index 13a989de7fd076..5344d9155c8a47 100644 --- a/packages/edit-post/src/components/keyboard-shortcuts/index.js +++ b/packages/edit-post/src/components/keyboard-shortcuts/index.js @@ -130,7 +130,7 @@ function KeyboardShortcuts() { registerShortcut( { name: 'core/edit-post/toggle-sidebar', category: 'global', - description: __( 'Show or hide the settings sidebar.' ), + description: __( 'Show or hide the Settings sidebar.' ), keyCombination: { modifier: 'primaryShift', character: ',', diff --git a/packages/edit-post/src/components/sidebar/settings-sidebar/index.js b/packages/edit-post/src/components/sidebar/settings-sidebar/index.js index 677161c6b5a383..8450fec0225932 100644 --- a/packages/edit-post/src/components/sidebar/settings-sidebar/index.js +++ b/packages/edit-post/src/components/sidebar/settings-sidebar/index.js @@ -73,7 +73,7 @@ const SettingsSidebar = () => { } - closeLabel={ __( 'Close settings' ) } + closeLabel={ __( 'Close Settings' ) } headerClassName="edit-post-sidebar__panel-tabs" /* translators: button label text should, if possible, be under 16 characters. */ title={ __( 'Settings' ) } diff --git a/packages/edit-site/src/components/keyboard-shortcuts/register.js b/packages/edit-site/src/components/keyboard-shortcuts/register.js index ba164cf05b0a36..0574125ba476b6 100644 --- a/packages/edit-site/src/components/keyboard-shortcuts/register.js +++ b/packages/edit-site/src/components/keyboard-shortcuts/register.js @@ -66,7 +66,7 @@ function KeyboardShortcutsRegister() { registerShortcut( { name: 'core/edit-site/toggle-block-settings-sidebar', category: 'global', - description: __( 'Show or hide the block settings sidebar.' ), + description: __( 'Show or hide the Settings sidebar.' ), keyCombination: { modifier: 'primaryShift', character: ',', diff --git a/packages/edit-site/src/components/layout/index.js b/packages/edit-site/src/components/layout/index.js index abc33201d6c0ac..446556719c923e 100644 --- a/packages/edit-site/src/components/layout/index.js +++ b/packages/edit-site/src/components/layout/index.js @@ -252,7 +252,7 @@ export default function Layout() { } > diff --git a/packages/edit-site/src/components/save-panel/index.js b/packages/edit-site/src/components/save-panel/index.js index 398db8f3b40fab..fa9516f3599d9b 100644 --- a/packages/edit-site/src/components/save-panel/index.js +++ b/packages/edit-site/src/components/save-panel/index.js @@ -66,7 +66,7 @@ export default function SavePanel() { className={ classnames( 'edit-site-layout__actions', { 'is-entity-save-view-open': isSaveViewOpen, } ) } - ariaLabel={ __( 'Save sidebar' ) } + ariaLabel={ __( 'Save panel' ) } > { isSaveViewOpen ? ( entitySavedStates diff --git a/packages/edit-site/src/components/secondary-sidebar/list-view-sidebar.js b/packages/edit-site/src/components/secondary-sidebar/list-view-sidebar.js index dc33ffb649c7de..82c9739da1e75b 100644 --- a/packages/edit-site/src/components/secondary-sidebar/list-view-sidebar.js +++ b/packages/edit-site/src/components/secondary-sidebar/list-view-sidebar.js @@ -6,7 +6,6 @@ import { Button } from '@wordpress/components'; import { useFocusOnMount, useFocusReturn, - useInstanceId, useMergeRefs, } from '@wordpress/compose'; import { useDispatch } from '@wordpress/data'; @@ -32,13 +31,10 @@ export default function ListViewSidebar() { } } - const instanceId = useInstanceId( ListViewSidebar ); - const labelId = `edit-site-editor__list-view-panel-label-${ instanceId }`; const { PrivateListView } = unlock( blockEditorPrivateApis ); return ( // eslint-disable-next-line jsx-a11y/no-static-element-interactions
@@ -46,10 +42,10 @@ export default function ListViewSidebar() { className="edit-site-editor__list-view-panel-header" ref={ headerFocusReturnRef } > - { __( 'List View' ) } + { __( 'List View' ) }
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/global-styles-sidebar.js b/packages/edit-site/src/components/sidebar-edit-mode/global-styles-sidebar.js index b4513e3df5e1a2..ae124422f66ce1 100644 --- a/packages/edit-site/src/components/sidebar-edit-mode/global-styles-sidebar.js +++ b/packages/edit-site/src/components/sidebar-edit-mode/global-styles-sidebar.js @@ -56,7 +56,7 @@ export default function GlobalStylesSidebar() { identifier="edit-site/global-styles" title={ __( 'Styles' ) } icon={ styles } - closeLabel={ __( 'Close Styles sidebar' ) } + closeLabel={ __( 'Close Styles' ) } panelClassName="edit-site-global-styles-sidebar__panel" header={ diff --git a/packages/edit-site/src/components/sidebar-edit-mode/index.js b/packages/edit-site/src/components/sidebar-edit-mode/index.js index b9aeb1a2cdd000..5086981f871447 100644 --- a/packages/edit-site/src/components/sidebar-edit-mode/index.js +++ b/packages/edit-site/src/components/sidebar-edit-mode/index.js @@ -71,7 +71,7 @@ export function SidebarComplementaryAreaFills() { identifier={ sidebarName } title={ __( 'Settings' ) } icon={ isRTL() ? drawerLeft : drawerRight } - closeLabel={ __( 'Close settings' ) } + closeLabel={ __( 'Close Settings' ) } header={ } headerClassName="edit-site-sidebar-edit-mode__panel-tabs" > diff --git a/packages/edit-site/src/components/site-hub/index.js b/packages/edit-site/src/components/site-hub/index.js index c20a6ad202f5d7..88c33491bd890f 100644 --- a/packages/edit-site/src/components/site-hub/index.js +++ b/packages/edit-site/src/components/site-hub/index.js @@ -43,7 +43,7 @@ const SiteHub = forwardRef( ( props, ref ) => { const { setCanvasMode } = unlock( useDispatch( editSiteStore ) ); const { clearSelectedBlock } = useDispatch( blockEditorStore ); const siteIconButtonProps = { - label: __( 'Open Admin Sidebar' ), + label: __( 'Open Navigation' ), onClick: () => { if ( canvasMode === 'edit' ) { clearSelectedBlock(); diff --git a/packages/edit-widgets/src/components/secondary-sidebar/list-view-sidebar.js b/packages/edit-widgets/src/components/secondary-sidebar/list-view-sidebar.js index ee88c3088da114..6e828533ddb6aa 100644 --- a/packages/edit-widgets/src/components/secondary-sidebar/list-view-sidebar.js +++ b/packages/edit-widgets/src/components/secondary-sidebar/list-view-sidebar.js @@ -6,7 +6,6 @@ import { Button } from '@wordpress/components'; import { useFocusOnMount, useFocusReturn, - useInstanceId, useMergeRefs, } from '@wordpress/compose'; import { useDispatch } from '@wordpress/data'; @@ -32,13 +31,9 @@ export default function ListViewSidebar() { } } - const instanceId = useInstanceId( ListViewSidebar ); - const labelId = `edit-widgets-editor__list-view-panel-label-${ instanceId }`; - return ( // eslint-disable-next-line jsx-a11y/no-static-element-interactions
@@ -46,10 +41,10 @@ export default function ListViewSidebar() { className="edit-widgets-editor__list-view-panel-header" ref={ headerFocusReturnRef } > - { __( 'List View' ) } + { __( 'List View' ) }
diff --git a/packages/edit-widgets/src/components/sidebar/index.js b/packages/edit-widgets/src/components/sidebar/index.js index a4268df794462d..087f781f69a5ba 100644 --- a/packages/edit-widgets/src/components/sidebar/index.js +++ b/packages/edit-widgets/src/components/sidebar/index.js @@ -165,7 +165,7 @@ export default function Sidebar() { headerClassName="edit-widgets-sidebar__panel-tabs" /* translators: button label text should, if possible, be under 16 characters. */ title={ __( 'Settings' ) } - closeLabel={ __( 'Close settings' ) } + closeLabel={ __( 'Close Settings' ) } scope="core/edit-widgets" identifier={ currentArea } icon={ cog } diff --git a/test/e2e/specs/site-editor/title.spec.js b/test/e2e/specs/site-editor/title.spec.js index fada3fbe41e1ef..585b75c1507be3 100644 --- a/test/e2e/specs/site-editor/title.spec.js +++ b/test/e2e/specs/site-editor/title.spec.js @@ -61,7 +61,7 @@ test.describe( 'Site editor title', () => { 'role=treegrid[name="Block navigation structure"i]' ); await listView.locator( 'role=gridcell >> text="header"' ).click(); - await page.click( 'role=button[name="Close List View Sidebar"i]' ); + await page.click( 'role=button[name="Close"i]' ); // Evaluate the document settings secondary title. const secondaryTitle = page.locator(