fix(utils): short hex convert right

zyyv · Jan 30, 2024 · 2ad6f87 · 2ad6f87
1 parent e598002
commit 2ad6f87
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/utils.ts b/src/utils.ts
@@ -243,7 +243,7 @@ export function hexToRgb(color: string): string {
   if (_match)
     match = _match
   else if (_shortMatch)
-    match = _shortMatch
+    match = [null, ..._shortMatch.slice(1).map(c => c + c)] as unknown as RegExpMatchArray
   else
     throw new Error('Invalid HEX color format.')
 
@@ -261,7 +261,7 @@ export function hexToHsl(color: string): string {
   if (_match)
     match = _match
   else if (_shortMatch)
-    match = _shortMatch
+    match = [null, ..._shortMatch.slice(1).map(c => c + c)] as unknown as RegExpMatchArray
   else
     throw new Error('Invalid HEX color format.')
 
@@ -302,7 +302,7 @@ export function hexToHsb(color: string): string {
   if (_match)
     match = _match
   else if (_shortMatch)
-    match = _shortMatch
+    match = [null, ..._shortMatch.slice(1).map(c => c + c)] as unknown as RegExpMatchArray
   else
     throw new Error('Invalid HEX color format.')
 

diff --git a/test/utils.test.ts b/test/utils.test.ts
@@ -1,9 +1,10 @@
 import { describe, expect, it } from 'vitest'
-import { convertColor, hexToHsb, hexToHsl, hexToRgb, hsbToHex, hsbToHsl, hsbToRgb, hslToHex, hslToHsb, hslToRgb, isColor, rgbToHex, rgbToHsb, rgbToHsl } from '../src/index'
+import { convertColor, hexToHsb, hexToHsl, hexToRgb, hsbToHex, hsbToHsl, hsbToRgb, hslToHex, hslToHsb, hslToRgb, isColor, rgbToHex, rgbToHsb, rgbToHsl } from '../src'
 import type { ColorType } from '../src/types'
 
 describe('utils scoped', () => {
   const hex = '#ff0000'
+  const shortHex = '#f00'
   const rgb = 'rgb(255, 0, 0)'
   const hsl = 'hsl(0, 100%, 50%)'
   const hsb = 'hsb(0, 100%, 100%)'
@@ -30,6 +31,7 @@ describe('utils scoped', () => {
     expect(hexToHsb(hex)).toEqual(hsb)
     expect(hexToHsl(hex)).toEqual(hsl)
     expect(hexToRgb(hex)).toEqual(rgb)
+    expect(hexToRgb(shortHex)).toEqual(rgb)
 
     // hsl to others test case
     expect(hslToRgb(hsl)).toEqual(rgb)