refactor: AreaLightController vs INotify

README.md

@@ -846,5 +846,4 @@ description: false
 ```
 ## Coming soon features
 - reactions on sliding event instead of on change (value will be changed in the moment of sliding, not after)
-- faster reactions between multiple cards (instant change of value on other cards)
 - ui editor?

src/core/area-light-controller.ts

@@ -1,31 +1,29 @@
 import { HomeAssistant } from 'custom-card-helpers';
-import { IHassTextTemplate, ILightContainer, ILightFeatures } from '../types/types-interface';
+import { IHassTextTemplate, ILightContainer, ILightFeatures, INotifyGeneric } from '../types/types-interface';
 import { Background } from './colors/background';
 import { Color } from './colors/color';
 import { GlobalLights } from './global-lights';
 import { HassTextTemplate, StaticTextTemplate } from './hass-text-template';
 import { LightController } from './light-controller';
 import { LightFeaturesCombined } from './light-features';
-import { NotifyBase } from './notify-base';
 import { IconHelper } from './icon-helper';
 import { localize } from '../localize/localize';
 import { SceneData } from '../types/types-config';
+import { Action2 } from '../types/functions';
 
 /**
  * Serves as a controller for lights in single area.
  * This can contain multiple lights even some interactions can be different.
  * (Instead of turnOn, activate scene).
  */
-export class AreaLightController extends NotifyBase<AreaLightController> implements ILightContainer {
+export class AreaLightController implements ILightContainer, INotifyGeneric<LightController> {
     private _hass: HomeAssistant;
     private _lightGroup?: LightController;
     private _lights: LightController[];
     private _lightsFeatures: LightFeaturesCombined;
     private _defaultColor: Color;
 
     public constructor(entity_ids: string[], defaultColor: Color, lightGroupEntityId?: string) {
-        super();
-
         // we need at least one
         if (!entity_ids.length)
             throw new Error('No entity specified.');
@@ -59,13 +57,26 @@ export class AreaLightController extends NotifyBase<AreaLightController> impleme
         return this._lights.map(l => l); // map will cause creation of new array
     }
 
+    /**
+     * Will register for light changed events.
+     */
+    public registerOnPropertyChanged(id: string, callback: Action2<(keyof LightController)[], LightController>): void {
+        this._lights.forEach(l => l.registerOnPropertyChanged(id, callback));
+    }
+
+    /**
+     * Will unregister light changed events.
+     */
+    public unregisterOnPropertyChanged(id: string): void {
+        this._lights.forEach(l => l.unregisterOnPropertyChanged(id));
+    }
+
     public set hass(hass: HomeAssistant) {
         this._hass = hass;
         this._lights.forEach(l => l.hass = hass);
         if (this._lightGroup) {
             this._lightGroup.hass = hass;
         }
-        this.raisePropertyChanged('hass');
     }
     public get hass() {
         return this._hass;
@@ -211,7 +222,7 @@ export class AreaLightController extends NotifyBase<AreaLightController> impleme
             }
         });
 
-        let result:string;
+        let result: string;
 
         if (description != null) {
             if (description) {

src/core/light-controller.ts

@@ -77,21 +77,21 @@ export class LightController extends NotifyBase<LightController> implements ISin
             this._lightState.brightnessValue = brightnessValue;
         }
 
-        this.raisePropertyChanged('state', 'brightnessValue');
+        this.raisePropertyChanged('isOn', 'isOff', 'brightnessValue');
     }
 
     private notifyTurnOff(): void {
         this._lightState.state = 'off';
         this._lightState.brightnessValue = 0;
 
-        this.raisePropertyChanged('state', 'brightnessValue');
+        this.raisePropertyChanged('isOn', 'isOff', 'brightnessValue');
     }
 
     private notifyBrightnessValueChanged(value: number): void {
         this._lightState.brightnessValue = value;
         this._lightState.state = value > 0 ? 'on' : 'off';
 
-        this.raisePropertyChanged('state', 'brightnessValue');
+        this.raisePropertyChanged('isOn', 'isOff', 'brightnessValue');
     }
 
     private notifyColorTempChanged(value: number): void {
@@ -113,10 +113,6 @@ export class LightController extends NotifyBase<LightController> implements ISin
 
     //#region State ON/OFF
 
-    public get state(): string {
-        return this._lightState.state;
-    }
-
     public isUnavailable(): boolean {
         return this._lightState.isUnavailable();
     }
@@ -132,7 +128,7 @@ export class LightController extends NotifyBase<LightController> implements ISin
     public turnOff(): void {
         this.toggle(false);
     }
-    public toggle(on: boolean, scene?: string | SceneData) {
+    private toggle(on: boolean, scene?: string | SceneData) {
         if (this.isUnavailable())
             return;
 

src/core/notify-base.ts

@@ -1,16 +1,16 @@
-import { Action1 } from '../types/functions';
+import { Action2 } from '../types/functions';
 import { INotifyGeneric } from '../types/types-interface';
 
 export abstract class NotifyBase<TThis> implements INotifyGeneric<TThis> {
-    private _propertyChangedCallbacks: Record<string, Action1<(keyof TThis)[]>>;
+    private _propertyChangedCallbacks: Record<string, Action2<(keyof TThis)[], TThis>>;
 
     protected constructor() {
         this._propertyChangedCallbacks = {};
     }
 
     protected raisePropertyChanged(...propertyNames: (keyof TThis)[]): void {
         for (const callbackId in this._propertyChangedCallbacks) {
-            this._propertyChangedCallbacks[callbackId](propertyNames);
+            this._propertyChangedCallbacks[callbackId](propertyNames, <TThis><unknown>this);
         }
     }
 
@@ -19,7 +19,7 @@ export abstract class NotifyBase<TThis> implements INotifyGeneric<TThis> {
      * @param id Id for this specific callback. If this id already exists, it's callback will be overwriten.
      * @param callback Action that will be called when any supported property if changed (takes propertyName as parameter).
      */
-    public registerOnPropertyChanged(id: string, callback: Action1<(keyof TThis)[]>) {
+    public registerOnPropertyChanged(id: string, callback: Action2<(keyof TThis)[], TThis>) {
         this._propertyChangedCallbacks[id] = callback;
     }
 

src/types/types-interface.ts

@@ -1,11 +1,9 @@
 import { HomeAssistant } from 'custom-card-helpers';
 import { Background } from '../core/colors/background';
-import { Action1 } from './functions';
+import { Action1, Action2 } from './functions';
 import { Color } from '../core/colors/color';
 import { HassLightColorMode } from './types-hass';
 
-export type ValueFactory = () => unknown;
-
 export interface INotify {
     /**
      * Will register callback on property change events. 
@@ -27,7 +25,7 @@ export interface INotifyGeneric<TThis> extends INotify {
      * @param id Id for this specific callback. If this id already exists, it's callback will be overwriten.
      * @param callback Action that will be called when any supported property if changed (takes propertyName as parameter).
      */
-    registerOnPropertyChanged(id: string, callback: Action1<(keyof TThis)[]>): void;
+    registerOnPropertyChanged(id: string, callback: Action2<(keyof TThis)[], TThis>): void;
 }
 
 export interface IHassTextTemplate {
@@ -70,7 +68,7 @@ export interface ILightConfig {
     get features(): ILightFeatures;
 }
 
-export interface ILightContainer extends ILightConfig, INotify {
+export interface ILightContainer extends ILightConfig {
     /**
      * @returns true if any light in this container is on.
      */
@@ -104,7 +102,7 @@ export interface ILightContainer extends ILightConfig, INotify {
     brightnessValue: number;
 }
 
-export interface ISingleLightContainer extends ILightContainer {
+export interface ISingleLightContainer extends ILightContainer, INotify {
     /**
      * @returns if light is in COLOR color mode.
      */