Support font provider in composition layer (#2439)

airbnb · Jun 20, 2024 · f5ee923 · f5ee923
1 parent fca6f33
commit f5ee923
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/Sources/Private/MainThread/LayerContainers/CompLayers/PreCompositionLayer.swift b/Sources/Private/MainThread/LayerContainers/CompLayers/PreCompositionLayer.swift
@@ -16,6 +16,7 @@ final class PreCompositionLayer: CompositionLayer {
     asset: PrecompAsset,
     layerImageProvider: LayerImageProvider,
     layerTextProvider: LayerTextProvider,
+    layerFontProvider: LayerFontProvider,
     textProvider: AnimationKeypathTextProvider,
     fontProvider: AnimationFontProvider,
     assetLibrary: AssetLibrary?,
@@ -38,6 +39,7 @@ final class PreCompositionLayer: CompositionLayer {
       assetLibrary: assetLibrary,
       layerImageProvider: layerImageProvider,
       layerTextProvider: layerTextProvider,
+      layerFontProvider: layerFontProvider,
       textProvider: textProvider,
       fontProvider: fontProvider,
       frameRate: frameRate,
@@ -77,6 +79,7 @@ final class PreCompositionLayer: CompositionLayer {
 
     layerImageProvider.addImageLayers(imageLayers)
     layerTextProvider.addTextLayers(textLayers)
+    layerFontProvider.addTextLayers(textLayers)
   }
 
   override init(layer: Any) {

diff --git a/Sources/Private/MainThread/LayerContainers/MainThreadAnimationLayer.swift b/Sources/Private/MainThread/LayerContainers/MainThreadAnimationLayer.swift
@@ -37,6 +37,7 @@ final class MainThreadAnimationLayer: CALayer, RootAnimationLayer {
       assetLibrary: animation.assetLibrary,
       layerImageProvider: layerImageProvider,
       layerTextProvider: layerTextProvider,
+      layerFontProvider: layerFontProvider,
       textProvider: textProvider,
       fontProvider: fontProvider,
       frameRate: CGFloat(animation.framerate),

diff --git a/Sources/Private/MainThread/LayerContainers/Utility/CompositionLayersInitializer.swift b/Sources/Private/MainThread/LayerContainers/Utility/CompositionLayersInitializer.swift
@@ -14,6 +14,7 @@ extension [LayerModel] {
     assetLibrary: AssetLibrary?,
     layerImageProvider: LayerImageProvider,
     layerTextProvider: LayerTextProvider,
+    layerFontProvider: LayerFontProvider,
     textProvider: AnimationKeypathTextProvider,
     fontProvider: AnimationFontProvider,
     frameRate: CGFloat,
@@ -49,6 +50,7 @@ extension [LayerModel] {
           asset: precompAsset,
           layerImageProvider: layerImageProvider,
           layerTextProvider: layerTextProvider,
+          layerFontProvider: layerFontProvider,
           textProvider: textProvider,
           fontProvider: fontProvider,
           assetLibrary: assetLibrary,