cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ivy): correctly support ngProjectAs on templates (#34200)

Browse Source 
Prior to this commit, if a template (for example, generated using structural directive such as *ngIf) contains `ngProjectAs` attribute, it was not included into attributes array in generated code and as a result, these templates were not matched at runtime during content projection. This commit adds the logic to append `ngProjectAs` values into corresponding element's attribute arrays, so content projection works as expected.

PR Close #34200
This commit is contained in:
Andrew Kushnir
2019-12-02 15:34:48 -08:00
committed by Miško Hevery
parent eae541b6e2
commit 41ea3c214a
3 changed files with 101 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
packages/core/test/acceptance/content_spec.ts
View File

@ -1165,6 +1165,53 @@ describe('projection', () => {
expect(fixture.nativeElement).toHaveText('inline()ng-template(onetwothree)');
});
it('should project template content with `ngProjectAs` defined', () => {
@Component({
selector: 'projector-app',
template: `
Projected
<ng-content select="foo"></ng-content>
<ng-content select="[foo]"></ng-content>
<ng-content select=".foo"></ng-content>
`,
})
class ProjectorApp {
}
@Component({
selector: 'root-comp',
template: `
<projector-app>
<div *ngIf="show" ngProjectAs="foo">as element</div>
<div *ngIf="show" ngProjectAs="[foo]">as attribute</div>
<div *ngIf="show" ngProjectAs=".foo">as class</div>
</projector-app>
`,
})
class RootComp {
show = true;
}
TestBed.configureTestingModule({
declarations: [ProjectorApp, RootComp],
});
const fixture = TestBed.createComponent(RootComp);
fixture.detectChanges();
let content = fixture.nativeElement.textContent;
expect(content).toContain('as element');
expect(content).toContain('as attribute');
expect(content).toContain('as class');
fixture.componentInstance.show = false;
fixture.detectChanges();
content = fixture.nativeElement.textContent;
expect(content).not.toContain('as element');
expect(content).not.toContain('as attribute');
expect(content).not.toContain('as class');
});
describe('on containers', () => {
it('should work when matching attributes', () => {
let xDirectives = 0;