Creating new NSWindowDelegateContainer (#6)

Author: leogdion

.github/workflows/RadiantKit.yml

@@ -13,7 +13,7 @@ jobs:
     if: "!contains(github.event.head_commit.message, 'ci skip')"
     runs-on: ubuntu-latest
     container:
-      image: swiftlang/swift:nightly-6.0-jammy
+      image: swift:6.0.1-noble
     steps:
       - uses: actions/checkout@v4
       - name: Cache swift package modules

Sources/RadiantKit/AppKit/NSWindowDelegateContainer.swift

@@ -0,0 +1,35 @@
+//
+//  NSWindowDelegateContainer.swift
+//  RadiantKit
+//
+//  Created by Leo Dion.
+//  Copyright © 2024 BrightDigit.
+//
+//  Permission is hereby granted, free of charge, to any person
+//  obtaining a copy of this software and associated documentation
+//  files (the “Software”), to deal in the Software without
+//  restriction, including without limitation the rights to use,
+//  copy, modify, merge, publish, distribute, sublicense, and/or
+//  sell copies of the Software, and to permit persons to whom the
+//  Software is furnished to do so, subject to the following
+//  conditions:
+//
+//  The above copyright notice and this permission notice shall be
+//  included in all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+//  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+//  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+//  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+//  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//  OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if canImport(AppKit) && canImport(SwiftUI)
+  public import AppKit
+  @MainActor public protocol NSWindowDelegateContainer: AnyObject {
+    var windowDelegate: (any NSWindowDelegate)? { get set }
+  }
+#endif

Sources/RadiantKit/AppKit/View+NSWindowDelegate.swift

@@ -29,24 +29,26 @@
 
 #if canImport(AppKit) && canImport(SwiftUI)
   import AppKit
-
   public import SwiftUI
 
   fileprivate struct NSWindowDelegateAdaptorModifier: ViewModifier {
-    @Binding var binding: (any NSWindowDelegate)?
+    let container: any NSWindowDelegateContainer
     let delegate: any NSWindowDelegate
 
     init(
-      binding: Binding<(any NSWindowDelegate)?>,
+      container: any NSWindowDelegateContainer,
       delegate: @autoclosure () -> any NSWindowDelegate
     ) {
-      self._binding = binding
-      self.delegate = binding.wrappedValue ?? delegate()
-
-      #warning(
-        "Issue 100 - We can't set binding here - Modifying state during view update, this will cause undefined behavior."
-      )
-      self.binding = self.delegate
+      self.container = container
+      if let windowDelegate = container.windowDelegate {
+        self.delegate = windowDelegate
+      }
+      else {
+        let newDelegate = delegate()
+        print("Creating a New Window Delegate")
+        self.delegate = newDelegate
+        self.container.windowDelegate = newDelegate
+      }
     }
 
     func body(content: Content) -> some View {
@@ -60,10 +62,10 @@
 
   extension View {
     public func nsWindowDelegateAdaptor(
-      _ binding: Binding<(any NSWindowDelegate)?>,
+      _ container: any NSWindowDelegateContainer,
       _ delegate: @autoclosure () -> any NSWindowDelegate
     ) -> some View {
-      self.modifier(NSWindowDelegateAdaptorModifier(binding: binding, delegate: delegate()))
+      self.modifier(NSWindowDelegateAdaptorModifier(container: container, delegate: delegate()))
     }
   }
 #endif