fix(expo-modules-core): allow SwiftUI views to work on macOS

twodoorsdev · Dec 15, 2024 · c96c5ee · c96c5ee
1 parent 7889e97
commit c96c5ee
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/packages/expo-modules-core/CHANGELOG.md b/packages/expo-modules-core/CHANGELOG.md
@@ -10,6 +10,7 @@
 
 - Ensure `uuid.v4`and`uuid.v5` is available on old react native architecture. ([#33621](https://github.com/expo/expo/pull/33621) by [@andrejpavlovic](https://github.com/andrejpavlovic))
 - Changed `import` to `import type` for TS type declarations. ([#33447](https://github.com/expo/expo/pull/33447) by [@j-piasecki](https://github.com/j-piasecki))
+- [macOS] Allow SwiftUI views to work on macOS ([#33506](https://github.com/expo/expo/pull/33506) by [@hassankhan](https://github.com/hassankhan))
 
 ### 💡 Others
 

diff --git a/packages/expo-modules-core/ios/Core/Views/SwiftUI/SwiftUIViewHost.swift b/packages/expo-modules-core/ios/Core/Views/SwiftUI/SwiftUIViewHost.swift
@@ -9,6 +9,17 @@ extension ExpoSwiftUI {
   struct UIViewHost: UIViewRepresentable {
     let view: UIView
 
+
+    #if os(macOS)
+    func makeNSView(context: Context) -> NSView {
+        return view
+    }
+
+    func updateNSView(_ nsView: NSView, context: Context) {
+        // Nothing to do here
+    }
+    #endif
+
     func makeUIView(context: Context) -> UIView {
       return view
     }

diff --git a/packages/expo-modules-core/ios/Platform.swift b/packages/expo-modules-core/ios/Platform.swift
@@ -10,5 +10,6 @@ public typealias UIResponder = NSResponder
 public typealias UIApplicationDelegate = NSApplicationDelegate
 public typealias UIWindow = NSWindow
 public typealias UIHostingController = NSHostingController
+public typealias UIViewRepresentable = NSViewRepresentable
 
 #endif // os(macOS)