fix(workspaces): display assignment when moving window in dynamic mode (#554)

Author: wojciech-kulik

.swiftformat

@@ -28,7 +28,7 @@
 --selfrequired expectation,wait
 --patternlet inline
 
---disable wrapMultilineStatementBraces, blankLinesAroundMark, trailingClosures, wrapPropertyBodies, wrapFunctionBodies
+--disable wrapMultilineStatementBraces, blankLinesAroundMark, trailingClosures, wrapPropertyBodies, wrapFunctionBodies, preferForLoop
 
 --exclude Dangerfile.swift
 

FlashSpace/Features/FocusManager/FocusedWindowTracker.swift

@@ -82,6 +82,8 @@ final class FocusedWindowTracker {
         // Skip if the app is floating
         guard !settingsRepository.floatingAppsSettings.floatingApps.containsApp(app) else { return }
 
+        workspaceManager.invalidateInactiveWorkspaces()
+
         // Find the workspace that contains the app.
         // The same app can be in multiple workspaces, the highest priority has the one
         // from the active workspace.

FlashSpace/Features/Workspaces/WorkspaceManager.swift

@@ -100,6 +100,7 @@ final class WorkspaceManager: ObservableObject {
             .compactMap { $0.userInfo?[NSWorkspace.applicationUserInfoKey] as? NSRunningApplication }
             .filter { $0.activationPolicy == .regular }
             .sink { [weak self] application in
+                self?.invalidateInactiveWorkspaces()
                 self?.rememberLastFocusedApp(application, retry: true)
             }
     }
@@ -576,6 +577,18 @@ extension WorkspaceManager {
         lastFocusedApp[profilesRepository.selectedProfile.id, default: [:]][workspace.id] = app
     }
 
+    func invalidateInactiveWorkspaces() {
+        guard workspaceSettings.displayMode == .dynamic else { return }
+
+        activeWorkspace = activeWorkspace.filter { display, workspace in
+            let isValid = workspace.displays.contains(display)
+            if !isValid {
+                Logger.log("Invalidating workspace: \(workspace.name) on display: \(display)")
+            }
+            return isValid
+        }
+    }
+
     func pauseWorkspaceManagement() {
         guard !workspaceSettings.isPaused else { return }