Remove the WebImage placeholder maxWidth/maxHeight modifier, this may…

… break some use case like `TabView`. If user want to use placeholder, limit themselves
SDWebImage · Mar 10, 2021 · 97d862c · 97d862c
1 parent e19c35a
commit 97d862c
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 41 deletions.
diff --git a/SDWebImageSwiftUI/Classes/ImagePlayer.swift b/SDWebImageSwiftUI/Classes/ImagePlayer.swift
@@ -37,6 +37,17 @@ public final class ImagePlayer : ObservableObject {
     /// Current playing frame image
     @Published public var currentFrame: PlatformImage?
 
+    /// Current playing frame index
+    @Published public var currentFrameIndex: UInt = 0
+
+    /// Current playing loop count
+    @Published public var currentLoopCount: UInt = 0
+
+    /// Current playing status
+    public var isPlaying: Bool {
+        player?.isPlaying ?? false
+    }
+
     /// Start the animation
     public func startPlaying() {
         player?.startPlaying()
@@ -52,38 +63,44 @@ public final class ImagePlayer : ObservableObject {
         player?.stopPlaying()
     }
 
+    /// Seek to frame and loop count
+    public func seekToFrame(at: UInt, loopCount: UInt) {
+        player?.seekToFrame(at: at, loopCount: loopCount)
+    }
+
     /// Clear the frame buffer
     public func clearFrameBuffer() {
         player?.clearFrameBuffer()
     }
 
-
     /// Setup the player using Animated Image
     /// - Parameter image: animated image
-    public func setupPlayer(image: PlatformImage?) {
+    public func setupPlayer(animatedImage: SDAnimatedImageProvider) {
         if player != nil {
             return
         }
-        if let animatedImage = image as? SDAnimatedImageProvider & PlatformImage {
-            if let imagePlayer = SDAnimatedImagePlayer(provider: animatedImage) {
-                imagePlayer.animationFrameHandler = { [weak self] (_, frame) in
-                    self?.currentFrame = frame
-                }
-                // Setup configuration
-                if let maxBufferSize = maxBufferSize {
-                    imagePlayer.maxBufferSize = maxBufferSize
-                }
-                if let customLoopCount = customLoopCount {
-                    imagePlayer.totalLoopCount = customLoopCount
-                }
-                imagePlayer.runLoopMode = runLoopMode
-                imagePlayer.playbackRate = playbackRate
-                imagePlayer.playbackMode = playbackMode
-
-                self.player = imagePlayer
-
-                imagePlayer.startPlaying()
+        if let imagePlayer = SDAnimatedImagePlayer(provider: animatedImage) {
+            imagePlayer.animationFrameHandler = { [weak self] (index, frame) in
+                self?.currentFrameIndex = index
+                self?.currentFrame = frame
+            }
+            imagePlayer.animationLoopHandler = { [weak self] (loopCount) in
+                self?.currentLoopCount = loopCount
+            }
+            // Setup configuration
+            if let maxBufferSize = maxBufferSize {
+                imagePlayer.maxBufferSize = maxBufferSize
+            }
+            if let customLoopCount = customLoopCount {
+                imagePlayer.totalLoopCount = customLoopCount
             }
+            imagePlayer.runLoopMode = runLoopMode
+            imagePlayer.playbackRate = playbackRate
+            imagePlayer.playbackMode = playbackMode
+
+            self.player = imagePlayer
+
+            imagePlayer.startPlaying()
         }
     }
 }
diff --git a/SDWebImageSwiftUI/Classes/WebImage.swift b/SDWebImageSwiftUI/Classes/WebImage.swift
@@ -63,26 +63,19 @@ public struct WebImage : View {
         return Group {
             if imageManager.image != nil {
                 if isAnimating && !imageManager.isIncremental {
-                    if imagePlayer.currentFrame != nil {
-                        configure(image: imagePlayer.currentFrame!)
-                        .onPlatformAppear(appear: {
-                            self.imagePlayer.startPlaying()
-                        }, disappear: {
-                            if self.pausable {
-                                self.imagePlayer.pausePlaying()
-                            } else {
-                                self.imagePlayer.stopPlaying()
-                            }
-                            if self.purgeable {
-                                self.imagePlayer.clearFrameBuffer()
-                            }
-                        })
-                    } else {
-                        configure(image: imageManager.image!)
-                        .onReceive(imageManager.$image) { image in
-                            self.imagePlayer.setupPlayer(image: image)
+                    setupPlayer()
+                    .onPlatformAppear(appear: {
+                        self.imagePlayer.startPlaying()
+                    }, disappear: {
+                        if self.pausable {
+                            self.imagePlayer.pausePlaying()
+                        } else {
+                            self.imagePlayer.stopPlaying()
                         }
-                    }
+                        if self.purgeable {
+                            self.imagePlayer.clearFrameBuffer()
+                        }
+                    })
                 } else {
                     if imagePlayer.currentFrame != nil {
                         configure(image: imagePlayer.currentFrame!)
@@ -92,7 +85,6 @@ public struct WebImage : View {
                 }
             } else {
                 setupPlaceholder()
-                .frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: .infinity)
                 .onPlatformAppear(appear: {
                     // Load remote image when first appear
                     if self.imageManager.isFirstLoad {
@@ -164,6 +156,18 @@ public struct WebImage : View {
         }
     }
 
+    /// Animated Image Support
+    func setupPlayer() -> some View {
+        if let currentFrame = imagePlayer.currentFrame {
+            return configure(image: currentFrame)
+        } else if let animatedImage = imageManager.image as? SDAnimatedImageProvider & PlatformImage {
+            self.imagePlayer.setupPlayer(animatedImage: animatedImage)
+            return configure(image: animatedImage)
+        } else {
+            return configure(image: imageManager.image!)
+        }
+    }
+
     /// Placeholder View Support
     func setupPlaceholder() -> some View {
         // Don't use `Group` because it will trigger `.onAppear` and `.onDisappear` when condition view removed, treat placeholder as an entire component