From aca3eb60db263da7ce416e74d4a1865204d8a01d Mon Sep 17 00:00:00 2001
From: Andrea Fercia <a.fercia@gmail.com>
Date: Mon, 12 Feb 2024 15:25:25 +0100
Subject: [PATCH 1/4] Fix visual and DOM order of the list view header tabs and
 close button.

---
 .../editor/src/components/list-view-sidebar/index.js | 12 ++++++------
 .../src/components/list-view-sidebar/style.scss      |  1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/editor/src/components/list-view-sidebar/index.js b/packages/editor/src/components/list-view-sidebar/index.js
index 9484ddcf3943d..a87ea94a85811 100644
--- a/packages/editor/src/components/list-view-sidebar/index.js
+++ b/packages/editor/src/components/list-view-sidebar/index.js
@@ -130,12 +130,6 @@ export default function ListViewSidebar() {
 				initialTabId="list-view"
 			>
 				<div className="edit-post-editor__document-overview-panel__header">
-					<Button
-						className="editor-list-view-sidebar__close-button"
-						icon={ closeSmall }
-						label={ __( 'Close' ) }
-						onClick={ closeListView }
-					/>
 					<Tabs.TabList
 						className="editor-list-view-sidebar__tabs-tablist"
 						ref={ tabsRef }
@@ -153,6 +147,12 @@ export default function ListViewSidebar() {
 							{ _x( 'Outline', 'Post overview' ) }
 						</Tabs.Tab>
 					</Tabs.TabList>
+					<Button
+						className="editor-list-view-sidebar__close-button"
+						icon={ closeSmall }
+						label={ __( 'Close' ) }
+						onClick={ closeListView }
+					/>
 				</div>
 
 				<Tabs.TabPanel
diff --git a/packages/editor/src/components/list-view-sidebar/style.scss b/packages/editor/src/components/list-view-sidebar/style.scss
index f2db812c5690e..2d2dc4ec8c487 100644
--- a/packages/editor/src/components/list-view-sidebar/style.scss
+++ b/packages/editor/src/components/list-view-sidebar/style.scss
@@ -14,7 +14,6 @@
 	}
 	.editor-list-view-sidebar__close-button {
 		background: $white;
-		order: 1;
 		align-self: center;
 		margin-right: $grid-unit-10;
 	}

From d82a88f96dd7148d61ea122a2d72cab248c5cd31 Mon Sep 17 00:00:00 2001
From: Andrea Fercia <a.fercia@gmail.com>
Date: Wed, 14 Feb 2024 10:14:11 +0100
Subject: [PATCH 2/4] Adjust test.

---
 test/e2e/specs/site-editor/list-view.spec.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/e2e/specs/site-editor/list-view.spec.js b/test/e2e/specs/site-editor/list-view.spec.js
index 9b7a1c17a9ce1..97f853367fd28 100644
--- a/test/e2e/specs/site-editor/list-view.spec.js
+++ b/test/e2e/specs/site-editor/list-view.spec.js
@@ -118,7 +118,6 @@ test.describe( 'Site Editor List View', () => {
 		// out of range of the sidebar region. Must shift+tab 1 time to reach
 		// close button before list view area.
 		await pageUtils.pressKeys( 'shift+Tab' );
-		await pageUtils.pressKeys( 'shift+Tab' );
 		await expect(
 			page
 				.getByRole( 'region', { name: 'List View' } )

From a09349b3c4042c215301bdfe9b9175295e22eb00 Mon Sep 17 00:00:00 2001
From: Andrea Fercia <a.fercia@gmail.com>
Date: Wed, 14 Feb 2024 12:45:00 +0100
Subject: [PATCH 3/4] Adjust more test.

---
 test/e2e/specs/editor/various/list-view.spec.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/e2e/specs/editor/various/list-view.spec.js b/test/e2e/specs/editor/various/list-view.spec.js
index cb15c12c84b49..d3bd2c5efcd7c 100644
--- a/test/e2e/specs/editor/various/list-view.spec.js
+++ b/test/e2e/specs/editor/various/list-view.spec.js
@@ -360,7 +360,6 @@ test.describe( 'List View', () => {
 		// out of range of the sidebar region. Must shift+tab 2 times to reach
 		// close button before tab panel.
 		await pageUtils.pressKeys( 'shift+Tab' );
-		await pageUtils.pressKeys( 'shift+Tab' );
 		await expect(
 			page
 				.getByRole( 'region', { name: 'Document Overview' } )

From 9dabda644b0d01df5844c59b33289d4a8b7010f9 Mon Sep 17 00:00:00 2001
From: Andrea Fercia <a.fercia@gmail.com>
Date: Fri, 16 Feb 2024 09:41:46 +0100
Subject: [PATCH 4/4] Adjust test more accurately.

---
 test/e2e/specs/editor/various/list-view.spec.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/e2e/specs/editor/various/list-view.spec.js b/test/e2e/specs/editor/various/list-view.spec.js
index d3bd2c5efcd7c..b1069e8d5d4d0 100644
--- a/test/e2e/specs/editor/various/list-view.spec.js
+++ b/test/e2e/specs/editor/various/list-view.spec.js
@@ -378,6 +378,7 @@ test.describe( 'List View', () => {
 		// Focus the outline tab and select it. This test ensures the outline
 		// tab receives similar focus events based on the shortcut.
 		await pageUtils.pressKeys( 'shift+Tab' );
+		await pageUtils.pressKeys( 'shift+Tab' );
 		await page.keyboard.press( 'ArrowRight' );
 		const outlineButton = page.getByRole( 'tab', {
 			name: 'Outline',
@@ -387,7 +388,7 @@ test.describe( 'List View', () => {
 
 		// From here, tab in to the editor so focus can be checked on return to
 		// the outline tab in the sidebar.
-		await pageUtils.pressKeys( 'Tab', { times: 2 } );
+		await pageUtils.pressKeys( 'Tab', { times: 3 } );
 		// Focus should be placed on the outline tab button since there is
 		// nothing to focus inside the tab itself.
 		await pageUtils.pressKeys( 'access+o' );