From 18888989ecf19b2dd7d80306a65f722283255256 Mon Sep 17 00:00:00 2001
From: Brody Roberts <brodyroberts2002@gmail.com>
Date: Mon, 23 Jun 2025 10:16:43 -0700
Subject: [PATCH 1/7] More progress very close

---
 Sources/FlowStack/FlowLink.swift | 61 ++++++++++++++++++++++++++++----
 1 file changed, 55 insertions(+), 6 deletions(-)

diff --git a/Sources/FlowStack/FlowLink.swift b/Sources/FlowStack/FlowLink.swift
index 269360c..67a23d5 100644
--- a/Sources/FlowStack/FlowLink.swift
+++ b/Sources/FlowStack/FlowLink.swift
@@ -246,13 +246,15 @@ public struct FlowLink<Label>: View where Label: View {
     private var value: (any (Equatable & Hashable))?
     private var configuration: Configuration
 
-    @Environment(\.self) private var capturedEnvironment
+//    @Environment(\.self) private var capturedEnvironment
 
     @Environment(\.flowPath) private var path
     @Environment(\.flowDepth) private var flowDepth
     @Environment(\.flowTransaction) private var transaction
     @Environment(\.flowAnimationDuration) private var flowDuration
 
+    @Environment(\.colorScheme) private var colorScheme
+
     @State private var overrideAnchor: Anchor<CGRect>?
 
     @State private var size: CGSize?
@@ -297,23 +299,24 @@ public struct FlowLink<Label>: View where Label: View {
     }
 
     @State private var snapshot: UIImage?
+    @State var appendedToPath: Bool = false
+    @State var initialSnapshot: Bool = false
 
     @MainActor
     private func updateSnapshot() -> UIImage? {
-        guard snapshot == nil else { return snapshot }
-
+        print("🦦 updateSnapshot \(capturedEnvironment.colorScheme)")
+        initialSnapshot = true
         guard let size = size else { return nil }
 
         let frame = CGRect(origin: .zero, size: size)
 
         let controller = UIHostingController(
             rootView: label()
-                .transformEnvironment(\.self) { environment in
-                    environment = capturedEnvironment
-                }
+                .environment(\.self, capturedEnvironment)
                 .environment(\.opacityTransitionPercent, 1)
                 .ignoresSafeArea()
         )
+
         let view = controller.view
 
         guard let view = view else {
@@ -377,10 +380,24 @@ public struct FlowLink<Label>: View where Label: View {
                             path?.wrappedValue.append(value, context: context)
                         }
                     }
+                    appendedToPath = true
                 }
             }
     }
 
