Skip to content

Fix dragging in color area and sync value #486

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

Merged
merged 4 commits into from
May 17, 2023
Merged

Fix dragging in color area and sync value #486

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0f1f8a8
Fix dragging in color area and sync value
bjarnef May 16, 2023
08b18a5
Remove import of Colord
bjarnef May 16, 2023
0958825
Update packages/uui-color-area/lib/uui-color-area.element.ts
iOvergaard May 17, 2023
e41d701
prettier
iOvergaard May 17, 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
58 changes: 29 additions & 29 deletions packages/uui-color-area/lib/uui-color-area.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ export class UUIColorAreaElement extends LitElement {
// TODO: Can we move the parsing of a color string to shared utility function?
const parsed = colord(newVal);

if (parsed) {
if (parsed.isValid()) {
const { h, s, l } = parsed.toHsl();

this.hue = h;
Expand Down Expand Up @@ -228,43 +228,36 @@ export class UUIColorAreaElement extends LitElement {
);
}

getValueFromMousePosition(event: MouseEvent) {
return this.getValueFromCoordinates(
event.clientX - event.offsetX,
event.clientY - event.offsetY
);
}

getValueFromTouchPosition(event: TouchEvent) {
return this.getValueFromCoordinates(
event.touches[0].clientX,
event.touches[0].clientY
);
}

getValueFromCoordinates(x: number, y: number) {
const grid = this.shadowRoot!.querySelector<HTMLElement>('.color-area')!;
const { width, height } = grid.getBoundingClientRect();

this.saturation = clamp((x / width) * 100, 0, 100);
this.lightness = clamp(100 - (y / height) * 100, 0, 100);

this.syncValues();
}

syncValues() {
const color = colord({
h: this.hue,
s: this.saturation,
l: this.lightness,
a: this.alpha,
a: this.alpha / 100,
});

this.value = color.toRgbString();
this._value = color.toRgbString();

this.dispatchEvent(new UUIColorAreaEvent(UUIColorAreaEvent.CHANGE));
}

/** Generates a hex string from HSL values. Hue must be 0-360. All other arguments must be 0-100. */
private getHexString(
hue: number,
saturation: number,
lightness: number,
alpha = 100
) {
const color = colord(
`hsla(${hue}, ${saturation}%, ${lightness}%, ${alpha / 100})`
);
if (!color.isValid()) {
return '';
}

return color.toHex();
}

render() {
const gridHandleX = this.saturation;
const gridHandleY = 100 - this.brightness;
Expand All @@ -273,7 +266,9 @@ export class UUIColorAreaElement extends LitElement {
<div
part="grid"
class="color-area"
style=${styleMap({ backgroundColor: `hsl(${this.hue}deg, 100%, 50%)` })}
style=${styleMap({
backgroundColor: this.getHexString(this.hue, 100, 50),
})}
@mousedown=${this.handleGridDrag}
@touchstart=${this.handleGridDrag}>
<span
Expand All @@ -285,7 +280,12 @@ export class UUIColorAreaElement extends LitElement {
style=${styleMap({
top: `${gridHandleY}%`,
left: `${gridHandleX}%`,
backgroundColor: `hsla(${this.hue}deg, ${this.saturation}%, ${this.lightness}%)`,
backgroundColor: this.getHexString(
this.hue,
this.saturation,
this.lightness,
this.alpha
),
})}
role="application"
tabindex=${ifDefined(this.disabled ? undefined : '0')}
Expand Down