Render sharp status icons with colored menus and retain routes through back transitions

Author: tiensonqin

apple/Sources/Logseq/LGNavigationExtension.swift

@@ -476,6 +476,9 @@ private struct LGNavigationContent: View {
     let composerDismissalEnabled: Bool
     let rootTransform: ((AnyView) -> AnyView)?
     @State private var path: [Int] = []
+    #if os(iOS)
+    @State private var transitions = LGNavigationTransitions()
+    #endif
     @State private var usesSystemGroupedBackground = false
     @State private var visibleScrollTitle: String?
     @AppStorage("logseq.appearance") private var appearance = "system"
@@ -618,6 +621,9 @@ private struct LGNavigationContent: View {
     private var rootNavigationSurface: some View {
         transformedRootContent
             .padding(.top, navigationContentTopPadding)
+            #if os(iOS)
+            .background(LGNavigationControllerObserver(transitions: transitions).allowsHitTesting(false))
+            #endif
     }
 
 
@@ -735,10 +741,12 @@ private struct LGNavigationContent: View {
                 let removedCount = max(0, path.count - newPath.count)
                 path = newPath
                 if removedCount > 0 {
-                    Task { @MainActor in
-                        await Task.yield()
-                        emitBack(count: removedCount)
-                    }
+                    #if os(iOS)
+                    // Keep the outgoing route alive until UIKit finishes its pop.
+                    transitions.afterPop { emitBack(count: removedCount) }
+                    #else
+                    emitBack(count: removedCount)
+                    #endif
                 }
             }
         )
@@ -763,6 +771,63 @@ private struct LGNavigationContent: View {
     }
 }
 
