Refactor

Author: anconaesselmann

Sources/LoadableView/Protocols/LoadableView/BaseLoadableView.swift

@@ -36,10 +36,49 @@ public protocol BaseLoadableView: View {
     // MARK: Optional
     func onAppear()
     func onDisappear()
+
+    // Note:
+    //    Has default implementation. Must call respective initialLoad method
+    //    on view model in custom implementation
+    func initialLoadAction() async
 }
 
 public extension BaseLoadableView {
     func onAppear() { }
 
     func onDisappear() { }
 }
+
+internal extension BaseLoadableView {
+    @ViewBuilder
+    func _buildBody() -> some View {
+        ZStack {
+            switch vm.viewState {
+            case .notLoaded:
+                notLoaded()
+            case .loaded(let element):
+                loaded(element)
+            }
+            InternalLoadingView(vm.overlayState) {
+                loading()
+            }
+            InternalErrorView(vm.overlayState) {
+                errorView($0)
+            }
+        }.task {
+            await initialLoadAction()
+        }
+        .onAppear {
+            vm.onAppear()
+            onAppear()
+        }
+        .onDisappear {
+            vm.onDisappear()
+            onDisappear()
+
+        }
+        .refreshable {
+            vm.refresh()
+        }
+    }
+}

Sources/LoadableView/Protocols/LoadableView/BaseLoadableViewModel.swift

@@ -34,7 +34,6 @@ public protocol BaseLoadableViewModel: ObservableObject, AnyObject {
 }
 
 public extension BaseLoadableViewModel {
-
     func onAppear() {
         if let foregroundEnteringAware = self as? (any ForegroundEnteringAware) {
             ForegroundingDetector.shared.observe(foregroundEnteringAware)

Sources/LoadableView/Protocols/LoadableView/IDedLoadableView.swift

@@ -20,43 +20,21 @@ public protocol IDedLoadableView: BaseLoadableView
 }
 
 public extension IDedLoadableView {
+    func initialLoadAction() async {
+        do {
+            try await vm.initialLoad(id: id)
+        } catch {
+            assertionFailure("\(error)")
+        }
+    }
+}
 
+public extension IDedLoadableView {
     @ViewBuilder
     var body: some View {
-        ZStack {
-            switch vm.viewState {
-            case .notLoaded:
-                notLoaded()
-            case .loaded(let element):
-                loaded(element)
-            }
-            InternalLoadingView(vm.overlayState) {
-                loading()
-            }
-            InternalErrorView(vm.overlayState) {
-                errorView($0)
-            }
-        }.task {
-            do {
-                try await vm.initialLoad(id: id)
-            } catch {
-                assertionFailure("\(error)")
+        _buildBody()
+            .onChange(of: id) { oldValue, newValue in
+                vm.idHasChanged(newValue, showLoading: true)
             }
-        }
-        .onAppear {
-            vm.onAppear()
-            onAppear()
-        }
-        .onDisappear {
-            vm.onDisappear()
-            onDisappear()
-
-        }
-        .refreshable {
-            vm.refresh()
-        }
-        .onChange(of: id) { oldValue, newValue in
-            vm.idHasChanged(newValue, showLoading: true)
-        }
     }
 }

Sources/LoadableView/Protocols/LoadableView/LoadableView.swift

@@ -12,39 +12,19 @@ public protocol LoadableView: BaseLoadableView
 }
 
 public extension LoadableView {
+    func initialLoadAction() async {
+        await vm.initialLoad()
+    }
+}
+
+public extension LoadableView {
+
     func cancel() async {
         // Implement to cancel loading
     }
-    
+
     @ViewBuilder
     var body: some View {
-        ZStack {
-            switch vm.viewState {
-            case .notLoaded:
-                notLoaded()
-            case .loaded(let element):
-                loaded(element)
-            }
-            InternalLoadingView(vm.overlayState) {
-                loading()
-            }
-            InternalErrorView(vm.overlayState) {
-                errorView($0)
-            }
-        }.task {
-            await vm.initialLoad()
-        }
-        .onAppear {
-            vm.onAppear()
-            onAppear()
-        }
-        .onDisappear {
-            vm.onDisappear()
-            onDisappear()
-
-        }
-        .refreshable {
-            vm.refresh()
-        }
+        _buildBody()
     }
 }