Use null instead of empty string

AdguardTeam · May 23, 2024 · 1f671bd · 1f671bd
1 parent 628e64f
commit 1f671bd
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/scriptlets/trusted-click-element.ts b/src/scriptlets/trusted-click-element.ts
@@ -210,6 +210,10 @@ export function trustedClickElement(
                     return true;
                 }
 
+                if (!parsedCookies[cookieKey]) {
+                    return false;
+                }
+
                 return valueMatch.test(parsedCookies[cookieKey] || '');
             });
         });
@@ -261,7 +265,7 @@ export function trustedClickElement(
      * - always know on what index corresponding element should be put
      * - prevent selectors from being queried multiple times
      */
-    let selectorsSequence = selectors
+    let selectorsSequence: Array<string | null> = selectors
         .split(SELECTORS_DELIMITER)
         .map((selector) => selector.trim());
 
@@ -343,11 +347,13 @@ export function trustedClickElement(
 
         // selectorsSequence should be modified after the loop to not break loop indexation
         selectorsSequence = selectorsSequence.map((selector) => {
-            return fulfilledSelectors.includes(selector) ? '' : selector;
+            return selector && fulfilledSelectors.includes(selector)
+                ? null
+                : selector;
         });
 
         // Disconnect observer after finding all elements
-        const allSelectorsFulfilled = selectorsSequence.every((selector) => selector === '');
+        const allSelectorsFulfilled = selectorsSequence.every((selector) => selector === null);
         if (allSelectorsFulfilled) {
             observer.disconnect();
         }