Revert 1 animate speedless fans upstream

TODO.md

@@ -0,0 +1,4 @@
+# TODO
+
+- [ ] Allow tap actions on cards even if they are sliders
+

hacs.json

@@ -1,5 +1,5 @@
 {
-    "name": "Slider Button Card",
+    "name": "Slider Button Card (Liz Sugar mods)",
     "render_readme": true,
     "filename": "slider-button-card.js",
     "domains": ["light", "fan", "cover", "switch", "input_boolean", "media_player"]

src/controllers/controller.ts

@@ -20,6 +20,10 @@ export abstract class Controller {
   _sliderPrevColor = '';
 
   abstract _value?: number;
+  abstract _originalValue?: number;
+  abstract _originalValueLock?: boolean;
+  abstract _clickPosition?: number;
+  abstract _clickPositionLock?: boolean;
   abstract _targetValue?: number;
   abstract _min?: number;
   abstract _max?: number;
@@ -67,6 +71,58 @@ export abstract class Controller {
     }
   }
 
+  set originalValue(value: number) {
+    this._originalValue = value;
+  }
+
+  get originalValue(): number {
+    //return this.originalValue;
+    if (this._originalValue === 0) {
+      return 0;
+    }
+    if (this._originalValue) {
+      return Math.round(this._originalValue / this.step) * this.step;
+    }
+    return 0;
+  }
+
+  get originalValueLock(): boolean {
+    if (this._originalValueLock == true) {
+      return true;
+    }
+    return false;
+  }
+
+  set originalValueLock(lock: boolean) {
+    this._originalValueLock = lock;
+  }
+
+  set clickPosition(value: number) {
+    this._clickPosition = value;
+  }
+
+  get clickPosition(): number {
+    //return this.clickPosition;
+    if (this._clickPosition === 0) {
+      return 0;
+    }
+    if (this._clickPosition) {
+      return Math.round(this._clickPosition / this.step) * this.step;
+    }
+    return 0;
+  }
+
+  get clickPositionLock(): boolean {
+    if (this._clickPositionLock == true) {
+      return true;
+    }
+    return false;
+  }
+
+  set clickPositionLock(lock: boolean) {
+    this._clickPositionLock = lock;
+  }
+
   get targetValue(): number {
     if (this._targetValue === 0) {
       return 0;
@@ -236,7 +292,7 @@ export abstract class Controller {
   moveSlider(event: any, {left, top, width, height}): number {
     let percentage = this.calcMovementPercentage(event, {left, top, width, height});
     percentage = this.applyStep(percentage);
-    percentage = normalize(percentage, 0, 100);
+    //percentage = normalize(percentage, 0, 100);
     if (!this.isValuePercentage) {
       percentage = percentageToValue(percentage, this.min, this.max);
     }

src/controllers/get-controller.ts

@@ -17,6 +17,7 @@ export class ControllerFactory {
       [Domain.LIGHT]: LightController,
       [Domain.FAN]: FanController,
       [Domain.SWITCH]: SwitchController,
+      [Domain.AUTOMATION]: SwitchController,
       [Domain.COVER]: CoverController,
       [Domain.INPUT_BOOLEAN]: InputBooleanController,
       [Domain.MEDIA_PLAYER]: MediaController,

src/slider-button-card.ts

@@ -14,7 +14,7 @@ import { localize } from './localize/localize';
 
 import type { SliderButtonCardConfig } from './types';
 import { ActionButtonConfigDefault, ActionButtonMode, IconConfigDefault } from './types';
-import { getSliderDefaultForEntity } from './utils';
+import { getSliderDefaultForEntity, normalize } from './utils';
 
 /* eslint no-console: 0 */
 console.info(
@@ -385,6 +385,13 @@ export class SliderButtonCard extends LitElement implements LovelaceCard {
       return;
     }
     this.slider.setPointerCapture(event.pointerId);
+
+    let oldPercentage;
+    if (this.ctrl.originalValueLock != true) {
+      this.ctrl.originalValue = this.ctrl.value;
+      this.ctrl.originalValueLock = true;
+    }
+    oldPercentage = this.ctrl.originalValue;
   }
 
   private onPointerUp(event: PointerEvent): void {
@@ -393,6 +400,8 @@ export class SliderButtonCard extends LitElement implements LovelaceCard {
     }
     this.setStateValue(this.ctrl.targetValue);
     this.slider.releasePointerCapture(event.pointerId);
+    this.ctrl.originalValueLock = false;
+    this.ctrl.clickPositionLock = false;
   }
 
   private onPointerMove(event: any): void {
@@ -401,9 +410,29 @@ export class SliderButtonCard extends LitElement implements LovelaceCard {
     }
     if (!this.slider.hasPointerCapture(event.pointerId)) return;
     const {left, top, width, height} = this.slider.getBoundingClientRect();
+    this.ctrl.log('event', event);
+
     const percentage = this.ctrl.moveSlider(event, {left, top, width, height});
+
+    let clickPosition;
+    if (this.ctrl.clickPositionLock != true)
+    {
+      this.ctrl.clickPosition = percentage;
+      this.ctrl.clickPositionLock = true;
+    }
+    clickPosition = this.ctrl.clickPosition;
+
+    let delta = this.ctrl.clickPosition - percentage;
+    let newPercentage = this.ctrl.originalValue - delta;
+    newPercentage = normalize(newPercentage, 0, 100)
+
+    this.ctrl.log('oldPercentage', this.ctrl.originalValue);
+    this.ctrl.log('clickPosition', this.ctrl.clickPosition);
     this.ctrl.log('onPointerMove', percentage);
-    this.updateValue(percentage);
+    this.ctrl.log('delta', delta);
+    this.ctrl.log('newPercentage', newPercentage)
+
+    this.updateValue(newPercentage);
   }
 
   connectedCallback(): void {
@@ -548,6 +577,7 @@ export class SliderButtonCard extends LitElement implements LovelaceCard {
       overflow: hidden;
       white-space: nowrap;
       text-shadow: var(--label-text-shadow, none);
+      font-weight: 500;
     }
     .off .name {
       color: var(--label-color-off, var(--primary-text-color, white));
@@ -731,7 +761,7 @@ export class SliderButtonCard extends LitElement implements LovelaceCard {
       opacity: 1;            
     }
     .slider[data-show-track="true"] .slider-thumb:after {
-      opacity: 0.9;
+      opacity: 0.675;
     }
     .off .slider[data-show-track="true"] .slider-thumb:after {
       opacity: 1;

src/types.ts

@@ -80,6 +80,7 @@ export enum Domain {
   MEDIA_PLAYER = 'media_player',
   CLIMATE = 'climate',
   LOCK = 'lock',
+  AUTOMATION = 'automation',
 }
 
 export const ActionButtonConfigDefault: ActionButtonConfig = {
@@ -138,6 +139,15 @@ export const SliderConfigDefaultDomain: Map<string, SliderConfig> = new Map([
     toggle_on_click: true,
     force_square: false,
   }],
+  [Domain.AUTOMATION, {
+    direction: SliderDirections.LEFT_RIGHT,
+    background: SliderBackground.SOLID,
+    use_state_color: false,
+    use_percentage_bg_opacity: false,
+    show_track: false,
+    toggle_on_click: true,
+    force_square: false,
+  }],
   [Domain.COVER, {
     direction: SliderDirections.TOP_BOTTOM,
     background: SliderBackground.STRIPED,