Merge pull request #211 from oddbird/hashless-hex

Handle hashless hex
oddbird · Nov 7, 2024 · 9143bb8 · 9143bb8
2 parents 92f04dc + 81d1b6a
commit 9143bb8
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 2 deletions.
diff --git a/src/lib/components/colors/Header.svelte b/src/lib/components/colors/Header.svelte
@@ -42,8 +42,19 @@
       try {
         newColor = to(value, targetSpace, { inGamut: true });
       } catch (error) {
-        hasError = true;
-        console.error(error);
+        try {
+          // If it's possibly hex without a hash, add a hash and try again.
+          if ([3, 4, 6, 8].includes(value.length)) {
+            newColor = to(`#${value}`, targetSpace, { inGamut: true });
+          } else {
+            throw error;
+          }
+          // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        } catch (errorWithHash) {
+          hasError = true;
+          // Log original error
+          console.error(error);
+        }
       }
       if (newColor) {
         $color = newColor;

diff --git a/test/lib/components/colors/Header.spec.ts b/test/lib/components/colors/Header.spec.ts
@@ -23,6 +23,40 @@ describe('Header', () => {
     expect(actual.coords).toEqual([0, 100, 50]);
   });
 
+  it('handles hex with a preceding hash', async () => {
+    const color = writable(HSL_WHITE);
+    const { getByLabelText } = render(Header, {
+      type: 'bg',
+      color,
+      format: 'hsl',
+    });
+    const input = getByLabelText('Background Color');
+    await fireEvent.focus(input);
+    await fireEvent.input(input, { target: { value: '#f00' } });
+    await fireEvent.blur(input);
+    const actual = get(color);
+
+    expect(actual.space).toEqual(HSL);
+    expect(actual.coords).toEqual([0, 100, 50]);
+  });
+
+  it('handles hex without a preceding hash', async () => {
+    const color = writable(HSL_WHITE);
+    const { getByLabelText } = render(Header, {
+      type: 'bg',
+      color,
+      format: 'hsl',
+    });
+    const input = getByLabelText('Background Color');
+    await fireEvent.focus(input);
+    await fireEvent.input(input, { target: { value: 'f00' } });
+    await fireEvent.blur(input);
+    const actual = get(color);
+
+    expect(actual.space).toEqual(HSL);
+    expect(actual.coords).toEqual([0, 100, 50]);
+  });
+
   it('shows error on invalid color', async () => {
     vi.spyOn(console, 'error').mockImplementation(() => {
       /* do nothing */