Use swiftui-window-reference

Author: trbernstein

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.7
+// swift-tools-version: 5.10
 import PackageDescription
 
 let package = Package(
@@ -9,8 +9,16 @@ let package = Package(
             name: "FramelessWindow",
             targets: ["FramelessWindow"])
     ],
+	dependencies: [
+		.package(url: "https://github.com/astzweig/swiftui-window-reference", from: "1.0.0")
+	],
     targets: [
-        .target(name: "FramelessWindow"),
+        .target(
+			name: "FramelessWindow",
+			dependencies: [
+				.product(name: "WindowReference", package: "swiftui-window-reference")
+			]
+		),
 		.executableTarget(
 			name: "TestApp",
 			dependencies: ["FramelessWindow"]

README.md

@@ -15,7 +15,7 @@ import FramelessWindow
 @main
 struct YourApp: App {
     var body: some Scene {
-        FramelessWindow(withId: "window-id") {
+        FramelessWindow("Window Title", id: "window-id") {
             ContentView()
         }
     }
@@ -66,3 +66,4 @@ The minimum Swift version supported by swiftui-frameless-window releases are det
 swiftui-frameless-window   | Minimum Swift Version
 ---------------------------|----------------------
 `0.0.1 ...`                | 5.7
+`2.0.0 ...`                | 5.10

Sources/FramelessWindow/Environment.swift

@@ -1,4 +1,5 @@
 import SwiftUI
+import WindowReference
 
 /**
  A SwiftUI scene that creates a bare single window without the included default items.
@@ -7,10 +8,6 @@ import SwiftUI
  default window buttons. Additionally it is excluded from the applications window menu.
  */
 public struct FramelessWindow<Content: View>: Scene {
-	/// Store the window in local state to share within the environment.
-	@State private var window: NSWindow?
-	@Environment(\.scenePhase) private var scenePhase
-
 	let titleKey: LocalizedStringKey
 	let id: String
 	let content: () -> Content
@@ -19,11 +16,10 @@ public struct FramelessWindow<Content: View>: Scene {
 	/// into the environment.
 	public var body: some Scene {
 		Window(self.titleKey, id: self.id) {
-			self.content()
-				.ignoresSafeArea()
-				.framelessWindow(self.$window)
+			WindowReference(withId: self.id, andWindowInitializer: self.modify(window:)) {
+				self.content()
+			}.ignoresSafeArea()
 		}.windowStyle(.hiddenTitleBar)
-			.onChange(of: self.scenePhase, perform: self.adaptWindowToScenePhase(_:))
 	}
 
 	/**
@@ -37,48 +33,16 @@ public struct FramelessWindow<Content: View>: Scene {
 	 window menu, this value has no effect. Default value is `"Launcher"`.
 	 - content: The view content to display in the window.
 	 */
-	public init(withId id: String, andTitle titleKey: LocalizedStringKey = "Launcher", @ViewBuilder content: @escaping () -> Content) {
-		self.titleKey = titleKey
+	public init(_ title: LocalizedStringKey = "Launcher", id: String, @ViewBuilder content: @escaping () -> Content) {
+		self.titleKey = title
 		self.id = id
 		self.content = content
 	}
 
-	/// Make window frameless on active states and remove it from environment on background state.
-	private func adaptWindowToScenePhase(_ phase: ScenePhase) {
-		guard phase != .background else {
-			self.removeWindowFromEnvironment()
-			return
-		}
-		guard self.window == nil else { return }
-		guard let window = self.getWindowById() else { return }
-
-		self.modify(window: window)
-		self.addWindowToEnvironment(window)
-	}
-
-	/// Adds window to enviroment by assigning to own state variable.
-	private func addWindowToEnvironment(_ window: NSWindow) {
-		self.window = window
-	}
-
-	/// Remove window from enviroment by assigning nil to own state variable.
-	private func removeWindowFromEnvironment() {
-		self.window = nil
-	}
-
 	/// Hide the miniaturize and zoom default window buttons and remove the window from the application window menu.
 	private func modify(window: NSWindow) {
 		window.standardWindowButton(.miniaturizeButton)?.isHidden = true
 		window.standardWindowButton(.zoomButton)?.isHidden = true
 		window.isExcludedFromWindowsMenu = true
 	}
-
-	/// Return the window with the matching identifier from all windows of the current application.
-	private func getWindowById() -> NSWindow? {
-		for window in NSApplication.shared.windows {
-			guard window.identifier?.rawValue == self.id else { continue }
-			return window
-		}
-		return nil
-	}
 }

Sources/FramelessWindow/FramelessWindow.swift

@@ -3,7 +3,7 @@ import FramelessWindow
 
 struct TestApp: App {
 	var body: some Scene {
-		FramelessWindow(withId: "single-window", andTitle: "Single Window") {
+		FramelessWindow("Single Window", id: "single-window") {
 			VStack {
 				Image(systemName: "globe").font(.title).foregroundStyle(.blue)
 				Text("Hello, world!")