@momo-kits/native-kits 0.0.1-beta.4 → 0.89.1-2

package/ios/PopupView/FullscreenPopup.swift

@@ -0,0 +1,251 @@
+
+import Foundation
+import SwiftUI
+
+public struct FullscreenPopup<Item: Equatable, PopupContent: View>: ViewModifier {
+
+    // MARK: - Presentaion
+    @Binding var isPresented: Bool
+    @Binding var item: Item?
+
+    var isBoolMode: Bool
+
+    var sheetPresented: Bool {
+        item != nil || isPresented
+    }
+
+    // MARK: - Parameters
+    var type: Popup<Item, PopupContent>.PopupType
+    var position: Popup<Item, PopupContent>.Position
+
+    var animation: Animation
+
+    /// If nil - never hides on its own
+    var autohideIn: Double?
+
+    /// Should allow dismiss by dragging
+    var dragToDismiss: Bool
+
+    /// Should close on tap outside - default is `true`
+    var closeOnTapOutside: Bool
+
+    /// Background color for outside area - default is `Color.clear`
+    var backgroundColor: Color
+
+    /// is called on any close action
+    var dismissCallback: (DismissSource) -> ()
+
+    var view: () -> PopupContent
+
+    // MARK: - Presentation animation
+    /// Trigger popup showing/hiding animations and...
+    @State private var shouldShowContent = false
+
+    /// ... once hiding animation is finished remove popup from the memory using this flag
+    @State private var showContent = false
+
+    /// show transparentNonAnimatingFullScreenCover
+    @State private var showSheet = false
+
+    /// opacity of background color
+    @State private var opacity = 0.0
+
+    // MARK: - Autohide
+    /// Class reference for capturing a weak reference later in dispatch work holder.
+    private var isPresentedRef: ClassReference<Binding<Bool>>?
+    private var itemRef: ClassReference<Binding<Item?>>?
+
+    /// holder for autohiding dispatch work (to be able to cancel it when needed)
+    private var dispatchWorkHolder = DispatchWorkHolder()
+
+    // MARK: - Internal
+    /// Set dismiss souce to pass to dismiss callback
+    @State private var dismissSource: DismissSource?
+
+    init(isPresented: Binding<Bool>,
+         type: Popup<Item, PopupContent>.PopupType = .`default`,
+         position: Popup<Item, PopupContent>.Position = .bottom,
+         animation: Animation,
+         autohideIn: Double?,
+         dragToDismiss: Bool,
+         closeOnTapOutside: Bool,
+         backgroundColor: Color,
+         dismissCallback: @escaping (DismissSource) -> (),
+         view: @escaping () -> PopupContent) {
+        self._isPresented = isPresented
+        self._item = .constant(nil)
+        self.isBoolMode = true
+
+        self.type = type
+        self.position = position
+        self.animation = animation
+        self.autohideIn = autohideIn
+        self.dragToDismiss = dragToDismiss
+        self.closeOnTapOutside = closeOnTapOutside
+        self.backgroundColor = backgroundColor
+        self.dismissCallback = dismissCallback
+        self.view = view
+
+        self.isPresentedRef = ClassReference(self.$isPresented)
+        self.itemRef = ClassReference(self.$item)
+    }
+
+    init(item: Binding<Item?>,
+         type: Popup<Item, PopupContent>.PopupType = .`default`,
+         position: Popup<Item, PopupContent>.Position = .bottom,
+         animation: Animation,
+         autohideIn: Double?,
+         dragToDismiss: Bool,
+         closeOnTapOutside: Bool,
+         backgroundColor: Color,
+         dismissCallback: @escaping (DismissSource) -> (),
+         view: @escaping () -> PopupContent) {
+        self._isPresented = .constant(false)
+        self._item = item
+        self.isBoolMode = false
+
+        self.type = type
+        self.position = position
+        self.animation = animation
+        self.autohideIn = autohideIn
+        self.dragToDismiss = dragToDismiss
+        self.closeOnTapOutside = closeOnTapOutside
+        self.backgroundColor = backgroundColor
+        self.dismissCallback = dismissCallback
+        self.view = view
+
+        self.isPresentedRef = ClassReference(self.$isPresented)
+        self.itemRef = ClassReference(self.$item)
+    }
+
+    public func body(content: Content) -> some View {
+        if isBoolMode {
+            boolBody(content: content)
+        } else {
+            itemBody(content: content)
+        }
+    }
+
+    func backgroundColorView() -> some View {
+        backgroundColor.opacity(opacity)
+            .applyIf(closeOnTapOutside) { view in
+                view.contentShape(Rectangle())
+            }
+            .addTapIf(if: closeOnTapOutside) {
+                dismissSource = .tapOutside
+                isPresented = false
+                item = nil
+            }
+            .edgesIgnoringSafeArea(.all)
+            .animation(.linear(duration: 0.2), value: opacity)
+    }
+
+    public func boolBody(content: Content) -> some View {
+        content
+            .transparentNonAnimatingFullScreenCover(isPresented: $showSheet) {
+                backgroundColorView()
+                    .modifier(
+                        Popup(
+                            isPresented: $isPresented,
+                            type: type,
+                            position: position,
+                            animation: animation,
+                            autohideIn: autohideIn,
+                            dragToDismiss: dragToDismiss,
+                            closeOnTapOutside: closeOnTapOutside,
+                            shouldShowContent: shouldShowContent,
+                            showContent: showContent,
+                            dismissCallback: { _ in },
+                            dismissSource: $dismissSource,
+                            animationCompletedCallback: onAnimationCompleted,
+                            view: view)
+                    )
+            }
+            .valueChanged(value: isPresented, onChange: { newValue in
+                appearAction(sheetPresented: newValue)
+            })
+    }
+
+    public func itemBody(content: Content) -> some View {
+        content
+            .transparentNonAnimatingFullScreenCover(isPresented: $showSheet) {
+                backgroundColorView()
+                    .modifier(
+                        Popup(
+                            item: $item,
+                            type: type,
+                            position: position,
+                            animation: animation,
+                            autohideIn: autohideIn,
+                            dragToDismiss: dragToDismiss,
+                            closeOnTapOutside: closeOnTapOutside,
+                            shouldShowContent: shouldShowContent,
+                            showContent: showContent,
+                            dismissCallback: { _ in },
+                            dismissSource: $dismissSource,
+                            animationCompletedCallback: onAnimationCompleted,
+                            view: view)
+                    )
+            }
+            .valueChanged(value: item, onChange: { newValue in
+                appearAction(sheetPresented: newValue != nil)
+            })
+    }
+
+    func appearAction(sheetPresented: Bool) {
+        if sheetPresented {
+            dismissSource = nil
+            showSheet = true // show transparent fullscreen sheet
+            showContent = true // immediately load popup body
+            performWithDelay(0.01) {
+                shouldShowContent = true // this will cause currentOffset change thus triggering the sliding showing animation
+                opacity = 1 // this will cause cross disolving animation for background color
+                setupAutohide()
+            }
+        } else {
+            dispatchWorkHolder.work?.cancel()
+            shouldShowContent = false // this will cause currentOffset change thus triggering the sliding hiding animation
+            opacity = 0
+            // do the rest once the animation is finished (see onAnimationCompleted())
+            performWithDelay(0.3) { // TEMP: imitate onAnimationCompleted for now
+                onAnimationCompleted()
+            }
+        }
+    }
+
+    func onAnimationCompleted() -> () {
+        if shouldShowContent { // return if this was called on showing animation, only proceed if called on hiding
+            return
+        }
+        showContent = false // unload popup body after hiding animation is done
+        performWithDelay(0.01) {
+            showSheet = false
+        }
+        dismissCallback(dismissSource ?? .binding)
+    }
+
+    func setupAutohide() {
+        // if needed, dispatch autohide and cancel previous one
+        if let autohideIn = autohideIn {
+            dispatchWorkHolder.work?.cancel()
+
+            // Weak reference to avoid the work item capturing the struct,
+            // which would create a retain cycle with the work holder itself.
+            dispatchWorkHolder.work = DispatchWorkItem(block: { [weak isPresentedRef, weak itemRef] in
+                isPresentedRef?.value.wrappedValue = false
+                itemRef?.value.wrappedValue = nil
+                dismissSource = .autohide
+            })
+            if sheetPresented, let work = dispatchWorkHolder.work {
+                DispatchQueue.main.asyncAfter(deadline: .now() + autohideIn, execute: work)
+            }
+        }
+    }
+
+    func performWithDelay(_ delay: Double, block: @escaping ()->()) {
+        DispatchQueue.main.asyncAfter(deadline: .now() + delay) {
+            block()
+        }
+    }
+
+}

