refactor: pinning window won't set CanJoinAllSpaces on macOS (#854)

This commit reverts the logic introduced in e7dd27c744: > Pinning the main window would bring "NSWindowCollectionBehaviorCanJoinAllSpaces" > back to make it really stay pinned across all the spaces. Commit 6bc78b41ef (diff-b55e9c1de63ea370ce736826e4dea5685bfa3992d8dee58427337e68b71a1fc1) did a tiny refactor to the frontend code merged in the above commit, these changes are reverted as well. We revert these changes because we observed an issue with window focus, and we don't know the root cause and how to fix the issue either. The following change is kept because we don't want to hit this NS panel bug[1]. But if the issue still exists after this commit, it will be removed as well. In "src-tauri/src/setup/mac.rs": ```diff panel.set_collection_behaviour( - NSWindowCollectionBehavior::NSWindowCollectionBehaviorCanJoinAllSpaces + NSWindowCollectionBehavior::NSWindowCollectionBehaviorMoveToActiveSpace ``` [1]: https://github.com/ahkohd/tauri-nspanel/issues/76
2025-12-23 14:59:24 +01:00 · 2025-08-01 15:28:11 +08:00
parent 5c6cf18139
commit 2eb10933e7
12 changed files with 45 additions and 181 deletions
--- a/docs/content.en/docs/release-notes/_index.md
+++ b/docs/content.en/docs/release-notes/_index.md
@@ -30,6 +30,7 @@ Information about release notes of Coco App is provided here.
 - chore: delete unused code files and dependencies #841
 - chore: ignore tauri::AppHandle's generic argument R #845
 - refactor: check Extension/plugin.json from all sources #846
+- refactor: pinning window won't set CanJoinAllSpaces on macOS #854

 ## 0.7.1 (2025-07-27)

--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -852,7 +852,6 @@ dependencies = [
 "cfg-if",
 "chinese-number",
 "chrono",
- "cocoa 0.24.1",
 "derive_more 2.0.1",
 "dirs 5.0.1",
 "enigo",
@@ -916,22 +915,6 @@ dependencies = [
 "zip 4.0.0",
 ]

-[[package]]
-name = "cocoa"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a"
-dependencies = [
- "bitflags 1.3.2",
- "block",
- "cocoa-foundation 0.1.2",
- "core-foundation 0.9.4",
- "core-graphics 0.22.3",
- "foreign-types 0.3.2",
- "libc",
- "objc",
-]
-
 [[package]]
 name = "cocoa"
 version = "0.26.0"
@@ -940,28 +923,14 @@ checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2"
 dependencies = [
 "bitflags 2.9.0",
 "block",
- "cocoa-foundation 0.2.0",
+ "cocoa-foundation",
 "core-foundation 0.10.0",
- "core-graphics 0.24.0",
+ "core-graphics",
 "foreign-types 0.5.0",
 "libc",
 "objc",
 ]

-[[package]]
-name = "cocoa-foundation"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7"
-dependencies = [
- "bitflags 1.3.2",
- "block",
- "core-foundation 0.9.4",
- "core-graphics-types 0.1.3",
- "libc",
- "objc",
-]
-
 [[package]]
 name = "cocoa-foundation"
 version = "0.2.0"
@@ -971,7 +940,7 @@ dependencies = [
 "bitflags 2.9.0",
 "block",
 "core-foundation 0.10.0",
- "core-graphics-types 0.2.0",
+ "core-graphics-types",
 "libc",
 "objc",
 ]
@@ -1088,19 +1057,6 @@ version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"

-[[package]]
-name = "core-graphics"
-version = "0.22.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation 0.9.4",
- "core-graphics-types 0.1.3",
- "foreign-types 0.3.2",
- "libc",
-]
-
 [[package]]
 name = "core-graphics"
 version = "0.24.0"
@@ -1109,22 +1065,11 @@ checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1"
 dependencies = [
 "bitflags 2.9.0",
 "core-foundation 0.10.0",
- "core-graphics-types 0.2.0",
+ "core-graphics-types",
 "foreign-types 0.5.0",
 "libc",
 ]

-[[package]]
-name = "core-graphics-types"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation 0.9.4",
- "libc",
-]
-
 [[package]]
 name = "core-graphics-types"
 version = "0.2.0"
