Refactor dipatch method

pixiebrix · Sep 21, 2024 · 006640c · 006640c
1 parent c46fe8c
commit 006640c
Showing 1 changed file with 24 additions and 27 deletions.
diff --git a/src/contentScript/stateController.ts b/src/contentScript/stateController.ts
@@ -142,6 +142,25 @@ function mergeState(
   }
 }
 
+/**
+ * Dispatch a state change event to the document.
+ * @see STATE_CHANGE_JS_EVENT_TYPE
+ */
+function dispatchStateChangeEvent(
+  // For now, leave off the state data because state controller in the content script uses JavaScript/DOM
+  // events, which is a public channel (the host site/other extensions can see the event).
+  detail: StateChangeEventDetail,
+) {
+  console.debug("Dispatching statechange", detail);
+
+  document.dispatchEvent(
+    new CustomEvent(STATE_CHANGE_JS_EVENT_TYPE, {
+      detail,
+      bubbles: true,
+    }),
+  );
+}
+
 function dispatchStateChangeEventOnChange({
   previous,
   next,
@@ -167,22 +186,11 @@ function dispatchStateChangeEventOnChange({
   }
 
   if (!isEqual(previous, next)) {
-    // For now, leave off the event data because state controller in the content script uses JavaScript/DOM
-    // events, which is a public channel (the host site/other extensions can see the event).
-    const detail: StateChangeEventDetail = {
+    dispatchStateChangeEvent({
       namespace,
       extensionId: modComponentId,
       blueprintId: modId,
-    };
-
-    console.debug("Dispatching statechange", detail);
-
-    document.dispatchEvent(
-      new CustomEvent(STATE_CHANGE_JS_EVENT_TYPE, {
-        detail,
-        bubbles: true,
-      }),
-    );
+    });
   }
 }
 
@@ -314,21 +322,10 @@ function onSessionStorageChange(
   if (areaName === "session") {
     for (const key of Object.keys(change)) {
       if (key.startsWith(keyPrefix)) {
-        const modId = validateRegistryId(key.slice(keyPrefix.length));
-
-        const detail: StateChangeEventDetail = {
+        dispatchStateChangeEvent({
           namespace: StateNamespaces.MOD,
-          blueprintId: modId,
-        };
-
-        console.debug("Dispatching statechange", detail);
-
-        document.dispatchEvent(
-          new CustomEvent(STATE_CHANGE_JS_EVENT_TYPE, {
-            detail,
-            bubbles: true,
-          }),
-        );
+          blueprintId: validateRegistryId(key.slice(keyPrefix.length)),
+        });
       }
     }
   }