Skip to content

Commit 4f0781c

Browse files
committed
Toggle color picker popover clicking preview button
1 parent af8b738 commit 4f0781c

File tree

1 file changed

+24
-25
lines changed

1 file changed

+24
-25
lines changed

packages/uui-color-picker/lib/uui-color-picker.element.ts

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,6 @@ export class UUIColorPickerElement extends LabelMixin('label', LitElement) {
107107
margin-left: 0.75rem;
108108
border-radius: 50%;
109109
}
110-
color-picker__trigger {
111-
cursor: pointer;
112-
}
113110
.color-picker__preview::before,
114111
.color-picker__trigger::before {
115112
content: '';
@@ -488,7 +485,7 @@ export class UUIColorPickerElement extends LabelMixin('label', LitElement) {
488485
event.stopImmediatePropagation();
489486

490487
const target = event.target as HTMLElement;
491-
const popover = target.nextElementSibling as UUIPopoverElement;
488+
const popover = target.parentElement as UUIPopoverElement;
492489

493490
popover.open = !popover?.open;
494491

@@ -497,7 +494,7 @@ export class UUIColorPickerElement extends LabelMixin('label', LitElement) {
497494

498495
closeColorPicker(event: Event) {
499496
const target = event.target as UUIPopoverElement;
500-
const trigger = target.previousElementSibling;
497+
const trigger = target.querySelector("button[part=trigger]");
501498

502499
if (trigger) {
503500
trigger.setAttribute('aria-expanded', 'false');
@@ -653,27 +650,29 @@ export class UUIColorPickerElement extends LabelMixin('label', LitElement) {
653650
}
654651

655652
private _renderPreviewButton() {
656-
return html`<button
657-
type="button"
658-
slot="trigger"
659-
aria-label="${this.label || 'Open Color picker'}"
660-
class=${classMap({
661-
'color-picker__trigger': true,
662-
'color-dropdown__trigger--disabled': this.disabled,
663-
'color-dropdown__trigger--small': this.size === 'small',
664-
'color-dropdown__trigger--medium': this.size === 'medium',
665-
'color-dropdown__trigger--large': this.size === 'large',
666-
'color-picker__transparent-bg': true,
667-
})}
668-
style=${styleMap({
669-
'--preview-color': `hsla(${this.hue}deg, ${this.saturation}%, ${
670-
this.lightness
671-
}%, ${this.alpha / 100})`,
672-
})}
673-
@click=${this.openColorPicker}
674-
aria-haspopup="true"
675-
aria-expanded="false"></button>
653+
return html`
676654
<uui-popover placement="bottom-start" @close=${this.closeColorPicker}>
655+
<button
656+
type="button"
657+
part="trigger"
658+
slot="trigger"
659+
aria-label="${this.label || 'Open Color picker'}"
660+
class=${classMap({
661+
'color-picker__trigger': true,
662+
'color-dropdown__trigger--disabled': this.disabled,
663+
'color-dropdown__trigger--small': this.size === 'small',
664+
'color-dropdown__trigger--medium': this.size === 'medium',
665+
'color-dropdown__trigger--large': this.size === 'large',
666+
'color-picker__transparent-bg': true,
667+
})}
668+
style=${styleMap({
669+
'--preview-color': `hsla(${this.hue}deg, ${this.saturation}%, ${
670+
this.lightness
671+
}%, ${this.alpha / 100})`,
672+
})}
673+
@click=${this.openColorPicker}
674+
aria-haspopup="true"
675+
aria-expanded="false"></button>
677676
<div slot="popover">${this._renderColorPicker()}</div>
678677
</uui-popover>`;
679678
}

0 commit comments

Comments
 (0)