Merge pull request #247 from oddbird/hotfix-ratio

Fix ratio not updating when sliders change
oddbird · Mar 3, 2025 · 5f9c4b6 · 5f9c4b6
2 parents 4d10b48 + 4337ce3
commit 5f9c4b6
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/src/lib/components/ratio/index.svelte b/src/lib/components/ratio/index.svelte
@@ -7,14 +7,16 @@
   import { RATIOS } from '$lib/constants';
   import { bg, fg } from '$lib/stores';
 
-  let fgPremultiplied = $derived.by(() => {
-    if ($fg.alpha === 1 || $bg.alpha !== 1) return $fg;
-    return mix($bg, $fg, $fg.alpha, {
-      space: 'srgb',
-      premultiplied: false,
-    });
+  let ratio = $derived.by(() => {
+    let fgPremultiplied = $fg;
+    if ($fg.alpha !== 1 && $bg.alpha === 1) {
+      fgPremultiplied = mix($bg, $fg, $fg.alpha, {
+        space: 'srgb',
+        premultiplied: false,
+      });
+    }
+    return contrast($bg, fgPremultiplied, 'WCAG21');
   });
-  let ratio = $derived(contrast($bg, fgPremultiplied, 'WCAG21'));
   let displayRatio = $derived(Math.round((ratio + Number.EPSILON) * 100) / 100);
   let pass = $derived(ratio >= RATIOS.AA.Normal);
   let alphaWarning = $derived.by(() => {

diff --git a/test/lib/components/Ratio.spec.ts b/test/lib/components/Ratio.spec.ts
@@ -1,7 +1,7 @@
-import { render } from '@testing-library/svelte';
+import { render, waitFor } from '@testing-library/svelte';
 
 import Ratio from '$lib/components/ratio/index.svelte';
-import { reset } from '$lib/stores';
+import { fg, reset } from '$lib/stores';
 
 describe('Ratio', () => {
   afterEach(() => {
@@ -15,4 +15,18 @@ describe('Ratio', () => {
     expect(queryAllByText('Pass')).not.toBeNull();
     expect(queryByText('Fail')).toBeNull();
   });
+
+  it('updates ratio when color changes', async () => {
+    const { getByText, queryByText, queryAllByText } = render(Ratio);
+    fg.update((val) => {
+      val.coords = [0.5, 0.5, 0.5];
+      return val;
+    });
+
+    await waitFor(() => {
+      expect(getByText('3.22:1')).toBeVisible();
+      expect(queryByText('Pass')).not.toBeNull();
+      expect(queryAllByText('Fail')).not.toBeNull();
+    });
+  });
 });