Fixes to window

Author: morajabi

apple/InlineMac/InlineApp.swift

@@ -16,7 +16,8 @@ struct InlineApp: App {
   @Environment(\.openWindow) var openWindow
 
   var body: some Scene {
-    Window("Inline", id: "main") {
+    // Note(@mo): Using Window here messes up with our title bar handling upon window re-open after close
+    WindowGroup("main") {
       MainWindow()
         .environmentObject(self.ws)
         .environmentObject(self.viewModel)

apple/InlineMac/Models/NavigationModel.swift

@@ -39,6 +39,8 @@ private struct NavigationState: Codable {
 @MainActor
 class NavigationModel: ObservableObject {
   static let shared = NavigationModel()
+  
+  private let log = Log.scoped("Navigation", enableTracing: true)
 
   @Published var homePath: [NavigationRoute] = []
   @Published var homeSelection: NavigationRoute = .homeRoot
@@ -51,7 +53,13 @@ class NavigationModel: ObservableObject {
   @Published private var spacePathDict: [Int64: [NavigationRoute]] = [:]
   @Published private var spaceSelectionDict: [Int64: NavigationRoute] = [:]
 
-  public var windowManager: MainWindowViewModel?
+  public var windowManager: MainWindowViewModel? {
+    didSet {
+      log.trace("windowManager set")
+      // upon window creation
+      prepareForCurrentRoute()
+    }
+  }
 
   var spacePath: Binding<[NavigationRoute]> {
     Binding(
@@ -96,8 +104,8 @@ class NavigationModel: ObservableObject {
   private var cancellables = Set<AnyCancellable>()
 
   init() {
-    loadState()
     setupSubscriptions()
+    loadState()
     setupStatePersistence()
   }
 
@@ -117,6 +125,14 @@ class NavigationModel: ObservableObject {
     }.store(in: &cancellables)
   }
 
+  private func prepareForCurrentRoute() {
+    if let activeSpaceId {
+      windowManager?.setUpForInnerRoute(spaceSelectionDict[activeSpaceId] ?? .spaceRoot)
+    } else {
+      windowManager?.setUpForInnerRoute(homePath.last ?? homeSelection)
+    }
+  }
+
   // Used from sidebars
   func select(_ route: NavigationRoute) {
     if let activeSpaceId {

apple/InlineMac/Views/Main/Commands.swift

@@ -24,6 +24,9 @@ struct MainWindowCommands: Commands {
 
       Divider()
     }
+    
+    // This removes the "New Window" command from the File menu
+    CommandGroup(replacing: .newItem) { }
 
     TextEditingCommands()
 

apple/InlineMac/Views/Main/MainWindow.swift

@@ -85,12 +85,17 @@ class MainWindowViewModel: ObservableObject {
   private var windowInitilized = false
 
   func windowInititized(_ window: NSWindow) {
+    let previousWindow = self.window
     self.window = window
 
-    if windowInitilized {
-      return
-    }
-    windowInitilized = true
+//    if previousWindow == window {
+//      return
+//    }
+//    if windowInitilized {
+//      return
+//    }
+//    windowInitilized = true
+    Log.shared.debug("Window initialized")
 
     setUpWindowSizeMonitor()
     setupWindow(for: topLevelRoute)

server/src/index.ts

@@ -5,6 +5,7 @@ import { gitCommitHash, version } from "@in/server/buildEnv"
 Sentry.init({
   dsn: SENTRY_DSN,
   tracesSampleRate: 1.0,
+  enabled: process.env.NODE_ENV !== "development",
 })
 
 // Main app
@@ -22,9 +23,7 @@ const port = process.env["PORT"] || 8000
 
 // Ensure to call this before importing any other modules!
 
-if (process.env.NODE_ENV === "development") {
-  console.info(`🚧 Starting server in development mode...`)
-} else {
+if (process.env.NODE_ENV !== "development") {
   console.info(`🚧 Starting server • ${process.env.NODE_ENV} • ${version} • ${gitCommitHash}`)
 }