Merge pull request onevcat#1829 from onevcat/fix/onFailureImage-swiftui

Move and apply onFailureImage to common scope
sjedruszkiewicz · Oct 3, 2021 · 01a8752 · 01a8752
2 parents eab0df6 + 1438c76
commit 01a8752
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/Sources/General/KF.swift b/Sources/General/KF.swift
@@ -390,19 +390,6 @@ extension KF.Builder {
         return self
     }
 
-    /// Sets the image that will be used if an image retrieving task fails.
-    /// - Parameter image: The image that will be used when something goes wrong.
-    /// - Returns: A `KF.Builder` with changes applied.
-    ///
-    /// If set and an image retrieving error occurred Kingfisher will set provided image (or empty)
-    /// in place of requested one. It's useful when you don't want to show placeholder
-    /// during loading time but wants to use some default image when requests will be failed.
-    ///
-    public func onFailureImage(_ image: KFCrossPlatformImage?) -> Self {
-        options.onFailureImage = .some(image)
-        return self
-    }
-
     /// Enables progressive image loading with a specified `ImageProgressive` setting to process the
     /// progressive JPEG data and display it in a progressive way.
     /// - Parameter progressive: The progressive settings which is used while loading.

diff --git a/Sources/General/KFOptionsSetter.swift b/Sources/General/KFOptionsSetter.swift
@@ -326,12 +326,24 @@ extension KFOptionSetter {
 
     /// Sets whether the image setting for an image view should happen with transition even when retrieved from cache.
     /// - Parameter enabled: Enable the force transition or not.
-    /// - Returns: A `KF.Builder` with changes applied.
+    /// - Returns: A `Self` with changes applied.
     public func forceTransition(_ enabled: Bool = true) -> Self {
         options.forceTransition = enabled
         return self
     }
 
+    /// Sets the image that will be used if an image retrieving task fails.
+    /// - Parameter image: The image that will be used when something goes wrong.
+    /// - Returns: A `Self` with changes applied.
+    ///
+    /// If set and an image retrieving error occurred Kingfisher will set provided image (or empty)
+    /// in place of requested one. It's useful when you don't want to show placeholder
+    /// during loading time but wants to use some default image when requests will be failed.
+    ///
+    public func onFailureImage(_ image: KFCrossPlatformImage?) -> Self {
+        options.onFailureImage = .some(image)
+        return self
+    }
 }
 
 // MARK: - Request Modifier

diff --git a/Sources/SwiftUI/ImageBinder.swift b/Sources/SwiftUI/ImageBinder.swift
@@ -86,6 +86,13 @@ extension KFImage {
                                 context.onSuccessDelegate.call(value)
                             }
                         case .failure(let error):
+                            CallbackQueue.mainCurrentOrAsync.execute {
+                                if let image = context.options.onFailureImage {
+                                    self.loadedImage = image
+                                }
+                                self.loaded = true
+                            }
+
                             CallbackQueue.mainAsync.execute {
                                 context.onFailureDelegate.call(error)
                             }