Skip to content

Commit afb61e6

Browse files
refactor: Add rgbToHex function name (#175)
* released v2.5.1 #173 * Add rgbToHex and alias rgbaToHex --------- Co-authored-by: 小弟调调 <398188662@qq.com>
1 parent 1b50ebe commit afb61e6

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

packages/color-convert/src/index.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,13 +186,17 @@ export const rgbStringToHsva = rgbaStringToHsva;
186186

187187
/** Converts an RGBA color plus alpha transparency to hex */
188188
export const rgbaToHex = ({ r, g, b }: RgbaColor): string => {
189+
return rgbToHex({ r, g, b });
190+
};
191+
192+
export const rgbToHex = ({ r, g, b }: RgbColor): string => {
189193
const bin = (r << 16) | (g << 8) | b;
190194
return `#${((h) => new Array(7 - h.length).join('0') + h)(bin.toString(16))}`;
191195
};
192196

193197
export const rgbaToHexa = ({ r, g, b, a }: RgbaColor): string => {
194198
const alpha = typeof a === 'number' && ((a * 255) | (1 << 8)).toString(16).slice(1);
195-
return `${rgbaToHex({ r, g, b, a })}${alpha ? alpha : ''}`;
199+
return `${rgbToHex({ r, g, b })}${alpha ? alpha : ''}`;
196200
};
197201
export type HexColor = `#${string}`;
198202
export const hexToHsva = (hex: string): HsvaColor => rgbaToHsva(hexToRgba(hex));
@@ -277,14 +281,13 @@ export const hsvaToRgbaString = (hsva: HsvaColor): string => {
277281

278282
export const rgbaToRgb = ({ r, g, b }: RgbaColor): RgbColor => ({ r, g, b });
279283
export const hslaToHsl = ({ h, s, l }: HslaColor): HslColor => ({ h, s, l });
280-
export const hsvaToHex = (hsva: HsvaColor): string => rgbaToHex(hsvaToRgba(hsva));
284+
export const hsvaToHex = (hsva: HsvaColor): string => rgbToHex(hsvaToRgba(hsva));
281285
export const hsvaToHexa = (hsva: HsvaColor): string => rgbaToHexa(hsvaToRgba(hsva));
282286
export const hsvaToHsv = ({ h, s, v }: HsvaColor): HsvColor => ({ h, s, v });
283287
export const hexToXY = (hex: string): XYColor => rgbToXY(rgbaToRgb(hexToRgba(hex)));
284288
export const xyToHex = (xy: XYColor): string =>
285-
rgbaToHex({
289+
rgbToHex({
286290
...xyToRgb(xy),
287-
a: 255,
288291
});
289292

290293
/**

0 commit comments

Comments
 (0)