package/ios/{Popup → PopupView}/Modifiers.swift

@@ -1,5 +1,3 @@
-
-
 import SwiftUI
 
 extension View {
@@ -11,19 +9,17 @@ extension View {
         animation: Animation = Animation.easeOut(duration: 0.3),
         autohideIn: Double? = nil,
         dragToDismiss: Bool = true,
-        closeOnTap: Bool = true,
         closeOnTapOutside: Bool = false,
         backgroundColor: Color = Color.clear,
         @ViewBuilder view: @escaping () -> PopupContent) -> some View {
             self.modifier(
-                Popup(
+                FullscreenPopup(
                     item: item,
                     type: type,
                     position: position,
                     animation: animation,
                     autohideIn: autohideIn,
                     dragToDismiss: dragToDismiss,
-                    closeOnTap: closeOnTap,
                     closeOnTapOutside: closeOnTapOutside,
                     backgroundColor: backgroundColor,
                     dismissCallback: { _ in },
@@ -38,19 +34,17 @@ extension View {
         animation: Animation = Animation.easeOut(duration: 0.3),
         autohideIn: Double? = nil,
         dragToDismiss: Bool = true,
-        closeOnTap: Bool = true,
         closeOnTapOutside: Bool = false,
         backgroundColor: Color = Color.clear,
         @ViewBuilder view: @escaping () -> PopupContent) -> some View {
             self.modifier(
-                Popup<Int, PopupContent>(
+                FullscreenPopup<Int, PopupContent>(
                     isPresented: isPresented,
                     type: type,
                     position: position,
                     animation: animation,
                     autohideIn: autohideIn,
                     dragToDismiss: dragToDismiss,
-                    closeOnTap: closeOnTap,
                     closeOnTapOutside: closeOnTapOutside,
                     backgroundColor: backgroundColor,
                     dismissCallback: { _ in },
@@ -65,20 +59,18 @@ extension View {
         animation: Animation = Animation.easeOut(duration: 0.3),
         autohideIn: Double? = nil,
         dragToDismiss: Bool = true,
-        closeOnTap: Bool = true,
         closeOnTapOutside: Bool = false,
         backgroundColor: Color = Color.clear,
         dismissCallback: @escaping () -> (),
         @ViewBuilder view: @escaping () -> PopupContent) -> some View {
             self.modifier(
-                Popup(
+                FullscreenPopup(
                     item: item,
                     type: type,
                     position: position,
                     animation: animation,
                     autohideIn: autohideIn,
                     dragToDismiss: dragToDismiss,
-                    closeOnTap: closeOnTap,
                     closeOnTapOutside: closeOnTapOutside,
                     backgroundColor: backgroundColor,
                     dismissCallback: { _ in dismissCallback() },
@@ -93,20 +85,18 @@ extension View {
         animation: Animation = Animation.easeOut(duration: 0.3),
         autohideIn: Double? = nil,
         dragToDismiss: Bool = true,
-        closeOnTap: Bool = true,
         closeOnTapOutside: Bool = false,
         backgroundColor: Color = Color.clear,
         dismissCallback: @escaping () -> (),
         @ViewBuilder view: @escaping () -> PopupContent) -> some View {
             self.modifier(
-                Popup<Int, PopupContent>(
+                FullscreenPopup<Int, PopupContent>(
                     isPresented: isPresented,
                     type: type,
                     position: position,
                     animation: animation,
                     autohideIn: autohideIn,
                     dragToDismiss: dragToDismiss,
-                    closeOnTap: closeOnTap,
                     closeOnTapOutside: closeOnTapOutside,
                     backgroundColor: backgroundColor,
                     dismissCallback: { _ in dismissCallback() },
@@ -121,20 +111,18 @@ extension View {
         animation: Animation = Animation.easeOut(duration: 0.3),
         autohideIn: Double? = nil,
         dragToDismiss: Bool = true,
-        closeOnTap: Bool = true,
         closeOnTapOutside: Bool = false,
         backgroundColor: Color = Color.clear,
         dismissSourceCallback: @escaping (DismissSource) -> (),
         @ViewBuilder view: @escaping () -> PopupContent) -> some View {
             self.modifier(
-                Popup(
+                FullscreenPopup(
                     item: item,
                     type: type,
                     position: position,
                     animation: animation,
                     autohideIn: autohideIn,
                     dragToDismiss: dragToDismiss,
-                    closeOnTap: closeOnTap,
                     closeOnTapOutside: closeOnTapOutside,
                     backgroundColor: backgroundColor,
                     dismissCallback: dismissSourceCallback,
@@ -149,20 +137,18 @@ extension View {
         animation: Animation = Animation.easeOut(duration: 0.3),
         autohideIn: Double? = nil,
         dragToDismiss: Bool = true,
-        closeOnTap: Bool = true,
         closeOnTapOutside: Bool = false,
         backgroundColor: Color = Color.clear,
         dismissSourceCallback: @escaping (DismissSource) -> (),
         @ViewBuilder view: @escaping () -> PopupContent) -> some View {
             self.modifier(
-                Popup<Int, PopupContent>(
+                FullscreenPopup<Int, PopupContent>(
                     isPresented: isPresented,
                     type: type,
                     position: position,
                     animation: animation,
                     autohideIn: autohideIn,
                     dragToDismiss: dragToDismiss,
-                    closeOnTap: closeOnTap,
                     closeOnTapOutside: closeOnTapOutside,
                     backgroundColor: backgroundColor,
                     dismissCallback: dismissSourceCallback,

package/ios/{Popup → PopupView}/PopupView.swift

@@ -1,5 +1,3 @@
-
-
 import SwiftUI
 
 public enum DismissSource {
@@ -18,10 +16,12 @@ public struct Popup<Item: Equatable, PopupContent: View>: ViewModifier {
          animation: Animation,
          autohideIn: Double?,
          dragToDismiss: Bool,
-         closeOnTap: Bool,
          closeOnTapOutside: Bool,
-         backgroundColor: Color,
+         shouldShowContent: Bool = true,
+         showContent: Bool = true,
          dismissCallback: @escaping (DismissSource) -> (),
+         dismissSource: Binding<DismissSource?>,
+         animationCompletedCallback: @escaping () -> (),
          view: @escaping () -> PopupContent) {
         self._isPresented = isPresented
         self._item = .constant(nil)
@@ -30,13 +30,13 @@ public struct Popup<Item: Equatable, PopupContent: View>: ViewModifier {
         self.animation = animation
         self.autohideIn = autohideIn
         self.dragToDismiss = dragToDismiss
-        self.closeOnTap = closeOnTap
         self.closeOnTapOutside = closeOnTapOutside
-        self.backgroundColor = backgroundColor
+        self.shouldShowContent = shouldShowContent
+        self.showContent = showContent
         self.dismissCallback = dismissCallback
+        self._dismissSource = dismissSource
+        self.animationCompletedCallback = animationCompletedCallback
         self.view = view
-        self.isPresentedRef = ClassReference(self.$isPresented)
-        self.itemRef = ClassReference(self.$item)
     }
 
     init(item: Binding<Item?>,
@@ -45,10 +45,12 @@ public struct Popup<Item: Equatable, PopupContent: View>: ViewModifier {
          animation: Animation,
          autohideIn: Double?,
          dragToDismiss: Bool,
-         closeOnTap: Bool,
          closeOnTapOutside: Bool,
-         backgroundColor: Color,
+         shouldShowContent: Bool = true,
+         showContent: Bool = true,
          dismissCallback: @escaping (DismissSource) -> (),
+         dismissSource: Binding<DismissSource?>,
+         animationCompletedCallback: @escaping () -> (),
          view: @escaping () -> PopupContent) {
         self._isPresented = .constant(false)
         self._item = item
@@ -57,13 +59,13 @@ public struct Popup<Item: Equatable, PopupContent: View>: ViewModifier {
         self.animation = animation
         self.autohideIn = autohideIn
         self.dragToDismiss = dragToDismiss
-        self.closeOnTap = closeOnTap
         self.closeOnTapOutside = closeOnTapOutside
-        self.backgroundColor = backgroundColor
+        self.shouldShowContent = shouldShowContent
+        self.showContent = showContent
         self.dismissCallback = dismissCallback
+        self._dismissSource = dismissSource
+        self.animationCompletedCallback = animationCompletedCallback
         self.view = view
-        self.isPresentedRef = ClassReference(self.$isPresented)
-        self.itemRef = ClassReference(self.$item)
     }
     
     public enum PopupType {
@@ -85,7 +87,6 @@ public struct Popup<Item: Equatable, PopupContent: View>: ViewModifier {
     public enum Position {
         case top
         case bottom
-        case center
     }
 
     private enum DragState {
@@ -112,15 +113,10 @@ public struct Popup<Item: Equatable, PopupContent: View>: ViewModifier {
     }
 
     // MARK: - Public Properties
-
     /// Tells if the sheet should be presented or not
     @Binding var isPresented: Bool
     @Binding var item: Item?
 
-    var sheetPresented: Bool {
-        item != nil || isPresented
-    }
-
     var type: PopupType
     var position: Position
 
@@ -129,33 +125,31 @@ public struct Popup<Item: Equatable, PopupContent: View>: ViewModifier {
     /// If nil - never hides on its own
     var autohideIn: Double?
 
-    /// Should close on tap - default is `true`
-    var closeOnTap: Bool
-
     /// Should allow dismiss by dragging
     var dragToDismiss: Bool
 
     /// Should close on tap outside - default is `true`
     var closeOnTapOutside: Bool
-    
-    /// Background color for outside area - default is `Color.clear`
-    var backgroundColor: Color
+
+    /// Trigger popup showing/hiding animations and...
+    var shouldShowContent: Bool
+
+    /// ... once hiding animation is finished remove popup from the memory using this flag
+    var showContent: Bool
 
     /// is called on any close action
     var dismissCallback: (DismissSource) -> ()
 
-    var view: () -> PopupContent
+    /// Set dismiss souce to pass to dismiss callback
+    @Binding private var dismissSource: DismissSource?
 
-    /// holder for autohiding dispatch work (to be able to cancel it when needed)
-    var dispatchWorkHolder = DispatchWorkHolder()
+    /// called on showing/hiding sliding animation completed
+    var animationCompletedCallback: () -> ()
 
-    // MARK: - Private Properties
+    var view: () -> PopupContent
 
+    // MARK: - Private Properties
     @Environment(\.safeAreaInsets) private var safeAreaInsets
-    
-    /// Class reference for capturing a weak reference later in dispatch work holder.
-    private var isPresentedRef: ClassReference<Binding<Bool>>?
-    private var itemRef: ClassReference<Binding<Item?>>?
 
     /// The rect and safe area of the hosting controller
     @State private var presenterContentRect: CGRect = .zero
@@ -168,15 +162,6 @@ public struct Popup<Item: Equatable, PopupContent: View>: ViewModifier {
 
     /// Last position for drag gesture
     @State private var lastDragPosition: CGFloat = 0
-
-    /// Trigger popup showing/hiding animations and...
-    @State private var shouldShowContent: Bool = false
-    
-    /// ... once hiding animation is finished remove popup from the memory using this flag
-    @State private var showContent: Bool = false
-
-    /// Set dismiss souce to pass to dismiss callback
-    @State private var dismissSource: DismissSource?
     
     /// The offset when the popup is displayed
     private var displayedOffset: CGFloat {
@@ -200,9 +185,7 @@ public struct Popup<Item: Equatable, PopupContent: View>: ViewModifier {
 
     /// The offset when the popup is hidden
     private var hiddenOffset: CGFloat {
-        if position == .center {
-            return displayedOffset
-        } else if position == .top {
+        if position == .top {
             if presenterContentRect.isEmpty {
                 return -1000
             }
@@ -219,11 +202,6 @@ public struct Popup<Item: Equatable, PopupContent: View>: ViewModifier {
     private var currentOffset: CGFloat {
         return shouldShowContent ? displayedOffset : hiddenOffset
     }
-    
-    /// The current background opacity, based on the **presented** property
-    private var currentBackgroundOpacity: Double {
-        return shouldShowContent ? 1.0 : 0.0
-    }
 
     private var screenSize: CGSize {
         #if os(iOS) || os(tvOS)
@@ -240,94 +218,26 @@ public struct Popup<Item: Equatable, PopupContent: View>: ViewModifier {
     }
 
     // MARK: - Content Builders
-
     public func body(content: Content) -> some View {
-        main(content: content)
-            .onAppear {
-                appearAction(sheetPresented: sheetPresented)
-            }
-            .valueChanged(value: isPresented) { isPresented in
-                appearAction(sheetPresented: isPresented)
-                if isPresented {
-                    dismissSource = .binding
-                }
-                if !isPresented {
-                    dismissCallback(dismissSource ?? .autohide)
+        content
+            .frameGetter($presenterContentRect)
+            .overlay(
+                Group {
+                    if showContent {
+                        sheet()
+                    }
                 }
-            }
-            .valueChanged(value: item) { item in
-                appearAction(sheetPresented: item != nil)
-                if item != nil {
-                    dismissSource = .binding
-                }
-                if item == nil {
-                    dismissCallback(dismissSource ?? .autohide)
-                }
-            }
-    }
-
-    private func main(content: Content) -> some View {
-        ZStack {
-            content
-                .frameGetter($presenterContentRect)
-
-            if showContent {
-                popupBackground()
-            }
-        }
-        .overlay(
-            Group {
-                if showContent {
-                    sheet()
-                }
-            }
-        )
-    }
-
-    private func popupBackground() -> some View {
-        backgroundColor
-            .applyIf(closeOnTapOutside) { view in
-                view.contentShape(Rectangle())
-            }
-            .addTapIf(if: closeOnTapOutside) {
-                dismissSource = .tapOutside
-                dismiss()
-            }
-            .edgesIgnoringSafeArea(.all)
-            .opacity(currentBackgroundOpacity)
-            .animation(.linear)
+            )
     }
 
     /// This is the builder for the sheet content
     func sheet() -> some View {
-
-        // if needed, dispatch autohide and cancel previous one
-        if let autohideIn = autohideIn {
-            dispatchWorkHolder.work?.cancel()
-            
-            // Weak reference to avoid the work item capturing the struct,
-            // which would create a retain cycle with the work holder itself.
-            
-            dispatchWorkHolder.work = DispatchWorkItem(block: { [weak isPresentedRef, weak itemRef] in
-                isPresentedRef?.value.wrappedValue = false
-                itemRef?.value.wrappedValue = nil
-                dismissSource = .autohide
-            })
-            if sheetPresented, let work = dispatchWorkHolder.work {
-                DispatchQueue.main.asyncAfter(deadline: .now() + autohideIn, execute: work)
-            }
-        }
-
         let sheet = ZStack {
             self.view()
-                .addTapIf(if: closeOnTap) {
-                    dismissSource = .tapInside
-                    dismiss()
-                }
                 .frameGetter($sheetContentRect)
                 .offset(y: currentOffset)
                 .onAnimationCompleted(for: currentOffset) {
-                    showContent = shouldShowContent
+                    animationCompletedCallback()
                 }
                 .animation(animation)
         }
@@ -372,26 +282,8 @@ public struct Popup<Item: Equatable, PopupContent: View>: ViewModifier {
     }
     #endif
     
-    private func appearAction(sheetPresented: Bool) {
-        if sheetPresented {
-            showContent = true // immediately load popup body
-            DispatchQueue.main.async {
-                shouldShowContent = true // this will cause currentOffset change thus triggering the showing animation
-            }
-        } else {
-            shouldShowContent = false // this will cause currentOffset change thus triggering the hiding animation
-            // unload popup body after hiding animation is done (see sheet())
-        }
-    }
-    
     private func dismiss() {
-        dispatchWorkHolder.work?.cancel()
         isPresented = false
         item = nil
-        if position == .center {
-            DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
-                showContent = false
-            }
-        }
     }
 }