Cacheing bugfix

Author: anconaesselmann

Sources/LoadableView/Protocols/LoadableView/BaseLoadableView.swift

@@ -51,13 +51,17 @@ public extension BaseLoadableView {
 
 internal extension BaseLoadableView {
     @ViewBuilder
-    func _buildBody() -> some View {
+    func _buildBody(_ id: Any? = nil) -> some View {
         ZStack {
-            switch vm.viewState {
-            case .notLoaded:
-                notLoaded()
-            case .loaded(let element):
-                loaded(element)
+            if !vm.viewState.hasLoaded, let cached = vm._cached(id) {
+                loaded(cached)
+            } else {
+                switch vm.viewState {
+                case .notLoaded:
+                    notLoaded()
+                case .loaded(let element):
+                    loaded(element)
+                }
             }
             InternalLoadingView(vm.overlayState) {
                 loading()

Sources/LoadableView/Protocols/LoadableView/BaseLoadableViewModel.swift

@@ -33,6 +33,8 @@ public protocol BaseLoadableViewModel: ObservableObject, AnyObject {
 
     // Note: - Used internally for observing LoadableViewObservables
     func _refresh(ifID id: UUID, showLoading: Bool)
+
+    func _cached(_ id: Any?) -> Element?
 }
 
 public extension BaseLoadableViewModel {

Sources/LoadableView/Protocols/LoadableView/IDedLoadableView.swift

@@ -32,7 +32,7 @@ public extension IDedLoadableView {
 public extension IDedLoadableView {
     @ViewBuilder
     var body: some View {
-        _buildBody()
+        _buildBody(id)
             .onChange(of: id) { oldValue, newValue in
                 vm.idHasChanged(newValue, showLoading: true)
             }

Sources/LoadableView/Protocols/LoadableView/IDedLoadableViewModel.swift

@@ -61,6 +61,17 @@ public extension IDedLoadableViewModel {
         refresh(showLoading: showLoading)
     }
 
+    func _cached(_ id: Any?) -> Element? {
+        guard let id = self.id ?? id as? ID else {
+            return nil
+        }
+        if let cache, let cached = cache.value(forKey: id) {
+            return cached
+        } else {
+            return nil
+        }
+    }
+
     func initialLoad(id: ID) async throws {
         do {
             guard case .notLoaded = viewState else {
@@ -95,6 +106,7 @@ public extension IDedLoadableViewModel {
                 throw LoadableViewError.noId
             }
             let item = try await load(id: id)
+            cache?.insert(item, forKey: id)
             guard await shouldRefresh(viewState.loaded, newItem: item) else {
                 return
             }

Sources/LoadableView/Protocols/LoadableView/LoadableViewModel.swift

@@ -13,7 +13,11 @@ public extension LoadableViewModel {
     func cancel() async {
         // Implement to cancel loading
     }
-    
+
+    func _cached(_ id: Any?) -> Element? {
+        return nil
+    }
+
     func initialLoad() async {
         do {
             guard case .notLoaded = viewState else {