fix(ivy): ChangeDetectorRef should be injectable on ng-container (#29424)
PR Close #29424
This commit is contained in:
parent
10734ac607
commit
17b3f11e07
|
@ -349,7 +349,9 @@ export function createViewRef(
|
||||||
const componentIndex = hostTNode.directiveStart;
|
const componentIndex = hostTNode.directiveStart;
|
||||||
const componentView = getComponentViewByIndex(hostTNode.index, hostView);
|
const componentView = getComponentViewByIndex(hostTNode.index, hostView);
|
||||||
return new ViewRef(componentView, context, componentIndex);
|
return new ViewRef(componentView, context, componentIndex);
|
||||||
} else if (hostTNode.type === TNodeType.Element || hostTNode.type === TNodeType.Container) {
|
} else if (
|
||||||
|
hostTNode.type === TNodeType.Element || hostTNode.type === TNodeType.Container ||
|
||||||
|
hostTNode.type === TNodeType.ElementContainer) {
|
||||||
const hostComponentView = findComponentView(hostView);
|
const hostComponentView = findComponentView(hostView);
|
||||||
return new ViewRef(hostComponentView, hostComponentView[CONTEXT], -1);
|
return new ViewRef(hostComponentView, hostComponentView[CONTEXT], -1);
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,6 +39,28 @@ describe('di', () => {
|
||||||
fixture.detectChanges();
|
fixture.detectChanges();
|
||||||
expect((pipeInstance !.cdr as ViewRef<MyApp>).context).toBe(fixture.componentInstance);
|
expect((pipeInstance !.cdr as ViewRef<MyApp>).context).toBe(fixture.componentInstance);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('should inject host component ChangeDetectorRef into directives on ng-container', () => {
|
||||||
|
let dirInstance: MyDirective;
|
||||||
|
|
||||||
|
@Directive({selector: '[getCDR]'})
|
||||||
|
class MyDirective {
|
||||||
|
constructor(public cdr: ChangeDetectorRef) { dirInstance = this; }
|
||||||
|
}
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'my-app',
|
||||||
|
template: `<ng-container getCDR>Visible</ng-container>`,
|
||||||
|
})
|
||||||
|
class MyApp {
|
||||||
|
constructor(public cdr: ChangeDetectorRef) {}
|
||||||
|
}
|
||||||
|
|
||||||
|
TestBed.configureTestingModule({declarations: [MyApp, MyDirective]});
|
||||||
|
const fixture = TestBed.createComponent(MyApp);
|
||||||
|
fixture.detectChanges();
|
||||||
|
expect((dirInstance !.cdr as ViewRef<MyApp>).context).toBe(fixture.componentInstance);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should not cause cyclic dependency if same token is requested in deps with @SkipSelf', () => {
|
it('should not cause cyclic dependency if same token is requested in deps with @SkipSelf', () => {
|
||||||
|
|
|
@ -17,10 +17,6 @@
|
||||||
// tslint:disable
|
// tslint:disable
|
||||||
|
|
||||||
window.testBlocklist = {
|
window.testBlocklist = {
|
||||||
"CdkDrag standalone draggable should throw if attached to an ng-container": {
|
|
||||||
"error": "Error: Expected function to throw an exception with a message matching /^cdkDrag must be attached to an element node/, but it threw an exception with message 'No provider for ChangeDetectorRef!'.",
|
|
||||||
"notes": "Unknown"
|
|
||||||
},
|
|
||||||
"MatBadge should clear any pre-existing badges": {
|
"MatBadge should clear any pre-existing badges": {
|
||||||
"error": "Error: Expected 2 to be 1.",
|
"error": "Error: Expected 2 to be 1.",
|
||||||
"notes": "Breaking change: Static directive inputs evaluated in creation mode (MatBadge._clearExistingBadges is executed before child nodes of PreExistingBadge are aded to the DOM)"
|
"notes": "Breaking change: Static directive inputs evaluated in creation mode (MatBadge._clearExistingBadges is executed before child nodes of PreExistingBadge are aded to the DOM)"
|
||||||
|
|
Loading…
Reference in New Issue