Merge pull request #95 from componentskit/fix-modals-dismiss

mikhailChelbaev · web-flow · commit 1155cddcd353 · 2025-05-09T21:59:47.000+03:00
Properly handle `dismiss` in modals
diff --git a/Sources/ComponentsKit/Components/Modal/SwiftUI/Helpers/ModalPresentationModifier.swift b/Sources/ComponentsKit/Components/Modal/SwiftUI/Helpers/ModalPresentationModifier.swift
@@ -38,7 +38,10 @@ struct ModalPresentationModifier<Modal: View>: ViewModifier {
         }
       }
       .fullScreenCover(
-        isPresented: self.$isPresented,
+        isPresented: .init(
+          get: { self.isPresented },
+          set: { self.isContentVisible = $0 }
+        ),
         onDismiss: self.onDismiss,
         content: {
           self.content()
diff --git a/Sources/ComponentsKit/Components/Modal/SwiftUI/Helpers/ModalPresentationWithItemModifier.swift b/Sources/ComponentsKit/Components/Modal/SwiftUI/Helpers/ModalPresentationWithItemModifier.swift
@@ -39,7 +39,10 @@ struct ModalPresentationWithItemModifier<Modal: View, Item: Identifiable>: ViewM
         }
       }
       .fullScreenCover(
-        item: self.$presentedItem,
+        item: .init(
+          get: { self.presentedItem },
+          set: { self.visibleItem = $0 }
+        ),
         onDismiss: self.onDismiss,
         content: { item in
           self.content(item)

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,10 @@ struct ModalPresentationModifier<Modal: View>: ViewModifier {`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`	`.fullScreenCover(`
`41`		`- isPresented: self.$isPresented,`
	`41`	`+ isPresented: .init(`
	`42`	`+ get: { self.isPresented },`
	`43`	`+ set: { self.isContentVisible = $0 }`
	`44`	`+ ),`
`42`	`45`	`onDismiss: self.onDismiss,`
`43`	`46`	`content: {`
`44`	`47`	`self.content()`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,10 @@ struct ModalPresentationWithItemModifier<Modal: View, Item: Identifiable>: ViewM`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`	`.fullScreenCover(`
`42`		`- item: self.$presentedItem,`
	`42`	`+ item: .init(`
	`43`	`+ get: { self.presentedItem },`
	`44`	`+ set: { self.visibleItem = $0 }`
	`45`	`+ ),`
`43`	`46`	`onDismiss: self.onDismiss,`
`44`	`47`	`content: { item in`
`45`	`48`	`self.content(item)`