-
Notifications
You must be signed in to change notification settings - Fork 2.6k
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.
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
Replace polymer paper-slider #18168
Merged
Merged
Replace polymer paper-slider #18168
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
b1339d6
experiment
silamon 4685e56
Merge branch 'dev' into slider-experiment
silamon ca590c5
finish
silamon dc4df04
Clean up polymer-paper styles
silamon e2107c1
Fixes
silamon 81ca6cc
Fixes
silamon 6132558
Merge branch 'dev' into slider-experiment
bramkragten e26f89d
Fixes
silamon 860ec36
Fix ltr direction in selector color temp (put a default)
silamon File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| import { CSSResultGroup, LitElement, css, html, nothing } from "lit"; | ||
| import { customElement, property } from "lit/decorators"; | ||
| import "./ha-icon"; | ||
| import "./ha-slider"; | ||
| import { fireEvent } from "../common/dom/fire_event"; | ||
|
|
||
| @customElement("ha-labeled-slider") | ||
| class HaLabeledSlider extends LitElement { | ||
| @property() public labeled? = false; | ||
|
|
||
| @property() public caption?: string; | ||
|
|
||
| @property() public disabled?: boolean; | ||
|
|
||
| @property() public required?: boolean; | ||
|
|
||
| @property() public min: number = 0; | ||
|
|
||
| @property() public max: number = 100; | ||
|
|
||
| @property() public step: number = 1; | ||
|
|
||
| @property() public helper?: string; | ||
|
|
||
| @property() public extra = false; | ||
|
|
||
| @property() public icon?: string; | ||
|
|
||
| @property() public value?: number; | ||
|
|
||
| protected render() { | ||
| return html` | ||
| <div class="title">${this._getTitle()}</div> | ||
| <div class="extra-container"><slot name="extra"></slot></div> | ||
| <div class="slider-container"> | ||
| ${this.icon ? html`<ha-icon icon=${this.icon}></ha-icon>` : nothing} | ||
| <ha-slider | ||
| .min=${this.min} | ||
| .max=${this.max} | ||
| .step=${this.step} | ||
| labeled=${this.labeled} | ||
| .disabled=${this.disabled} | ||
| .value=${this.value} | ||
| @change=${this._inputChanged} | ||
| ></ha-slider> | ||
| </div> | ||
| ${this.helper | ||
| ? html`<ha-input-helper-text> ${this.helper} </ha-input-helper-text>` | ||
| : nothing} | ||
| `; | ||
| } | ||
|
|
||
| private _getTitle(): string { | ||
| return `${this.caption}${this.caption && this.required ? " *" : ""}`; | ||
| } | ||
|
|
||
| private _inputChanged(ev) { | ||
| fireEvent(this, "value-changed", { | ||
| value: Number((ev.target as any).value), | ||
| }); | ||
| } | ||
|
|
||
| static get styles(): CSSResultGroup { | ||
| return css` | ||
| :host { | ||
| display: block; | ||
| } | ||
|
|
||
| .title { | ||
| margin: 5px 0 8px; | ||
| color: var(--primary-text-color); | ||
| } | ||
|
|
||
| .slider-container { | ||
| display: flex; | ||
| } | ||
|
|
||
| ha-icon { | ||
| margin-top: 8px; | ||
| color: var(--secondary-text-color); | ||
| } | ||
|
|
||
| ha-slider { | ||
| flex-grow: 1; | ||
| background-image: var(--ha-slider-background); | ||
| border-radius: 4px; | ||
| } | ||
| `; | ||
| } | ||
| } | ||
|
|
||
| declare global { | ||
| interface HTMLElementTagNameMap { | ||
| "ha-labeled-slider": HaLabeledSlider; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this one is incorrect. Labeled should be passed to ha-slider, it should be attached to the tag.