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

fix(ivy): avoid unnecessary i18n instructions generation for <ng-template> with structural directives (#32623)

Browse Source 
If an <ng-template> contains a structural directive (for example *ngIf), Ngtsc generates extra template function with 1 template instruction call. When <ng-template> tag also contains i18n attribute on it, we generate i18nStart and i18nEnd instructions around it, which is unnecessary and breaking runtime. This commit adds a logic to make sure we do not generate i18n instructions in case only `template` is present.

PR Close #32623
This commit is contained in:
Andrew Kushnir
2019-09-11 14:00:59 -07:00
committed by Kara Erickson
parent 0477bfc8ed
commit 5328bb223a
3 changed files with 77 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
packages/compiler-cli/test/compliance/r3_view_compiler_i18n_spec.ts
View File

@ -2462,6 +2462,64 @@ describe('i18n support in the template compiler', () => {
verify(input, output);
});
// Note: applying structural directives to <ng-template> is typically user error, but it is
// technically allowed, so we need to support it.
it('should handle structural directives', () => {
const input = `
<ng-template *ngIf="someFlag" i18n>Content A</ng-template>
<ng-container *ngIf="someFlag" i18n>Content B</ng-container>
`;
const output = String.raw `
const $_c0$ = [4, "ngIf"];
var $I18N_1$;
if (ngI18nClosureMode) {
const $MSG_EXTERNAL_3308216566145348998$$APP_SPEC_TS___2$ = goog.getMsg("Content A");
$I18N_1$ = $MSG_EXTERNAL_3308216566145348998$$APP_SPEC_TS___2$;
} else {
$I18N_1$ = $localize \`Content A\`;
}
function MyComponent_0_ng_template_0_Template(rf, ctx) {
if (rf & 1) {
$r3$.ɵɵi18n(0, $I18N_1$);
}
}
function MyComponent_0_Template(rf, ctx) {
if (rf & 1) {
$r3$.ɵɵtemplate(0, MyComponent_0_ng_template_0_Template, 1, 0, "ng-template");
}
}
var $I18N_3$;
if (ngI18nClosureMode) {
const $MSG_EXTERNAL_8349021389088127654$$APP_SPEC_TS__4$ = goog.getMsg("Content B");
$I18N_3$ = $MSG_EXTERNAL_8349021389088127654$$APP_SPEC_TS__4$;
} else {
$I18N_3$ = $localize \`Content B\`;
}
function MyComponent_ng_container_1_Template(rf, ctx) {
if (rf & 1) {
$r3$.ɵɵelementContainerStart(0);
$r3$.ɵɵi18n(1, $I18N_3$);
$r3$.ɵɵelementContainerEnd();
}
}
…
consts: 2,
vars: 2,
template: function MyComponent_Template(rf, ctx) {
if (rf & 1) {
$r3$.ɵɵtemplate(0, MyComponent_0_Template, 1, 0, undefined, $_c0$);
$r3$.ɵɵtemplate(1, MyComponent_ng_container_1_Template, 2, 0, "ng-container", $_c0$);
}
if (rf & 2) {
$r3$.ɵɵproperty("ngIf", ctx.someFlag);
$r3$.ɵɵadvance(1);
$r3$.ɵɵproperty("ngIf", ctx.someFlag);
}
}
`;
verify(input, output);
});
});
describe('whitespace preserving mode', () => {