Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
25 changes: 24 additions & 1 deletion src/components/ha-base-time-input.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LitElement, html, TemplateResult, css } from "lit";
import { LitElement, html, TemplateResult, css, PropertyValues } from "lit";
Comment thread
balloob marked this conversation as resolved.
Outdated
import { customElement, property } from "lit/decorators";
import "./ha-select";
import "@material/mwc-list/mwc-list-item";
Expand All @@ -21,6 +21,11 @@ export class HaBaseTimeInput extends LitElement {
*/
@property() label?: string;

/**
* Helper for the input
*/
@property() helper?: string;

/**
* auto validate time inputs
*/
Expand Down Expand Up @@ -207,9 +212,16 @@ export class HaBaseTimeInput extends LitElement {
<mwc-list-item value="PM">PM</mwc-list-item>
</ha-select>`}
</div>
${this.helper ? html`<div class="helper">${this.helper}</div>` : ""}
`;
}

protected firstUpdated(changedProps: PropertyValues) {
super.firstUpdated(changedProps);
this.addEventListener("focus", () => this.toggleAttribute("focused", true));
this.addEventListener("blur", () => this.toggleAttribute("focused", false));
}

Comment thread
balloob marked this conversation as resolved.
Outdated
private _valueChanged(ev) {
this[ev.target.name] =
ev.target.name === "amPm" ? ev.target.value : Number(ev.target.value);
Expand Down Expand Up @@ -303,6 +315,17 @@ export class HaBaseTimeInput extends LitElement {
color: var(--mdc-theme-text-primary-on-background, rgba(0, 0, 0, 0.87));
padding-left: 4px;
}

.helper {
color: var(--mdc-text-field-label-ink-color, rgba(0, 0, 0, 0.6));
opacity: 0;
font-size: 0.75rem;
will-change: opacity;
transition: opacity 150ms 0ms cubic-bezier(0.4, 0, 0.2, 1);
}
:host([focused]) .helper {
opacity: 1;
}
`;
}

Expand Down
3 changes: 3 additions & 0 deletions src/components/ha-duration-input.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ class HaDurationInput extends LitElement {

@property() public label?: string;

@property() public helper?: string;

@property({ type: Boolean }) public required?: boolean;

@property({ type: Boolean }) public enableMillisecond?: boolean;
Expand All @@ -35,6 +37,7 @@ class HaDurationInput extends LitElement {
return html`
<ha-base-time-input
.label=${this.label}
.helper=${this.helper}
.required=${this.required}
.autoValidate=${this.required}
.disabled=${this.disabled}
Expand Down
3 changes: 3 additions & 0 deletions src/components/ha-form/ha-form-string.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ export class HaFormString extends LitElement implements HaFormElement {

@property() public label!: string;

@property() public helper?: string;

@property({ type: Boolean }) public disabled = false;

@state() private _unmaskedPassword = false;
Expand All @@ -53,6 +55,7 @@ export class HaFormString extends LitElement implements HaFormElement {
: "password"}
.label=${this.label}
.value=${this.data || ""}
.helper=${this.helper}
.disabled=${this.disabled}
.required=${this.schema.required}
.autoValidate=${this.schema.required}
Expand Down
3 changes: 3 additions & 0 deletions src/components/ha-selector/ha-selector-duration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ export class HaTimeDuration extends LitElement {

@property() public label?: string;

@property() public helper?: string;

@property({ type: Boolean }) public disabled = false;

@property({ type: Boolean }) public required = true;
Expand All @@ -22,6 +24,7 @@ export class HaTimeDuration extends LitElement {
return html`
<ha-duration-input
.label=${this.label}
.helper=${this.helper}
.data=${this.value}
.disabled=${this.disabled}
.required=${this.required}
Expand Down
3 changes: 3 additions & 0 deletions src/components/ha-selector/ha-selector-number.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ export class HaNumberSelector extends LitElement {

@property() public label?: string;

@property() public helper?: string;

@property({ type: Boolean }) public required = true;

@property({ type: Boolean }) public disabled = false;
Expand Down Expand Up @@ -48,6 +50,7 @@ export class HaNumberSelector extends LitElement {
.max=${this.selector.number.max}
.value=${this.value ?? ""}
.step=${this.selector.number.step ?? 1}
.helper=${this.helper}
.disabled=${this.disabled}
.required=${this.required}
.suffix=${this.selector.number.unit_of_measurement}
Expand Down
4 changes: 4 additions & 0 deletions src/components/ha-selector/ha-selector-text.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ export class HaTextSelector extends LitElement {

@property() public placeholder?: string;

@property() public helper?: string;

@property() public selector!: StringSelector;

@property({ type: Boolean }) public disabled = false;
Expand All @@ -32,6 +34,7 @@ export class HaTextSelector extends LitElement {
.label=${this.label}
.placeholder=${this.placeholder}
.value=${this.value || ""}
.helper=${this.helper}
.disabled=${this.disabled}
@input=${this._handleChange}
autocapitalize="none"
Expand All @@ -44,6 +47,7 @@ export class HaTextSelector extends LitElement {
return html`<ha-textfield
.value=${this.value || ""}
.placeholder=${this.placeholder || ""}
.helper=${this.helper}
.disabled=${this.disabled}
.type=${this._unmaskedPassword ? "text" : this.selector.text?.type}
@input=${this._handleChange}
Expand Down
2 changes: 0 additions & 2 deletions src/dialogs/config-flow/dialog-data-entry-flow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ import { fireEvent, HASSDomEvent } from "../../common/dom/fire_event";
import { computeRTL } from "../../common/util/compute_rtl";
import "../../components/ha-circular-progress";
import "../../components/ha-dialog";
import "../../components/ha-form/ha-form";
import "../../components/ha-icon-button";
import "../../components/ha-markdown";
import {
AreaRegistryEntry,
subscribeAreaRegistry,
Expand Down
6 changes: 6 additions & 0 deletions src/dialogs/config-flow/show-dialog-config-flow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,12 @@ export const showConfigFlowDialog = (
);
},

renderShowFormStepFieldHelper(hass, step, field) {
return hass.localize(
`component.${step.handler}.config.step.${step.step_id}.data_description.${field.name}`
);
},

renderShowFormStepFieldError(hass, step, error) {
return hass.localize(
`component.${step.handler}.config.error.${error}`,
Expand Down
6 changes: 6 additions & 0 deletions src/dialogs/config-flow/show-dialog-data-entry-flow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ export interface FlowConfig {
field: HaFormSchema
): string;

renderShowFormStepFieldHelper(
hass: HomeAssistant,
step: DataEntryFlowStepForm,
field: HaFormSchema
): string;

renderShowFormStepFieldError(
hass: HomeAssistant,
step: DataEntryFlowStepForm,
Expand Down
6 changes: 6 additions & 0 deletions src/dialogs/config-flow/show-dialog-options-flow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,12 @@ export const showOptionsFlowDialog = (
);
},

renderShowFormStepFieldHelper(hass, step, field) {
return hass.localize(
`component.${configEntry.domain}.options.step.${step.step_id}.data_description.${field.name}`
);
},

renderShowFormStepFieldError(hass, step, error) {
return hass.localize(
`component.${configEntry.domain}.options.error.${error}`,
Expand Down
4 changes: 4 additions & 0 deletions src/dialogs/config-flow/step-flow-form.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class StepFlowForm extends LitElement {
.schema=${step.data_schema}
.error=${step.errors}
.computeLabel=${this._labelCallback}
.computeHelper=${this._helperCallback}
.computeError=${this._errorCallback}
></ha-form>
</div>
Expand Down Expand Up @@ -166,6 +167,9 @@ class StepFlowForm extends LitElement {
private _labelCallback = (field: HaFormSchema): string =>
this.flowConfig.renderShowFormStepFieldLabel(this.hass, this.step, field);

private _helperCallback = (field: HaFormSchema): string =>
this.flowConfig.renderShowFormStepFieldHelper(this.hass, this.step, field);

private _errorCallback = (error: string) =>
this.flowConfig.renderShowFormStepFieldError(this.hass, this.step, error);

Expand Down