+    private struct EnvironmentRefresher: View {
+        var onUpdate: (EnvironmentValues) -> Void
+        var onChange: (EnvironmentValues) -> Void
+        @Environment(\.self) private var environmentSnapshotSource
+        @Environment(\.colorScheme) var colorScheme
+        var body: some View {
+            Color.clear
+                .onAppear { onUpdate(environmentSnapshotSource) }
+                .onChange(of: colorScheme) { _ in onChange(environmentSnapshotSource) }
+        }
+    }
+
+    @State private var capturedEnvironment = EnvironmentValues()
     public var body: some View {
         Group {
             if isContainedInPath && configuration.animateFromAnchor {
@@ -401,6 +418,31 @@ public struct FlowLink<Label>: View where Label: View {
                 }
             }
         }
+        // Problem: Reinit happens before the snapshot is taken.
+        // So environment is setup incorrectly with new approach.
+//        .onAppear {
+//            capturedEnvironment = environmentSnapshotSource
+//            capturedEnvironment.colorScheme = colorScheme
+//            updateSnapshot()
+//        }
+        .background(
+            EnvironmentRefresher { fetchedEnv in
+                print("🦦 function being called? ")
+                capturedEnvironment = fetchedEnv
+                print("🦦 colorScheme? -> \(colorScheme)")
+                capturedEnvironment.colorScheme = colorScheme
+                print("🦦 capturedEnv colorScheme? -> \(capturedEnvironment.colorScheme)")
+                updateSnapshot()
+            } onChange: { fetchedEnv in
+                let changedColorScheme = colorScheme == .dark ? ColorScheme.light : ColorScheme.dark
+                print("🦦 onChangedCalled ")
+                capturedEnvironment = fetchedEnv
+                print("🦦 colorScheme from onChange -> \(changedColorScheme)")
+                capturedEnvironment.colorScheme = changedColorScheme
+                print("🦦 capturedEnv colorScheme? -> \(capturedEnvironment.colorScheme)")
+                updateSnapshot()
+            }
+        )
         .background(
             GeometryReader { proxy in
                 Color.clear
@@ -471,3 +513,10 @@ private extension View {
         modifier(IgnoreAnimationModifier(transition: transition))
     }
 }
+
+//
+//extension EnvironmentValues: Equatable {
+//    public static func == (lhs: EnvironmentValues, rhs: EnvironmentValues) -> Bool {
+//        return lhs.colorScheme == rhs.colorScheme
+//    }
+//}

From 9c099e98e21e18aa8da3f31fd1d59a23ef11258f Mon Sep 17 00:00:00 2001
From: Brody Roberts <brodyroberts2002@gmail.com>
Date: Mon, 23 Jun 2025 10:30:37 -0700
Subject: [PATCH 2/7] Another saving point

---
 Sources/FlowStack/FlowLink.swift | 52 +++++++++++++-------------------
 1 file changed, 21 insertions(+), 31 deletions(-)

diff --git a/Sources/FlowStack/FlowLink.swift b/Sources/FlowStack/FlowLink.swift
index 67a23d5..5e76324 100644
--- a/Sources/FlowStack/FlowLink.swift
+++ b/Sources/FlowStack/FlowLink.swift
@@ -246,15 +246,11 @@ public struct FlowLink<Label>: View where Label: View {
     private var value: (any (Equatable & Hashable))?
     private var configuration: Configuration
 
-//    @Environment(\.self) private var capturedEnvironment
-
     @Environment(\.flowPath) private var path
     @Environment(\.flowDepth) private var flowDepth
     @Environment(\.flowTransaction) private var transaction
     @Environment(\.flowAnimationDuration) private var flowDuration
 
-    @Environment(\.colorScheme) private var colorScheme
-
     @State private var overrideAnchor: Anchor<CGRect>?
 
     @State private var size: CGSize?
@@ -302,7 +298,6 @@ public struct FlowLink<Label>: View where Label: View {
     @State var appendedToPath: Bool = false
     @State var initialSnapshot: Bool = false
 
-    @MainActor
     private func updateSnapshot() -> UIImage? {
         print("🦦 updateSnapshot \(capturedEnvironment.colorScheme)")
         initialSnapshot = true
@@ -386,14 +381,29 @@ public struct FlowLink<Label>: View where Label: View {
     }
 
     private struct EnvironmentRefresher: View {
-        var onUpdate: (EnvironmentValues) -> Void
-        var onChange: (EnvironmentValues) -> Void
-        @Environment(\.self) private var environmentSnapshotSource
+        @Binding var environment: EnvironmentValues
+        var updateSnapshot: () -> (Void)
+
+        init(environment: Binding<EnvironmentValues>, updateSnapshot: @escaping () -> (Void)) {
+            self._environment = environment
+            self.updateSnapshot = updateSnapshot
+        }
+
+        @Environment(\.self) private var fetchedEnv
         @Environment(\.colorScheme) var colorScheme
         var body: some View {
             Color.clear
-                .onAppear { onUpdate(environmentSnapshotSource) }
-                .onChange(of: colorScheme) { _ in onChange(environmentSnapshotSource) }
+                .onAppear {
+                    environment = fetchedEnv
+                    environment.colorScheme = colorScheme
+                    updateSnapshot()
+                }
+                .onChange(of: colorScheme) { _ in
+                    environment = fetchedEnv
+                    let changedColorScheme = colorScheme == .light ? ColorScheme.dark : ColorScheme.light
+                    environment.colorScheme = changedColorScheme
+                    updateSnapshot()
+                }
         }
     }
 
@@ -418,28 +428,8 @@ public struct FlowLink<Label>: View where Label: View {
                 }
             }
         }
-        // Problem: Reinit happens before the snapshot is taken.
-        // So environment is setup incorrectly with new approach.
-//        .onAppear {
-//            capturedEnvironment = environmentSnapshotSource
-//            capturedEnvironment.colorScheme = colorScheme
-//            updateSnapshot()
-//        }
         .background(
-            EnvironmentRefresher { fetchedEnv in
-                print("🦦 function being called? ")
-                capturedEnvironment = fetchedEnv
-                print("🦦 colorScheme? -> \(colorScheme)")
-                capturedEnvironment.colorScheme = colorScheme
-                print("🦦 capturedEnv colorScheme? -> \(capturedEnvironment.colorScheme)")
-                updateSnapshot()
-            } onChange: { fetchedEnv in
-                let changedColorScheme = colorScheme == .dark ? ColorScheme.light : ColorScheme.dark
-                print("🦦 onChangedCalled ")
-                capturedEnvironment = fetchedEnv
-                print("🦦 colorScheme from onChange -> \(changedColorScheme)")
-                capturedEnvironment.colorScheme = changedColorScheme
-                print("🦦 capturedEnv colorScheme? -> \(capturedEnvironment.colorScheme)")
+            EnvironmentRefresher(environment: $capturedEnvironment) {
                 updateSnapshot()
             }
         )

From 84bf86bf42ccfef8dc9b2419bc3c51fc7dd65c5b Mon Sep 17 00:00:00 2001
From: Brody Roberts <brodyroberts2002@gmail.com>
Date: Mon, 23 Jun 2025 13:00:07 -0700
Subject: [PATCH 3/7] This method doesn't work

---
 Sources/FlowStack/FlowLink.swift | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Sources/FlowStack/FlowLink.swift b/Sources/FlowStack/FlowLink.swift
index 5e76324..44652d5 100644
--- a/Sources/FlowStack/FlowLink.swift
+++ b/Sources/FlowStack/FlowLink.swift
@@ -295,12 +295,9 @@ public struct FlowLink<Label>: View where Label: View {
     }
 
     @State private var snapshot: UIImage?
-    @State var appendedToPath: Bool = false
-    @State var initialSnapshot: Bool = false
 
     private func updateSnapshot() -> UIImage? {
         print("🦦 updateSnapshot \(capturedEnvironment.colorScheme)")
-        initialSnapshot = true
         guard let size = size else { return nil }
 
         let frame = CGRect(origin: .zero, size: size)
@@ -325,8 +322,12 @@ public struct FlowLink<Label>: View where Label: View {
 
         let renderer = UIGraphicsImageRenderer(size: frame.size)
 
+        // PROBLEM:
+        // drawing with afterScreenUpdates:YES inside CoreAnimation commit is not supported.
+
+        // PROBLEM: Snapshotting once in new flowLayer means that It's snap shotting the article itself and not the preview this method doesn't work...
         var image = renderer.image { _ in
-            view.drawHierarchy(in: CGRect(x: 0, y: 0, width: size.width, height: size.height), afterScreenUpdates: true)
+            DispatchQueue.main.async { view.drawHierarchy(in: CGRect(x: 0, y: 0, width: size.width, height: size.height), afterScreenUpdates: false) }
         }
 
         if let overrideFrame = overrideFrame,
@@ -375,7 +376,6 @@ public struct FlowLink<Label>: View where Label: View {
                             path?.wrappedValue.append(value, context: context)
                         }
                     }
-                    appendedToPath = true
                 }
             }
     }
@@ -399,8 +399,8 @@ public struct FlowLink<Label>: View where Label: View {
                     updateSnapshot()
                 }
                 .onChange(of: colorScheme) { _ in
-                    environment = fetchedEnv
                     let changedColorScheme = colorScheme == .light ? ColorScheme.dark : ColorScheme.light
+                    environment = fetchedEnv
                     environment.colorScheme = changedColorScheme
                     updateSnapshot()
                 }

From 916fcaab70528b3b5020cba09d62c8abefc7bdda Mon Sep 17 00:00:00 2001
From: Brody Roberts <brodyroberts2002@gmail.com>
Date: Mon, 23 Jun 2025 16:49:36 -0700
Subject: [PATCH 4/7] FIXED BUG

---
 Sources/FlowStack/FlowLink.swift | 93 ++++++++++++--------------------
 Sources/FlowStack/FlowPath.swift | 14 +++++
 2 files changed, 49 insertions(+), 58 deletions(-)

diff --git a/Sources/FlowStack/FlowLink.swift b/Sources/FlowStack/FlowLink.swift
index 44652d5..a5e9106 100644
--- a/Sources/FlowStack/FlowLink.swift
+++ b/Sources/FlowStack/FlowLink.swift
@@ -251,6 +251,9 @@ public struct FlowLink<Label>: View where Label: View {
     @Environment(\.flowTransaction) private var transaction
     @Environment(\.flowAnimationDuration) private var flowDuration
 
+    @Environment(\.colorScheme) private var colorScheme
+    @Environment(\.self) private var fetchedEnvironment
+
     @State private var overrideAnchor: Anchor<CGRect>?
 
     @State private var size: CGSize?
@@ -259,6 +262,12 @@ public struct FlowLink<Label>: View where Label: View {
     @State var isShowing: Bool = true
     @State var buttonPressed: Bool = false
 
+    @State var environmentList: [EnvironmentValues] = []
+    @State private var snapshots: [ColorScheme: UIImage] = [:]
+    @State private var environment = EnvironmentValues()
+    @State private var refreshButton = UUID()
+
+
     /// Creates a flow link that presents the view corresponding to a value.
     ///
     /// When someone activates the flow link that this initializer
@@ -294,26 +303,23 @@ public struct FlowLink<Label>: View where Label: View {
         return path?.wrappedValue.elements.map(\.context?.linkDepth).contains(flowDepth) ?? false
     }
 
-    @State private var snapshot: UIImage?
-
-    private func updateSnapshot() -> UIImage? {
-        print("🦦 updateSnapshot \(capturedEnvironment.colorScheme)")
+    private func updateSnapshot(colorScheme: ColorScheme) -> UIImage? {
         guard let size = size else { return nil }
 
         let frame = CGRect(origin: .zero, size: size)
+        environment = fetchedEnvironment
+        environment.colorScheme = colorScheme
 
         let controller = UIHostingController(
             rootView: label()
-                .environment(\.self, capturedEnvironment)
+                .environment(\.self, environment)
                 .environment(\.opacityTransitionPercent, 1)
                 .ignoresSafeArea()
         )
 
         let view = controller.view
 
-        guard let view = view else {
-            return nil
-        }
+        guard let view = view else { return nil}
 
         view.bounds = CGRect(origin: .zero, size: size)
         view.backgroundColor = .clear
@@ -322,12 +328,8 @@ public struct FlowLink<Label>: View where Label: View {
 
         let renderer = UIGraphicsImageRenderer(size: frame.size)
 
-        // PROBLEM:
-        // drawing with afterScreenUpdates:YES inside CoreAnimation commit is not supported.
-
-        // PROBLEM: Snapshotting once in new flowLayer means that It's snap shotting the article itself and not the preview this method doesn't work...
         var image = renderer.image { _ in
-            DispatchQueue.main.async { view.drawHierarchy(in: CGRect(x: 0, y: 0, width: size.width, height: size.height), afterScreenUpdates: false) }
+            view.drawHierarchy(in: CGRect(x: 0, y: 0, width: size.width, height: size.height), afterScreenUpdates: true)
         }
 
         if let overrideFrame = overrideFrame,
@@ -369,7 +371,8 @@ public struct FlowLink<Label>: View where Label: View {
                 }
                 Task {
                     if configuration.transitionFromSnapshot {
-                        context?.snapshot = await updateSnapshot()
+                        print("🦦 current colorScheme: -> \(colorScheme)")
+                        context?.snapshot = snapshots[colorScheme]
                     }
                     if let value = value {
                         withTransaction(transaction) {
@@ -378,36 +381,8 @@ public struct FlowLink<Label>: View where Label: View {
                     }
                 }
             }
+            .id(refreshButton)
     }
-
-    private struct EnvironmentRefresher: View {
-        @Binding var environment: EnvironmentValues
-        var updateSnapshot: () -> (Void)
-
-        init(environment: Binding<EnvironmentValues>, updateSnapshot: @escaping () -> (Void)) {
-            self._environment = environment
-            self.updateSnapshot = updateSnapshot
-        }
-
-        @Environment(\.self) private var fetchedEnv
-        @Environment(\.colorScheme) var colorScheme
-        var body: some View {
-            Color.clear
-                .onAppear {
-                    environment = fetchedEnv
-                    environment.colorScheme = colorScheme
-                    updateSnapshot()
-                }
-                .onChange(of: colorScheme) { _ in
-                    let changedColorScheme = colorScheme == .light ? ColorScheme.dark : ColorScheme.light
-                    environment = fetchedEnv
-                    environment.colorScheme = changedColorScheme
-                    updateSnapshot()
-                }
-        }
-    }
-
-    @State private var capturedEnvironment = EnvironmentValues()
     public var body: some View {
         Group {
             if isContainedInPath && configuration.animateFromAnchor {
@@ -417,8 +392,8 @@ public struct FlowLink<Label>: View where Label: View {
                 if configuration.animateFromAnchor && overrideAnchor == nil {
                     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
+                    /// (Workaround) Override an animation with an animation that does nothing
+                    /// Leaving a flowlayer too early can cause an un-wanted animation
                         .ignoreAnimation()
                 } else if configuration.animateFromAnchor {
                     button
@@ -428,11 +403,17 @@ public struct FlowLink<Label>: View where Label: View {
                 }
             }
         }
-        .background(
-            EnvironmentRefresher(environment: $capturedEnvironment) {
-                updateSnapshot()
-            }
-        )
+        .onChange(of: colorScheme) { newScheme in
+            refreshButton = UUID()
+            snapshots[newScheme]
+            path?.wrappedValue.updateSnapshots(from: newScheme)
+        }
+        .onAppear {
+            let lightImage = updateSnapshot(colorScheme: .light)
+            let darkImage = updateSnapshot(colorScheme: .dark)
+            snapshots[.light] = lightImage
+            snapshots[.dark] = darkImage
+        }
         .background(
             GeometryReader { proxy in
                 Color.clear
@@ -453,7 +434,8 @@ public struct FlowLink<Label>: View where Label: View {
             return PathContext(
                 anchor: configuration.animateFromAnchor ? anchor : nil,
                 overrideAnchor: configuration.animateFromAnchor ? overrideAnchor : nil,
-                snapshot: configuration.animateFromAnchor && configuration.transitionFromSnapshot ? snapshot : nil,
+                snapshot: configuration.animateFromAnchor && configuration.transitionFromSnapshot ? snapshots[colorScheme] : nil,
+                snapshotDict: snapshots,
                 linkDepth: flowDepth,
                 cornerRadius: configuration.cornerRadius,
                 cornerStyle: configuration.cornerStyle,
@@ -472,6 +454,7 @@ public struct FlowLink<Label>: View where Label: View {
             context?.overrideAnchor = overrideAnchor
         }
     }
+
     private func handleFlowLinkOpacity() {
         if isShowing == true, buttonPressed {
             isShowing = false
@@ -484,6 +467,7 @@ public struct FlowLink<Label>: View where Label: View {
     }
 }
 
+
 private struct IgnoreAnimationModifier: ViewModifier {
     @State var shouldDisplay = true
     let transition: AnyTransition
@@ -503,10 +487,3 @@ private extension View {
         modifier(IgnoreAnimationModifier(transition: transition))
     }
 }
-
-//
-//extension EnvironmentValues: Equatable {
-//    public static func == (lhs: EnvironmentValues, rhs: EnvironmentValues) -> Bool {
-//        return lhs.colorScheme == rhs.colorScheme
-//    }
-//}
diff --git a/Sources/FlowStack/FlowPath.swift b/Sources/FlowStack/FlowPath.swift
index e0043b6..376e6d7 100644
--- a/Sources/FlowStack/FlowPath.swift
+++ b/Sources/FlowStack/FlowPath.swift
@@ -28,6 +28,7 @@ struct PathContext: Equatable, Hashable {
     var overrideAnchor: Anchor<CGRect>?
 
     var snapshot: UIImage?
+    var snapshotDict: [ColorScheme: UIImage] = [:]
     var linkDepth: Int = 0
 
     var cornerRadius: CGFloat = 0
@@ -99,6 +100,19 @@ public struct FlowPath: Equatable, Hashable {
     public mutating func append<P>(_ newElement: P) where P: Hashable {
         self.append(newElement, context: nil)
     }
+
+    /// Adds a method to tell flowPath to use the correct snapshot for the respective colorScheme
+    public mutating func updateSnapshots(from colorScheme: ColorScheme) {
+        for i in elements.indices {
+            guard var context = elements[i].context else { continue }
+
+            if let newSnapshot = context.snapshotDict[colorScheme] {
+                print("🦦 Entered on colorScheme -> \(colorScheme)")
+                context.snapshot = newSnapshot
+                elements[i].context = context
+            }
+        }
+    }
 }
 
 struct FlowPathKey: EnvironmentKey {

From c6ee862ab1d98872ad0f18ab39e74f159933abdb Mon Sep 17 00:00:00 2001
From: Brody Roberts <brodyroberts2002@gmail.com>
Date: Mon, 23 Jun 2025 17:00:20 -0700
Subject: [PATCH 5/7] removed print

---
 Sources/FlowStack/FlowLink.swift | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Sources/FlowStack/FlowLink.swift b/Sources/FlowStack/FlowLink.swift
index a5e9106..a371b5b 100644
--- a/Sources/FlowStack/FlowLink.swift
+++ b/Sources/FlowStack/FlowLink.swift
@@ -371,7 +371,6 @@ public struct FlowLink<Label>: View where Label: View {
                 }
                 Task {
                     if configuration.transitionFromSnapshot {
-                        print("🦦 current colorScheme: -> \(colorScheme)")
                         context?.snapshot = snapshots[colorScheme]
                     }
                     if let value = value {

From 8feff97efcbffeef962717bb43011a9b1d4cc652 Mon Sep 17 00:00:00 2001
From: Brody Roberts <brodyroberts2002@gmail.com>
Date: Mon, 30 Jun 2025 10:13:04 -0700
Subject: [PATCH 6/7] Fixed Snapshot Theme Bug

---
 Sources/FlowStack/FlowLink.swift | 22 +++++++++++++++-------
 Sources/FlowStack/FlowPath.swift |  7 +++----
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/Sources/FlowStack/FlowLink.swift b/Sources/FlowStack/FlowLink.swift
index a371b5b..8384090 100644
--- a/Sources/FlowStack/FlowLink.swift
+++ b/Sources/FlowStack/FlowLink.swift
@@ -303,7 +303,7 @@ public struct FlowLink<Label>: View where Label: View {
         return path?.wrappedValue.elements.map(\.context?.linkDepth).contains(flowDepth) ?? false
     }
 
-    private func updateSnapshot(colorScheme: ColorScheme) -> UIImage? {
+    private func createSnapshot(colorScheme: ColorScheme) -> UIImage? {
         guard let size = size else { return nil }
 
         let frame = CGRect(origin: .zero, size: size)
@@ -407,12 +407,7 @@ public struct FlowLink<Label>: View where Label: View {
             snapshots[newScheme]
             path?.wrappedValue.updateSnapshots(from: newScheme)
         }
-        .onAppear {
-            let lightImage = updateSnapshot(colorScheme: .light)
-            let darkImage = updateSnapshot(colorScheme: .dark)
-            snapshots[.light] = lightImage
-            snapshots[.dark] = darkImage
-        }
+        .onAppear { initSnapshots() }
         .background(
             GeometryReader { proxy in
                 Color.clear
@@ -446,6 +441,8 @@ public struct FlowLink<Label>: View where Label: View {
             )
         })
         .onPreferenceChange(PathContextKey.self) { value in
+//            print("🦦 value hash id? \(value?.hashValue)")
+//            print("🦦 \(value?.linkDepth ?? 0)")
             context = value
         }
         .onPreferenceChange(AnimationAnchorKey.self) { anchor in
@@ -464,6 +461,17 @@ public struct FlowLink<Label>: View where Label: View {
             }}
         }
     }
+
+    private func initSnapshots() {
+        Task {
+            // Prevent Snapshot from being taken too early
+            try? await Task.sleep(10000)
+                let lightImage = createSnapshot(colorScheme: .light)
+                let darkImage = createSnapshot(colorScheme: .dark)
+                snapshots[.light] = lightImage
+                snapshots[.dark] = darkImage
+        }
+    }
 }
 
 
diff --git a/Sources/FlowStack/FlowPath.swift b/Sources/FlowStack/FlowPath.swift
index 376e6d7..2cc400c 100644
--- a/Sources/FlowStack/FlowPath.swift
+++ b/Sources/FlowStack/FlowPath.swift
@@ -50,13 +50,11 @@ struct FlowElement: Equatable, Hashable {
     static func == (lhs: FlowElement, rhs: FlowElement) -> Bool {
         lhs.value.hashValue == rhs.value.hashValue &&
         _mangledTypeName(type(of: lhs.value)) == _mangledTypeName(type(of: rhs.value)) &&
-        lhs.context == rhs.context &&
         lhs.index == rhs.index
     }
 
     func hash(into hasher: inout Hasher) {
         hasher.combine(_mangledTypeName(type(of: value)))
-        hasher.combine(context)
         hasher.combine(index)
     }
 }
@@ -103,13 +101,14 @@ public struct FlowPath: Equatable, Hashable {
 
     /// Adds a method to tell flowPath to use the correct snapshot for the respective colorScheme
     public mutating func updateSnapshots(from colorScheme: ColorScheme) {
+        print("🦦 \(elements.count)")
         for i in elements.indices {
             guard var context = elements[i].context else { continue }
 
             if let newSnapshot = context.snapshotDict[colorScheme] {
-                print("🦦 Entered on colorScheme -> \(colorScheme)")
+
                 context.snapshot = newSnapshot
-                elements[i].context = context
+                elements[i].context?.snapshot = context.snapshot
             }
         }
     }

From 77e000035d2cd5f51f7e42e4bfc336d83e8d052e Mon Sep 17 00:00:00 2001
From: Brody Roberts <brodyroberts2002@gmail.com>
Date: Mon, 30 Jun 2025 10:30:15 -0700
Subject: [PATCH 7/7] Fixing Comment and extra spaces

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

diff --git a/Sources/FlowStack/FlowLink.swift b/Sources/FlowStack/FlowLink.swift
index 8384090..e2458d2 100644
--- a/Sources/FlowStack/FlowLink.swift
+++ b/Sources/FlowStack/FlowLink.swift
@@ -267,7 +267,6 @@ public struct FlowLink<Label>: View where Label: View {
     @State private var environment = EnvironmentValues()
     @State private var refreshButton = UUID()
 
-
     /// Creates a flow link that presents the view corresponding to a value.
     ///
     /// When someone activates the flow link that this initializer
@@ -441,8 +440,6 @@ public struct FlowLink<Label>: View where Label: View {
             )
         })
         .onPreferenceChange(PathContextKey.self) { value in
-//            print("🦦 value hash id? \(value?.hashValue)")
-//            print("🦦 \(value?.linkDepth ?? 0)")
             context = value
         }
         .onPreferenceChange(AnimationAnchorKey.self) { anchor in
@@ -464,7 +461,7 @@ public struct FlowLink<Label>: View where Label: View {
 
     private func initSnapshots() {
         Task {
-            // Prevent Snapshot from being taken too early
+            // Prevent Snapshot from being taken too early before Fetchable content loads
             try? await Task.sleep(10000)
                 let lightImage = createSnapshot(colorScheme: .light)
                 let darkImage = createSnapshot(colorScheme: .dark)
@@ -474,7 +471,6 @@ public struct FlowLink<Label>: View where Label: View {
     }
 }
 
-
 private struct IgnoreAnimationModifier: ViewModifier {
     @State var shouldDisplay = true
     let transition: AnyTransition
diff --git a/Sources/FlowStack/FlowPath.swift b/Sources/FlowStack/FlowPath.swift
index 2cc400c..06f8b8a 100644
--- a/Sources/FlowStack/FlowPath.swift
+++ b/Sources/FlowStack/FlowPath.swift
@@ -99,14 +99,13 @@ public struct FlowPath: Equatable, Hashable {
         self.append(newElement, context: nil)
     }
 
-    /// Adds a method to tell flowPath to use the correct snapshot for the respective colorScheme
+    /// Adds a method to tell flow path to use the correct snapshot for the currently set colorScheme
+    /// - Parameters:
+    ///    - colorScheme: The new color scheme to be used for snapshots
     public mutating func updateSnapshots(from colorScheme: ColorScheme) {
-        print("🦦 \(elements.count)")
         for i in elements.indices {
             guard var context = elements[i].context else { continue }
-
             if let newSnapshot = context.snapshotDict[colorScheme] {
-
                 context.snapshot = newSnapshot
                 elements[i].context?.snapshot = context.snapshot
             }