Port dioxus to objc2

Author: nicoburns

Cargo.lock

@@ -367,6 +367,10 @@ infer = "0.19.0"
 dunce = "1.0.5"
 percent-encoding = "2.3.1"
 muda = "0.17.0"
+objc2 = { version = "0.6.3", features = ["exception"] }
+objc2-foundation = { version = "0.3.2", default-features = false }
+objc2-ui-kit = { version = "0.3.2", default-features = false }
+objc2-app-kit = { version = "0.3.2", default-features = false }
 tray-icon = "0.21.0"
 open = "5.3.2"
 webbrowser = "1.0"

Cargo.toml

@@ -68,8 +68,9 @@ muda = { workspace = true }
 tray-icon = { workspace = true }
 
 [target.'cfg(target_os = "ios")'.dependencies]
-objc = "0.2.7"
-objc_id = "0.1.1"
+objc2 = { workspace = true }
+objc2-foundation = { workspace = true, features = ["NSThread"] }
+objc2-ui-kit = { workspace = true, features = ["UIView", "UIViewController"] }
 
 # use rustls on android
 [target.'cfg(target_os = "android")'.dependencies]
@@ -84,9 +85,8 @@ ndk-context = { version = "0.1.1" }
 tungstenite = { workspace = true, features = ["native-tls"] }
 
 [target.'cfg(target_os = "macos")'.dependencies]
-cocoa = "0.26.1"
-core-foundation = "0.10.1"
-objc = "0.2.7"
+objc2 = { workspace = true }
+objc2-app-kit = { workspace = true, features = ["NSView"] }
 
 [build-dependencies]
 lazy-js-bundle = { workspace = true }

packages/desktop/Cargo.toml

@@ -23,6 +23,10 @@ use tao::{
 };
 use wry::{RequestAsyncResponder, WebView};
 
+#[cfg(target_os = "ios")]
+use objc2::rc::Retained;
+#[cfg(target_os = "ios")]
+use objc2_ui_kit::UIView;
 #[cfg(target_os = "ios")]
 use tao::platform::ios::WindowExtIOS;
 
@@ -71,7 +75,7 @@ pub struct DesktopService {
     pub(crate) close_behaviour: Rc<Cell<WindowCloseBehaviour>>,
 
     #[cfg(target_os = "ios")]
-    pub(crate) views: Rc<std::cell::RefCell<Vec<*mut objc::runtime::Object>>>,
+    pub(crate) views: Rc<std::cell::RefCell<Vec<Retained<UIView>>>>,
 }
 
 /// A smart pointer to the current window.
@@ -288,51 +292,54 @@ impl DesktopService {
         self.asset_handlers.remove_handler(name).map(|_| ())
     }
 
+    #[cfg(target_os = "ios")]
+    /// Get a retained reference to the current UIView
+    pub fn ui_view(&self) -> objc2::rc::Retained<objc2_ui_kit::UIView> {
+        use objc2::rc::Retained;
+        use objc2_ui_kit::UIView;
+        let ui_view = self.window.ui_view().cast::<UIView>();
+        unsafe { Retained::retain(ui_view) }.unwrap()
+    }
+
+    #[cfg(target_os = "ios")]
+    /// Get a retained reference to the current UIViewController
+    pub fn ui_view_controller(&self) -> objc2::rc::Retained<objc2_ui_kit::UIViewController> {
+        use objc2::rc::Retained;
+        use objc2_ui_kit::UIViewController;
+        let ui_view_controller = self.window.ui_view_controller().cast::<UIViewController>();
+        unsafe { Retained::retain(ui_view_controller) }.unwrap()
+    }
+
     /// Push an objc view to the window
     #[cfg(target_os = "ios")]
-    pub fn push_view(&self, view: objc_id::ShareId<objc::runtime::Object>) {
-        let window = &self.window;
-
-        unsafe {
-            use objc::runtime::Object;
-            use objc::*;
-            assert!(is_main_thread());
-            let ui_view = window.ui_view() as *mut Object;
-            let ui_view_frame: *mut Object = msg_send![ui_view, frame];
-            let _: () = msg_send![view, setFrame: ui_view_frame];
-            let _: () = msg_send![view, setAutoresizingMask: 31];
-
-            let ui_view_controller = window.ui_view_controller() as *mut Object;
-            let _: () = msg_send![ui_view_controller, setView: view];
-            self.views.borrow_mut().push(ui_view);
-        }
+    pub fn push_view(&self, new_view: Retained<UIView>) {
+        use objc2_ui_kit::UIViewAutoresizing;
+
+        assert!(is_main_thread());
+        let current_ui_view = self.ui_view();
+        let current_ui_view_frame = current_ui_view.frame();
+
+        new_view.setFrame(current_ui_view_frame);
+        new_view.setAutoresizingMask(UIViewAutoresizing::from_bits(31).unwrap());
+
+        let ui_view_controller = self.ui_view_controller();
+        ui_view_controller.setView(Some(&new_view));
+        self.views.borrow_mut().push(new_view);
     }
 
     /// Pop an objc view from the window
     #[cfg(target_os = "ios")]
     pub fn pop_view(&self) {
-        let window = &self.window;
-
-        unsafe {
-            use objc::runtime::Object;
-            use objc::*;
-            assert!(is_main_thread());
-            if let Some(view) = self.views.borrow_mut().pop() {
-                let ui_view_controller = window.ui_view_controller() as *mut Object;
-                let _: () = msg_send![ui_view_controller, setView: view];
-            }
+        assert!(is_main_thread());
+        if let Some(view) = self.views.borrow_mut().pop() {
+            self.ui_view_controller().setView(Some(&view));
         }
     }
 }
 
 #[cfg(target_os = "ios")]
 fn is_main_thread() -> bool {
-    use objc::runtime::{Class, BOOL, NO};
-    use objc::*;
-
-    let cls = Class::get("NSThread").unwrap();
-    let result: BOOL = unsafe { msg_send![cls, isMainThread] };
-    result != NO
+    objc2_foundation::NSThread::isMainThread_class()
 }
 
 /// A [`DesktopContext`] that is pending creation.

packages/desktop/src/desktop_context.rs

@@ -234,18 +234,13 @@ impl WebviewInstance {
 
         // https://developer.apple.com/documentation/appkit/nswindowcollectionbehavior/nswindowcollectionbehaviormanaged
         #[cfg(target_os = "macos")]
-        #[allow(deprecated)]
         {
-            use cocoa::appkit::NSWindowCollectionBehavior;
-            use cocoa::base::id;
-            use objc::{msg_send, sel, sel_impl};
+            use objc2::rc::Retained;
+            use objc2_app_kit::{NSWindow, NSWindowCollectionBehavior};
             use tao::platform::macos::WindowExtMacOS;
-
-            unsafe {
-                let window: id = window.ns_window() as id;
-                #[allow(unexpected_cfgs)]
-                let _: () = msg_send![window, setCollectionBehavior: NSWindowCollectionBehavior::NSWindowCollectionBehaviorManaged];
-            }
+            let ns_window: Retained<NSWindow> =
+                unsafe { Retained::retain(window.ns_window().cast()) }.unwrap();
+            ns_window.setCollectionBehavior(NSWindowCollectionBehavior::Managed)
         }
 
         let mut web_context = WebContext::new(cfg.data_dir.clone());