Skip to content
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

fix(tree): not picking up indirect descendant node definitions #17522

Merged
merged 1 commit into from
Oct 30, 2019
Merged

fix(tree): not picking up indirect descendant node definitions #17522

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
49 changes: 36 additions & 13 deletions src/cdk/tree/tree.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@ describe('CdkTree', () => {
it('with the right accessibility roles', () => {
expect(treeElement.getAttribute('role')).toBe('tree');

getNodes(treeElement).forEach(node => {
expect(node.getAttribute('role')).toBe('treeitem');
});
expect(getNodes(treeElement).every(node => {
return node.getAttribute('role') === 'treeitem';
})).toBe(true);
});

it('with the right data', () => {
Expand Down Expand Up @@ -469,6 +469,15 @@ describe('CdkTree', () => {
expect(changedNodes[2].getAttribute('initialIndex')).toBe(null);
});
});

it('should pick up indirect descendant node definitions', () => {
configureCdkTreeTestingModule([SimpleCdkTreeAppWithIndirectNodes]);
const fixture = TestBed.createComponent(SimpleCdkTreeAppWithIndirectNodes);
fixture.detectChanges();
treeElement = fixture.nativeElement.querySelector('cdk-tree');

expect(getNodes(treeElement).length).toBe(3);
});
});

describe('nested tree', () => {
Expand Down Expand Up @@ -502,9 +511,9 @@ describe('CdkTree', () => {
it('with the right accessibility roles', () => {
expect(treeElement.getAttribute('role')).toBe('tree');

getNodes(treeElement).forEach(node => {
expect(node.getAttribute('role')).toBe('treeitem');
});
expect(getNodes(treeElement).every(node => {
return node.getAttribute('role') === 'treeitem';
})).toBe(true);
});

it('with the right data', () => {
Expand Down Expand Up @@ -827,9 +836,9 @@ describe('CdkTree', () => {
getNodes(initialNodes[0]).forEach((node: Element, index: number) => {
node.setAttribute('initialIndex', `c${index}`);
});
getNodes(initialNodes[0]).forEach((node, index) => {
expect(node.getAttribute('initialIndex')).toBe(`c${index}`);
});
expect(getNodes(initialNodes[0]).every((node, index) => {
return node.getAttribute('initialIndex') === `c${index}`;
})).toBe(true);
}

function mutateChildren(parent: TestData) {
Expand Down Expand Up @@ -965,10 +974,8 @@ describe('CdkTree', () => {

const depthElements = Array.from(treeElement.querySelectorAll('.tree-test-level')!);
const expectedLevels = ['0', '0', '1', '2', '0'];
depthElements.forEach((element, index) => {
const actualLevel = element.textContent!.trim();
expect(actualLevel).toBe(expectedLevels[index]);
});
const actualLevels = depthElements.map(element => element.textContent!.trim());
expect(actualLevels).toEqual(expectedLevels);
expect(depthElements.length).toBe(5);
});
});
Expand Down Expand Up @@ -1158,6 +1165,22 @@ class SimpleCdkTreeApp {
@ViewChildren(CdkTreeNodePadding) paddingNodes: QueryList<CdkTreeNodePadding<TestData>>;
}

@Component({
template: `
<cdk-tree [dataSource]="dataSource" [treeControl]="treeControl">
<ng-container [ngSwitch]="true">
<cdk-tree-node *cdkTreeNodeDef="let node" class="customNodeClass"
cdkTreeNodePadding [cdkTreeNodePaddingIndent]="indent"
cdkTreeNodeToggle>
{{node.pizzaTopping}} - {{node.pizzaCheese}} + {{node.pizzaBase}}
</cdk-tree-node>
</ng-container>
</cdk-tree>
`
})
class SimpleCdkTreeAppWithIndirectNodes extends SimpleCdkTreeApp {
}

@Component({
template: `
<cdk-tree [dataSource]="dataSource" [treeControl]="treeControl">
Expand Down
6 changes: 5 additions & 1 deletion src/cdk/tree/tree.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,11 @@ export class CdkTree<T> implements AfterContentChecked, CollectionViewer, OnDest
@ViewChild(CdkTreeNodeOutlet, {static: true}) _nodeOutlet: CdkTreeNodeOutlet;

/** The tree node template for the tree */
@ContentChildren(CdkTreeNodeDef) _nodeDefs: QueryList<CdkTreeNodeDef<T>>;
@ContentChildren(CdkTreeNodeDef, {
// We need to use `descendants: true`, because Ivy will no longer match
// indirect descendants if it's left as false.
descendants: true
Copy link
Member Author

Choose a reason for hiding this comment

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

@jelbourn this could break if somebody were to nest cdk-tree, but I couldn't find any examples of it being supported. We support nesting tree nodes, but not the tree itself. We can support it, but it would need a bit of extra logic.

Copy link
Member

Choose a reason for hiding this comment

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

IIRC we explicitly don't support nested trees (and tables) because of the trick we do for mostRecent___Outlet

}) _nodeDefs: QueryList<CdkTreeNodeDef<T>>;

// TODO(tinayuangao): Setup a listener for scrolling, emit the calculated view to viewChange.
// Remove the MAX_VALUE in viewChange
Expand Down