Fixed bugs.

Author: ivanvorobei

Sources/SwiftUIExtension/Compability/ViewCompability.swift

@@ -46,7 +46,9 @@ extension View {
         if #available(iOS 17.0, watchOS 10.0, macOS 14.0, *) {
             return self.scrollClipDisabled(disabled)
         } else {
-            return self
+            return self.introspect(.scrollView, on: .iOS(.v15, .v16)) { scrollView in
+                    scrollView.clipsToBounds = false
+                }
         }
     }
 

Sources/SwiftUIExtension/LayoutGuides/LayoutGuides.swift

@@ -24,8 +24,8 @@ public enum LayoutPadding {
 
 internal struct FitGuide: ViewModifier {
 
-    @State var layoutMargins: EdgeInsets = .init()
-    @State var readableMargins: EdgeInsets = .init()
+    @State var layoutMargins: EdgeInsets? = nil
+    @State var readableMargins: EdgeInsets? = nil
 
     private let guide: LayoutGuide
     private let padding: LayoutPadding
@@ -50,8 +50,8 @@ internal struct FitGuide: ViewModifier {
                                 }
                             )
                         )
-                        .contentMargins(.leading, layoutMargins.leading, for: .scrollContent)
-                        .contentMargins(.trailing, layoutMargins.trailing, for: .scrollContent)
+                        .contentMargins(.leading, layoutMargins?.leading, for: .scrollContent)
+                        .contentMargins(.trailing, layoutMargins?.trailing, for: .scrollContent)
                 } else {
                     content
                 }
@@ -64,8 +64,8 @@ internal struct FitGuide: ViewModifier {
                             }
                         )
                     )
-                    .padding(.leading, layoutMargins.leading)
-                    .padding(.trailing, layoutMargins.trailing)
+                    .padding(.leading, layoutMargins?.leading)
+                    .padding(.trailing, layoutMargins?.trailing)
             }
 
         case .readableMargins:
@@ -81,8 +81,8 @@ internal struct FitGuide: ViewModifier {
                                 }
                             )
                         )
-                        .contentMargins(.leading, readableMargins.leading, for: .scrollContent)
-                        .contentMargins(.trailing, readableMargins.trailing, for: .scrollContent)
+                        .contentMargins(.leading, readableMargins?.leading, for: .scrollContent)
+                        .contentMargins(.trailing, readableMargins?.trailing, for: .scrollContent)
                 } else {
                     content
                 }
@@ -95,8 +95,8 @@ internal struct FitGuide: ViewModifier {
                             }
                         )
                     )
-                    .padding(.leading, readableMargins.leading)
-                    .padding(.trailing, readableMargins.trailing)
+                    .padding(.leading, readableMargins?.leading)
+                    .padding(.trailing, readableMargins?.trailing)
             }
         }
     }

Sources/SwiftUIExtension/LayoutGuides/LayoutGuidesObserverView.swift

@@ -1,5 +1,6 @@
 #if os(iOS) || os(tvOS)
 import SwiftUI
+import SwiftBoost
 
 internal struct LayoutGuidesObserverView: UIViewRepresentable {
 
@@ -31,8 +32,8 @@ internal struct LayoutGuidesObserverView: UIViewRepresentable {
         var layoutMarginsDidChanged: ((EdgeInsets) -> Void)? = nil
         var readableMarginsDidChanged: ((EdgeInsets) -> Void)? = nil
 
-        var cachedLayoutMargins: EdgeInsets? = nil
-        var cachedReadableMargins: EdgeInsets? = nil
+        var cachedLayoutMargins: EdgeInsets? = EdgeInsets()
+        var cachedReadableMargins: EdgeInsets? = EdgeInsets()
 
         override func layoutMarginsDidChange() {
             super.layoutMarginsDidChange()
@@ -45,7 +46,7 @@ internal struct LayoutGuidesObserverView: UIViewRepresentable {
         }
 
         private func update() {
-            guard let viewController = self.viewController else{ return }
+            guard let viewController = self.viewController else { return }
             let safeAreaInsets = viewController.view.safeAreaInsets.edgeInsets
 
             let layout = viewController.view.layoutMargins.edgeInsets

Sources/SwiftUIExtension/Views/Mimicrate/ModalSheet/ModalSheetModifier.swift

@@ -101,6 +101,7 @@ struct ModalSheetModifier<ModalContent: View, Selection: Hashable>: ViewModifier
         .animation(.default, value: selection)
         .onChange(of: isPresented) { isPresented in
             if !isPresented {
+                dragOffset = .zero
                 delay(presentDimissDuration) {
                     self.onDismiss?()
                 }