disableSafeArea 기능 추가

Author: sunghyun-k

Sources/WindowOverlay/Internals/WindowBridgingView.swift

@@ -3,11 +3,13 @@ import UIKit
 
 internal struct WindowBridgingView<V: View>: UIViewRepresentable {
   var isPresented: Bool
+  var disableSafeArea: Bool
   var content: V
 
   func makeUIView(context: Context) -> _HelperView {
     return _HelperView(
       isPresented: isPresented,
+      disableSafeArea: disableSafeArea,
       content: EnvPassingView(
         content: content,
         environment: context.environment
@@ -17,6 +19,7 @@ internal struct WindowBridgingView<V: View>: UIViewRepresentable {
   func updateUIView(_ helper: _HelperView, context: Context) {
     helper.setContent(
       isPresented: isPresented,
+      disableSafeArea: disableSafeArea,
       content: EnvPassingView(
         content: content,
         environment: context.environment
@@ -32,18 +35,20 @@ internal struct WindowBridgingView<V: View>: UIViewRepresentable {
       content.environment(\.self, environment)
     }
   }
-  
+
   internal final class _HelperView: UIView {
     private var isPresented: Bool
+    private var disableSafeArea: Bool
     private var content: EnvPassingView
 
     private var overlayWindow: WindowOverlayWindow?
     private var hostingController: UIHostingController<EnvPassingView>? {
       overlayWindow?.rootViewController as? UIHostingController<EnvPassingView>
     }
 
-    fileprivate init(isPresented: Bool, content: EnvPassingView) {
+    fileprivate init(isPresented: Bool, disableSafeArea: Bool, content: EnvPassingView) {
       self.isPresented = isPresented
+      self.disableSafeArea = disableSafeArea
       self.content = content
       super.init(frame: .zero)
     }
@@ -60,9 +65,11 @@ internal struct WindowBridgingView<V: View>: UIViewRepresentable {
 
     fileprivate func setContent(
       isPresented: Bool,
+      disableSafeArea: Bool,
       content: EnvPassingView
     ) {
       self.isPresented = isPresented
+      self.disableSafeArea = disableSafeArea
       self.content = content
       updateView()
     }
@@ -72,6 +79,7 @@ internal struct WindowBridgingView<V: View>: UIViewRepresentable {
         if hostingController == nil {
           overlayWindow?.rootViewController = UIHostingController(rootView: content)
           overlayWindow?.rootViewController?.view.backgroundColor = .clear
+          hostingController?.disableSafeArea(disableSafeArea)
         } else {
           hostingController?.rootView = content
         }
@@ -83,3 +91,13 @@ internal struct WindowBridgingView<V: View>: UIViewRepresentable {
     }
   }
 }
+
+extension UIHostingController {
+  func disableSafeArea(_ disable: Bool) {
+    if #available(iOS 16.4, *) {
+      self.safeAreaRegions = disable ? [] : .all
+    } else {
+      self._disableSafeArea = disable
+    }
+  }
+}

Sources/WindowOverlay/WindowOverlayModifier.swift

@@ -1,20 +1,16 @@
 import SwiftUI
 
 extension View {
-  public func windowOverlay<V: View>(isPresented: Bool, @ViewBuilder content: () -> V) -> some View {
-    modifier(WindowOverlayModifier(isPresented: isPresented, overlay: content()))
-  }
-}
-
-private struct WindowOverlayModifier<V: View>: ViewModifier {
-  var isPresented: Bool
-  var overlay: V
-
-  func body(content: Content) -> some View {
-    content
-      ._background {
-        WindowBridgingView(isPresented: isPresented, content: overlay)
-          .allowsHitTesting(false)
-      }
+  public func windowOverlay<V: View>(
+    isPresented: Bool,
+    disableSafeArea: Bool = false,
+    @ViewBuilder content: () -> V
+  ) -> some View {
+    self._background {
+      WindowBridgingView(
+        isPresented: isPresented, disableSafeArea: disableSafeArea, content: content()
+      )
+      .allowsHitTesting(false)
+    }
   }
 }