Fix bel bel on nav

Author: morajabi

apple/InlineMac/AppDelegate.swift

@@ -7,6 +7,7 @@ import UserNotifications
 
 class AppDelegate: NSObject, NSApplicationDelegate {
   let notifications = NotificationsManager()
+  let navigation: NavigationModel = .shared
 
   func applicationWillFinishLaunching(_ notification: Notification) {
     // Disable native tabbing
@@ -23,7 +24,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
       options.debug = false
       options.tracesSampleRate = 0.1
     }
-    
+
     notifications.setup()
   }
 

apple/InlineMac/InlineApp.swift

@@ -9,12 +9,12 @@ struct InlineApp: App {
   @NSApplicationDelegateAdaptor private var appDelegate: AppDelegate
   @StateObject var viewModel = MainWindowViewModel()
   @StateObject var ws = WebSocketManager()
-  @StateObject var navigation = NavigationModel()
+  @StateObject var navigation: NavigationModel = .shared
   @StateObject var auth = Auth.shared
   @StateObject var overlay = OverlayManager()
 
   @Environment(\.openWindow) var openWindow
-  
+
   var body: some Scene {
     // Note(@mo): Using Window here messes up with our title bar handling upon window re-open after close
     WindowGroup("main") {
@@ -91,7 +91,6 @@ struct InlineApp: App {
     // Reset internal navigation
     navigation.reset()
 
-    
     // Close Settings
     if let window = NSApplication.shared.keyWindow {
       window.close()

apple/InlineMac/Models/NavigationModel.swift

@@ -36,10 +36,9 @@ private struct NavigationState: Codable {
   var spaceSelectionDict: [Int64: NavigationRoute]
 }
 
-@MainActor
 class NavigationModel: ObservableObject {
   static let shared = NavigationModel()
-  
+
   private let log = Log.scoped("Navigation", enableTracing: true)
 
   @Published var homePath: [NavigationRoute] = []
@@ -53,13 +52,7 @@ class NavigationModel: ObservableObject {
   @Published private var spacePathDict: [Int64: [NavigationRoute]] = [:]
   @Published private var spaceSelectionDict: [Int64: NavigationRoute] = [:]
 
-  public var windowManager: MainWindowViewModel? {
-    didSet {
-      log.trace("windowManager set")
-      // upon window creation
-      prepareForCurrentRoute()
-    }
-  }
+  public var windowManager: MainWindowViewModel?
 
   var spacePath: Binding<[NavigationRoute]> {
     Binding(
@@ -73,10 +66,9 @@ class NavigationModel: ObservableObject {
         guard let self,
               let activeSpaceId
         else { return }
-        Task { @MainActor in
-          self.spacePathDict[activeSpaceId] = newValue
-          self.windowManager?.setUpForInnerRoute(newValue.last ?? .spaceRoot)
-        }
+
+        self.spacePathDict[activeSpaceId] = newValue
+        self.setUpForRoute(newValue.last ?? .spaceRoot)
       }
     )
   }
@@ -93,10 +85,9 @@ class NavigationModel: ObservableObject {
         guard let self,
               let activeSpaceId
         else { return }
-        Task { @MainActor in
-          self.spaceSelectionDict[activeSpaceId] = newValue
-          self.windowManager?.setUpForInnerRoute(newValue)
-        }
+
+        self.spaceSelectionDict[activeSpaceId] = newValue
+        self.setUpForRoute(newValue)
       }
     )
   }
@@ -114,44 +105,52 @@ class NavigationModel: ObservableObject {
       .sink { [weak self] newValue in
         guard let self, let spaceId = newValue else { return }
         guard let w = self.windowManager, w.topLevelRoute == .main else { return }
-        self.windowManager?.setUpForInnerRoute(self.spaceSelectionDict[spaceId] ?? .spaceRoot)
+        self.setUpForRoute(self.spaceSelectionDict[spaceId] ?? .spaceRoot)
       }
       .store(in: &cancellables)
 
     $homePath.sink { [weak self] newValue in
       guard let self = self else { return }
       guard let w = self.windowManager, w.topLevelRoute == .main else { return }
-      self.windowManager?.setUpForInnerRoute(newValue.last ?? self.homeSelection)
+      self.setUpForRoute(newValue.last ?? self.homeSelection)
     }.store(in: &cancellables)
   }
 
   private func prepareForCurrentRoute() {
     if let activeSpaceId {
-      windowManager?.setUpForInnerRoute(spaceSelectionDict[activeSpaceId] ?? .spaceRoot)
+      setUpForRoute(spaceSelectionDict[activeSpaceId] ?? .spaceRoot)
     } else {
-      windowManager?.setUpForInnerRoute(homePath.last ?? homeSelection)
+      setUpForRoute(homePath.last ?? homeSelection)
+    }
+  }
+
+  private func setUpForRoute(_ route: NavigationRoute) {
+    guard let windowManager = windowManager else {
+      log.error("Window manager not set up")
+      return
     }
+    windowManager.setUpForInnerRoute(route)
   }
 
   // Used from sidebars
   func select(_ route: NavigationRoute) {
     if let activeSpaceId {
       spaceSelectionDict[activeSpaceId] = route
-      windowManager?.setUpForInnerRoute(route)
+      setUpForRoute(route)
     } else {
       homeSelection = route
       homePath.removeAll()
-      windowManager?.setUpForInnerRoute(route)
+      setUpForRoute(route)
     }
   }
 
   func navigate(to route: NavigationRoute) {
     if let activeSpaceId {
       spacePathDict[activeSpaceId, default: []].append(route)
-      windowManager?.setUpForInnerRoute(route)
+      setUpForRoute(route)
     } else {
       homePath.append(route)
-      windowManager?.setUpForInnerRoute(route)
+      setUpForRoute(route)
     }
   }
 
@@ -160,24 +159,24 @@ class NavigationModel: ObservableObject {
     // TODO: Load from persistence layer
     if spacePathDict[id] == nil {
       spacePathDict[id] = []
-      windowManager?.setUpForInnerRoute(.spaceRoot)
+      setUpForRoute(.spaceRoot)
     }
   }
 
   func goHome() {
     activeSpaceId = nil
     // TODO: Load from persistence layer
     let currentHomeRoute = homePath.last ?? homeSelection
-    windowManager?.setUpForInnerRoute(currentHomeRoute)
+    setUpForRoute(currentHomeRoute)
   }
 
   func navigateBack() {
     if let activeSpaceId {
       spacePathDict[activeSpaceId]?.removeLast()
-      windowManager?.setUpForInnerRoute(spacePathDict[activeSpaceId]?.last ?? .spaceRoot)
+      setUpForRoute(spacePathDict[activeSpaceId]?.last ?? .spaceRoot)
     } else {
       homePath.removeLast()
-      windowManager?.setUpForInnerRoute(homePath.last ?? homeSelection)
+      setUpForRoute(homePath.last ?? homeSelection)
     }
   }
 

apple/InlineMac/Utils/LineHeight.swift

@@ -2,51 +2,52 @@
 //  https://github.com/krzyzanowskim/STTextView/blob/main/LICENSE.md
 
 #if canImport(AppKit) && !targetEnvironment(macCatalyst)
-import AppKit
+  import AppKit
 #endif
 #if canImport(UIKit)
-import UIKit
+  import UIKit
 #endif
 
 func calculateDefaultLineHeight(for font: CTFont) -> CGFloat {
   /// Heavily inspired by WebKit
-  
+
   let kLineHeightAdjustment: CGFloat = 0.15
-  
+
   var ascent = CTFontGetAscent(font)
   var descent = CTFontGetDescent(font)
   var lineGap = CTFontGetLeading(font)
-  
+
   let familyName = CTFontCopyFamilyName(font) as String
-  
+
   if shouldUseAdjustment(familyName) {
     // Needs ascent adjustment
     ascent += round((ascent + descent) * kLineHeightAdjustment)
   }
-  
+
   // Compute line spacing before the line metrics hacks are applied.
   var lineSpacing = round(ascent) + round(descent) + round(lineGap)
-  
+
   // Hack Hiragino line metrics to allow room for marked text underlines.
   if descent < 3, lineGap >= 3, familyName.hasPrefix("Hiragino") == true {
     lineGap -= 3 - descent
     descent = 3
   }
-  
-#if os(iOS) || targetEnvironment(macCatalyst)
-  let adjustment = shouldUseAdjustment(familyName) ? ceil(ascent + descent) * kLineHeightAdjustment : 0
-  lineGap = ceil(lineGap)
-  lineSpacing = ceil(ascent) + adjustment + ceil(descent) + lineGap
-  ascent = ceil(ascent + adjustment)
-  descent = ceil(descent)
-#endif
-  
+
+  #if os(iOS) || targetEnvironment(macCatalyst)
+    let adjustment =
+      shouldUseAdjustment(familyName) ? ceil(ascent + descent) * kLineHeightAdjustment : 0
+    lineGap = ceil(lineGap)
+    lineSpacing = ceil(ascent) + adjustment + ceil(descent) + lineGap
+    ascent = ceil(ascent + adjustment)
+    descent = ceil(descent)
+  #endif
+
   return lineSpacing
 }
 
 private func shouldUseAdjustment(_ familyName: String) -> Bool {
   familyName.caseInsensitiveCompare("Times") == .orderedSame
     || familyName.caseInsensitiveCompare("Helvetica") == .orderedSame
-    || familyName.caseInsensitiveCompare("Courier") == .orderedSame // macOS only
+    || familyName.caseInsensitiveCompare("Courier") == .orderedSame  // macOS only
     || familyName.caseInsensitiveCompare(".Helvetica NeueUI") == .orderedSame
 }

apple/InlineMac/Views/Chat/AppKit/MessageTableView.swift

@@ -83,6 +83,7 @@ class MessagesTableView: NSViewController {
     scroll.verticalScroller?.controlSize = .small // This makes it ultra-minimal
 
     scroll.postsBoundsChangedNotifications = true
+    scroll.automaticallyAdjustsContentInsets = false
 
     return scroll
   }()
@@ -96,6 +97,23 @@ class MessagesTableView: NSViewController {
     super.viewDidLoad()
     setupScrollObserver()
   }
+
+
+  // This fixes the issue with the toolbar messing up initial content insets on window open. Now we call it on did layout and it fixes the issue.
+  private func updateScrollViewInsets() {
+    guard let window = view.window else { return }
+    
+    let windowFrame = window.frame
+    let contentFrame = window.contentLayoutRect
+    let toolbarHeight = windowFrame.height - contentFrame.height
+    
+    scrollView.contentInsets = NSEdgeInsets(
+      top: toolbarHeight,
+      left: 0,
+      bottom: 0,
+      right: 0
+    )
+  }
 
   private func setupViews() {
     view.addSubview(scrollView)
@@ -120,6 +138,8 @@ class MessagesTableView: NSViewController {
   private func scrollToBottom(animated: Bool) {
     guard messages.count > 0 else { return }
 
+    print("scrollTopInset \(scrollView.contentInsets.top)")
+    
     let lastRow = messages.count - 1
 
     if animated {
@@ -363,6 +383,7 @@ class MessagesTableView: NSViewController {
 
   override func viewDidLayout() {
     super.viewDidLayout()
+    updateScrollViewInsets()
 
     let newWidth = tableView.bounds.width
 //    let newWidth = width

apple/InlineMac/Views/Chat/ChatView.swift

@@ -38,6 +38,7 @@ struct ChatView: View {
         compose
       }
       // So the scroll bar goes under the toolbar
+      // Note(@mo: this adds a bug on first frame toolbar doesn't have background and insets are messed up? so scroll fails initially)
       .ignoresSafeArea(.container, edges: .top)
     }
     .task {
@@ -60,7 +61,7 @@ struct ChatView: View {
   var body: some View {
     content
       // Hide default title. No way to achieve this without this for now
-      .navigationTitle("")
+      .navigationTitle(" ")
       .toolbar {
         ToolbarItem(placement: .navigation) {
           HStack {
@@ -100,6 +101,7 @@ struct ChatView: View {
           }
         }
       }
+      .toolbarBackground(.visible, for: .windowToolbar)
   }
 
   /// Fetch chat history

apple/InlineMac/Views/Main/MainView.swift

@@ -40,7 +40,7 @@ struct MainView: View {
       self.setUpSidebarAutoCollapse()
     }
     .task {
-      await requestNotifications();
+      await requestNotifications()
     }
     // Disable auto collapse while user is modifying it to avoid jump
     .onChange(of: window.columnVisibility) { _ in
@@ -74,6 +74,7 @@ struct MainView: View {
           .navigationDestination(for: NavigationRoute.self) { route in
             renderSpaceRoute(for: route, spaceId: spaceId)
           }
+        
       } else {
         renderHomeRoute(for: navigation.homeSelection)
           // Note(@mo): without this .id, route would not update correctly
@@ -116,7 +117,7 @@ struct MainView: View {
     switch destination {
     case .chat(let peer):
       ChatView(peerId: peer)
-        
+      
     case .homeRoot:
       HomeRoot()
 

apple/InlineMac/Views/Main/MainWindow.swift

@@ -59,7 +59,6 @@ enum TopLevelRoute {
   case main
 }
 
-@MainActor
 class MainWindowViewModel: ObservableObject {
   @Published var topLevelRoute: TopLevelRoute
   @Published var columnVisibility: NavigationSplitViewVisibility
@@ -88,9 +87,9 @@ class MainWindowViewModel: ObservableObject {
     let previousWindow = self.window
     self.window = window
 
-//    if previousWindow == window {
-//      return
-//    }
+    if previousWindow == window {
+      return
+    }
 //    if windowInitilized {
 //      return
 //    }