From d11c37ce3f399fb35b0b8736da30c1a1b6bff53c Mon Sep 17 00:00:00 2001
From: Brody Roberts <brodyroberts2002@gmail.com>
Date: Thu, 26 Jun 2025 11:13:43 -0700
Subject: [PATCH 1/5] Opacity Transition Progress

---
 Sources/FlowStack/FlowLink.swift              | 12 ++++---
 Sources/FlowStack/FlowTransition.swift        | 31 ++++++++++++++++---
 .../FlowStack/View+InteractiveDismiss.swift   | 12 ++++---
 3 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/Sources/FlowStack/FlowLink.swift b/Sources/FlowStack/FlowLink.swift
index 269360c..83a20e9 100644
--- a/Sources/FlowStack/FlowLink.swift
+++ b/Sources/FlowStack/FlowLink.swift
@@ -252,6 +252,7 @@ public struct FlowLink<Label>: View where Label: View {
     @Environment(\.flowDepth) private var flowDepth
     @Environment(\.flowTransaction) private var transaction
     @Environment(\.flowAnimationDuration) private var flowDuration
+    @SwiftUI.Environment(\.opacityTransitionPercent) var percent
 
     @State private var overrideAnchor: Anchor<CGRect>?
 
@@ -392,7 +393,7 @@ public struct FlowLink<Label>: View where Label: View {
                         .opacity(isShowing ? 1.0 : 0.0)
                         /// (Workaround) Override an animation with an animation that does nothing
                         /// Leaving a flowlayer too early can cause an un-wanted animation
-                        .ignoreAnimation()
+//                        .ignoreAnimation()
                 } else if configuration.animateFromAnchor {
                     button
                         .transition(.opacityPercent)
@@ -442,12 +443,15 @@ public struct FlowLink<Label>: View where Label: View {
     }
     private func handleFlowLinkOpacity() {
         if isShowing == true, buttonPressed {
-            isShowing = false
+            withAnimation(.easeOut) { isShowing = false }
             buttonPressed = false
         } else if isShowing == false {
-            DispatchQueue.main.asyncAfter(deadline: .now() + flowDuration) { withAnimation(nil) {
+//            DispatchQueue.main.asyncAfter(deadline: .now() + flowDuration * 0.5) { withAnimation(.easeIn) {
+//                isShowing = true
+//            }}
+            withAnimation(.easeIn) {
                 isShowing = true
-            }}
+            }
         }
     }
 }
diff --git a/Sources/FlowStack/FlowTransition.swift b/Sources/FlowStack/FlowTransition.swift
index f883aa4..eaf3248 100644
--- a/Sources/FlowStack/FlowTransition.swift
+++ b/Sources/FlowStack/FlowTransition.swift
@@ -80,6 +80,10 @@ extension AnyTransition {
         @State private var snapCornerRadiusZero: Bool = true
         @State private var availableSize: CGSize = .zero
 
+        @State var transitionWithOpacity: Bool = true
+        @State var isPanDismiss: Bool = false
+        @State private var panOpacity: CGFloat = 1
+
         private var snapshotPercent: CGFloat {
             max(0, 1 - percent / 0.2)
         }
@@ -160,20 +164,21 @@ extension AnyTransition {
             GeometryReader { proxy in
                 let zoomRect = zoomRect(with: proxy, anchor: context.overrideAnchor ?? context.anchor, percent: percent, pullOffset: panOffset)
                 let scaleRatio = context.shouldScaleHorizontally ? zoomRect.size.width / proxy.size.width : 1.0
-
                 content
                     .onInteractiveDismissGesture(threshold: 80, isEnabled: !isDisabled, isDismissing: isDismissing, onDismiss: {
-                        dismiss()
+                        withAnimation(transaction.animation) { dismiss() }
                         isDismissing = true
-                    }, onPan: { offset in
+                    }, onPan: { offset, shouldDismiss in
                         snapCornerRadiusZero = false
                         isEnded = false
                         panOffset = offset
+                        if shouldDismiss, transitionWithOpacity { isPanDismiss = true }
                     }, onEnded: { isDismissing in
                         // TODO: FS-34: Handle snap corner radius 0 on interactive dismiss cancel
                         withTransaction(transaction) {
                             panOffset = .zero
                             isEnded = true
+                            if isPanDismiss { panOpacity = .zero }
                         }
                     })
                     .onPreferenceChange(InteractiveDismissDisabledKey.self) { isDisabled in
@@ -203,10 +208,28 @@ extension AnyTransition {
                         x: zoomRect.origin.x,
                         y: zoomRect.origin.y
                     )
-                    .opacity(context.anchor == nil ? percent : 1)
+                    .modifier(OpacityViewModifier(transitionWithOpacity: transitionWithOpacity, context: context, isDismissing: isDismissing, percent: percent, panOpacity: panOpacity))
             }
             .ignoresSafeArea(.container, edges: .all)
         }
+
+        private struct OpacityViewModifier: ViewModifier {
+            let transitionWithOpacity: Bool
+            let context: PathContext
+            let isDismissing: Bool
+            var percent: CGFloat
+            var panOpacity: CGFloat
+            func body(content: Content) -> some View {
+                if !transitionWithOpacity {
+                    content
+                        .opacity(context.anchor == nil ? percent : 1)
+                } else {
+                    content
+                        .opacity(panOpacity)
+                        .opacity(isDismissing ? 1 : percent)
+                }
+            }
+        }
     }
 }
 
diff --git a/Sources/FlowStack/View+InteractiveDismiss.swift b/Sources/FlowStack/View+InteractiveDismiss.swift
index 60b64f8..6efa909 100644
--- a/Sources/FlowStack/View+InteractiveDismiss.swift
+++ b/Sources/FlowStack/View+InteractiveDismiss.swift
@@ -41,7 +41,7 @@ struct InteractiveDismissContainer<T: View>: UIViewControllerRepresentable {
 
     var threshold: Double
 
-    var onPan: (CGPoint) -> Void
+    var onPan: (CGPoint, Bool) -> Void
     var isEnabled: Bool
     var isDismissing: Bool
     var onDismiss: () -> Void
@@ -123,7 +123,7 @@ class InteractiveDismissViewController<Content: View>: UIHostingController<Conte
 class InteractiveDismissCoordinator: NSObject, ObservableObject, UIGestureRecognizerDelegate {
     var threshold: Double
 
-    var onPan: (CGPoint) -> Void
+    var onPan: (CGPoint, Bool) -> Void
     var isEnabled: Bool {
         didSet {
             panGestureRecognizer.isEnabled = isEnabled
@@ -168,7 +168,7 @@ class InteractiveDismissCoordinator: NSObject, ObservableObject, UIGestureRecogn
         }
     }
 
-    init(threshold: Double, onPan: @escaping (CGPoint) -> Void, isEnabled: Bool, isDismissing: Bool, onDismiss: @escaping () -> Void, onEnded: @escaping (Bool) -> Void) {
+    init(threshold: Double, onPan: @escaping (CGPoint, Bool) -> Void, isEnabled: Bool, isDismissing: Bool, onDismiss: @escaping () -> Void, onEnded: @escaping (Bool) -> Void) {
         self.threshold = threshold
 
         self.onPan = onPan
@@ -210,13 +210,15 @@ class InteractiveDismissCoordinator: NSObject, ObservableObject, UIGestureRecogn
     }
 
     private func update(offset: CGPoint, isEdge: Bool, hasEnded: Bool) {
-        onPan(offset)
+//        onPan(offset)
 
         let shouldDismiss = offset.y > threshold || (offset.x > threshold && isEdge)
         if shouldDismiss != isPastThreshold && shouldDismiss {
             impactGenerator.impactOccurred()
         }
 
+        onPan(offset, shouldDismiss)
+
         isPastThreshold = shouldDismiss
 
         if hasEnded {
@@ -274,7 +276,7 @@ class InteractiveDismissCoordinator: NSObject, ObservableObject, UIGestureRecogn
 }
 
 extension View {
-    func onInteractiveDismissGesture(threshold: Double = 50, isEnabled: Bool = true, isDismissing: Bool = false, onDismiss: @escaping () -> Void, onPan: @escaping (CGPoint) -> Void = { _ in }, onEnded: @escaping (Bool) -> Void = { _ in }) -> some View {
+    func onInteractiveDismissGesture(threshold: Double = 50, isEnabled: Bool = true, isDismissing: Bool = false, onDismiss: @escaping () -> Void, onPan: @escaping (CGPoint, Bool) -> Void = { _, _ in }, onEnded: @escaping (Bool) -> Void = { _ in }) -> some View {
         InteractiveDismissContainer(threshold: threshold, onPan: onPan, isEnabled: isEnabled, isDismissing: isDismissing, onDismiss: onDismiss, onEnded: onEnded, content: self)
     }
 }

From 9b175406f9cc7e19e1db27baa87f51d10412c77b Mon Sep 17 00:00:00 2001
From: Brody Roberts <brodyroberts2002@gmail.com>
Date: Thu, 26 Jun 2025 11:56:00 -0700
Subject: [PATCH 2/5] FlowStack can now choose between using regular
 Transitions and opacity transitions

---
 Sources/FlowStack/FlowLink.swift       | 23 +++++++++++++++--------
 Sources/FlowStack/FlowPath.swift       |  3 +++
 Sources/FlowStack/FlowStack.swift      |  3 +--
 Sources/FlowStack/FlowTransition.swift |  8 ++++----
 4 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/Sources/FlowStack/FlowLink.swift b/Sources/FlowStack/FlowLink.swift
index 83a20e9..23d42d4 100644
--- a/Sources/FlowStack/FlowLink.swift
+++ b/Sources/FlowStack/FlowLink.swift
@@ -216,9 +216,10 @@ public struct FlowLink<Label>: View where Label: View {
         ///   - shadowColor: The shadow color applied to the transitioning destination view. This value should typically match the shadow color of the flow link contents or flow link animation anchor for visual consistency.
         ///   - shadowOffset: The shadow offset applied to the transitioning destination view. This value should typically match the shadow offset of the flow link contents or flow link animation anchor for visual consistency.
         ///   - zoomStyle: The zoom style applied to the transitioning destination view
-        public init(animateFromAnchor: Bool = true, transitionFromSnapshot: Bool = true, cornerRadius: CGFloat = 0, cornerStyle: RoundedCornerStyle = .circular, shadowRadius: CGFloat = 0, shadowColor: Color? = nil, shadowOffset: CGPoint = .zero, zoomStyle: ZoomStyle = .scaleHorizontally) {
+        public init(animateFromAnchor: Bool = true, transitionFromSnapshot: Bool = true, transitionWithOpacity: Bool = false, cornerRadius: CGFloat = 0, cornerStyle: RoundedCornerStyle = .circular, shadowRadius: CGFloat = 0, shadowColor: Color? = nil, shadowOffset: CGPoint = .zero, zoomStyle: ZoomStyle = .scaleHorizontally) {
             self.animateFromAnchor = animateFromAnchor
             self.transitionFromSnapshot = transitionFromSnapshot
+            self.transitionWithOpacity = transitionWithOpacity
             self.cornerRadius = cornerRadius
             self.cornerStyle = cornerStyle
             self.shadowRadius = shadowRadius
@@ -230,6 +231,8 @@ public struct FlowLink<Label>: View where Label: View {
         let animateFromAnchor: Bool
         let transitionFromSnapshot: Bool
 
+        let transitionWithOpacity: Bool
+
         let cornerRadius: CGFloat
         let cornerStyle: RoundedCornerStyle
 
@@ -430,7 +433,8 @@ public struct FlowLink<Label>: View where Label: View {
                 shadowColor: configuration.shadowColor,
                 shadowOffset: configuration.shadowOffset,
                 shouldShowSkrim: configuration.showsSkrim,
-                shouldScaleHorizontally: configuration.zoomStyle == .scaleHorizontally
+                shouldScaleHorizontally: configuration.zoomStyle == .scaleHorizontally,
+                transitionWithOpacity: configuration.transitionWithOpacity
             )
         })
         .onPreferenceChange(PathContextKey.self) { value in
@@ -443,14 +447,17 @@ public struct FlowLink<Label>: View where Label: View {
     }
     private func handleFlowLinkOpacity() {
         if isShowing == true, buttonPressed {
-            withAnimation(.easeOut) { isShowing = false }
+            if configuration.transitionWithOpacity {
+                withAnimation(.easeOut) { isShowing = false }
+            } else {
+                isShowing = false
+            }
             buttonPressed = false
         } else if isShowing == false {
-//            DispatchQueue.main.asyncAfter(deadline: .now() + flowDuration * 0.5) { withAnimation(.easeIn) {
-//                isShowing = true
-//            }}
-            withAnimation(.easeIn) {
-                isShowing = true
+            if configuration.transitionWithOpacity {
+                DispatchQueue.main.asyncAfter(deadline: .now() + flowDuration) { withAnimation(.easeIn) {isShowing = true } }
+            } else {
+                withAnimation(.easeIn) { isShowing = true }
             }
         }
     }
diff --git a/Sources/FlowStack/FlowPath.swift b/Sources/FlowStack/FlowPath.swift
index e0043b6..f2427f2 100644
--- a/Sources/FlowStack/FlowPath.swift
+++ b/Sources/FlowStack/FlowPath.swift
@@ -39,6 +39,9 @@ struct PathContext: Equatable, Hashable {
 
     var shouldShowSkrim: Bool = true
     var shouldScaleHorizontally: Bool = true
+
+    // animation with opacity ???
+    var transitionWithOpacity: Bool = false
 }
 
 struct FlowElement: Equatable, Hashable {
diff --git a/Sources/FlowStack/FlowStack.swift b/Sources/FlowStack/FlowStack.swift
index 1b19c95..c176f57 100644
--- a/Sources/FlowStack/FlowStack.swift
+++ b/Sources/FlowStack/FlowStack.swift
@@ -305,13 +305,12 @@ public struct FlowStack<Root: View, Overlay: View>: View {
 
             ForEach(pathToUse.wrappedValue.elements, id: \.self) { element in
                 if let destination = destination(for: element.value) {
-
                     skrim(for: element)
 
                     destination.content(element.value)
                         .frame(maxWidth: .infinity, maxHeight: .infinity)
                         .id(element.hashValue)
-                        .transition(.flowTransition(with: element.context ?? .init()))
+                        .transition(.flowTransition(with: element.context ?? .init(), transitionWithOpacity: element.context?.transitionWithOpacity ?? false))
                         .modifier(AccessibilityModifier(element: element.index))
                 }
             }
diff --git a/Sources/FlowStack/FlowTransition.swift b/Sources/FlowStack/FlowTransition.swift
index eaf3248..fb11eab 100644
--- a/Sources/FlowStack/FlowTransition.swift
+++ b/Sources/FlowStack/FlowTransition.swift
@@ -40,10 +40,10 @@ struct FlowDismissActionKey: EnvironmentKey {
 
 extension AnyTransition {
 
-    static func flowTransition(with context: PathContext) -> AnyTransition {
+    static func flowTransition(with context: PathContext, transitionWithOpacity: Bool) -> AnyTransition {
         AnyTransition.modifier(
-            active: FlowPresentModifier(percent: 0, context: context),
-            identity: FlowPresentModifier(percent: 1, context: context)
+            active: FlowPresentModifier(percent: 0, context: context, transitionWithOpacity: transitionWithOpacity),
+            identity: FlowPresentModifier(percent: 1, context: context, transitionWithOpacity: transitionWithOpacity)
         )
     }
 
@@ -72,6 +72,7 @@ extension AnyTransition {
     struct FlowPresentModifier: Animatable, ViewModifier {
         var percent: CGFloat
         var context: PathContext
+        var transitionWithOpacity: Bool
 
         @State var panOffset: CGPoint = .zero
         @State var isEnded: Bool = false
@@ -80,7 +81,6 @@ extension AnyTransition {
         @State private var snapCornerRadiusZero: Bool = true
         @State private var availableSize: CGSize = .zero
 
-        @State var transitionWithOpacity: Bool = true
         @State var isPanDismiss: Bool = false
         @State private var panOpacity: CGFloat = 1
 

From 70441c116a80db90ddf0965fe057a62237742590 Mon Sep 17 00:00:00 2001
From: Brody Roberts <brodyroberts2002@gmail.com>
Date: Thu, 26 Jun 2025 12:49:40 -0700
Subject: [PATCH 3/5] Delaying animation of opacityTransition

---
 Sources/FlowStack/FlowLink.swift       | 4 ++--
 Sources/FlowStack/FlowTransition.swift | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Sources/FlowStack/FlowLink.swift b/Sources/FlowStack/FlowLink.swift
index 23d42d4..5aeab64 100644
--- a/Sources/FlowStack/FlowLink.swift
+++ b/Sources/FlowStack/FlowLink.swift
@@ -455,9 +455,9 @@ public struct FlowLink<Label>: View where Label: View {
             buttonPressed = false
         } else if isShowing == false {
             if configuration.transitionWithOpacity {
-                DispatchQueue.main.asyncAfter(deadline: .now() + flowDuration) { withAnimation(.easeIn) {isShowing = true } }
-            } else {
                 withAnimation(.easeIn) { isShowing = true }
+            } else {
+                DispatchQueue.main.asyncAfter(deadline: .now() + flowDuration) { isShowing = true }
             }
         }
     }
diff --git a/Sources/FlowStack/FlowTransition.swift b/Sources/FlowStack/FlowTransition.swift
index fb11eab..8ace9c5 100644
--- a/Sources/FlowStack/FlowTransition.swift
+++ b/Sources/FlowStack/FlowTransition.swift
@@ -166,7 +166,7 @@ extension AnyTransition {
                 let scaleRatio = context.shouldScaleHorizontally ? zoomRect.size.width / proxy.size.width : 1.0
                 content
                     .onInteractiveDismissGesture(threshold: 80, isEnabled: !isDisabled, isDismissing: isDismissing, onDismiss: {
-                        withAnimation(transaction.animation) { dismiss() }
+                        dismiss()
                         isDismissing = true
                     }, onPan: { offset, shouldDismiss in
                         snapCornerRadiusZero = false
@@ -175,7 +175,9 @@ extension AnyTransition {
                         if shouldDismiss, transitionWithOpacity { isPanDismiss = true }
                     }, onEnded: { isDismissing in
                         // TODO: FS-34: Handle snap corner radius 0 on interactive dismiss cancel
-                        withTransaction(transaction) {
+                        var customTransaction = transaction
+                        customTransaction.animation?.speed(0.8)
+                        withTransaction(customTransaction) {
                             panOffset = .zero
                             isEnded = true
                             if isPanDismiss { panOpacity = .zero }

From fd0d6f29d78883bc90947d7949ef7533c3763047 Mon Sep 17 00:00:00 2001
From: Brody Roberts <brodyroberts2002@gmail.com>
Date: Mon, 30 Jun 2025 09:25:49 -0700
Subject: [PATCH 4/5] improved ignoreAnimation modifer

---
 Sources/FlowStack/FlowLink.swift  | 13 +++++++++++--
 Sources/FlowStack/FlowPath.swift  |  1 -
 Sources/FlowStack/FlowStack.swift |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Sources/FlowStack/FlowLink.swift b/Sources/FlowStack/FlowLink.swift
index 5aeab64..403a0e3 100644
--- a/Sources/FlowStack/FlowLink.swift
+++ b/Sources/FlowStack/FlowLink.swift
@@ -395,8 +395,8 @@ public struct FlowLink<Label>: View where Label: View {
                     button
                         .opacity(isShowing ? 1.0 : 0.0)
                         /// (Workaround) Override an animation with an animation that does nothing
-                        /// Leaving a flowlayer too early can cause an un-wanted animation
-//                        .ignoreAnimation()
+                        /// Leaving a flowlayer too early when panning can cause an un-wanted animation
+                        .ifTransitionWithOpacity(configuration.transitionWithOpacity)
                 } else if configuration.animateFromAnchor {
                     button
                         .transition(.opacityPercent)
@@ -481,4 +481,13 @@ private extension View {
     func ignoreAnimation(transition: AnyTransition = .identity) -> some View {
         modifier(IgnoreAnimationModifier(transition: transition))
     }
+
+    @ViewBuilder
+    func ifTransitionWithOpacity(_ condition: Bool) -> some View {
+        if condition {
+            self
+        } else {
+            self.ignoreAnimation()
+        }
+    }
 }
diff --git a/Sources/FlowStack/FlowPath.swift b/Sources/FlowStack/FlowPath.swift
index f2427f2..ef17939 100644
--- a/Sources/FlowStack/FlowPath.swift
+++ b/Sources/FlowStack/FlowPath.swift
@@ -40,7 +40,6 @@ struct PathContext: Equatable, Hashable {
     var shouldShowSkrim: Bool = true
     var shouldScaleHorizontally: Bool = true
 
-    // animation with opacity ???
     var transitionWithOpacity: Bool = false
 }
 
diff --git a/Sources/FlowStack/FlowStack.swift b/Sources/FlowStack/FlowStack.swift
index c176f57..62eccf3 100644
--- a/Sources/FlowStack/FlowStack.swift
+++ b/Sources/FlowStack/FlowStack.swift
@@ -304,7 +304,7 @@ public struct FlowStack<Root: View, Overlay: View>: View {
                 .environment(\.flowDepth, 0)
 
             ForEach(pathToUse.wrappedValue.elements, id: \.self) { element in
-                if let destination = destination(for: element.value) {
+                if let destination = destination(for: element.value) {  
                     skrim(for: element)
 
                     destination.content(element.value)

From 9854a6e3ad963f6ce033d5f3cc5e1f9d633d96f6 Mon Sep 17 00:00:00 2001
From: Brody Roberts <brodyroberts2002@gmail.com>
Date: Mon, 7 Jul 2025 08:52:00 -0700
Subject: [PATCH 5/5] final changes to pr?

---
 Sources/FlowStack/FlowLink.swift                | 3 +--
 Sources/FlowStack/View+InteractiveDismiss.swift | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/Sources/FlowStack/FlowLink.swift b/Sources/FlowStack/FlowLink.swift
index 26ef96f..6893e41 100644
--- a/Sources/FlowStack/FlowLink.swift
+++ b/Sources/FlowStack/FlowLink.swift
@@ -405,7 +405,6 @@ public struct FlowLink<Label>: View where Label: View {
         }
         .onChange(of: colorScheme) { newScheme in
             refreshButton = UUID()
-            snapshots[newScheme]
             path?.wrappedValue.updateSnapshots(from: newScheme)
         }
         .onAppear { initSnapshots() }
@@ -471,7 +470,7 @@ public struct FlowLink<Label>: View where Label: View {
     private func initSnapshots() {
         Task {
             // Prevent Snapshot from being taken too early before Fetchable content loads
-            try? await Task.sleep(10000)
+            try? await Task.sleep(nanoseconds: 10_000)
                 let lightImage = createSnapshot(colorScheme: .light)
                 let darkImage = createSnapshot(colorScheme: .dark)
                 snapshots[.light] = lightImage
diff --git a/Sources/FlowStack/View+InteractiveDismiss.swift b/Sources/FlowStack/View+InteractiveDismiss.swift
index 6efa909..5e5e121 100644
--- a/Sources/FlowStack/View+InteractiveDismiss.swift
+++ b/Sources/FlowStack/View+InteractiveDismiss.swift
@@ -210,8 +210,6 @@ class InteractiveDismissCoordinator: NSObject, ObservableObject, UIGestureRecogn
     }
 
     private func update(offset: CGPoint, isEdge: Bool, hasEnded: Bool) {
-//        onPan(offset)
-
         let shouldDismiss = offset.y > threshold || (offset.x > threshold && isEdge)
         if shouldDismiss != isPastThreshold && shouldDismiss {
             impactGenerator.impactOccurred()