change api of modals: calculate model with item

Author: mikhailChelbaev

Sources/ComponentsKit/Components/Modal/SwiftUI/Helpers/ModalPresentationModifier.swift

@@ -28,8 +28,8 @@ struct ModalPresentationModifier<Modal: View>: ViewModifier {
           self.isPresented = true
         }
       }
-      .onChange(of: self.isContentVisible) { newValue in
-        if newValue {
+      .onChange(of: self.isContentVisible) { isVisible in
+        if isVisible {
           self.isPresented = true
         } else {
           DispatchQueue.main.asyncAfter(deadline: .now() + self.transitionDuration) {

Sources/ComponentsKit/Components/Modal/SwiftUI/Helpers/ModalPresentationWithItemModifier.swift

@@ -6,12 +6,12 @@ struct ModalPresentationWithItemModifier<Modal: View, Item: Identifiable>: ViewM
 
   @ViewBuilder var content: (Item) -> Modal
 
-  let transitionDuration: TimeInterval
+  let transitionDuration: (Item) -> TimeInterval
   let onDismiss: (() -> Void)?
 
   init(
     item: Binding<Item?>,
-    transitionDuration: TimeInterval,
+    transitionDuration: @escaping (Item) -> TimeInterval,
     onDismiss: (() -> Void)?,
     @ViewBuilder content: @escaping (Item) -> Modal
   ) {
@@ -23,11 +23,17 @@ struct ModalPresentationWithItemModifier<Modal: View, Item: Identifiable>: ViewM
 
   func body(content: Content) -> some View {
     content
-      .onChange(of: self.visibleItem.isNotNil) { newValue in
-        if newValue {
+      .onAppear {
+        self.presentedItem = self.visibleItem
+      }
+      .onChange(of: self.visibleItem.isNotNil) { isVisible in
+        if isVisible {
           self.presentedItem = self.visibleItem
         } else {
-          DispatchQueue.main.asyncAfter(deadline: .now() + self.transitionDuration) {
+          let duration = self.presentedItem.map { item in
+            self.transitionDuration(item)
+          } ?? 0.3
+          DispatchQueue.main.asyncAfter(deadline: .now() + duration) {
             self.presentedItem = self.visibleItem
           }
         }
@@ -49,7 +55,7 @@ struct ModalPresentationWithItemModifier<Modal: View, Item: Identifiable>: ViewM
 extension View {
   func modal<Modal: View, Item: Identifiable>(
     item: Binding<Item?>,
-    transitionDuration: TimeInterval,
+    transitionDuration: @escaping (Item) -> TimeInterval,
     onDismiss: (() -> Void)? = nil,
     @ViewBuilder content: @escaping (Item) -> Modal
   ) -> some View {

Sources/ComponentsKit/Components/Modal/SwiftUI/SUBottomModal.swift

@@ -195,7 +195,7 @@ extension View {
   ///       }
   ///       .bottomModal(
   ///         item: $selectedItem,
-  ///         model: BottomModalVM(),
+  ///         model: { _ in BottomModalVM() },
   ///         onDismiss: {
   ///           print("Modal dismissed")
   ///         },
@@ -218,15 +218,15 @@ extension View {
   ///   ```
   public func bottomModal<Item: Identifiable, Header: View, Body: View, Footer: View>(
     item: Binding<Item?>,
-    model: BottomModalVM = .init(),
+    model: @escaping (Item) -> BottomModalVM = { _ in .init() },
     onDismiss: (() -> Void)? = nil,
     @ViewBuilder header: @escaping (Item) -> Header,
     @ViewBuilder body: @escaping (Item) -> Body,
     @ViewBuilder footer: @escaping (Item) -> Footer
   ) -> some View {
     return self.modal(
       item: item,
-      transitionDuration: model.transition.value,
+      transitionDuration: { model($0).transition.value },
       onDismiss: onDismiss,
       content: { unwrappedItem in
         SUBottomModal(
@@ -242,7 +242,7 @@ extension View {
               }
             }
           ),
-          model: model,
+          model: model(unwrappedItem),
           header: { header(unwrappedItem) },
           body: { body(unwrappedItem) },
           footer: { footer(unwrappedItem) }
@@ -289,7 +289,7 @@ extension View {
   ///       }
   ///       .bottomModal(
   ///         item: $selectedItem,
-  ///         model: BottomModalVM(),
+  ///         model: { _ in BottomModalVM() },
   ///         onDismiss: {
   ///           print("Modal dismissed")
   ///         },
@@ -302,7 +302,7 @@ extension View {
   ///   ```
   public func bottomModal<Item: Identifiable, Body: View>(
     item: Binding<Item?>,
-    model: BottomModalVM = .init(),
+    model: @escaping (Item) -> BottomModalVM = { _ in .init() },
     onDismiss: (() -> Void)? = nil,
     @ViewBuilder body: @escaping (Item) -> Body
   ) -> some View {

Sources/ComponentsKit/Components/Modal/SwiftUI/SUCenterModal.swift

@@ -157,7 +157,7 @@ extension View {
   ///       }
   ///       .centerModal(
   ///         item: $selectedItem,
-  ///         model: CenterModalVM(),
+  ///         model: { _ in CenterModalVM() },
   ///         onDismiss: {
   ///           print("Modal dismissed")
   ///         },
@@ -180,15 +180,15 @@ extension View {
   ///   ```
   public func centerModal<Item: Identifiable, Header: View, Body: View, Footer: View>(
     item: Binding<Item?>,
-    model: CenterModalVM = .init(),
+    model: @escaping (Item) -> CenterModalVM = { _ in .init() },
     onDismiss: (() -> Void)? = nil,
     @ViewBuilder header: @escaping (Item) -> Header,
     @ViewBuilder body: @escaping (Item) -> Body,
     @ViewBuilder footer: @escaping (Item) -> Footer
   ) -> some View {
     return self.modal(
       item: item,
-      transitionDuration: model.transition.value,
+      transitionDuration: { model($0).transition.value },
       onDismiss: onDismiss,
       content: { unwrappedItem in
         SUCenterModal(
@@ -204,7 +204,7 @@ extension View {
               }
             }
           ),
-          model: model,
+          model: model(unwrappedItem),
           header: { header(unwrappedItem) },
           body: { body(unwrappedItem) },
           footer: { footer(unwrappedItem) }
@@ -251,7 +251,7 @@ extension View {
   ///       }
   ///       .centerModal(
   ///         item: $selectedItem,
-  ///         model: CenterModalVM(),
+  ///         model: { _ in CenterModalVM() },
   ///         onDismiss: {
   ///           print("Modal dismissed")
   ///         },
@@ -264,7 +264,7 @@ extension View {
   ///   ```
   public func centerModal<Item: Identifiable, Body: View>(
     item: Binding<Item?>,
-    model: CenterModalVM = .init(),
+    model: @escaping (Item) -> CenterModalVM = { _ in .init() },
     onDismiss: (() -> Void)? = nil,
     @ViewBuilder body: @escaping (Item) -> Body
   ) -> some View {