From 312fa6ef8cb6f5d7e06be2e334e19048423a36b2 Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Tue, 10 Sep 2024 05:40:28 +0800
Subject: [PATCH] Editor topbar: reorder the actions on the right (#65163)

* Editor - move publish button to penultimate position

* Widgets - Move Save button to penultimate position

* Reorder global styles/settings pinned items
---
 packages/edit-widgets/src/components/header/index.js | 2 +-
 packages/editor/src/components/editor/index.js       | 2 +-
 packages/editor/src/components/header/index.js       | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/edit-widgets/src/components/header/index.js b/packages/edit-widgets/src/components/header/index.js
index 0aadec83d5d2f..80dda479d59ed 100644
--- a/packages/edit-widgets/src/components/header/index.js
+++ b/packages/edit-widgets/src/components/header/index.js
@@ -61,8 +61,8 @@ function Header() {
 					) }
 				</div>
 				<div className="edit-widgets-header__actions">
-					<SaveButton />
 					<PinnedItems.Slot scope="core/edit-widgets" />
+					<SaveButton />
 					<MoreMenu />
 				</div>
 			</div>
diff --git a/packages/editor/src/components/editor/index.js b/packages/editor/src/components/editor/index.js
index b094c3ceb4437..21becea43cd7e 100644
--- a/packages/editor/src/components/editor/index.js
+++ b/packages/editor/src/components/editor/index.js
@@ -74,11 +74,11 @@ function Editor( {
 					<EditorInterface { ...props }>
 						{ extraContent }
 					</EditorInterface>
+					{ children }
 					<Sidebar
 						onActionPerformed={ onActionPerformed }
 						extraPanels={ extraSidebarPanels }
 					/>
-					{ children }
 				</ExperimentalEditorProvider>
 			) }
 		</>
diff --git a/packages/editor/src/components/header/index.js b/packages/editor/src/components/header/index.js
index b8eda30c72186..2e045ad732942 100644
--- a/packages/editor/src/components/header/index.js
+++ b/packages/editor/src/components/header/index.js
@@ -142,6 +142,9 @@ function Header( {
 					forceIsAutosaveable={ forceIsDirty }
 				/>
 				<PostViewLink />
+				{ ( isWideViewport || ! showIconLabels ) && (
+					<PinnedItems.Slot scope="core" />
+				) }
 				{ ! customSaveButton && (
 					<PostPublishButtonOrToggle
 						forceIsDirty={ forceIsDirty }
@@ -151,9 +154,6 @@ function Header( {
 					/>
 				) }
 				{ customSaveButton }
-				{ ( isWideViewport || ! showIconLabels ) && (
-					<PinnedItems.Slot scope="core" />
-				) }
 				<MoreMenu />
 			</motion.div>
 		</div>