lottie-ios 4.2.0 → 4.3.0

package/README.md

@@ -3,7 +3,7 @@
 
 **View documentation, FAQ, help, examples, and more at [airbnb.io/lottie](https://airbnb.io/lottie/)**
 
-Lottie is a cross-platform library for iOS, macOS, tvOS, [Android](https://github.com/airbnb/lottie-android), and [Web](https://github.com/airbnb/lottie-web) that natively renders vector-based animations and art in realtime with minimal code.
+Lottie is a cross-platform library for iOS, macOS, tvOS, visionOS, [Android](https://github.com/airbnb/lottie-android), and [Web](https://github.com/airbnb/lottie-web) that natively renders vector-based animations and art in realtime with minimal code.
 
 Lottie loads and renders animations and vectors exported in the bodymovin JSON format. Bodymovin JSON can be created and exported from After Effects with [bodymovin](https://github.com/bodymovin/bodymovin), Sketch with [Lottie Sketch Export](https://github.com/buba447/Lottie-Sketch-Export), and from [Haiku](https://www.haiku.ai).
 
@@ -41,7 +41,7 @@ To install Lottie using [Swift Package Manager](https://github.com/apple/swift-p
 or you can add the following dependency to your `Package.swift`:
 
 ```swift
-.package(url: "https://github.com/airbnb/lottie-spm.git", from: "4.2.0")
+.package(url: "https://github.com/airbnb/lottie-spm.git", from: "4.3.0")
 ```
 
 When using Swift Package Manager we recommend using the [lottie-spm](https://github.com/airbnb/lottie-spm) repo instead of the main lottie-ios repo.  The main git repository for [lottie-ios](https://github.com/airbnb/lottie-ios) is somewhat large (300+ MB), and Swift Package Manager always downloads the full repository with all git history. The [lottie-spm](https://github.com/airbnb/lottie-spm) repo is much smaller (less than 500kb), so can be downloaded much more quickly. 

package/Rakefile

@@ -1,3 +1,6 @@
+require 'json'
+require 'git'
+
 namespace :build do
   desc 'Builds all packages and executables'
   task all: ['package:all', 'example:all', 'xcframework']
@@ -5,7 +8,7 @@ namespace :build do
   desc 'Builds the Lottie package for supported platforms'
   namespace :package do
     desc 'Builds the Lottie package for all supported platforms'
-    task all: ['iOS', 'macOS', 'tvOS']
+    task all: ['iOS', 'macOS', 'tvOS', 'visionOS']
 
     desc 'Builds the Lottie package for iOS'
     task :iOS do
@@ -21,56 +24,90 @@ namespace :build do
     task :tvOS do
       xcodebuild('build -scheme "Lottie (tvOS)" -destination generic/platform=tvOS -workspace Lottie.xcworkspace')
     end
+
+    desc 'Builds the Lottie package for visionOS'
+    task :visionOS do
+      ifVisionOSEnabled {
+        xcodebuild('build -scheme "Lottie (visionOS)" -destination generic/platform=visionOS -workspace Lottie.xcworkspace')
+      }
+    end
   end
 
   desc 'Builds the Lottie example app for supported platforms'
   namespace :example do
     desc 'Builds the Lottie example apps for all supported platforms'
-    task all: ['iOS', 'macOS', 'tvOS']
+    task all: ['iOS', 'macOS', 'tvOS', 'visionOS']
 
     desc 'Builds the iOS Lottie Example app'
     task :iOS do
-      xcodebuild('build -scheme "Example (iOS)" -destination "platform=iOS Simulator,name=iPhone SE (3rd generation)" -workspace Lottie.xcworkspace')
+      xcodebuild('build -scheme "Example (Multiplatform)" -destination "platform=iOS Simulator,name=iPhone SE (3rd generation)" -workspace Lottie.xcworkspace')
     end
 
     desc 'Builds the macOS Lottie Example app'
     task :macOS do
-      xcodebuild('build -scheme "Example (macOS)" -workspace Lottie.xcworkspace')
+      xcodebuild('build -scheme "Example (Multiplatform)" -workspace Lottie.xcworkspace')
     end
 
     desc 'Builds the tvOS Lottie Example app'
     task :tvOS do
-      xcodebuild('build -scheme "Example (tvOS)" -destination "platform=tvOS Simulator,name=Apple TV" -workspace Lottie.xcworkspace')
+      xcodebuild('build -scheme "Example (Multiplatform)" -destination "platform=tvOS Simulator,name=Apple TV" -workspace Lottie.xcworkspace')
+    end
+
+    desc 'Builds the visionOS Lottie Example app'
+    task :visionOS do
+      ifVisionOSEnabled {
+        xcodebuild('build -scheme "Example (Multiplatform)" -destination "platform=visionOS Simulator,name=Apple Vision Pro" -workspace Lottie.xcworkspace')
+      }
     end
   end
 
   desc 'Builds an xcframework for all supported platforms'
-  task :xcframework do
+  task :xcframework, [:zip_archive_name] do |_t, args|
+    args.with_defaults(:zip_archive_name => 'Lottie')
+
     sh 'rm -rf .build/archives'
-    xcodebuild('archive -workspace Lottie.xcworkspace -scheme "Lottie (iOS)" -destination generic/platform=iOS -archivePath ".build/archives/Lottie_iOS" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES')
-    xcodebuild('archive -workspace Lottie.xcworkspace -scheme "Lottie (iOS)" -destination "generic/platform=iOS Simulator" -archivePath ".build/archives/Lottie_iOS_Simulator" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES')
-    xcodebuild('archive -workspace Lottie.xcworkspace -scheme "Lottie (iOS)" -destination "generic/platform=macOS,variant=Mac Catalyst" -archivePath ".build/archives/Lottie_Mac_Catalyst" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES')
-    xcodebuild('archive -workspace Lottie.xcworkspace -scheme "Lottie (macOS)" -destination generic/platform=macOS -archivePath ".build/archives/Lottie_macOS" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES')
-    xcodebuild('archive -workspace Lottie.xcworkspace -scheme "Lottie (tvOS)" -destination generic/platform=tvOS -archivePath ".build/archives/Lottie_tvOS" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES')
-    xcodebuild('archive -workspace Lottie.xcworkspace -scheme "Lottie (tvOS)" -destination "generic/platform=tvOS Simulator" -archivePath ".build/archives/Lottie_tvOS_Simulator" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES')
-    xcodebuild(
-      [
-        '-create-xcframework',
-        '-framework .build/archives/Lottie_iOS.xcarchive/Products/Library/Frameworks/Lottie.framework',
-        '-framework .build/archives/Lottie_iOS_Simulator.xcarchive/Products/Library/Frameworks/Lottie.framework',
-        '-framework .build/archives/Lottie_Mac_Catalyst.xcarchive/Products/Library/Frameworks/Lottie.framework',
-        '-framework .build/archives/Lottie_macOS.xcarchive/Products/Library/Frameworks/Lottie.framework',
-        '-framework .build/archives/Lottie_tvOS.xcarchive/Products/Library/Frameworks/Lottie.framework',
-        '-framework .build/archives/Lottie_tvOS_Simulator.xcarchive/Products/Library/Frameworks/Lottie.framework',
-        '-output .build/archives/Lottie.xcframework'
-      ].join(" "))
+
+    # Build the framework for each supported platform, including simulators
+    xcodebuild('archive -workspace Lottie.xcworkspace -scheme "Lottie (iOS)" -destination generic/platform=iOS -archivePath ".build/archives/Lottie_iOS" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ENABLE_BITCODE=NO')
+    xcodebuild('archive -workspace Lottie.xcworkspace -scheme "Lottie (iOS)" -destination "generic/platform=iOS Simulator" -archivePath ".build/archives/Lottie_iOS_Simulator" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ENABLE_BITCODE=NO')
+    xcodebuild('archive -workspace Lottie.xcworkspace -scheme "Lottie (iOS)" -destination "generic/platform=macOS,variant=Mac Catalyst" -archivePath ".build/archives/Lottie_Mac_Catalyst" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ENABLE_BITCODE=NO')
+    xcodebuild('archive -workspace Lottie.xcworkspace -scheme "Lottie (macOS)" -destination generic/platform=macOS -archivePath ".build/archives/Lottie_macOS" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ENABLE_BITCODE=NO')
+    xcodebuild('archive -workspace Lottie.xcworkspace -scheme "Lottie (tvOS)" -destination generic/platform=tvOS -archivePath ".build/archives/Lottie_tvOS" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ENABLE_BITCODE=NO')
+    xcodebuild('archive -workspace Lottie.xcworkspace -scheme "Lottie (tvOS)" -destination "generic/platform=tvOS Simulator" -archivePath ".build/archives/Lottie_tvOS_Simulator" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ENABLE_BITCODE=NO')
+
+    ifVisionOSEnabled {
+      xcodebuild('archive -workspace Lottie.xcworkspace -scheme "Lottie (visionOS)" -destination generic/platform=visionOS -archivePath ".build/archives/Lottie_visionOS" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ENABLE_BITCODE=NO')
+      xcodebuild('archive -workspace Lottie.xcworkspace -scheme "Lottie (visionOS)" -destination "generic/platform=visionOS Simulator" -archivePath ".build/archives/Lottie_visionOS_Simulator" SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES ENABLE_BITCODE=NO')
+    }
+
+    # Combine all of the platforms into a single XCFramework
+    xcframeworkInvocation = [
+      '-create-xcframework',
+      '-framework .build/archives/Lottie_iOS.xcarchive/Products/Library/Frameworks/Lottie.framework',
+      '-framework .build/archives/Lottie_iOS_Simulator.xcarchive/Products/Library/Frameworks/Lottie.framework',
+      '-framework .build/archives/Lottie_Mac_Catalyst.xcarchive/Products/Library/Frameworks/Lottie.framework',
+      '-framework .build/archives/Lottie_tvOS.xcarchive/Products/Library/Frameworks/Lottie.framework',
+      '-framework .build/archives/Lottie_tvOS_Simulator.xcarchive/Products/Library/Frameworks/Lottie.framework',
+      '-framework .build/archives/Lottie_macOS.xcarchive/Products/Library/Frameworks/Lottie.framework',
+    ]
+
+    ifVisionOSEnabled {
+      xcframeworkInvocation.push('-framework .build/archives/Lottie_visionOS.xcarchive/Products/Library/Frameworks/Lottie.framework')
+      xcframeworkInvocation.push('-framework .build/archives/Lottie_visionOS_Simulator.xcarchive/Products/Library/Frameworks/Lottie.framework')
+    }
+
+    xcframeworkInvocation.push('-output .build/archives/Lottie.xcframework')
+
+    xcodebuild(xcframeworkInvocation.join(" "))
+
+    # Archive the XCFramework into a zip file
     Dir.chdir('.build/archives') do
       # Use --symlinks to avoid "Multiple binaries share the same codesign path. This can happen if your build process copies frameworks by following symlinks." 
       # error when validating macOS apps (#1948)
-      sh 'zip -r --symlinks Lottie.xcframework.zip Lottie.xcframework'
+      sh "zip -r --symlinks #{args[:zip_archive_name]}.xcframework.zip Lottie.xcframework"
       sh 'rm -rf Lottie.xcframework'
     end
-    sh 'swift package compute-checksum .build/archives/Lottie.xcframework.zip'
+    sh "swift package compute-checksum .build/archives/#{args[:zip_archive_name]}.xcframework.zip"
   end
 end
 
@@ -115,6 +152,10 @@ namespace :test do
       xcodebuild('build -scheme "Lottie" -destination generic/platform=iOS')
       xcodebuild('build -scheme "Lottie" -destination generic/platform=macOS')
       xcodebuild('build -scheme "Lottie" -destination generic/platform=tvOS')
+
+      ifVisionOSEnabled {
+        xcodebuild('build -scheme "Lottie" -destination generic/platform=visionOS')
+      }
     end
   end
 end
@@ -129,6 +170,12 @@ namespace :lint do
   task :podspec do
     sh 'pod lib lint lottie-ios.podspec'
   end
+
+  desc 'Lints the EmbeddedLibraries directory'
+  task :EmbeddedLibraries do
+    sh 'echo "Linting /Sources/Private/EmbeddedLibraries (should not contain any public symbols)"'
+    sh '! grep -r "public" Sources/Private/EmbeddedLibraries --include \*.swift'
+  end
 end
 
 namespace :format do
@@ -138,6 +185,41 @@ namespace :format do
   end
 end
 
+namespace :emerge do
+  desc 'Uploads to emerge'
+  task :upload do
+    xcodebuild('build -scheme "SizeTest" -destination generic/platform=iOS -project script/SizeTest/SizeTest.xcodeproj -archivePath test.xcarchive archive CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO')
+    sh "zip -r -qq test.zip test.xcarchive"
+
+    g = Git.open('.')
+
+    upload_data = {
+      repoName: 'airbnb/lottie-ios',
+      filename: 'test.zip'
+    }
+    if ENV["PR_NUMBER"] != "" && ENV["PR_NUMBER"] != "false"
+      upload_data[:sha] = g.log[0].parents[1].sha
+      upload_data[:baseSha] = g.log[0].parent.sha
+      upload_data[:prNumber] = ENV["PR_NUMBER"]
+      upload_data[:buildType] = 'pull_request'
+    else
+      upload_data[:sha] = g.log[0].sha
+      upload_data[:buildType] = 'master'
+    end
+    api_token = ENV['EMERGE_API_TOKEN']
+    if api_token.nil? || api_token.empty?
+      puts "Skipping Emerge upload because API token was not provided."
+      next
+    end
+    api_token_header = "X-API-Token: #{api_token}"
+    url = "https://api.emergetools.com/upload"
+    cmd = "curl --fail -s --request POST --url #{url} --header 'Accept: application/json' --header 'Content-Type: application/json' --header '#{api_token_header}' --data '#{upload_data.to_json}'"
+    upload_json = %x(#{cmd})
+    upload_url = JSON.parse(upload_json)['uploadURL']
+    %x(curl --fail -s -H 'Content-Type: application/zip' -T test.zip '#{upload_url}')
+  end
+end
+
 def xcodebuild(command)
   # Check if the mint tool is installed -- if so, pipe the xcodebuild output through xcbeautify
   `which mint`
@@ -148,3 +230,18 @@ def xcodebuild(command)
     sh "xcodebuild #{command}"
   end
 end
+
+# Runs the given code block, unless `SKIP_VISION_OS=true`.
+# This can be removed once CI only uses Xcode 15+.
+def ifVisionOSEnabled
+  if ENV["SKIP_VISION_OS"] == "true"
+    puts "Skipping visionOS build"
+  else
+    # As of 9/5/23 the GitHub Actions runner doesn't include the visionOS SDK by default,
+    # so we have to download it manually. Following the suggested workaround from
+    # https://github.com/actions/runner-images/issues/8144#issuecomment-1702786388
+    `brew install xcodesorg/made/xcodes`
+    `xcodes runtimes install 'visionOS 1.0-beta3'`
+    yield
+  end
+end

package/Sources/Private/CoreAnimation/Animations/DropShadowAnimation.swift

@@ -0,0 +1,160 @@
+// Created by Cal Stephens on 8/15/23.
+// Copyright © 2023 Airbnb Inc. All rights reserved.
+
+import QuartzCore
+
+// MARK: - DropShadowModel
+
+protocol DropShadowModel {
+  /// The opacity of the drop shadow, from 0 to 100.
+  var _opacity: KeyframeGroup<LottieVector1D>? { get }
+
+  /// The shadow radius of the blur
+  var _radius: KeyframeGroup<LottieVector1D>? { get }
+
+  /// The color of the drop shadow
+  var _color: KeyframeGroup<LottieColor>? { get }
+
+  /// The angle of the drop shadow, in degrees,
+  /// with "90" resulting in a shadow directly beneath the layer.
+  /// Combines with the `distance` to form the `shadowOffset`.
+  var _angle: KeyframeGroup<LottieVector1D>? { get }
+
+  /// The distance of the drop shadow offset.
+  /// Combines with the `angle` to form the `shadowOffset`.
+  var _distance: KeyframeGroup<LottieVector1D>? { get }
+}
+
+// MARK: - DropShadowStyle + DropShadowModel
+
+extension DropShadowStyle: DropShadowModel {
+  var _opacity: KeyframeGroup<LottieVector1D>? { opacity }
+  var _color: KeyframeGroup<LottieColor>? { color }
+  var _angle: KeyframeGroup<LottieVector1D>? { angle }
+  var _distance: KeyframeGroup<LottieVector1D>? { distance }
+
+  var _radius: KeyframeGroup<LottieVector1D>? {
+    size.map { sizeValue in
+      // After Effects shadow softness uses a different range of values than CALayer.shadowRadius,
+      // so shadows render too softly if we directly use the value from After Effects. We find that
+      // dividing this value from After Effects by 2 produces results that are visually similar.
+      LottieVector1D(sizeValue.cgFloatValue / 2)
+    }
+  }
+}
+
+// MARK: - DropShadowEffect + DropShadowModel
+
+extension DropShadowEffect: DropShadowModel {
+  var _color: KeyframeGroup<LottieColor>? { color?.value }
+  var _distance: KeyframeGroup<LottieVector1D>? { distance?.value }
+
+  var _radius: KeyframeGroup<LottieVector1D>? {
+    softness?.value?.map { softnessValue in
+      // After Effects shadow softness uses a different range of values than CALayer.shadowRadius,
+      // so shadows render too softly if we directly use the value from After Effects. We find that
+      // dividing this value from After Effects by 5 produces results that are visually similar.
+      LottieVector1D(softnessValue.cgFloatValue / 5)
+    }
+  }
+
+  var _opacity: KeyframeGroup<LottieVector1D>? {
+    opacity?.value?.map { originalOpacityValue in
+      // `DropShadowEffect.opacity` is a value between 0 and 255,
+      // but `DropShadowModel._opacity` expects a value between 0 and 100.
+      LottieVector1D((originalOpacityValue.value / 255.0) * 100)
+    }
+  }
+
+  var _angle: KeyframeGroup<LottieVector1D>? {
+    direction?.value?.map { originalAngleValue in
+      // `DropShadowEffect.distance` is rotated 90º from the
+      // angle value representation expected by `DropShadowModel._angle`
+      LottieVector1D(originalAngleValue.value - 90)
+    }
+  }
+}
+
+// MARK: - CALayer + DropShadowModel
+
+extension CALayer {
+
+  // MARK: Internal
+
+  /// Adds drop shadow animations from the given `DropShadowModel` to this layer
+  @nonobjc
+  func addDropShadowAnimations(
+    for dropShadowModel: DropShadowModel,
+    context: LayerAnimationContext)
+    throws
+  {
+    try addShadowOpacityAnimation(from: dropShadowModel, context: context)
+    try addShadowColorAnimation(from: dropShadowModel, context: context)
+    try addShadowRadiusAnimation(from: dropShadowModel, context: context)
+    try addShadowOffsetAnimation(from: dropShadowModel, context: context)
+  }
+
+  // MARK: Private
+
+  private func addShadowOpacityAnimation(from model: DropShadowModel, context: LayerAnimationContext) throws {
+    guard let opacityKeyframes = model._opacity else { return }
+
+    try addAnimation(
+      for: .shadowOpacity,
+      keyframes: opacityKeyframes,
+      value: {
+        // Lottie animation files express opacity as a numerical percentage value
+        // (e.g. 0%, 50%, 100%) so we divide by 100 to get the decimal values
+        // expected by Core Animation (e.g. 0.0, 0.5, 1.0).
+        $0.cgFloatValue / 100
+      },
+      context: context)
+  }
+
+  private func addShadowColorAnimation(from model: DropShadowModel, context: LayerAnimationContext) throws {
+    guard let shadowColorKeyframes = model._color else { return }
+
+    try addAnimation(
+      for: .shadowColor,
+      keyframes: shadowColorKeyframes,
+      value: \.cgColorValue,
+      context: context)
+  }
+
+  private func addShadowRadiusAnimation(from model: DropShadowModel, context: LayerAnimationContext) throws {
+    guard let shadowSizeKeyframes = model._radius else { return }
+
+    try addAnimation(
+      for: .shadowRadius,
+      keyframes: shadowSizeKeyframes,
+      value: \.cgFloatValue,
+      context: context)
+  }
+
+  private func addShadowOffsetAnimation(from model: DropShadowModel, context: LayerAnimationContext) throws {
+    guard
+      let angleKeyframes = model._angle,
+      let distanceKeyframes = model._distance
+    else { return }
+
+    let offsetKeyframes = Keyframes.combined(angleKeyframes, distanceKeyframes) { angleDegrees, distance -> CGSize in
+      // Lottie animation files express rotation in degrees
+      // (e.g. 90º, 180º, 360º) so we convert to radians to get the
+      // values expected by Core Animation (e.g. π/2, π, 2π)
+      let angleRadians = (angleDegrees.cgFloatValue * .pi) / 180
+
+      // Lottie animation files express the `shadowOffset` as (angle, distance) pair,
+      // which we convert to the expected x / y offset values:
+      let offsetX = distance.cgFloatValue * cos(angleRadians)
+      let offsetY = distance.cgFloatValue * sin(angleRadians)
+      return CGSize(width: offsetX, height: offsetY)
+    }
+
+    try addAnimation(
+      for: .shadowOffset,
+      keyframes: offsetKeyframes,
+      value: { $0 },
+      context: context)
+  }
+
+}

package/Sources/Private/CoreAnimation/Animations/LayerProperty.swift

@@ -26,6 +26,16 @@ struct LayerProperty<ValueRepresentation> {
 }
 
 extension LayerProperty where ValueRepresentation: Equatable {
+  /// Initializes a `LayerProperty` that corresponds to a property on `CALayer`
+  /// or some other `CALayer` subclass like `CAShapeLayer`.
+  /// - Parameters:
+  ///   - caLayerKeypath: The Objective-C `#keyPath` to the `CALayer` property,
+  ///     e.g. `#keyPath(CALayer.opacity)` or `#keyPath(CAShapeLayer.path)`.
+  ///   - defaultValue: The default value of the property (e.g. the value of the
+  ///     property immediately after calling `CALayer.init()`). Knowing this value
+  ///     lets us perform some optimizations in `CALayer+addAnimation`.
+  ///   - customizableProperty: A description of how this property can be customized
+  ///     dynamically at runtime using `AnimationView.setValueProvider(_:keypath:)`.
   init(
     caLayerKeypath: String,
     defaultValue: ValueRepresentation?,
@@ -52,7 +62,10 @@ struct CustomizableProperty<ValueRepresentation> {
 
   /// A closure that coverts the type-erased value of an `AnyValueProvider`
   /// to the strongly-typed representation used by this property, if possible.
-  let conversion: (Any) -> ValueRepresentation?
+  ///  - `value` is the value for the current frame that should be converted,
+  ///    as returned by `AnyValueProvider.typeErasedStorage`.
+  ///  - `valueProvider` is the `AnyValueProvider` that returned the type-erased value.
+  let conversion: (_ value: Any, _ valueProvider: AnyValueProvider) -> ValueRepresentation?
 }
 
 // MARK: - PropertyName
@@ -66,6 +79,8 @@ enum PropertyName: String, CaseIterable {
   case scale = "Scale"
   case position = "Position"
   case rotation = "Rotation"
+  case strokeWidth = "Stroke Width"
+  case gradientColors = "Colors"
 }
 
 // MARK: CALayer properties
@@ -159,6 +174,34 @@ extension LayerProperty {
       },
       customizableProperty: nil /* currently unsupported */ )
   }
+
+  static var shadowOpacity: LayerProperty<CGFloat> {
+    .init(
+      caLayerKeypath: #keyPath(CALayer.shadowOpacity),
+      defaultValue: 0,
+      customizableProperty: nil /* currently unsupported */ )
+  }
+
+  static var shadowColor: LayerProperty<CGColor> {
+    .init(
+      caLayerKeypath: #keyPath(CALayer.shadowColor),
+      defaultValue: .rgb(0, 0, 0),
+      customizableProperty: nil /* currently unsupported */ )
+  }
+
+  static var shadowRadius: LayerProperty<CGFloat> {
+    .init(
+      caLayerKeypath: #keyPath(CALayer.shadowRadius),
+      defaultValue: 3.0,
+      customizableProperty: nil /* currently unsupported */ )
+  }
+
+  static var shadowOffset: LayerProperty<CGSize> {
+    .init(
+      caLayerKeypath: #keyPath(CALayer.shadowOffset),
+      defaultValue: CGSize(width: 0, height: -3.0),
+      customizableProperty: nil /* currently unsupported */ )
+  }
 }
 
 // MARK: CAShapeLayer properties
@@ -182,7 +225,7 @@ extension LayerProperty {
     .init(
       caLayerKeypath: #keyPath(CAShapeLayer.lineWidth),
       defaultValue: 1,
-      customizableProperty: nil /* currently unsupported */ )
+      customizableProperty: .floatValue(.strokeWidth))
   }
 
   static var lineDashPhase: LayerProperty<CGFloat> {
@@ -221,14 +264,14 @@ extension LayerProperty {
     .init(
       caLayerKeypath: #keyPath(CAGradientLayer.colors),
       defaultValue: nil,
-      customizableProperty: nil /* currently unsupported */ )
+      customizableProperty: .gradientColors)
   }
 
   static var locations: LayerProperty<[CGFloat]> {
     .init(
       caLayerKeypath: #keyPath(CAGradientLayer.locations),
       defaultValue: nil,
-      customizableProperty: nil /* currently unsupported */ )
+      customizableProperty: .gradientLocations)
   }
 
   static var startPoint: LayerProperty<CGPoint> {
@@ -252,7 +295,7 @@ extension CustomizableProperty {
   static var color: CustomizableProperty<CGColor> {
     .init(
       name: [.color],
-      conversion: { typeErasedValue in
+      conversion: { typeErasedValue, _ in
         guard let color = typeErasedValue as? LottieColor else {
           return nil
         }
@@ -264,7 +307,7 @@ extension CustomizableProperty {
   static var opacity: CustomizableProperty<CGFloat> {
     .init(
       name: [.opacity],
-      conversion: { typeErasedValue in
+      conversion: { typeErasedValue, _ in
         guard let vector = typeErasedValue as? LottieVector1D else { return nil }
 
         // Lottie animation files express opacity as a numerical percentage value
@@ -277,7 +320,7 @@ extension CustomizableProperty {
   static var scaleX: CustomizableProperty<CGFloat> {
     .init(
       name: [.scale],
-      conversion: { typeErasedValue in
+      conversion: { typeErasedValue, _ in
         guard let vector = typeErasedValue as? LottieVector3D else { return nil }
 
         // Lottie animation files express scale as a numerical percentage value
@@ -290,7 +333,7 @@ extension CustomizableProperty {
   static var scaleY: CustomizableProperty<CGFloat> {
     .init(
       name: [.scale],
-      conversion: { typeErasedValue in
+      conversion: { typeErasedValue, _ in
         guard let vector = typeErasedValue as? LottieVector3D else { return nil }
 
         // Lottie animation files express scale as a numerical percentage value
@@ -303,7 +346,7 @@ extension CustomizableProperty {
   static var rotation: CustomizableProperty<CGFloat> {
     .init(
       name: [.rotation],
-      conversion: { typeErasedValue in
+      conversion: { typeErasedValue, _ in
         guard let vector = typeErasedValue as? LottieVector1D else { return nil }
 
         // Lottie animation files express rotation in degrees
@@ -316,6 +359,36 @@ extension CustomizableProperty {
   static var position: CustomizableProperty<CGPoint> {
     .init(
       name: [.position],
-      conversion: { ($0 as? LottieVector3D)?.pointValue })
+      conversion: { typeErasedValue, _ in
+        guard let vector = typeErasedValue as? LottieVector3D else { return nil }
+        return vector.pointValue
+      })
+  }
+
+  static var gradientColors: CustomizableProperty<[CGColor]> {
+    .init(
+      name: [.gradientColors],
+      conversion: { _, typeErasedValueProvider in
+        guard let gradientValueProvider = typeErasedValueProvider as? GradientValueProvider else { return nil }
+        return gradientValueProvider.colors.map { $0.cgColorValue }
+      })
+  }
+
+  static var gradientLocations: CustomizableProperty<[CGFloat]> {
+    .init(
+      name: [.gradientColors],
+      conversion: { _, typeErasedValueProvider in
+        guard let gradientValueProvider = typeErasedValueProvider as? GradientValueProvider else { return nil }
+        return gradientValueProvider.locations.map { CGFloat($0) }
+      })
+  }
+
+  static func floatValue(_ name: PropertyName...) -> CustomizableProperty<CGFloat> {
+    .init(
+      name: name,
+      conversion: { typeErasedValue, _ in
+        guard let vector = typeErasedValue as? LottieVector1D else { return nil }
+        return vector.cgFloatValue
+      })
   }
 }