jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-09 18:36:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent quickbar command entry duplicates (#10861)

Browse Source
This commit is contained in:
Philip Allgaier 2021-12-11 17:01:24 +01:00 committed by GitHub
parent 585648ac4c
commit ca6fd6c770
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/dialogs/quick-bar/ha-quick-bar.ts
View File

@ -99,6 +99,8 @@ export class QuickBar extends LitElement {
private _focusSet = false; private _focusSet = false;
private _focusListElement?: ListItem | null;
public async showDialog(params: QuickBarParams) { public async showDialog(params: QuickBarParams) {
this._commandMode = params.commandMode || this._toggleIfAlreadyOpened(); this._commandMode = params.commandMode || this._toggleIfAlreadyOpened();
this._initializeItemsIfNeeded(); this._initializeItemsIfNeeded();
@ -317,7 +319,8 @@ export class QuickBar extends LitElement {
} else if (ev.code === "ArrowDown") { } else if (ev.code === "ArrowDown") {
ev.preventDefault(); ev.preventDefault();
this._getItemAtIndex(0)?.focus(); this._getItemAtIndex(0)?.focus();
this._getItemAtIndex(1)?.focus(); this._focusSet = true;
this._focusListElement = this._getItemAtIndex(0);
} }
} }
@ -350,6 +353,11 @@ export class QuickBar extends LitElement {
this._initializeItemsIfNeeded(); this._initializeItemsIfNeeded();
this._filter = this._search; this._filter = this._search;
} else { } else {
if (this._focusSet && this._focusListElement) {
this._focusSet = false;
// @ts-ignore
this._focusListElement.rippleHandlers.endFocus();
}
this._debouncedSetFilter(this._search); this._debouncedSetFilter(this._search);
} }
} }
@ -366,12 +374,14 @@ export class QuickBar extends LitElement {
private _setFocusFirstListItem() { private _setFocusFirstListItem() {
// @ts-ignore // @ts-ignore
this._getItemAtIndex(0)?.rippleHandlers.startFocus(); this._getItemAtIndex(0)?.rippleHandlers.startFocus();
this._focusListElement = this._getItemAtIndex(0);
} }
private _handleListItemKeyDown(ev: KeyboardEvent) { private _handleListItemKeyDown(ev: KeyboardEvent) {
const isSingleCharacter = ev.key.length === 1; const isSingleCharacter = ev.key.length === 1;
const isFirstListItem = const isFirstListItem =
(ev.target as HTMLElement).getAttribute("index") === "0"; (ev.target as HTMLElement).getAttribute("index") === "0";
this._focusListElement = ev.target as ListItem;
if (ev.key === "ArrowUp") { if (ev.key === "ArrowUp") {
if (isFirstListItem) { if (isFirstListItem) {
this._filterInputField?.focus(); this._filterInputField?.focus();
@ -511,7 +521,13 @@ export class QuickBar extends LitElement {
if (page.component) { if (page.component) {
const info = this._getNavigationInfoFromConfig(page); const info = this._getNavigationInfoFromConfig(page);
if (info) { // Add to list, but only if we do not already have an entry for the same path and component
if (
info &&
!items.some(
(e) => e.path === info.path && e.component === info.component
)
) {
items.push(info); items.push(info);
} }
} }