MindWorkAI/AI-Studio
MindWorkAI/AI-Studio
1
0
Fork 0
mirror of https://github.com/MindWorkAI/AI-Studio.git synced 2026-08-11 19:32:10 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed the macOS build of the native share sheet

Browse Source
This commit is contained in:
Thorsten Sommer 2026-08-04 10:38:41 +02:00
parent 9814723eba
commit 0b459801d4
Signed by untrusted user who does not match committer: tsommer
GPG Key ID: 371BBA77A02C0108
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/Cargo.toml
View File

@ -75,8 +75,8 @@ windows-collections = "=0.2.0"
[target.'cfg(target_os = "macos")'.dependencies]
apple-native-keyring-store = { version = "1.0.0", features = ["keychain"] }
objc2 = "0.6.3"
objc2-app-kit = { version = "0.3.2", features = ["NSSharingService", "NSView"] }
objc2-foundation = { version = "0.3.2", features = ["NSArray", "NSString", "NSURL"] }
objc2-app-kit = { version = "0.3.2", features = ["NSResponder", "NSSharingService", "NSView"] }
objc2-foundation = { version = "0.3.2", features = ["NSArray", "NSGeometry", "NSString", "NSURL"] }
[target.'cfg(target_os = "linux")'.dependencies]
ashpd = { version = "0.13.12", default-features = false, features = ["tokio", "open_uri", "global_shortcuts"] }

29
runtime/src/share_sheet.rs
View File

@ -103,9 +103,20 @@ async fn share_file_on_platform(path: PathBuf) -> Result<(), String> {
#[cfg(target_os = "macos")]
async fn share_file_on_platform(path: PathBuf) -> Result<(), String> {
use objc2::MainThreadMarker;
use objc2_app_kit::{NSRectEdge, NSSharingServicePicker, NSView};
use objc2_foundation::{NSArray, NSRect, NSString, NSURL};
use std::cell::RefCell;
use objc2::rc::Retained;
use objc2::runtime::AnyObject;
use objc2::{AnyThread, MainThreadMarker};
use objc2_app_kit::{NSSharingServicePicker, NSView};
use objc2_foundation::{NSArray, NSRect, NSRectEdge, NSString, NSURL};
// AppKit does not retain the picker while its UI is shown. Without a strong reference of our
// own, the picker would be deallocated right after showRelativeToRect and the share sheet
// would close immediately. We create and replace the picker on the main thread only, hence a
// thread-local reference is sufficient:
thread_local! {
static CURRENT_PICKER: RefCell<Option<Retained<NSSharingServicePicker>>> = const { RefCell::new(None) };
}
let window = crate::app_window::MAIN_WINDOW.lock().unwrap().clone()
.ok_or_else(|| String::from("The main window is not available."))?;
@ -115,13 +126,19 @@ async fn share_file_on_platform(path: PathBuf) -> Result<(), String> {
window.run_on_main_thread(move || {
let result = (|| -> Result<(), String> {
let mtm = MainThreadMarker::new().ok_or_else(|| String::from("The macOS share sheet must run on the main thread."))?;
// We create the NSView reference from a raw pointer below, which bypasses the
// main-thread guarantee of objc2. Thus, we assert the main thread ourselves:
let _mtm = MainThreadMarker::new().ok_or_else(|| String::from("The macOS share sheet must run on the main thread."))?;
let path = NSString::from_str(&path);
let url = NSURL::fileURLWithPath(&path);
let items = NSArray::from_retained_slice(&[url]);
let picker = NSSharingServicePicker::alloc(mtm).initWithItems(&items);
let item: Retained<AnyObject> = Retained::into_super(Retained::into_super(url));
let items = NSArray::from_retained_slice(&[item]);
// Safety: the items are NSURL instances, which conform to NSPasteboardWriting.
let picker = unsafe { NSSharingServicePicker::initWithItems(NSSharingServicePicker::alloc(), &items) };
let view = unsafe { &*ui_window.ns_view().map_err(|error| format!("Failed to get the native view: {error}"))?.cast::<NSView>() };
picker.showRelativeToRect_ofView_preferredEdge(NSRect::ZERO, view, NSRectEdge::MinY);
CURRENT_PICKER.with(|current| current.replace(Some(picker)));
Ok(())
})();
let _ = sender.send(result);