Fix issue where DotLottieImageProvider didn't handle base64 images (a…

…irbnb#2283)

Sources/Private/Model/Assets/ImageAsset.swift

@@ -5,8 +5,15 @@
 // Created by Brandon Withrow on 1/9/19.
 //
 
+import CoreGraphics
 import Foundation
 
+#if canImport(UIKit)
+import UIKit
+#elseif canImport(AppKit)
+import AppKit
+#endif
+
 // MARK: - ImageAsset
 
 public final class ImageAsset: Asset {
@@ -111,3 +118,16 @@ extension Data {
  }
 
 }
+
+extension ImageAsset {
+ /// A `CGImage` loaded from this asset if represented using a Base 64 encoding
+ var base64Image: CGImage? {
+ guard let data = Data(imageAsset: self) else { return nil }
+
+ #if canImport(UIKit)
+ return UIImage(data: data)?.cgImage
+ #elseif canImport(AppKit)
+ return NSImage(data: data)?.lottie_CGImage
+ #endif
+ }
+}

Sources/Private/Model/DotLottie/DotLottieImageProvider.swift

@@ -37,7 +37,11 @@ class DotLottieImageProvider: AnimationImageProvider {
  let filepath: URL
 
  func imageForAsset(asset: ImageAsset) -> CGImage? {
- images[asset.name]
+ if let base64Image = asset.base64Image {
+ return base64Image
+ }
+
+ return images[asset.name]
  }
 
  // MARK: Private

Sources/Public/Animation/LottieAnimationLayer.swift

@@ -1333,19 +1333,6 @@ public class LottieAnimationLayer: CALayer {
 
  self.animationContext = animationContext
 
- switch currentRenderingEngine {
- case .mainThread:
- // On the CALayer side, just play all animations immediately. The UIView side
- // will handle queueing animations.
- break
-
- case .coreAnimation, nil:
- // The Core Animation engine automatically batches animation setup to happen
- // in `CALayer.display()`, which won't be called until the layer is on-screen,
- // so we don't need to defer animation setup at this layer.
- break
- }
-
  animationID = animationID + 1
  _activeAnimationName = LottieAnimationLayer.animationName + String(animationID)
 

Sources/Public/iOS/BundleImageProvider.swift

@@ -32,11 +32,8 @@ public class BundleImageProvider: AnimationImageProvider {
  // MARK: Public
 
  public func imageForAsset(asset: ImageAsset) -> CGImage? {
- if
- let data = Data(imageAsset: asset),
- let image = UIImage(data: data)
- {
- return image.cgImage
+ if let base64Image = asset.base64Image {
+ return base64Image
  }
 
  let imagePath: String?

Sources/Public/macOS/BundleImageProvider.macOS.swift

@@ -31,11 +31,8 @@ public class BundleImageProvider: AnimationImageProvider {
  // MARK: Public
 
  public func imageForAsset(asset: ImageAsset) -> CGImage? {
- if
- let data = Data(imageAsset: asset),
- let image = NSImage(data: data)
- {
- return image.lottie_CGImage
+ if let base64Image = asset.base64Image {
+ return base64Image
  }
 
  let imagePath: String?

Tests/__Snapshots__/AutomaticEngineTests/testAutomaticEngineDetection.Issues-issue_2265.txt

@@ -0,0 +1 @@
+Supports Core Animation engine