Skip to content

refactor(core): update internal utility #68775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
crisbeto wants to merge 1 commit into
base: main
Choose a base branch
from
+28 −2
Open

refactor(core): update internal utility #68775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions packages/core/src/internal/get_closest_component_name.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,13 @@ import {getTNode} from '../render3/util/view_utils';
* Warning! this function will return minified names if the name of the component is minified. The
* consumer of the function is responsible for resolving the minified name to its original name.
* @param node Node from which to start the search.
* @param predicate Predicate function that can be used to decide which nodes should be skipped over
* during the search. Return true if the search should stop or false to keep going up the tree.
*/
export function getClosestComponentName(node: Node): string | null {
export function getClosestComponentName(
node: Node,
predicate?: (current: HTMLElement, componentName: string) => boolean,
): string | null {
let currentNode = node as Node | null;

while (currentNode) {
Expand All @@ -40,7 +45,7 @@ export function getClosestComponentName(node: Node): string | null {

// Note: the name may be an empty string if the class name is
// dropped due to minification. In such cases keep going up the tree.
if (name !== null) {
if (name !== null && (!predicate || predicate(currentNode as HTMLElement, name))) {
return name;
} else {
break;
Expand Down
21 changes: 21 additions & 0 deletions packages/core/test/acceptance/internal_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,5 +143,26 @@ describe('internal utilities', () => {
);
ref.destroy();
});

it('should be able to skip over components', () => {
@Component({
selector: 'comp',
template: '<div class="target"></div>',
})
class Comp {}

@Component({
template: `<section><comp /></section>`,
imports: [Comp],
})
class App {}

const fixture = TestBed.createComponent(App);
fixture.detectChanges();
const target = fixture.nativeElement.querySelector('.target');

expect(getClosestComponentName(target)).toBe('Comp');
expect(getClosestComponentName(target, (el) => el.tagName !== 'COMP')).toBe('App');
});
});
});
Loading