From 5e29aa4fa4bd4eba9a33408d168c079cc494f519 Mon Sep 17 00:00:00 2001
From: David Calhoun <github@davidcalhoun.me>
Date: Tue, 8 Jul 2025 15:36:34 -0400
Subject: [PATCH 1/2] feat: Standardize iOS navigation

Remove duplicative actions. Disable unsupported actions.
---
 ios/Demo-iOS/Sources/EditorView.swift | 28 ++++++---------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/ios/Demo-iOS/Sources/EditorView.swift b/ios/Demo-iOS/Sources/EditorView.swift
index c8afea9e..6a7daad0 100644
--- a/ios/Demo-iOS/Sources/EditorView.swift
+++ b/ios/Demo-iOS/Sources/EditorView.swift
@@ -11,25 +11,16 @@ struct EditorView: View {
     var body: some View {
         _EditorView(configuration: configuration)
             .toolbar {
-                ToolbarItemGroup(placement: .topBarLeading) {
-                    Button(action: {}, label: {
-                        Image(systemName: "xmark")
-                    })
-                }
                 ToolbarItemGroup(placement: .topBarTrailing) {
                     Button(action: {}, label: {
                         Image(systemName: "arrow.uturn.backward")
-                    })
+                    }).disabled(true)
                     Button(action: {}, label: {
                         Image(systemName: "arrow.uturn.forward")
                     }).disabled(true)
                 }
 
                 ToolbarItemGroup(placement: .topBarTrailing) {
-                    Button(action: {}, label: {
-                        Image(systemName: "safari")
-                    })
-
                     moreMenu
                 }
             }
@@ -40,25 +31,19 @@ struct EditorView: View {
             Section {
                 Button(action: {}, label: {
                     Label("Code Editor", systemImage: "curlybraces")
-                })
-                Button(action: {}, label: {
-                    Label("Outline", systemImage: "list.bullet.indent")
-                })
+                }).disabled(true)
                 Button(action: /*@START_MENU_TOKEN@*/{}/*@END_MENU_TOKEN@*/, label: {
                     Label("Preview", systemImage: "safari")
-                })
-            }
-            Section {
+                }).disabled(true)
                 Button(action: /*@START_MENU_TOKEN@*/{}/*@END_MENU_TOKEN@*/, label: {
                     Label("Revisions (42)", systemImage: "clock.arrow.circlepath")
-                })
+                }).disabled(true)
                 Button(action: /*@START_MENU_TOKEN@*/{}/*@END_MENU_TOKEN@*/, label: {
                     Label("Post Settings", systemImage: "gearshape")
-                })
-
+                }).disabled(true)
                 Button(action: /*@START_MENU_TOKEN@*/{}/*@END_MENU_TOKEN@*/, label: {
                     Label("Help", systemImage: "questionmark.circle")
-                })
+                }).disabled(true)
             }
             Section {
                 Text("Blocks: 4, Words: 8, Characters: 15")
@@ -68,7 +53,6 @@ struct EditorView: View {
         } label: {
             Image(systemName: "ellipsis")
         }
-        .tint(Color.primary)
     }
 }
 

From d4ed94a3fdda2456d29ec6164b0a6cbd02d62f28 Mon Sep 17 00:00:00 2001
From: David Calhoun <github@davidcalhoun.me>
Date: Fri, 3 Oct 2025 14:41:24 -0400
Subject: [PATCH 2/2] feat: iOS Demo app close button uses "X" icon rather than
 "Back" text

Match the WordPress mobile app design.
---
 ios/Demo-iOS/Sources/EditorView.swift | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ios/Demo-iOS/Sources/EditorView.swift b/ios/Demo-iOS/Sources/EditorView.swift
index 6a7daad0..23a2e119 100644
--- a/ios/Demo-iOS/Sources/EditorView.swift
+++ b/ios/Demo-iOS/Sources/EditorView.swift
@@ -3,6 +3,7 @@ import GutenbergKit
 
 struct EditorView: View {
     private let configuration: EditorConfiguration
+    @Environment(\.dismiss) private var dismiss
 
     init(configuration: EditorConfiguration) {
         self.configuration = configuration
@@ -10,7 +11,16 @@ struct EditorView: View {
 
     var body: some View {
         _EditorView(configuration: configuration)
+            .navigationBarBackButtonHidden(true)
             .toolbar {
+                ToolbarItem(placement: .topBarLeading) {
+                    Button(action: {
+                        dismiss()
+                    }, label: {
+                        Image(systemName: "xmark")
+                    })
+                }
+
                 ToolbarItemGroup(placement: .topBarTrailing) {
                     Button(action: {}, label: {
                         Image(systemName: "arrow.uturn.backward")