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

fix(ivy): taking "interpolation" config option into account (FW-723) (#27363)

Browse Source 
PR Close #27363
This commit is contained in:
Andrew Kushnir
2018-11-29 16:21:16 -08:00
committed by Igor Minar
parent 159788685a
commit 8e644d99fc
14 changed files with 221 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/core/src/render3/jit/compiler_facade_interface.ts
View File

@ -132,6 +132,7 @@ export interface R3ComponentMetadataFacade extends R3DirectiveMetadataFacade {
styles: string[];
encapsulation: ViewEncapsulation;
viewProviders: Provider[]|null;
interpolation?: [string, string];
}
export type ViewEncapsulation = number;

1
packages/core/src/render3/jit/directive.ts
View File

@ -61,6 +61,7 @@ export function compileComponent(type: Type<any>, metadata: Component): void {
directives: [],
pipes: new Map(),
encapsulation: metadata.encapsulation || ViewEncapsulation.Emulated,
interpolation: metadata.interpolation,
viewProviders: metadata.viewProviders || null,
};
ngComponentDef = compiler.compileComponent(

33
packages/core/test/linker/integration_spec.ts
View File

@ -1295,27 +1295,26 @@ function declareTests(config?: {useJit: boolean}) {
expect(needsAttribute.fooAttribute).toBeNull();
});
fixmeIvy('FW-723: Custom interpolation markers are not supported') &&
it('should support custom interpolation', () => {
TestBed.configureTestingModule({
declarations: [
MyComp, ComponentWithCustomInterpolationA, ComponentWithCustomInterpolationB,
ComponentWithDefaultInterpolation
]
});
const template = `<div>{{ctxProp}}</div>
it('should support custom interpolation', () => {
TestBed.configureTestingModule({
declarations: [
MyComp, ComponentWithCustomInterpolationA, ComponentWithCustomInterpolationB,
ComponentWithDefaultInterpolation
]
});
const template = `<div>{{ctxProp}}</div>
<cmp-with-custom-interpolation-a></cmp-with-custom-interpolation-a>
<cmp-with-custom-interpolation-b></cmp-with-custom-interpolation-b>`;
TestBed.overrideComponent(MyComp, {set: {template}});
const fixture = TestBed.createComponent(MyComp);
TestBed.overrideComponent(MyComp, {set: {template}});
const fixture = TestBed.createComponent(MyComp);
fixture.componentInstance.ctxProp = 'Default Interpolation';
fixture.componentInstance.ctxProp = 'Default Interpolation';
fixture.detectChanges();
expect(fixture.nativeElement)
.toHaveText(
'Default InterpolationCustom Interpolation ACustom Interpolation B (Default Interpolation)');
});
fixture.detectChanges();
expect(fixture.nativeElement)
.toHaveText(
'Default InterpolationCustom Interpolation ACustom Interpolation B (Default Interpolation)');
});
});
describe('dependency injection', () => {