fix: resubmit

TheNoim · Jan 18, 2023 · c9009f0 · c9009f0
1 parent 414b30b
commit c9009f0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/reactive_home/src/composeables/useNewBoolean.ts b/reactive_home/src/composeables/useNewBoolean.ts
@@ -32,11 +32,15 @@ export function useNewBoolean(state: FullfilledUseState, debug = false) {
   }, 50);
 
   const localValue = ref(stringBoolToBool(state.value.state));
-
+  let skipNextWatch = false;
   const lastChanged = ref(state.value.last_changed);
 
   // Local state changes
   watch(localValue, (newLocalValue, oldLocalValue) => {
+    if (skipNextWatch) {
+      skipNextWatch = false;
+      return;
+    }
     if (newLocalValue === oldLocalValue) {
       return;
     }
@@ -58,6 +62,7 @@ export function useNewBoolean(state: FullfilledUseState, debug = false) {
         skipContexts.splice(contextIndex, 1);
         return;
       }
+      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
@@ -58,12 +58,18 @@ export function useNewLight(state: FullfilledUseState, debug = false) {
     lock: false,
   });
 
+  let skipNextWatch = false;
+
   // Local state changes
   watch(
     () => {
       return { value: localValues.value, brightness: localValues.brightness };
     },
     (newLocalValues, oldLocalValues) => {
+      if (skipNextWatch) {
+        skipNextWatch = false;
+        return;
+      }
       if (
         newLocalValues.value === oldLocalValues.value &&
         newLocalValues.brightness === oldLocalValues.brightness
@@ -101,6 +107,7 @@ export function useNewLight(state: FullfilledUseState, debug = false) {
         skipContexts.splice(contextIndex, 1);
         return;
       }
+      skipNextWatch = true;
       localValues.value = stringBoolToBool(newEntityState.state);
       localValues.brightness = getBrightnessFromAttribute(newEntityState);
     }