test(ivy): get ViewRef.rootNodes should get all root nodes from projectable nodes (#33647)
PR Close #33647
This commit is contained in:
parent
9d99c7244f
commit
39712bcdb2
|
@ -19,7 +19,7 @@ import {CONTEXT, FLAGS, HOST, LView, LViewFlags, TVIEW, T_HOST} from './interfac
|
|||
import {assertNodeOfPossibleTypes} from './node_assert';
|
||||
import {destroyLView, renderDetachView} from './node_manipulation';
|
||||
import {findComponentView, getLViewParent} from './util/view_traversal_utils';
|
||||
import {getNativeByTNode, unwrapRNode} from './util/view_utils';
|
||||
import {unwrapRNode} from './util/view_utils';
|
||||
|
||||
|
||||
|
||||
|
@ -302,7 +302,8 @@ export class RootViewRef<T> extends ViewRef<T> {
|
|||
get context(): T { return null !; }
|
||||
}
|
||||
|
||||
function collectNativeNodes(lView: LView, tNode: TNode | null, result: any[]): any[] {
|
||||
function collectNativeNodes(
|
||||
lView: LView, tNode: TNode | null, result: any[], isProjection: boolean = false): any[] {
|
||||
while (tNode !== null) {
|
||||
ngDevMode && assertNodeOfPossibleTypes(
|
||||
tNode, TNodeType.Element, TNodeType.Container, TNodeType.Projection,
|
||||
|
@ -333,15 +334,13 @@ function collectNativeNodes(lView: LView, tNode: TNode | null, result: any[]): a
|
|||
const componentView = findComponentView(lView);
|
||||
const componentHost = componentView[T_HOST] as TElementNode;
|
||||
const parentView = getLViewParent(componentView);
|
||||
let currentProjectedNode: TNode|null =
|
||||
let firstProjectedNode: TNode|null =
|
||||
(componentHost.projection as(TNode | null)[])[tNode.projection as number];
|
||||
|
||||
while (currentProjectedNode !== null && parentView !== null) {
|
||||
result.push(getNativeByTNode(currentProjectedNode, parentView));
|
||||
currentProjectedNode = currentProjectedNode.next;
|
||||
if (firstProjectedNode !== null && parentView !== null) {
|
||||
collectNativeNodes(parentView, firstProjectedNode, result, true);
|
||||
}
|
||||
}
|
||||
tNode = tNode.next;
|
||||
tNode = isProjection ? tNode.projectionNext : tNode.next;
|
||||
}
|
||||
|
||||
return result;
|
||||
|
|
|
@ -55,7 +55,7 @@ describe('TemplateRef', () => {
|
|||
expect(rootNodes.length).toBe(0);
|
||||
});
|
||||
|
||||
it('should include projected nodes', () => {
|
||||
it('should include projected nodes and their children', () => {
|
||||
@Component({
|
||||
selector: 'menu-content',
|
||||
template: `
|
||||
|
@ -75,6 +75,7 @@ describe('TemplateRef', () => {
|
|||
<menu-content #menu="menuContent">
|
||||
<button>Item one</button>
|
||||
<button>Item two</button>
|
||||
<ng-template [ngIf]="true"><button>Item three</button></ng-template>
|
||||
</menu-content>
|
||||
`
|
||||
})
|
||||
|
@ -90,10 +91,11 @@ describe('TemplateRef', () => {
|
|||
|
||||
const instance = fixture.componentInstance;
|
||||
const viewRef = instance.viewContainerRef.createEmbeddedView(instance.content.template);
|
||||
const rootNodeTextContent = viewRef.rootNodes.map(node => node && node.textContent.trim())
|
||||
.filter(text => text !== '');
|
||||
const rootNodeTextContent =
|
||||
viewRef.rootNodes.map(node => node && node.textContent.trim())
|
||||
.filter(text => text !== '' && text.indexOf('ng-reflect-ng-if') === -1);
|
||||
|
||||
expect(rootNodeTextContent).toEqual(['Header', 'Item one', 'Item two']);
|
||||
expect(rootNodeTextContent).toEqual(['Header', 'Item one', 'Item two', 'Item three']);
|
||||
});
|
||||
|
||||
it('should descend into view containers on ng-template', () => {
|
||||
|
|
Loading…
Reference in New Issue