+#if os(iOS)
+@MainActor
+private final class LGNavigationTransitions {
+    weak var controller: UINavigationController?
+
+    func afterPop(_ completion: @escaping @MainActor () -> Void) {
+        guard let coordinator = controller?.transitionCoordinator else {
+            completion()
+            return
+        }
+        _ = coordinator.animate(alongsideTransition: nil) { context in
+            if !context.isCancelled { completion() }
+        }
+    }
+}
+
+@MainActor
+private struct LGNavigationControllerObserver: UIViewControllerRepresentable {
+    let transitions: LGNavigationTransitions
+
+    func makeUIViewController(context: Context) -> Observer {
+        Observer(transitions: transitions)
+    }
+
+    func updateUIViewController(_ controller: Observer, context: Context) {
+        controller.resolveNavigationController()
+    }
+
+    final class Observer: UIViewController {
+        let transitions: LGNavigationTransitions
+
+        init(transitions: LGNavigationTransitions) {
+            self.transitions = transitions
+            super.init(nibName: nil, bundle: nil)
+        }
+
+        required init?(coder: NSCoder) { fatalError("init(coder:) is unavailable") }
+
+        override func loadView() { view = UIView() }
+
+        override func didMove(toParent parent: UIViewController?) {
+            super.didMove(toParent: parent)
+            resolveNavigationController()
+        }
+
+        override func viewDidAppear(_ animated: Bool) {
+            super.viewDidAppear(animated)
+            resolveNavigationController()
+        }
+
+        func resolveNavigationController() {
+            if let navigationController { transitions.controller = navigationController }
+        }
+    }
+}
+#endif
+
 private struct LGBottomChromeSurface: ViewModifier {
     @ViewBuilder
     func body(content: Content) -> some View {

apple/Sources/Logseq/OutlinerRowExtension.swift

@@ -4,6 +4,7 @@ import LogseqModel
 import LUIAppleBackend
 #if os(iOS)
 import UniformTypeIdentifiers
+import UIKit
 #endif
 
 struct OutlinerRowPayload: Decodable, Equatable {
@@ -19,6 +20,15 @@ struct OutlinerRowPayload: Decodable, Equatable {
         let foreground: String?
         var id: String { uuid }
 
+        #if os(iOS)
+        func menuImage(in semanticColors: [String: Color]) -> UIImage? {
+            let key = icon.replacingOccurrences(of: "app:", with: "")
+            guard case let .assetName(name) = LGIconPolicy.icons[key] else { return nil }
+            return UIImage(named: name, in: .module, compatibleWith: nil)?
+                .withTintColor(UIColor(color(in: semanticColors)), renderingMode: .alwaysOriginal)
+        }
+        #endif
+
         func color(in semanticColors: [String: Color]) -> Color {
             guard let foreground else { return .primary }
             if let color = semanticColors[foreground] { return color }
@@ -131,7 +141,13 @@ struct OutlinerRowPayload: Decodable, Equatable {
                 Menu {
                     ForEach(Array(row.statuses.enumerated()), id: \.element.id) { index, item in
                         Button { emit("set-status", extra: ["count": .int(index)]) } label: {
-                            SwiftUI.Label { Text(verbatim: item.title) } icon: { statusIcon(item) }
+                            SwiftUI.Label { Text(verbatim: item.title) } icon: {
+                                #if os(iOS)
+                                if let image = item.menuImage(in: semanticColors) { Image(uiImage: image) }
+                                #else
+                                statusIcon(item)
+                                #endif
+                            }
                         }
                         .accessibilityIdentifier("button.block-task-status-option." + item.uuid)
                     }

apple/Sources/Logseq/OutlinerTextRow.swift

@@ -12,7 +12,7 @@ struct OutlinerTextRow: UIViewRepresentable {
 
     func makeUIView(context: Context) -> OutlinerTextRowView { OutlinerTextRowView() }
     func updateUIView(_ view: OutlinerTextRowView, context: Context) {
-        view.update(row, statusTint: UIColor(row.status?.color(in: semanticColors) ?? .primary), emit: emit)
+        view.update(row, semanticColors: semanticColors, emit: emit)
     }
     func sizeThatFits(_ proposal: ProposedViewSize, uiView: OutlinerTextRowView, context: Context) -> CGSize? {
         guard let width = proposal.width else { return nil }
@@ -39,6 +39,7 @@ struct OutlinerTextRow: UIViewRepresentable {
     private let failure = UILabel()
     private var tags: [UIButton] = []
     private var row: OutlinerRowPayload?
+    private var semanticColors: [String: Color] = [:]
     private var emit: ((String, String?, [String: LUIExtensionValue]) -> Void)?
 
     override init(frame: CGRect) {
@@ -67,9 +68,10 @@ struct OutlinerTextRow: UIViewRepresentable {
     }
     required init?(coder: NSCoder) { fatalError("init(coder:) is unavailable") }
 
-    func update(_ row: OutlinerRowPayload, statusTint: UIColor, emit: @escaping (String, String?, [String: LUIExtensionValue]) -> Void) {
+    func update(_ row: OutlinerRowPayload, semanticColors: [String: Color] = [:], emit: @escaping (String, String?, [String: LUIExtensionValue]) -> Void) {
         self.emit = emit
-        status.tintColor = statusTint
+        self.semanticColors = semanticColors
+        status.tintColor = UIColor(row.status?.color(in: semanticColors) ?? .primary)
         guard self.row != row else { return }
         self.row = row
         guides.update(row)
@@ -100,7 +102,7 @@ struct OutlinerTextRow: UIViewRepresentable {
             status.menu = UIMenu(children: [UIDeferredMenuElement.uncached { [weak self] complete in
                 guard let self, let row = self.row else { complete([]); return }
                 complete(row.statuses.enumerated().map { index, item in
-                    UIAction(title: item.title, image: self.statusImage(item.icon)) { [weak self] _ in
+                    UIAction(title: item.title, image: item.menuImage(in: self.semanticColors)) { [weak self] _ in
                         self?.emit?("set-status", nil, ["count": .int(index)])
                     }
                 })