chore: Address PR feedback

Author: Francesco Longo

src/internal/analytics-metadata/__tests__/dom-utils.test.tsx

@@ -4,7 +4,7 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 import { activateAnalyticsMetadata, getAnalyticsMetadataAttribute, METADATA_ATTRIBUTE } from '../attributes';
-import { findLogicalParent, isNodeComponent, findComponentUp, findSelectorUp } from '../dom-utils';
+import { findLogicalParent, isNodeComponent, findComponentUpUntil, findSelectorUp } from '../dom-utils';
 
 beforeAll(() => {
   activateAnalyticsMetadata(true);
@@ -78,17 +78,17 @@ describe('isNodeComponent', () => {
   });
 });
 
-describe('findComponentUp', () => {
+describe('findComponentUpUntil', () => {
   test('returns null when input is null', () => {
-    expect(findComponentUp(null)).toBeNull();
+    expect(findComponentUpUntil(null)).toBeNull();
   });
   test('returns parent component element', () => {
     const { container } = render(
       <div id="component-element" {...getAnalyticsMetadataAttribute({ component: { name: 'ComponentName' } })}>
         <div id="target-element"></div>
       </div>
     );
-    expect(findComponentUp(container.querySelector('#target-element'))!.id).toBe('component-element');
+    expect(findComponentUpUntil(container.querySelector('#target-element'))!.id).toBe('component-element');
   });
   test('returns parent component element with portals', () => {
     const { container } = render(
@@ -101,15 +101,15 @@ describe('findComponentUp', () => {
         </div>
       </div>
     );
-    expect(findComponentUp(container.querySelector('#target-element'))!.id).toBe('component-element');
+    expect(findComponentUpUntil(container.querySelector('#target-element'))!.id).toBe('component-element');
   });
   test('returns null when element has no parent component', () => {
     const { container } = render(
       <div>
         <div id="target-element"></div>
       </div>
     );
-    expect(findComponentUp(container.querySelector('#target-element'))).toBeNull();
+    expect(findComponentUpUntil(container.querySelector('#target-element'))).toBeNull();
   });
   test('with `until` argument', () => {
     const { container } = render(
@@ -128,31 +128,31 @@ describe('findComponentUp', () => {
       </>
     );
     expect(
-      findComponentUp(
+      findComponentUpUntil(
         container.querySelector('#target-element'),
         container.querySelector('#outer-element') as HTMLElement
       )!.id
     ).toBe('component-element');
     expect(
-      findComponentUp(
+      findComponentUpUntil(
         container.querySelector('#target-element'),
         container.querySelector('#target-element') as HTMLElement
       )
     ).toBeNull();
     expect(
-      findComponentUp(
+      findComponentUpUntil(
         container.querySelector('#target-element'),
         container.querySelector('#component-element') as HTMLElement
       )!.id
     ).toBe('component-element');
     expect(
-      findComponentUp(
+      findComponentUpUntil(
         container.querySelector('#another-target-element'),
         container.querySelector('#outer-element') as HTMLElement
       )!.id
     ).toBe('component-element');
     expect(
-      findComponentUp(
+      findComponentUpUntil(
         container.querySelector('#another-target-element'),
         container.querySelector('#another-until') as HTMLElement
       )

src/internal/analytics-metadata/dom-utils.ts

@@ -15,7 +15,7 @@ export const findLogicalParent = (node: HTMLElement): HTMLElement | null => {
   }
 };
 
-export function findComponentUp(node: HTMLElement | null, until: HTMLElement = document.body): HTMLElement | null {
+export function findComponentUpUntil(node: HTMLElement | null, until: HTMLElement = document.body): HTMLElement | null {
   let firstComponentElement = node;
   while (firstComponentElement && firstComponentElement !== until && !isNodeComponent(firstComponentElement)) {
     firstComponentElement = findLogicalParent(firstComponentElement);

src/internal/analytics-metadata/labels-utils.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { LABEL_DATA_ATTRIBUTE } from './attributes';
-import { findSelectorUp, findComponentUp } from './dom-utils';
+import { findSelectorUp, findComponentUpUntil } from './dom-utils';
 import { LabelIdentifier } from './interfaces';
 
 export const processLabel = (node: HTMLElement | null, labelIdentifier: string | LabelIdentifier | null): string => {
@@ -52,7 +52,7 @@ const processSingleLabel = (
     return processSingleLabel(findSelectorUp(node, rootSelector), labelSelector);
   }
   if (root === 'component') {
-    return processSingleLabel(findComponentUp(node), labelSelector);
+    return processSingleLabel(findComponentUpUntil(node), labelSelector);
   }
   if (root === 'body') {
     return processSingleLabel(document.body, labelSelector);