@@ -1528,8 +1473,8 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67fd9ae1736d6ebb2e472740fbee86fb2178b8d56feb98a6751411d4c95b7e72"
 dependencies = [
- "cocoa 0.26.0",
- "core-graphics 0.24.0",
+ "cocoa",
+ "core-graphics",
 "dunce",
 "gdk",
 "gdkx11",
@@ -1618,7 +1563,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0cf6f550bbbdd5fe66f39d429cb2604bcdacbf00dca0f5bbe2e9306a0009b7c6"
 dependencies = [
 "core-foundation 0.10.0",
- "core-graphics 0.24.0",
+ "core-graphics",
 "foreign-types-shared 0.3.1",
 "libc",
 "log",
@@ -5777,7 +5722,7 @@ checksum = "18051cdd562e792cad055119e0cdb2cfc137e44e3987532e0f9659a77931bb08"
 dependencies = [
 "bytemuck",
 "cfg_aliases",
- "core-graphics 0.24.0",
+ "core-graphics",
 "foreign-types 0.5.0",
 "js-sys",
 "log",
@@ -6024,7 +5969,7 @@ checksum = "1e59c1f38e657351a2e822eadf40d6a2ad4627b9c25557bc1180ec1b3295ef82"
 dependencies = [
 "bitflags 2.9.0",
 "core-foundation 0.10.0",
- "core-graphics 0.24.0",
+ "core-graphics",
 "crossbeam-channel",
 "dispatch",
 "dlopen2",
@@ -6222,9 +6167,9 @@ source = "git+https://github.com/ahkohd/tauri-nspanel?branch=v2#d4b9df797959f8fa
 dependencies = [
 "bitflags 2.9.0",
 "block",
- "cocoa 0.26.0",
+ "cocoa",
 "core-foundation 0.10.0",
- "core-graphics 0.24.0",
+ "core-graphics",
 "objc",
 "objc-foundation",
 "objc_id",
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -110,7 +110,6 @@ strum = { version = "0.27.2", features = ["derive"] }

 [target."cfg(target_os = \"macos\")".dependencies]
 tauri-nspanel = { git = "https://github.com/ahkohd/tauri-nspanel", branch = "v2" }
-cocoa = "0.24"

 [target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\"))".dependencies]
 tauri-plugin-single-instance = { version = "2.0.0", features = ["deep-link"] }
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -177,9 +177,7 @@ pub fn run() {
            extension::built_in::file_search::config::set_file_system_config,
            server::synthesize::synthesize,
            util::file::get_file_icon,
-            util::app_lang::update_app_lang,
-            #[cfg(target_os = "macos")]
-            setup::toggle_move_to_active_space_attribute,
+            util::app_lang::update_app_lang
        ])
        .setup(|app| {
            let app_handle = app.handle().clone();
--- a/src-tauri/src/setup/mac.rs
+++ b/src-tauri/src/setup/mac.rs
@@ -1,8 +1,6 @@
 //! credits to: https://github.com/ayangweb/ayangweb-EcoPaste/blob/169323dbe6365ffe4abb64d867439ed2ea84c6d1/src-tauri/src/core/setup/mac.rs

-use cocoa::appkit::NSWindow;
-use tauri::Manager;
-use tauri::{App, AppHandle, Emitter, EventTarget, WebviewWindow};
+use tauri::{App, Emitter, EventTarget, WebviewWindow};
 use tauri_nspanel::{WebviewWindowExt, cocoa::appkit::NSWindowCollectionBehavior, panel_delegate};

 use crate::common::MAIN_WINDOW_LABEL;
@@ -30,7 +28,7 @@ pub fn platform(
    // Do not steal focus from other windows
    panel.set_style_mask(NSWindowStyleMaskNonActivatingPanel);

-    // Share the window across all desktop spaces and full screen
+    // Open the window in the active workspace and full screen
    panel.set_collection_behaviour(
        NSWindowCollectionBehavior::NSWindowCollectionBehaviorMoveToActiveSpace
            | NSWindowCollectionBehavior::NSWindowCollectionBehaviorStationary
@@ -81,50 +79,3 @@ pub fn platform(
    // Set the delegate object for the window to handle window events
    panel.set_delegate(delegate);
 }
-
-/// Change NS window attribute between `NSWindowCollectionBehaviorCanJoinAllSpaces`
-/// and `NSWindowCollectionBehaviorMoveToActiveSpace` accordingly.
-///
-/// NOTE: this tauri command is not async because we should run it in the main
-/// thread, or `ns_window.setCollectionBehavior_(collection_behavior)` would lead
-/// to UB.
-#[tauri::command]
-pub(crate) fn toggle_move_to_active_space_attribute(tauri_app_hanlde: AppHandle) {
-    use cocoa::appkit::NSWindowCollectionBehavior;
-    use cocoa::base::id;
-
-    let main_window = tauri_app_hanlde
-        .get_webview_window(MAIN_WINDOW_LABEL)
-        .unwrap();
-    let ns_window = main_window.ns_window().unwrap() as id;
-    let mut collection_behavior = unsafe { ns_window.collectionBehavior() };
-    let join_all_spaces = collection_behavior
-        .contains(NSWindowCollectionBehavior::NSWindowCollectionBehaviorCanJoinAllSpaces);
-    let move_to_active_space = collection_behavior
-        .contains(NSWindowCollectionBehavior::NSWindowCollectionBehaviorMoveToActiveSpace);
-
-    match (join_all_spaces, move_to_active_space) {
-        (true, false) => {
-            collection_behavior
-                .remove(NSWindowCollectionBehavior::NSWindowCollectionBehaviorCanJoinAllSpaces);
-            collection_behavior
-                .insert(NSWindowCollectionBehavior::NSWindowCollectionBehaviorMoveToActiveSpace);
-        }
-        (false, true) => {
-            collection_behavior
-                .remove(NSWindowCollectionBehavior::NSWindowCollectionBehaviorMoveToActiveSpace);
-            collection_behavior
-                .insert(NSWindowCollectionBehavior::NSWindowCollectionBehaviorCanJoinAllSpaces);
-        }
-        _ => {
-            panic!(
-                "invalid NS window attribute, NSWindowCollectionBehaviorCanJoinAllSpaces is set [{}], NSWindowCollectionBehaviorMoveToActiveSpace is set [{}]",
-                join_all_spaces, move_to_active_space
-            );
-        }
-    }
-
-    unsafe {
-        ns_window.setCollectionBehavior_(collection_behavior);
-    }
-}
--- a/src/commands/system.ts
+++ b/src/commands/system.ts
@@ -35,7 +35,3 @@ export function show_check(): Promise<void> {
 export function hide_check(): Promise<void> {
  return invoke('hide_check');
 }
-
-export function toggle_move_to_active_space_attribute(): Promise<void> {
-  return invoke('toggle_move_to_active_space_attribute');
-}
--- a/src/components/Assistant/ChatHeader.tsx
+++ b/src/components/Assistant/ChatHeader.tsx
@@ -7,12 +7,12 @@ import PinIcon from "@/icons/Pin";
 import WindowsFullIcon from "@/icons/WindowsFull";
 import { useAppStore } from "@/stores/appStore";
 import type { Chat } from "@/types/chat";
+import platformAdapter from "@/utils/platformAdapter";
 import VisibleKey from "../Common/VisibleKey";
 import { useShortcutsStore } from "@/stores/shortcutsStore";
 import { HISTORY_PANEL_ID } from "@/constants";
 import { AssistantList } from "./AssistantList";
 import { ServerList } from "./ServerList";
-import { useTogglePin } from "@/hooks/useTogglePin";

 interface ChatHeaderProps {
  clearChat: () => void;
@@ -35,12 +35,22 @@ export function ChatHeader({
  showChatHistory = true,
  assistantIDs,
 }: ChatHeaderProps) {
-  const { isTauri } = useAppStore();
-  const { isPinned, togglePin } = useTogglePin();
+  const { isPinned, setIsPinned, isTauri } = useAppStore();

  const { historicalRecords, newSession, fixedWindow, external } =
    useShortcutsStore();

+  const togglePin = async () => {
+    try {
+      const newPinned = !isPinned;
+      await platformAdapter.setAlwaysOnTop(newPinned);
+      setIsPinned(newPinned);
+    } catch (err) {
+      console.error("Failed to toggle window pin state:", err);
+      setIsPinned(isPinned);
+    }
+  };
+
  return (
    <header
      className="flex items-center justify-between py-2 px-3 select-none"
--- a/src/components/Common/UI/Footer.tsx
+++ b/src/components/Common/UI/Footer.tsx
@@ -19,7 +19,6 @@ import source_default_dark_img from "@/assets/images/source_default_dark.png";
 import { useThemeStore } from "@/stores/themeStore";
 import platformAdapter from "@/utils/platformAdapter";
 import FontIcon from "../Icons/FontIcon";
-import { useTogglePin } from "@/hooks/useTogglePin";

 interface FooterProps {
  setIsPinnedWeb?: (value: boolean) => void;
@@ -38,16 +37,28 @@ export default function Footer({ setIsPinnedWeb }: FooterProps) {

  const isDark = useThemeStore((state) => state.isDark);

-  const { isTauri } = useAppStore();
-
-  const { isPinned, togglePin } = useTogglePin({
-    onPinChange: setIsPinnedWeb,
-  });
+  const { isTauri, isPinned, setIsPinned } = useAppStore();

  const { setVisible, updateInfo, skipVersions } = useUpdateStore();

  const { fixedWindow, modifierKey } = useShortcutsStore();

+  const setWindowAlwaysOnTop = useCallback(async (isPinned: boolean) => {
+    setIsPinnedWeb?.(isPinned);
+    return platformAdapter.setAlwaysOnTop(isPinned);
+  }, []);
+
+  const togglePin = async () => {
+    try {
+      const newPinned = !isPinned;
+      await setWindowAlwaysOnTop(newPinned);
+      setIsPinned(newPinned);
+    } catch (err) {
+      console.error("Failed to toggle window pin state:", err);
+      setIsPinned(isPinned);
+    }
+  };
+
  const openSetting = useCallback(() => {
    return platformAdapter.emitEvent("open_settings", "");
  }, []);
--- a/src/hooks/useTogglePin.ts
+++ b/src/hooks/useTogglePin.ts
@@ -1,33 +0,0 @@
-import { useCallback } from "react";
-
-import { useAppStore } from "@/stores/appStore";
-import platformAdapter from "@/utils/platformAdapter";
-
-interface UseTogglePinOptions {
-  onPinChange?: (isPinned: boolean) => void;
-}
-
-export const useTogglePin = (options?: UseTogglePinOptions) => {
-  const { isPinned, setIsPinned } = useAppStore();
-
-  const togglePin = useCallback(async () => {
-    try {
-      const newPinned = !isPinned;
-
-      if (options?.onPinChange) {
-        options.onPinChange(newPinned);
-      }
-
-      await platformAdapter.setAlwaysOnTop(newPinned);
-      await platformAdapter.toggleMoveToActiveSpaceAttribute();
-      setIsPinned(newPinned);
-    } catch (err) {
-      console.error("Failed to toggle window pin state:", err);
-    }
-  }, [isPinned, setIsPinned, options?.onPinChange]);
-
-  return {
-    isPinned,
-    togglePin,
-  };
-};
--- a/src/types/platform.ts
+++ b/src/types/platform.ts
@@ -59,7 +59,6 @@ export interface WindowOperations {
  hideWindow: () => Promise<void>;
  showWindow: () => Promise<void>;
  setAlwaysOnTop: (isPinned: boolean) => Promise<void>;
-  toggleMoveToActiveSpaceAttribute: () => Promise<void>;
  setShadow(enable: boolean): Promise<void>;
  getWebviewWindow: () => Promise<any>;
  getWindowByLabel: (label: string) => Promise<{
--- a/src/utils/tauriAdapter.ts
+++ b/src/utils/tauriAdapter.ts
@@ -16,8 +16,6 @@ import { useAppearanceStore } from "@/stores/appearanceStore";
 import { copyToClipboard, OpenURLWithBrowser } from ".";
 import { useAppStore } from "@/stores/appStore";
 import { unrequitable } from "@/utils";
-import { toggle_move_to_active_space_attribute } from "@/commands/system";
-import { isMac } from "@/utils/platform";

 export interface TauriPlatformAdapter extends BasePlatformAdapter {
  openFileDialog: (
@@ -82,13 +80,6 @@ export const createTauriAdapter = (): TauriPlatformAdapter => {
      return window.setAlwaysOnTop(isPinned);
    },

-    async toggleMoveToActiveSpaceAttribute() {
-      if (isMac) {
-        return toggle_move_to_active_space_attribute();
-      }
-      return Promise.resolve();
-    },
-
    async requestScreenRecordingPermission() {
      const { requestScreenRecordingPermission } = await import(
        "tauri-plugin-macos-permissions-api"
--- a/src/utils/webAdapter.ts
+++ b/src/utils/webAdapter.ts
@@ -58,10 +58,6 @@ export const createWebAdapter = (): WebPlatformAdapter => {
      console.log("Web mode simulated set always on top", isPinned);
    },

-    async toggleMoveToActiveSpaceAttribute() {
-      console.log("Web mode simulated toggle move to active space attribute");
-    },
-
    async checkScreenRecordingPermission() {
      console.log("Web mode simulated check screen recording permission");
      return false;