Merge pull request #241 from getmaxun/cap-list-select

fix: include visual containment for capture list selection
getmaxun · Dec 10, 2024 · 1383193 · 1383193
2 parents 14c9626 + 668a670
commit 1383193
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/server/src/workflow-management/selector.ts b/server/src/workflow-management/selector.ts
@@ -847,16 +847,24 @@ export const getNonUniqueSelectors = async (page: Page, coordinates: Coordinates
       if (!originalEl) return null;
 
       let element = originalEl;
+
+      const containerTags = ['DIV', 'SECTION', 'ARTICLE', 'MAIN', 'HEADER', 'FOOTER', 'NAV', 'ASIDE', 
+        'ADDRESS', 'BLOCKQUOTE', 'DETAILS', 'DIALOG', 'FIGURE', 'FIGCAPTION', 'MAIN', 'MARK', 'SUMMARY', 'TIME',
+        'TABLE', 'THEAD', 'TBODY', 'TFOOT', 'TR', 'TH', 'TD', 'CAPTION', 'COLGROUP', 'COL', 'FORM', 'FIELDSET',
+        'LEGEND', 'LABEL', 'INPUT', 'BUTTON', 'SELECT', 'DATALIST', 'OPTGROUP', 'OPTION', 'TEXTAREA', 'OUTPUT',
+        'PROGRESS', 'METER', 'DETAILS', 'SUMMARY', 'MENU', 'MENUITEM', 'MENUITEM', 'APPLET', 'EMBED', 'OBJECT',
+        'PARAM', 'VIDEO', 'AUDIO', 'SOURCE', 'TRACK', 'CANVAS', 'MAP', 'AREA', 'SVG', 'IFRAME', 'FRAME', 'FRAMESET',
+        'LI', 'UL', 'OL', 'DL', 'DT', 'DD', 'HR', 'P', 'PRE', 'LISTING', 'PLAINTEXT', 'A'
+      ];
 
-      if (originalEl.tagName === 'A') {
-        element = originalEl;
-      } else if (originalEl.parentElement?.tagName === 'A') {
-        element = originalEl.parentElement;
-      } else {
       while (element.parentElement) {
         const parentRect = element.parentElement.getBoundingClientRect();
         const childRect = element.getBoundingClientRect();
 
+        if (!containerTags.includes(element.parentElement.tagName)) {
+          break;
+        }
+
         const fullyContained = 
           parentRect.left <= childRect.left &&
           parentRect.right >= childRect.right &&
@@ -871,7 +879,6 @@ export const getNonUniqueSelectors = async (page: Page, coordinates: Coordinates
           element = element.parentElement;
         } else {
           break;
-        }
       }
     }