Use the only ZStack one state for indicator, instead of removing that indicator view from hierarchy

Author: dreampiggy

SDWebImageSwiftUI/Classes/ImageManager.swift

@@ -11,8 +11,8 @@ import SDWebImage
 
 class ImageManager : ObservableObject {
     @Published var image: PlatformImage? // loaded image, note when progressive loading, this will published multiple times with different partial image
-    @Published var isLoading: Bool = false // whether network is loading or cache is querying
-    @Published var progress: CGFloat = 0 // network progress
+    @Published var isLoading: Bool = false // whether network is loading or cache is querying, should only be used for indicator binding
+    @Published var progress: CGFloat = 0 // network progress, should only be used for indicator binding
 
     var manager = SDWebImageManager.shared
     weak var currentOperation: SDWebImageOperation? = nil

SDWebImageSwiftUI/Classes/Indicator/Indicator.swift

@@ -32,16 +32,12 @@ struct IndicatorViewModifier<T> : ViewModifier where T : View {
     var indicator: Indicator<T>
 
     func body(content: Content) -> some View {
-        Group {
-            if imageManager.isFinished {
-                // Disable Indiactor
-                content
+        ZStack {
+            content
+            if imageManager.isLoading {
+                indicator.content($imageManager.isLoading, $imageManager.progress)
             } else {
-                // Enable indicator
-                ZStack {
-                    content
-                    indicator.content($imageManager.isLoading, $imageManager.progress)
-                }
+                indicator.content($imageManager.isLoading, $imageManager.progress).hidden()
             }
         }
     }

SDWebImageSwiftUI/Classes/WebImage.swift

@@ -62,7 +62,7 @@ public struct WebImage : View {
                 .onDisappear {
                     guard self.cancelOnDisappear else { return }
                     // When using prorgessive loading, the previous partial image will cause onDisappear. Filter this case
-                    if self.imageManager.isLoading && !self.imageManager.isIncremental {
+                    if !self.imageManager.isFinished && !self.imageManager.isIncremental {
                         self.imageManager.cancel()
                     }
                 }