Skip to content

Commit fa9abc8

Browse files
authored
Merge pull request #62 from AnthonMS/bug/my-slider-cover-sliderMin-incorrect
Bug Fix: my-slider-v2 cover entity - value shown incorrect when using sliderMin with cover entity
2 parents aea9aca + 535b281 commit fa9abc8

File tree

7 files changed

+350
-253
lines changed

7 files changed

+350
-253
lines changed

dist/dev/my-cards.js

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/my-button.js

+120-75
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/my-cards.js

+192-147
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/my-slider-v2.js

+17-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/my-slider.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/cards/extras/const.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export const CARD_VERSION = '2.0.4'
2-
export const SLIDER_VERSION = '3.0.6'
2+
export const SLIDER_VERSION = '3.0.7'
33
export const BUTTON_VERSION = '1.0.2'
44

55

src/cards/my-slider.ts

+16-9
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,13 @@ export class MySliderV2 extends LitElement {
5757
private sliderVal: number = 0
5858
private sliderValPercent: number = 0.00
5959
private initialTransition: string = ''
60-
private setSliderValues(val, valPercent): void {
61-
if (this._config.inverse) {
62-
this.sliderVal = this._config.max - val
63-
this.sliderValPercent = 100 - valPercent
64-
}
65-
else {
66-
this.sliderVal = val
67-
this.sliderValPercent = valPercent
60+
private setSliderValues(val, valPercent, alreadyInversed = false): void {
61+
if (this._config.inverse && !alreadyInversed) {
62+
this.sliderVal = this._config.max - val;
63+
this.sliderValPercent = 100 - valPercent;
64+
} else {
65+
this.sliderVal = val;
66+
this.sliderValPercent = valPercent;
6867
}
6968
}
7069

@@ -393,6 +392,7 @@ export class MySliderV2 extends LitElement {
393392
let tmpVal = 0
394393
let sliderVal1 = 0
395394
let sliderVal2 = 0
395+
let alreadyInversed = false
396396
switch (entityType) {
397397

398398
case 'light': /* ------------ LIGHT ------------ */
@@ -528,6 +528,13 @@ export class MySliderV2 extends LitElement {
528528
defaultConfig.max = defaultConfig.max - defaultConfig.min
529529
tmpVal = tmpVal - defaultConfig.min
530530
}
531+
532+
// Calculate tmpVal based on the inverse logic
533+
if (defaultConfig.inverse) {
534+
// Inverted logic
535+
tmpVal = defaultConfig.max - tmpVal; // Invert for the slider
536+
alreadyInversed = true
537+
}
531538

532539
tmpVal = (tmpVal * (100 - defaultConfig.sliderMin) / 100) + defaultConfig.sliderMin
533540
tmpVal = tmpVal < defaultConfig.sliderMin ? defaultConfig.sliderMin : tmpVal
@@ -587,7 +594,7 @@ export class MySliderV2 extends LitElement {
587594
}
588595

589596
this._config = deepMerge(defaultConfig, this._config)
590-
this.setSliderValues(sliderVal1, sliderVal2)
597+
this.setSliderValues(sliderVal1, sliderVal2, alreadyInversed)
591598

592599
if (defaultConfig.mode === 'seekbar' && this.entity.state === 'playing') {
593600
this.updateSeekbar()

0 commit comments

Comments
 (0)