fix: another sync issue

TheNoim · Jan 18, 2023 · 6ffb1f7 · 6ffb1f7
1 parent 7f72c6e
commit 6ffb1f7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/reactive_home/src/composeables/useNewBoolean.ts b/reactive_home/src/composeables/useNewBoolean.ts
@@ -36,14 +36,11 @@ export function useNewBoolean(state: FullfilledUseState, debug = false) {
   const lastChanged = ref(state.value.last_changed);
 
   // Local state changes
-  watch(localValue, (newLocalValue, oldLocalValue) => {
+  watch(localValue, (newLocalValue) => {
     if (skipNextWatch) {
       skipNextWatch = false;
       return;
     }
-    if (newLocalValue === oldLocalValue) {
-      return;
-    }
     if (debug) {
       console.log(`call(${state.value.entity_id}): updateHASSState`);
     }
@@ -62,8 +59,10 @@ export function useNewBoolean(state: FullfilledUseState, debug = false) {
         skipContexts.splice(contextIndex, 1);
         return;
       }
-      skipNextWatch = true;
-      localValue.value = stringBoolToBool(newEntityState.state);
+      if (localValue.value !== stringBoolToBool(newEntityState.state)) {
+        skipNextWatch = true;
+        localValue.value = stringBoolToBool(newEntityState.state);
+      }
       lastChanged.value = newEntityState.last_changed;
     }
   );

diff --git a/reactive_home/src/composeables/useNewLight.ts b/reactive_home/src/composeables/useNewLight.ts
@@ -65,17 +65,11 @@ export function useNewLight(state: FullfilledUseState, debug = false) {
     () => {
       return { value: localValues.value, brightness: localValues.brightness };
     },
-    (newLocalValues, oldLocalValues) => {
+    (newLocalValues) => {
       if (skipNextWatch) {
         skipNextWatch = false;
         return;
       }
-      if (
-        newLocalValues.value === oldLocalValues.value &&
-        newLocalValues.brightness === oldLocalValues.brightness
-      ) {
-        return;
-      }
       if (debug) {
         console.log(`call(${state.value.entity_id}): updateHASSState`);
       }
@@ -107,9 +101,16 @@ export function useNewLight(state: FullfilledUseState, debug = false) {
         skipContexts.splice(contextIndex, 1);
         return;
       }
-      skipNextWatch = true;
-      localValues.value = stringBoolToBool(newEntityState.state);
-      localValues.brightness = getBrightnessFromAttribute(newEntityState);
+      if (localValues.value !== stringBoolToBool(newEntityState.state)) {
+        skipNextWatch = true;
+        localValues.value = stringBoolToBool(newEntityState.state);
+      }
+      if (
+        localValues.brightness !== getBrightnessFromAttribute(newEntityState)
+      ) {
+        skipNextWatch = true;
+        localValues.brightness = getBrightnessFromAttribute(newEntityState);
+      }
     }
   );