Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { componentsWithService } from "../../common/config/components_with_servi
import { domainIcon } from "../../common/entity/domain_icon";
import { computeDomain } from "../../common/entity/compute_domain";
import { domainToName } from "../../data/integration";
import { QuickOpenDialogParams } from "./show-dialog-quick-open";
import { QuickBarParams } from "./show-dialog-quick-bar";
import { HassEntity } from "home-assistant-js-websocket";
import { compare } from "../../common/string/compare";
import memoizeOne from "memoize-one";
Expand All @@ -29,8 +29,8 @@ interface CommandItem extends ServiceCallRequest {
text: string;
}

@customElement("ha-quick-open-dialog")
export class QuickOpenDialog extends LitElement {
@customElement("ha-quick-bar")
export class QuickBar extends LitElement {
@property({ attribute: false }) public hass!: HomeAssistant;

@internalProperty() private _commandItems: CommandItem[] = [];
Expand All @@ -41,7 +41,7 @@ export class QuickOpenDialog extends LitElement {

@internalProperty() private _commandMode = false;

public async showDialog(params: QuickOpenDialogParams) {
public async showDialog(params: QuickBarParams) {
this._commandMode = params.commandMode || false;
this._opened = true;
this._commandItems = this._generateCommandItems();
Expand All @@ -67,7 +67,7 @@ export class QuickOpenDialog extends LitElement {
class="heading"
@value-changed=${this._entityFilterChanged}
.label=${this.hass.localize(
"ui.dialogs.quick-open.filter_placeholder"
"ui.dialogs.quick-bar.filter_placeholder"
)}
type="search"
value=${this._commandMode ? `>${this._itemFilter}` : this._itemFilter}
Expand Down Expand Up @@ -138,9 +138,9 @@ export class QuickOpenDialog extends LitElement {

return reloadableDomains.map((domain) => ({
text:
this.hass.localize(`ui.dialogs.quick-open.commands.reload.${domain}`) ||
this.hass.localize(`ui.dialogs.quick-bar.commands.reload.${domain}`) ||
this.hass.localize(
"ui.dialogs.quick-open.commands.reload.reload",
"ui.dialogs.quick-bar.commands.reload.reload",
"domain",
domainToName(this.hass.localize, domain)
),
Expand Down Expand Up @@ -220,6 +220,6 @@ export class QuickOpenDialog extends LitElement {

declare global {
interface HTMLElementTagNameMap {
"ha-quick-open-dialog": QuickOpenDialog;
"ha-quick-bar": QuickBar;
}
}
20 changes: 20 additions & 0 deletions src/dialogs/quick-bar/show-dialog-quick-bar.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { fireEvent } from "../../common/dom/fire_event";

export interface QuickBarParams {
entityFilter?: string;
commandMode?: boolean;
}

export const loadQuickBar = () =>
import(/* webpackChunkName: "quick-bar-dialog" */ "./ha-quick-bar");

export const showQuickBar = (
element: HTMLElement,
dialogParams: QuickBarParams
): void => {
fireEvent(element, "show-dialog", {
dialogTag: "ha-quick-bar",
dialogImport: loadQuickBar,
dialogParams,
});
};
20 changes: 0 additions & 20 deletions src/dialogs/quick-open/show-dialog-quick-open.ts

This file was deleted.

4 changes: 2 additions & 2 deletions src/layouts/home-assistant.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ import {
import "./ha-init-page";
import "./home-assistant-main";
import { storeState } from "../util/ha-pref-storage";
import QuickOpenMixin from "../state/quick-open-mixin";
import QuickBarMixin from "../state/quick-bar-mixin";

@customElement("home-assistant")
export class HomeAssistantAppEl extends QuickOpenMixin(HassElement) {
export class HomeAssistantAppEl extends QuickBarMixin(HassElement) {
@internalProperty() private _route?: Route;

@internalProperty() private _error = false;
Expand Down
12 changes: 6 additions & 6 deletions src/state/quick-open-mixin.ts → src/state/quick-bar-mixin.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import type { Constructor, PropertyValues } from "lit-element";
import { HassElement } from "./hass-element";
import {
QuickOpenDialogParams,
showQuickOpenDialog,
} from "../dialogs/quick-open/show-dialog-quick-open";
QuickBarParams,
showQuickBar,
} from "../dialogs/quick-bar/show-dialog-quick-bar";

declare global {
interface HASSDomEvents {
"hass-quick-open": QuickOpenDialogParams;
"hass-quick-bar": QuickBarParams;
}
}

Expand All @@ -19,12 +19,12 @@ export default <T extends Constructor<HassElement>>(superClass: T) =>
document.addEventListener("keydown", (e: KeyboardEvent) => {
if (e.code === "KeyP" && e.metaKey) {
e.preventDefault();
const eventParams: QuickOpenDialogParams = {};
const eventParams: QuickBarParams = {};
if (e.shiftKey) {
eventParams.commandMode = true;
}

showQuickOpenDialog(this, eventParams);
showQuickBar(this, eventParams);
}
});
}
Expand Down
2 changes: 1 addition & 1 deletion src/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@
}
},
"dialogs": {
"quick-open": {
"quick-bar": {
"commands": {
"reload": {
"reload": "[%key:ui::panel::config::server_control::section::reloading::reload%]",
Expand Down