From 0a52bd6f6b360ba4e2da202f019673f5c3fd1f35 Mon Sep 17 00:00:00 2001
From: Ilia Mashkov <hikkikomori7@gmail.com>
Date: Tue, 10 Feb 2026 18:09:13 +0300
Subject: [PATCH] feat(FontApplicator): switch from props to derived state from
 comparisonStore, apply the fonts

---
 .../ui/FontApplicator/FontApplicator.svelte   | 44 +++++++++----------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/src/entities/Font/ui/FontApplicator/FontApplicator.svelte b/src/entities/Font/ui/FontApplicator/FontApplicator.svelte
index 1ec6114..a6076ec 100644
--- a/src/entities/Font/ui/FontApplicator/FontApplicator.svelte
+++ b/src/entities/Font/ui/FontApplicator/FontApplicator.svelte
@@ -6,30 +6,24 @@
     - Adds smooth transition when font appears
 -->
 <script lang="ts">
+import { getFontUrl } from '$entities/Font/lib';
 import { cn } from '$shared/shadcn/utils/shadcn-utils';
 import type { Snippet } from 'svelte';
 import { prefersReducedMotion } from 'svelte/motion';
-import { appliedFontsManager } from '../../model';
+import {
+    type UnifiedFont,
+    appliedFontsManager,
+} from '../../model';
 
 interface Props {
     /**
-     * Font name to set
+     * Applied font
      */
-    name: string;
-    /**
-     * Font id to load
-     */
-    id: string;
-    /** */
-    url: string;
+    font: UnifiedFont;
     /**
      * Font weight
      */
     weight?: number;
-    /**
-     * Variable font flag
-     */
-    isVariable?: boolean;
     /**
      * Additional classes
      */
@@ -40,12 +34,12 @@ interface Props {
     children?: Snippet;
 }
 
-let { name, id, url, weight = 400, isVariable = false, className, children }: Props = $props();
+let { font, weight = 400, className, children }: Props = $props();
 let element: Element;
 
 // Track if the user has actually scrolled this into view
 let hasEnteredViewport = $state(false);
-const status = $derived(appliedFontsManager.getFontStatus(id, weight, isVariable));
+const status = $derived(appliedFontsManager.getFontStatus(font.id, weight, font.features.isVariable));
 
 $effect(() => {
     if (status === 'loaded' || status === 'error') {
@@ -56,17 +50,19 @@ $effect(() => {
     const observer = new IntersectionObserver(entries => {
         if (entries[0].isIntersecting) {
             hasEnteredViewport = true;
-
+            const url = getFontUrl(font, weight);
             // Touch ensures it's in the queue.
             // It's safe to call this even if VirtualList called it
             // (Manager dedupes based on key)
-            appliedFontsManager.touch([{
-                id,
-                weight,
-                name,
-                url,
-                isVariable,
-            }]);
+            if (url) {
+                appliedFontsManager.touch([{
+                    id: font.id,
+                    weight,
+                    name: font.name,
+                    url,
+                    isVariable: font.features.isVariable,
+                }]);
+            }
 
             observer.unobserve(element);
         }
@@ -88,7 +84,7 @@ const transitionClasses = $derived(
 
 <div
     bind:this={element}
-    style:font-family={shouldReveal ? `'${name}'` : 'system-ui, -apple-system, sans-serif'}
+    style:font-family={shouldReveal ? `'${font.name}'` : 'system-ui, -apple-system, sans-serif'}
     class={cn(
         transitionClasses,
         // If reduced motion is on, we skip the transform/blur entirely