Merge pull request #13051 from home-assistant/dev

This commit is contained in:
Paulus Schoutsen 2022-06-30 10:22:17 -07:00 committed by GitHub
commit 68bb3558b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 32 additions and 13 deletions

View File

@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
[project]
name = "home-assistant-frontend"
version = "20220629.0"
version = "20220630.0"
license = {text = "Apache-2.0"}
description = "The Home Assistant frontend"
readme = "README.md"

View File

@ -2,6 +2,7 @@ import type {
Completion,
CompletionContext,
CompletionResult,
CompletionSource,
} from "@codemirror/autocomplete";
import type { EditorView, KeyBinding, ViewUpdate } from "@codemirror/view";
import { HassEntities } from "home-assistant-js-websocket";
@ -48,6 +49,9 @@ export class HaCodeEditor extends ReactiveElement {
@property({ type: Boolean, attribute: "autocomplete-entities" })
public autocompleteEntities = false;
@property({ type: Boolean, attribute: "autocomplete-icons" })
public autocompleteIcons = false;
@property() public error = false;
@state() private _value = "";
@ -160,16 +164,22 @@ export class HaCodeEditor extends ReactiveElement {
),
];
if (!this.readOnly && this.autocompleteEntities && this.hass) {
extensions.push(
this._loadedCodeMirror.autocompletion({
override: [
this._entityCompletions.bind(this),
this._mdiCompletions.bind(this),
],
maxRenderedOptions: 10,
})
);
if (!this.readOnly) {
const completionSources: CompletionSource[] = [];
if (this.autocompleteEntities && this.hass) {
completionSources.push(this._entityCompletions.bind(this));
}
if (this.autocompleteIcons) {
completionSources.push(this._mdiCompletions.bind(this));
}
if (completionSources.length > 0) {
extensions.push(
this._loadedCodeMirror.autocompletion({
override: completionSources,
maxRenderedOptions: 10,
})
);
}
}
this.codemirror = new this._loadedCodeMirror.EditorView({

View File

@ -31,6 +31,7 @@ export class HaTemplateSelector extends LitElement {
.readOnly=${this.disabled}
autofocus
autocomplete-entities
autocomplete-icons
@value-changed=${this._handleChange}
dir="ltr"
></ha-code-editor>

View File

@ -70,6 +70,7 @@ export class HaYamlEditor extends LitElement {
.readOnly=${this.readOnly}
mode="yaml"
autocomplete-entities
autocomplete-icons
.error=${this.isValid === false}
@value-changed=${this._onChange}
dir="ltr"

View File

@ -24,6 +24,7 @@ import { haStyle } from "../../../resources/styles";
import type { HomeAssistant, Route } from "../../../types";
import { documentationUrl } from "../../../util/documentation-url";
const JS_TYPE = __BUILD__;
const JS_VERSION = __VERSION__;
const PAGES: Array<{
@ -132,7 +133,9 @@ class HaConfigInfo extends LitElement {
${this.hass.localize(
"ui.panel.config.info.frontend_version",
"version",
JS_VERSION
JS_VERSION,
"type",
JS_TYPE
)}
</span>
</div>

View File

@ -60,6 +60,7 @@ class HaPanelDevMqtt extends LitElement {
<ha-code-editor
mode="jinja2"
autocomplete-entities
autocomplete-icons
.hass=${this.hass}
.value=${this.payload}
@value-changed=${this._handlePayload}

View File

@ -113,7 +113,7 @@ class HaPanelDevStatistics extends SubscribeMixin(LitElement) {
"ui.panel.developer-tools.tabs.statistics.fix_issue.fix"
)}
</mwc-button>`
: ""}`,
: ""}`,
width: "113px",
},
actions: {

View File

@ -133,6 +133,7 @@ class HaPanelDevTemplate extends LitElement {
.error=${this._error}
autofocus
autocomplete-entities
autocomplete-icons
@value-changed=${this._templateChanged}
dir="ltr"
></ha-code-editor>

View File

@ -198,6 +198,7 @@ export abstract class HuiElementEditor<T> extends LitElement {
mode="yaml"
autofocus
autocomplete-entities
autocomplete-icons
.hass=${this.hass}
.value=${this.yaml}
.error=${Boolean(this._errors)}

View File

@ -92,6 +92,7 @@ class LovelaceFullConfigEditor extends LitElement {
mode="yaml"
autofocus
autocomplete-entities
autocomplete-icons
.hass=${this.hass}
@value-changed=${this._yamlChanged}
@editor-save=${this._handleSave}