ENG-1484: extract constants, remove dead defaults per review

Author: sid597

apps/roam/src/utils/initializeObserversAndListeners.ts

@@ -278,7 +278,7 @@ export const initObservers = async ({
   const unsubGlobalTrigger = onSettingChange(
     settingKeys.globalTrigger,
     (newValue) => {
-      globalTrigger = ((newValue as string | undefined) ?? "\\").trim();
+      globalTrigger = (newValue as string).trim();
     },
   );
 
@@ -357,7 +357,7 @@ export const initObservers = async ({
   const unsubSearchTrigger = onSettingChange(
     settingKeys.nodeSearchMenuTrigger,
     (newValue) => {
-      customTrigger = (newValue as string | undefined) ?? "@";
+      customTrigger = newValue as string;
     },
   );
 

apps/roam/src/utils/pageRefObserverHandlers.ts

@@ -6,6 +6,12 @@ import { render as discourseOverlayRender } from "~/components/DiscourseContextO
 import { OnloadArgs } from "roamjs-components/types";
 import { renderSuggestive as renderSuggestiveOverlay } from "~/components/SuggestiveModeOverlay";
 
+const PAGE_REF_SELECTOR = "span.rm-page-ref";
+const DISCOURSE_OVERLAY_CLASS = "roamjs-discourse-context-overlay";
+const DISCOURSE_OVERLAY_ATTR = "data-roamjs-discourse-overlay";
+const SUGGESTIVE_OVERLAY_CLASS = "suggestive-mode-overlay";
+const SUGGESTIVE_OVERLAY_ATTR = "data-discourse-suggestive-overlay";
+
 const pageRefObservers = new Set<(s: HTMLSpanElement) => void>();
 const pageRefObserverRef: { current?: MutationObserver } = {
   current: undefined,
@@ -38,27 +44,27 @@ export const overlayPageRefHandler = (
     const tag =
       s.getAttribute("data-tag") ||
       s.parentElement.getAttribute("data-link-title");
-    const hasOverlayAttribute = s.getAttribute("data-roamjs-discourse-overlay");
+    const hasOverlayAttribute = s.getAttribute(DISCOURSE_OVERLAY_ATTR);
     const hasOverlayElement =
       (s.hasAttribute("data-tag") &&
         Array.from(s.children).some(
           (child) =>
             child instanceof HTMLSpanElement &&
-            child.querySelector(".roamjs-discourse-context-overlay"),
+            child.querySelector(`.${DISCOURSE_OVERLAY_CLASS}`),
         )) ||
       (s.parentElement &&
         Array.from(s.parentElement.children).some(
           (child) =>
             child instanceof HTMLSpanElement &&
-            child.querySelector(".roamjs-discourse-context-overlay"),
+            child.querySelector(`.${DISCOURSE_OVERLAY_CLASS}`),
         ));
     if (
       tag &&
       !hasOverlayAttribute &&
       !hasOverlayElement &&
       isDiscourseNode(getPageUidByPageTitle(tag))
     ) {
-      s.setAttribute("data-roamjs-discourse-overlay", "true");
+      s.setAttribute(DISCOURSE_OVERLAY_ATTR, "true");
       const parent = document.createElement("span");
       discourseOverlayRender({
         parent,
@@ -84,10 +90,10 @@ export const suggestiveOverlayPageRefHandler = (
       s.parentElement.getAttribute("data-link-title");
     if (
       tag &&
-      !s.getAttribute("data-discourse-suggestive-overlay") &&
+      !s.getAttribute(SUGGESTIVE_OVERLAY_ATTR) &&
       isDiscourseNode(getPageUidByPageTitle(tag))
     ) {
-      s.setAttribute("data-discourse-suggestive-overlay", "true");
+      s.setAttribute(SUGGESTIVE_OVERLAY_ATTR, "true");
       const parent = document.createElement("span");
       renderSuggestiveOverlay({
         parent,
@@ -141,19 +147,15 @@ const applyHandlersToExistingPageRefs = (
   handler: (s: HTMLSpanElement) => void,
 ) => {
   const existingPageRefs =
-    document.querySelectorAll<HTMLSpanElement>("span.rm-page-ref");
+    document.querySelectorAll<HTMLSpanElement>(PAGE_REF_SELECTOR);
   existingPageRefs.forEach((pageRef) => {
     handler(pageRef);
   });
 };
 
-const removeOverlayElements = (
-  pageRefSelector: string,
-  overlayClass: string,
-  attributeName: string,
-) => {
+const removeOverlayElements = (overlayClass: string, attributeName: string) => {
   const allPageRefs =
-    document.querySelectorAll<HTMLSpanElement>(pageRefSelector);
+    document.querySelectorAll<HTMLSpanElement>(PAGE_REF_SELECTOR);
   allPageRefs.forEach((pageRef) => {
     const directChildContainer = Array.from(pageRef.children).find(
       (child) =>
@@ -184,18 +186,10 @@ const removeOverlayElements = (
 
 // Queries all page refs (not just attributed ones) to catch cases where attribute is missing
 const removeOverlaysFromExistingPageRefs = () =>
-  removeOverlayElements(
-    "span.rm-page-ref",
-    "roamjs-discourse-context-overlay",
-    "data-roamjs-discourse-overlay",
-  );
+  removeOverlayElements(DISCOURSE_OVERLAY_CLASS, DISCOURSE_OVERLAY_ATTR);
 
 const removeSuggestiveOverlaysFromExistingPageRefs = () =>
-  removeOverlayElements(
-    "span.rm-page-ref",
-    "suggestive-mode-overlay",
-    "data-discourse-suggestive-overlay",
-  );
+  removeOverlayElements(SUGGESTIVE_OVERLAY_CLASS, SUGGESTIVE_OVERLAY_ATTR);
 
 export const onPageRefObserverChange =
   (handler: (s: HTMLSpanElement) => void) => (b: boolean) => {