Patch 4.0.5

alina-p-k · web-flow · commit 3aa55233eda7 · 2025-10-22T20:49:31.000+02:00
feat:
- added an ability to customise dismiss drag gesture area size

fix:
- fix problem with scrollview conflicts
diff --git a/Sources/Internal/Configurables/Global/GlobalConfig+Center.swift b/Sources/Internal/Configurables/Global/GlobalConfig+Center.swift
@@ -27,4 +27,5 @@ public final class GlobalConfigCenter: GlobalConfig { required public init() {}
     public var isDragGestureEnabled: Bool = false
     public var dragThreshold: CGFloat = 0
     public var isStackingEnabled: Bool = false
+    public var dragGestureAreaSize: CGFloat = 0
 }
diff --git a/Sources/Internal/Configurables/Global/GlobalConfig+Vertical.swift b/Sources/Internal/Configurables/Global/GlobalConfig+Vertical.swift
@@ -24,6 +24,7 @@ public final class GlobalConfigVertical: GlobalConfig { required public init() {
     public var isTapOutsideToDismissEnabled: Bool = false
     public var isDragGestureEnabled: Bool = true
     public var dragThreshold: CGFloat = 1/3
+    public var dragGestureAreaSize: CGFloat = 30
 
     // MARK: Non-Customizable
     public var ignoredSafeAreaEdges: Edge.Set = []
diff --git a/Sources/Internal/Configurables/Local/LocalConfig+Center.swift b/Sources/Internal/Configurables/Local/LocalConfig+Center.swift
@@ -25,4 +25,5 @@ public class LocalConfigCenter: LocalConfig { required public init() {}
     public var heightMode: HeightMode = GlobalConfigContainer.center.heightMode
     public var dragDetents: [DragDetent] = GlobalConfigContainer.center.dragDetents
     public var isDragGestureEnabled: Bool = GlobalConfigContainer.center.isDragGestureEnabled
+    public var dragGestureAreaSize: CGFloat = GlobalConfigContainer.center.dragGestureAreaSize
 }
diff --git a/Sources/Internal/Configurables/Local/LocalConfig+Vertical.swift b/Sources/Internal/Configurables/Local/LocalConfig+Vertical.swift
@@ -25,6 +25,7 @@ public class LocalConfigVertical: LocalConfig { required public init() {}
     // MARK: Gestures
     public var isTapOutsideToDismissEnabled: Bool = GlobalConfigContainer.vertical.isTapOutsideToDismissEnabled
     public var isDragGestureEnabled: Bool = GlobalConfigContainer.vertical.isDragGestureEnabled
+    public var dragGestureAreaSize: CGFloat = GlobalConfigContainer.vertical.dragGestureAreaSize
 }
 
 // MARK: Subclasses
diff --git a/Sources/Internal/Configurables/Local/LocalConfig.swift b/Sources/Internal/Configurables/Local/LocalConfig.swift
@@ -25,4 +25,5 @@ public protocol LocalConfig { init()
     // MARK: Gestures
     var isTapOutsideToDismissEnabled: Bool { get set }
     var isDragGestureEnabled: Bool { get set }
+    var dragGestureAreaSize: CGFloat { get set }
 }
diff --git a/Sources/Internal/Extensions/View+Gestures.swift b/Sources/Internal/Extensions/View+Gestures.swift
@@ -24,14 +24,14 @@ extension View {
 
 // MARK: On Drag Gesture
 extension View {
-    func onDragGesture(onChanged actionOnChanged: @escaping (CGFloat) async -> (), onEnded actionOnEnded: @escaping (CGFloat) async -> (), isEnabled: Bool) -> some View {
+    func onDragGesture(onChanged actionOnChanged: @escaping (DragGestureState) async -> (), onEnded actionOnEnded: @escaping (DragGestureState) async -> (), isEnabled: Bool) -> some View {
         #if os(tvOS)
         self
         #else
-        highPriorityGesture(
+        simultaneousGesture(
             DragGesture()
-                .onChanged { newValue in Task { @MainActor in await actionOnChanged(newValue.translation.height) }}
-                .onEnded { newValue in Task { @MainActor in await actionOnEnded(newValue.translation.height) }},
+                .onChanged { newValue in Task { @MainActor in await actionOnChanged(DragGestureState(newValue)) }}
+                .onEnded { newValue in Task { @MainActor in await actionOnEnded(DragGestureState(newValue)) }},
             isEnabled: isEnabled
         )
         #endif
diff --git a/Sources/Internal/Models/AnyPopupConfig.swift b/Sources/Internal/Models/AnyPopupConfig.swift
@@ -25,6 +25,7 @@ struct AnyPopupConfig: LocalConfig, Sendable { init() {}
     // MARK: Gestures
     var isTapOutsideToDismissEnabled: Bool = false
     var isDragGestureEnabled: Bool = false
+    var dragGestureAreaSize: CGFloat = 0
 }
 
 // MARK: Initialize
@@ -40,5 +41,6 @@ extension AnyPopupConfig {
         self.dragDetents = config.dragDetents
         self.isTapOutsideToDismissEnabled = config.isTapOutsideToDismissEnabled
         self.isDragGestureEnabled = config.isDragGestureEnabled
+        self.dragGestureAreaSize = config.dragGestureAreaSize
     }
 }
diff --git a/Sources/Internal/Models/DragGestureState.swift b/Sources/Internal/Models/DragGestureState.swift
@@ -0,0 +1,23 @@
+//
+//  DragGestureState.swift of MijickPopups
+//
+//  Created by Alina Petrovska
+//    - Mail: alina.petrovskaya@mijick.com
+//    - GitHub: https://github.com/alina-p-k
+//
+//  Copyright ©2025 Mijick. All rights reserved.
+		
+
+import SwiftUI
+
+struct DragGestureState {
+    let startLocationY: Double
+    let height: Double 
+}
+
+extension DragGestureState {
+    init(_ value: DragGesture.Value) {
+        self.startLocationY = value.startLocation.y
+        self.height = value.translation.height
+    }
+}
diff --git a/Sources/Internal/UI/PopupVerticalStackView.swift b/Sources/Internal/UI/PopupVerticalStackView.swift
@@ -18,7 +18,6 @@ struct PopupVerticalStackView: View {
     var body: some View { if viewModel.screen.height > 0 {
         ZStack(alignment: (!viewModel.alignment).toAlignment(), content: createPopupStack)
             .frame(height: viewModel.screen.height, alignment: viewModel.alignment.toAlignment())
-            .onDragGesture(onChanged: viewModel.onPopupDragGestureChanged, onEnded: viewModel.onPopupDragGestureEnded, isEnabled: viewModel.dragGestureEnabled)
     }}
 }
 private extension PopupVerticalStackView {
@@ -33,15 +32,16 @@ private extension PopupVerticalStackView {
             .padding(viewModel.activePopupProperties.innerPadding)
             .fixedSize(horizontal: false, vertical: viewModel.activePopupProperties.verticalFixedSize)
             .onHeightChange { await viewModel.updatePopupHeight($0, popup) }
-            .frame(height: viewModel.activePopupProperties.height, alignment: (!viewModel.alignment).toAlignment())
-            .frame(maxWidth: .infinity, maxHeight: viewModel.activePopupProperties.height, alignment: (!viewModel.alignment).toAlignment())
+            .frame(height: viewModel.activePopupProperties.height, alignment: popupAlignment)
+            .frame(maxWidth: .infinity, maxHeight: viewModel.activePopupProperties.height, alignment: popupAlignment)
             .background(backgroundColor: getBackgroundColor(for: popup), overlayColor: getStackOverlayColor(for: popup), corners: viewModel.activePopupProperties.corners)
             .offset(y: viewModel.calculateOffsetY(for: popup))
             .scaleEffect(x: viewModel.calculateScaleX(for: popup))
             .focusSection_tvOS()
             .padding(viewModel.activePopupProperties.outerPadding)
             .transition(transition)
             .zIndex(viewModel.calculateZIndex())
+            .onDragGesture(onChanged: viewModel.onPopupDragGestureChanged, onEnded: viewModel.onPopupDragGestureEnded, isEnabled: viewModel.dragGestureEnabled)
     }}
 }
 
@@ -52,4 +52,5 @@ private extension PopupVerticalStackView {
 private extension PopupVerticalStackView {
     var stackOverlayColor: Color { .black }
     var transition: AnyTransition { .move(edge: viewModel.alignment.toEdge()) }
+    var popupAlignment: Alignment { (!viewModel.alignment).toAlignment() }
 }
diff --git a/Sources/Internal/View Models/ViewModel+VerticalStack.swift b/Sources/Internal/View Models/ViewModel+VerticalStack.swift
@@ -310,14 +310,29 @@ extension VM.VerticalStack {
 
 // MARK: On Changed
 extension VM.VerticalStack {
-    func onPopupDragGestureChanged(_ value: CGFloat) async {
-        guard dragGestureEnabled else { return }
+    func onPopupDragGestureChanged(_ value: DragGestureState) async {
+        guard dragGestureEnabled, isValidDragGesture(value) else { return }
         
-        let newGestureTranslation = await calculateGestureTranslation(value)
+        let newGestureTranslation = await calculateGestureTranslation(value.height)
         await updateGestureTranslation(newGestureTranslation)
     }
 }
 private extension VM.VerticalStack {
+    func isValidDragGesture(_ value: DragGestureState) -> Bool {
+        guard popups.isEmpty == false else { return false }
+        guard let gestureAreaSize = popups.last?.config.dragGestureAreaSize, gestureAreaSize >= 0 else { return false }
+
+        var minStartPointOffset: CGFloat {
+            if screen.height <= activePopupProperties.height ?? 0 { return screen.safeArea.top + gestureAreaSize }
+            return gestureAreaSize
+        }
+        let popupHeight = activePopupProperties.height ?? minStartPointOffset
+    
+        switch popups.last?.config.alignment {
+            case .top: return popupHeight - minStartPointOffset <= value.startLocationY
+            default: return value.startLocationY <= minStartPointOffset
+        }
+    }
     func calculateGestureTranslation(_ value: CGFloat) async -> CGFloat { switch popups.last?.config.dragDetents.isEmpty ?? true {
         case true: calculateGestureTranslationWhenNoDragDetents(value)
         case false: calculateGestureTranslationWhenDragDetents(value)
@@ -355,8 +370,8 @@ private extension VM.VerticalStack {
 
 // MARK: On Ended
 extension VM.VerticalStack {
-    func onPopupDragGestureEnded(_ value: CGFloat) async {
-        guard value != 0, let activePopup = popups.last else { return }
+    func onPopupDragGestureEnded(_ value: DragGestureState) async {
+        guard value.height != 0, let activePopup = popups.last, isValidDragGesture(value) else { return }
 
         await dismissLastPopupIfNeeded(activePopup)
 
diff --git a/Sources/Public/Popup/Public+Popup+Config.swift b/Sources/Public/Popup/Public+Popup+Config.swift
@@ -150,4 +150,15 @@ public extension LocalConfigVertical {
      ![image](https://github.com/Mijick/Assets/blob/main/Framework%20Docs/Popups/enable-drag-gesture.png?raw=true)
      */
     func enableDragGesture(_ value: Bool) -> Self { self.isDragGestureEnabled = value; return self }
+    
+    /**
+     Defines the vertical size (in points) of the area that responds to dismissal drag gesture.
+     
+     Use this to control how much of the popup’s top/bottom region is draggable for dismiss gesture.
+     A larger value allows dragging from a wider area.
+     
+     ## Visualisation
+     ![image](https://github.com/Mijick/Assets/blob/main/Framework%20Docs/Popups/bottom-popup-draggable-area.png?raw=true)
+     */
+    func dragGestureAreaSize(_ value: CGFloat) -> Self { self.dragGestureAreaSize = value; return self }
 }
diff --git a/Sources/Public/Setup/Public+Setup+Config.swift b/Sources/Public/Setup/Public+Setup+Config.swift
@@ -141,4 +141,15 @@ public extension GlobalConfigVertical {
      - important: Drag progress is calculated as **dragTranslation** / **popupHeight**, therefore drag threshold value is expected to be between 0 and 1.
      */
     func dragThreshold(_ value: CGFloat) -> Self { self.dragThreshold = value; return self }
+    
+    /**
+     Defines the vertical size (in points) of the area that responds to dismissal drag gestures.
+     
+     Use this to control how much of the popup’s top/bottom region is draggable for dismiss gesture.
+     A larger value allows dragging from a wider area.
+     
+     ## Visualisation
+     ![image](https://github.com/Mijick/Assets/blob/main/Framework%20Docs/Popups/bottom-popup-draggable-area.png?raw=true)
+     */
+    func dragGestureAreaSize(_ value: CGFloat) -> Self { self.dragGestureAreaSize = value; return self }
 }
diff --git a/Tests/Tests+ViewModel+PopupVerticalStack.swift b/Tests/Tests+ViewModel+PopupVerticalStack.swift
@@ -1287,16 +1287,17 @@ extension PopupVerticalStackViewModelTests {
             viewModel: topViewModel,
             popups: popups,
             gestureValue: -133,
+            gestureStartLocation: 1000,
             expectedValues: (popupHeight: 344, gestureTranslation: -133)
         )
     }
 }
 private extension PopupVerticalStackViewModelTests {
-    func appendPopupsAndCheckGestureTranslationOnChange(viewModel: ViewModel, popups: [AnyPopup], gestureValue: CGFloat, expectedValues: (popupHeight: CGFloat, gestureTranslation: CGFloat)) async {
+    func appendPopupsAndCheckGestureTranslationOnChange(viewModel: ViewModel, popups: [AnyPopup], gestureValue: CGFloat, gestureStartLocation: CGFloat = 0, expectedValues: (popupHeight: CGFloat, gestureTranslation: CGFloat)) async {
         await viewModel.updatePopups(popups)
         await updatePopups(viewModel)
-        await viewModel.onPopupDragGestureChanged(gestureValue)
-
+        await viewModel.onPopupDragGestureChanged(.init(startLocationY: gestureStartLocation, height: gestureValue))
+        
         XCTAssertEqual(viewModel.activePopupProperties.height, expectedValues.popupHeight)
         XCTAssertEqual(viewModel.activePopupProperties.gestureTranslation, expectedValues.gestureTranslation)
     }
@@ -1385,6 +1386,7 @@ extension PopupVerticalStackViewModelTests {
             viewModel: topViewModel,
             popups: popups,
             gestureValue: -300,
+            gestureStartLocation: 1000,
             expectedValues: (popupHeight: nil, shouldPopupBeDismissed: true)
         )
     }
@@ -1433,6 +1435,7 @@ extension PopupVerticalStackViewModelTests {
             viewModel: topViewModel,
             popups: popups,
             gestureValue: 400,
+            gestureStartLocation: 1000,
             expectedValues: (popupHeight: 400, shouldPopupBeDismissed: false)
         )
     }
@@ -1445,6 +1448,7 @@ extension PopupVerticalStackViewModelTests {
             viewModel: topViewModel,
             popups: popups,
             gestureValue: 100,
+            gestureStartLocation: 1000,
             expectedValues: (popupHeight: 400, shouldPopupBeDismissed: false)
         )
     }
@@ -1457,16 +1461,17 @@ extension PopupVerticalStackViewModelTests {
             viewModel: topViewModel,
             popups: popups,
             gestureValue: 400,
+            gestureStartLocation: 1000,
             expectedValues: (popupHeight: screen.height - screen.safeArea.bottom, shouldPopupBeDismissed: false)
         )
     }
 }
 private extension PopupVerticalStackViewModelTests {
-    func appendPopupsAndCheckGestureTranslationOnEnd(viewModel: ViewModel, popups: [AnyPopup], gestureValue: CGFloat, expectedValues: (popupHeight: CGFloat?, shouldPopupBeDismissed: Bool)) async {
+    func appendPopupsAndCheckGestureTranslationOnEnd(viewModel: ViewModel, popups: [AnyPopup], gestureValue: CGFloat, gestureStartLocation: CGFloat = 0, expectedValues: (popupHeight: CGFloat?, shouldPopupBeDismissed: Bool)) async {
         await viewModel.updatePopups(popups)
         await updatePopups(viewModel)
         await viewModel.updateGestureTranslation(gestureValue)
-        await viewModel.onPopupDragGestureEnded(gestureValue)
+        await viewModel.onPopupDragGestureEnded(.init(startLocationY: gestureStartLocation, height: gestureValue))
 
         XCTAssertEqual(viewModel.popups.count, expectedValues.shouldPopupBeDismissed ? 0 : 1)
         XCTAssertEqual(viewModel.activePopupProperties.height, expectedValues.popupHeight)

Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,5 @@ public final class GlobalConfigCenter: GlobalConfig { required public init() {}`
`27`	`27`	`public var isDragGestureEnabled: Bool = false`
`28`	`28`	`public var dragThreshold: CGFloat = 0`
`29`	`29`	`public var isStackingEnabled: Bool = false`
	`30`	`+ public var dragGestureAreaSize: CGFloat = 0`
`30`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,5 @@ public class LocalConfigCenter: LocalConfig { required public init() {}`
`25`	`25`	`public var heightMode: HeightMode = GlobalConfigContainer.center.heightMode`
`26`	`26`	`public var dragDetents: [DragDetent] = GlobalConfigContainer.center.dragDetents`
`27`	`27`	`public var isDragGestureEnabled: Bool = GlobalConfigContainer.center.isDragGestureEnabled`
	`28`	`+ public var dragGestureAreaSize: CGFloat = GlobalConfigContainer.center.dragGestureAreaSize`
`28`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ public class LocalConfigVertical: LocalConfig { required public init() {}`
`25`	`25`	`// MARK: Gestures`
`26`	`26`	`public var isTapOutsideToDismissEnabled: Bool = GlobalConfigContainer.vertical.isTapOutsideToDismissEnabled`
`27`	`27`	`public var isDragGestureEnabled: Bool = GlobalConfigContainer.vertical.isDragGestureEnabled`
	`28`	`+ public var dragGestureAreaSize: CGFloat = GlobalConfigContainer.vertical.dragGestureAreaSize`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`// MARK: Subclasses`
Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,5 @@ public protocol LocalConfig { init()`
`25`	`25`	`// MARK: Gestures`
`26`	`26`	`var isTapOutsideToDismissEnabled: Bool { get set }`
`27`	`27`	`var isDragGestureEnabled: Bool { get set }`
	`28`	`+ var dragGestureAreaSize: CGFloat { get set }`
`28`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ struct AnyPopupConfig: LocalConfig, Sendable { init() {}`
`25`	`25`	`// MARK: Gestures`
`26`	`26`	`var isTapOutsideToDismissEnabled: Bool = false`
`27`	`27`	`var isDragGestureEnabled: Bool = false`
	`28`	`+ var dragGestureAreaSize: CGFloat = 0`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`// MARK: Initialize`
`@@ -40,5 +41,6 @@ extension AnyPopupConfig {`
`40`	`41`	`self.dragDetents = config.dragDetents`
`41`	`42`	`self.isTapOutsideToDismissEnabled = config.isTapOutsideToDismissEnabled`
`42`	`43`	`self.isDragGestureEnabled = config.isDragGestureEnabled`
	`44`	`+ self.dragGestureAreaSize = config.dragGestureAreaSize`
`43`	`45`	`}`
`44`	`46`	`}`