Bug fix

PRO-2684 · Sep 27, 2024 · d535790 · d535790
1 parent 4df8d6b
commit d535790
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git a/modules/main/parser.js b/modules/main/parser.js
@@ -4,6 +4,9 @@ const parser = usercssMeta.createParser({
     mandatoryKeys: ["name"],
     parseVar: { // Changes parser for checkbox so that it now returns a boolean. Ref: https://github.com/openstyles/usercss-meta/issues/93
         checkbox: parseBool
+    },
+    validateVar: { // Changes validator for checkbox so that it now asserts a boolean.
+        checkbox: validateBool
     }
 });
 
@@ -19,8 +22,21 @@ function parseBool(state) {
         state.value = true;
     } else {
         throw new usercssMeta.ParseError({
-            code: 'invalidBool',
-            message: 'value must be 0 or 1',
+            code: "invalidBool",
+            message: "value must be 0 or 1",
+            index: state.valueIndex
+        });
+    }
+}
+/**
+ * Validates a boolean value.
+ * @param {object} state The parser state.
+ */
+function validateBool(state) {
+    if (!state.value instanceof Boolean) {
+        throw new usercssMeta.ParseError({
+            code: "invalidCheckboxDefault",
+            message: "value must be 0 or 1",
             index: state.valueIndex
         });
     }

diff --git a/modules/renderer/settings.js b/modules/renderer/settings.js
@@ -53,8 +53,7 @@ function setValueToInput(varInput, value) {
             break;
     }
     if (changed) {
-        log("setValueToInput changes to", value);
-        varInput.dispatchEvent(new Event("change", { bubbles: true }));
+        varInput.dispatchEvent(new CustomEvent("change", { bubbles: true, detail: { fromCallback: true } }));
     }
 }
 /** Function to add a button to the right side of the setting item.
@@ -180,7 +179,7 @@ function createLinkedInputs(args) {
     number.addEventListener("change", () => {
         if (number.reportValidity()) {
             range.value = number.value;
-            range.dispatchEvent(new Event("change", { bubbles: true }));
+            range.dispatchEvent(new CustomEvent("change", { bubbles: true, detail: { fromCallback: false } }));
         }
     });
     return [range, number];
@@ -354,9 +353,11 @@ function addVar(details, path, name, varObj) {
     varItem.textContent = varObj.label;
     varItem.title = name;
     const varInput = addVarInput(varItem, varObj);
-    varInput.addEventListener("change", () => {
-        if (varInput.reportValidity()) {
-            transitio.configChange(path, { [name]: getValueFromInput(varInput) });
+    varInput.addEventListener("change", (e) => {
+        if (!e.detail?.fromCallback && varInput.reportValidity()) {
+            const msg = { [name]: getValueFromInput(varInput) };
+            log("configChange", path, msg);
+            transitio.configChange(path, msg);
         }
     });
     return varInput;