Skip to content

Fix quickbar overlaying, fix click handling #11900

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
bramkragten merged 2 commits into from
Mar 2, 2022
Merged

Fix quickbar overlaying, fix click handling #11900

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
392faa6
Fix quickbar items overlapping
bramkragten Feb 28, 2022
e161e59
Render virtual list after dialog animation finishes
bramkragten Mar 2, 2022
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
57 changes: 29 additions & 28 deletions src/dialogs/quick-bar/ha-quick-bar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,11 @@ export class QuickBar extends LitElement {

@state() private _search = "";

@state() private _opened = false;
@state() private _open = false;

@state() private _commandMode = false;

@state() private _done = false;
@state() private _opened = false;

@state() private _narrow = false;

Expand All @@ -109,12 +109,12 @@ export class QuickBar extends LitElement {
"all and (max-width: 450px), all and (max-height: 500px)"
).matches;
this._initializeItemsIfNeeded();
this._opened = true;
this._open = true;
}

public closeDialog() {
this._open = false;
this._opened = false;
this._done = false;
this._focusSet = false;
this._filter = "";
this._search = "";
Expand All @@ -133,7 +133,7 @@ export class QuickBar extends LitElement {
);

protected render() {
if (!this._opened) {
if (!this._open) {
return html``;
}

Expand Down Expand Up @@ -218,24 +218,26 @@ export class QuickBar extends LitElement {
`
: html`
<mwc-list>
<lit-virtualizer
scroller
@keydown=${this._handleListItemKeyDown}
@rangechange=${this._handleRangeChanged}
@click=${this._handleItemClick}
class="ha-scrollbar"
style=${styleMap({
height: this._narrow
? "calc(100vh - 56px)"
: `${Math.min(
items.length * (this._commandMode ? 56 : 72) + 26,
this._done ? 500 : 0
)}px`,
})}
.items=${items}
.renderItem=${this._renderItem}
>
</lit-virtualizer>
${this._opened
? html`<lit-virtualizer
scroller
@keydown=${this._handleListItemKeyDown}
@rangechange=${this._handleRangeChanged}
@click=${this._handleItemClick}
class="ha-scrollbar"
style=${styleMap({
height: this._narrow
? "calc(100vh - 56px)"
: `${Math.min(
items.length * (this._commandMode ? 56 : 72) + 26,
500
)}px`,
})}
.items=${items}
.renderItem=${this._renderItem}
>
</lit-virtualizer>`
: ""}
</mwc-list>
`}
${this._hint ? html`<div class="hint">${this._hint}</div>` : ""}
Expand All @@ -252,9 +254,7 @@ export class QuickBar extends LitElement {
}

private _handleOpened() {
this.updateComplete.then(() => {
this._done = true;
});
this._opened = true;
}

private async _handleRangeChanged(e) {
Expand Down Expand Up @@ -454,9 +454,10 @@ export class QuickBar extends LitElement {
}

private _handleItemClick(ev) {
const listItem = ev.target.closest("mwc-list-item");
this.processItemAndCloseDialog(
(ev.target as any).item,
Number((ev.target as HTMLElement).getAttribute("index"))
listItem.item,
Number(listItem.getAttribute("index"))
);
}

Expand Down