Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for Issue #57: Attempt to change hex code by typing results in #2NanNanNan #92

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix for Issue #57: Attempt to change hex code by typing results in #2NanNanNan #92

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbb1312
Fix hex input showing NaN when typing in hex value
RasyadiAbdoellah Apr 21, 2023
e729c78
simplified handleHexKeyUp
RasyadiAbdoellah Apr 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 24 additions & 7 deletions src/color-picker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ import {
hsv2rgb,
} from '@swiftcarrot/color-fns';
import { rgba2hex } from './utils';
import { useEffect, useState } from 'react';

const KEY_ENTER = 13;

const ColorPicker = ({ color, onChange, disabled }) => {
const { r, g, b, a, h, s, v } = color;
const { r, g, b, a, h, s, v, hex } = color;

function changeColor(color) {
if (onChange) {
Expand Down Expand Up @@ -44,16 +45,21 @@ const ColorPicker = ({ color, onChange, disabled }) => {
}

function changeHex(hex) {

const hexRegx = /^#(?:[0-9A-F]{3}|[0-9A-F]{6}|[0-9A-F]{8})$/i
const { r, g, b } = hex2rgb(hex);
const { h, s, v } = rgb2hsv(r, g, b);
changeColor({ ...color, r, g, b, h, s, v, hex });

if(hexRegx.test(hex)) {
changeColor({ ...color, r, g, b, h, s, v, hex });
}

}

function handleHexKeyUp(e) {
if (e.keyCode === KEY_ENTER) {
const hex = e.target.value.trim();
const { r, g, b } = hex2rgb(hex);
changeColor({ ...color, r, g, b, a, hex });
const hex = hexInput.trim();
changeHex(hex)
}
}

Expand All @@ -68,6 +74,14 @@ const ColorPicker = ({ color, onChange, disabled }) => {
const opacityGradient = `linear-gradient(to right, ${rgba0}, ${rgba100})`;
const hueBackground = hsv2hex(h, 100, 100);

const [hexInput, setHexInput] = useState(hex)

//reset hexInput if hex value is changed through another UI interaction
useEffect(() => {
setHexInput(hex)
},[hex])


return (
<div css={styles.picker} onClick={handleClick}>
<div css={styles.selector} style={{ backgroundColor: hueBackground }}>
Expand Down Expand Up @@ -163,8 +177,11 @@ const ColorPicker = ({ color, onChange, disabled }) => {
<input
style={{ width: 70, textAlign: 'left' }}
type="text"
value={color.hex}
onChange={(e) => changeHex(e.target.value)}
value={hexInput}
onChange={(e) => setHexInput(e.target.value)}
onBlur={() => {
changeHex(hexInput)
}}
onKeyUp={handleHexKeyUp}
disabled={disabled}
/>
Expand Down