Release 1.0 iPad navigation fix

docmostly/Features/Notifications/NotificationListRow.swift

@@ -2,6 +2,7 @@ import SwiftUI
 
 struct NotificationListRow: View {
     @Environment(AppState.self) private var appState
+    @Environment(\.pageOpenPresentation) private var pageOpenPresentation
 
     let notification: DocmostNotification
     let isUnread: Bool
@@ -24,18 +25,24 @@ struct NotificationListRow: View {
                 .accessibilityIdentifier("PageOpenLink.\(target.slugId)")
                 #else
                 Button {
-                    openPage(target)
+                    if pageOpenPresentation == .stack {
+                        openPage(target)
+                    } else {
+                        appState.openPage(target)
+                    }
                     if isUnread {
                         markRead()
                     }
                 } label: {
-                    HStack(spacing: 8) {
+                    HStack {
                         NotificationRowView(notification: notification, isUnread: isUnread)
 
-                        Image(systemName: "chevron.forward")
-                            .imageScale(.small)
-                            .foregroundStyle(.tertiary)
-                            .accessibilityHidden(true)
+                        if pageOpenPresentation == .stack {
+                            Image(systemName: "chevron.forward")
+                                .imageScale(.small)
+                                .foregroundStyle(.tertiary)
+                                .accessibilityHidden(true)
+                        }
                     }
                 }
                 .buttonStyle(.plain)

docmostly/Features/PageReader/PageOpenPresentation.swift

@@ -0,0 +1,14 @@
+import SwiftUI
+
+enum PageOpenPresentation: Equatable {
+    case stack
+    case detailColumn
+
+    var shouldClearSelectedPageOnReaderDisappear: Bool {
+        self == .stack
+    }
+}
+
+extension EnvironmentValues {
+    @Entry var pageOpenPresentation = PageOpenPresentation.stack
+}

docmostly/Features/PageReader/PageOpenTarget.swift

@@ -85,6 +85,7 @@ nonisolated struct PageOpenTarget: Identifiable, Hashable, Sendable {
 
 struct PageOpenLink<Label: View>: View {
     @Environment(AppState.self) private var appState
+    @Environment(\.pageOpenPresentation) private var pageOpenPresentation
 
     let target: PageOpenTarget
     let label: () -> Label
@@ -104,10 +105,20 @@ struct PageOpenLink<Label: View>: View {
         .buttonStyle(.plain)
         .accessibilityIdentifier(accessibilityIdentifier)
         #else
-        NavigationLink(value: target) {
-            label()
+        if pageOpenPresentation == .stack {
+            NavigationLink(value: target) {
+                label()
+            }
+            .accessibilityIdentifier(accessibilityIdentifier)
+        } else {
+            Button {
+                appState.openPage(target)
+            } label: {
+                label()
+            }
+            .buttonStyle(.plain)
+            .accessibilityIdentifier(accessibilityIdentifier)
         }
-        .accessibilityIdentifier(accessibilityIdentifier)
         #endif
     }
 
@@ -118,6 +129,7 @@ struct PageOpenLink<Label: View>: View {
 
 struct PageOpenDestinationView: View {
     @Environment(AppState.self) private var appState
+    @Environment(\.pageOpenPresentation) private var pageOpenPresentation
 
     let target: PageOpenTarget
 
@@ -127,6 +139,7 @@ struct PageOpenDestinationView: View {
                 appState.openPage(target)
             }
             .onDisappear {
+                guard pageOpenPresentation.shouldClearSelectedPageOnReaderDisappear else { return }
                 appState.clearSelectedPage(ifMatching: target.slugId)
             }
     }

docmostly/Features/PageReader/PageReaderDestinationView.swift

@@ -2,6 +2,7 @@ import SwiftUI
 
 struct PageReaderDestinationView: View {
     @Environment(AppState.self) private var appState
+    @Environment(\.pageOpenPresentation) private var pageOpenPresentation
 
     let pageID: String
 
@@ -11,6 +12,7 @@ struct PageReaderDestinationView: View {
                 appState.selectPage(id: pageID)
             }
             .onDisappear {
+                guard pageOpenPresentation.shouldClearSelectedPageOnReaderDisappear else { return }
                 appState.clearSelectedPage(ifMatching: pageID)
             }
     }

docmostly/Features/PageTree/PageTreeNodeView.swift

@@ -1,6 +1,8 @@
 import SwiftUI
 
 struct PageTreeNodeView: View {
+    @Environment(\.pageOpenPresentation) private var pageOpenPresentation
+
     let node: PageTreeNode
     let depth: Int
     let isExpanded: Bool
@@ -32,10 +34,19 @@ struct PageTreeNodeView: View {
                 .accessibilityLabel(node.title)
                 .accessibilityIdentifier(pageAccessibilityIdentifier)
                 #else
-                NavigationLink(value: node) {
-                    PageTreeNodeLabel(node: node)
+                if pageOpenPresentation == .stack {
+                    NavigationLink(value: node) {
+                        PageTreeNodeLabel(node: node)
+                    }
+                    .accessibilityIdentifier(pageAccessibilityIdentifier)
+                } else {
+                    Button(action: openNodeInDetailColumn) {
+                        PageTreeNodeLabel(node: node)
+                    }
+                    .buttonStyle(.plain)
+                    .accessibilityLabel(node.title)
+                    .accessibilityIdentifier(pageAccessibilityIdentifier)
                 }
-                .accessibilityIdentifier(pageAccessibilityIdentifier)
                 #endif
             }
             .padding(.leading, CGFloat(depth) * PageTreeSidebarMetrics.depthIndent)

docmostly/Features/Spaces/MainShellContentView.swift

@@ -2,34 +2,47 @@ import SwiftUI
 
 struct MainShellContentView: View {
     @Environment(AppState.self) private var appState
+    @Environment(\.pageOpenPresentation) private var pageOpenPresentation
     @State private var navigationPath = NavigationPath()
 
     var body: some View {
         NavigationStack(path: $navigationPath) {
-            Group {
-                switch appState.selectedSidebarDestination {
-                case .favorites:
-                    FavoritesView()
-                case .notifications:
-                    NotificationListView()
-                case .search:
-                    SearchView()
-                case .settings:
-                    SettingsView()
-                case .space(let spaceID):
-                    if let space = appState.spaces.first(where: { $0.id == spaceID }) {
-                        PageTreeView(space: space)
-                    } else {
-                        ContentUnavailableView("Space unavailable", systemImage: "square.stack.3d.up")
-                    }
-                case nil:
-                    ContentUnavailableView("Select a space", systemImage: "square.stack.3d.up")
-                }
-            }
+            MainShellContentRootView()
         }
         .onChange(of: appState.selectedSidebarDestination) {
             navigationPath = NavigationPath()
         }
+        .onChange(of: pageOpenPresentation) { _, newPresentation in
+            guard newPresentation == .detailColumn else { return }
+            navigationPath = NavigationPath()
+        }
         .navigationSplitViewColumnWidth(min: 280, ideal: 340, max: 460)
     }
 }
+
+private struct MainShellContentRootView: View {
+    @Environment(AppState.self) private var appState
+
+    var body: some View {
+        Group {
+            switch appState.selectedSidebarDestination {
+            case .favorites:
+                FavoritesView()
+            case .notifications:
+                NotificationListView()
+            case .search:
+                SearchView()
+            case .settings:
+                SettingsView()
+            case .space(let spaceID):
+                if let space = appState.spaces.first(where: { $0.id == spaceID }) {
+                    PageTreeView(space: space)
+                } else {
+                    ContentUnavailableView("Space unavailable", systemImage: "square.stack.3d.up")
+                }
+            case nil:
+                ContentUnavailableView("Select a space", systemImage: "square.stack.3d.up")
+            }
+        }
+    }
+}

docmostly/Features/Spaces/MainShellView.swift

@@ -3,6 +3,9 @@ import SwiftUI
 struct MainShellView: View {
     @Environment(AppState.self) private var appState
     @Environment(\.scenePhase) private var scenePhase
+    #if os(iOS)
+    @Environment(\.horizontalSizeClass) private var horizontalSizeClass
+    #endif
     #if os(macOS)
     @Environment(MacDesktopCommandController.self) private var commandController
     @State private var isShowingSpaceSettings = false
@@ -44,6 +47,10 @@ struct MainShellView: View {
                 MainShellDetailView()
             }
             .navigationSplitViewStyle(.balanced)
+            .environment(
+                \.pageOpenPresentation,
+                horizontalSizeClass == .compact ? .stack : .detailColumn
+            )
             #endif
         }
         .environment(notificationStore)

docmostlyTests/PageReader/PageOpenPresentationTests.swift

@@ -0,0 +1,13 @@
+import Testing
+@testable import docmostly
+
+@MainActor
+struct PageOpenPresentationTests {
+    @Test func stackReaderClearsSelectionWhenItDisappears() {
+        #expect(PageOpenPresentation.stack.shouldClearSelectedPageOnReaderDisappear)
+    }
+
+    @Test func detailColumnTransitionPreservesTheSelectedPage() {
+        #expect(!PageOpenPresentation.detailColumn.shouldClearSelectedPageOnReaderDisappear)
+    }
+}