Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 54 additions & 3 deletions server/src/workflow-management/selector.ts
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,24 @@ export const getElementInformation = async (
return deepestElement;
};

let deepestElement = findDeepestElement(elements);
// Logic to get list container element
let targetElement = null;

for (const element of elements) {
const deepestEl = findDeepestElement(elements);

if (deepestEl && element !== deepestEl) {
if (element.contains(deepestEl) &&
element !== deepestEl.parentElement &&
element.tagName !== 'HTML' &&
element.tagName !== 'BODY') {
targetElement = element;
break;
}
}
}

let deepestElement = targetElement || findDeepestElement(elements);
if (!deepestElement) return null;

const traverseShadowDOM = (element: HTMLElement): HTMLElement => {
Expand Down Expand Up @@ -854,7 +871,24 @@ export const getRect = async (page: Page, coordinates: Coordinates, listSelector
return deepestElement;
};

let deepestElement = findDeepestElement(elements);
// Logic to get list container element
let targetElement = null;

for (const element of elements) {
const deepestEl = findDeepestElement(elements);

if (deepestEl && element !== deepestEl) {
if (element.contains(deepestEl) &&
element !== deepestEl.parentElement &&
element.tagName !== 'HTML' &&
element.tagName !== 'BODY') {
targetElement = element;
break;
}
}
}

let deepestElement = targetElement || findDeepestElement(elements);
if (!deepestElement) return null;

const traverseShadowDOM = (element: HTMLElement): HTMLElement => {
Expand Down Expand Up @@ -2036,7 +2070,24 @@ export const getNonUniqueSelectors = async (page: Page, coordinates: Coordinates
return deepestElement;
};

let deepestElement = findDeepestElement(elements);
// Logic to get list container element
let targetElement = null;

for (const element of elements) {
const deepestEl = findDeepestElement(elements);

if (deepestEl && element !== deepestEl) {
if (element.contains(deepestEl) &&
element !== deepestEl.parentElement &&
element.tagName !== 'HTML' &&
element.tagName !== 'BODY') {
targetElement = element;
break;
}
}
}

let deepestElement = targetElement || findDeepestElement(elements);
Comment on lines +2073 to +2090
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Same inefficiency in the third occurrence

This is the third instance of the same inefficient pattern where findDeepestElement(elements) is repeatedly called inside the loop.

Since this pattern is repeated in three places, consider creating a helper function that implements this list container detection logic efficiently, which can then be reused in all three locations:

function findTargetElementOrDeepest(elements) {
  const deepestEl = findDeepestElement(elements);
  if (!deepestEl) return null;
  
  let targetElement = null;
  for (const element of elements) {
    if (element !== deepestEl && 
        element.contains(deepestEl) && 
        element !== deepestEl.parentElement && 
        element.tagName !== 'HTML' && 
        element.tagName !== 'BODY') {
      targetElement = element;
      break;
    }
  }
  
  return targetElement || deepestEl;
}

This would improve both performance and maintainability by eliminating duplicated code.

if (!deepestElement) return null;

const traverseShadowDOM = (element: HTMLElement): HTMLElement => {
Expand Down