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

fix(core): handle <ng-template> with local refs in i18n blocks (#35758)

Browse Source 
This commit extends the range of tNode types that may have local refs to include `TNodeType.Container` to account for `<ng-template>`s. Original changes in https://github.com/angular/angular/pull/33415 didn't include that type and as a result, an error is thrown at runtime in case an i18n block contains an `<ng-template>` with local refs.

PR Close #35758
This commit is contained in:
Andrew Kushnir 2020-02-28 09:07:37 -08:00 committed by atscott
parent 40035380e7
commit ef75875ca3
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/core/src/render3/i18n.ts
View File

@ -701,7 +701,8 @@ function i18nEndFirstPass(tView: TView, lView: LView) {
} }
// Check if an element has any local refs and skip them // Check if an element has any local refs and skip them
const tNode = getTNode(tView, index); const tNode = getTNode(tView, index);
if (tNode && (tNode.type === TNodeType.Element || tNode.type === TNodeType.ElementContainer) && if (tNode && (tNode.type === TNodeType.Container || tNode.type === TNodeType.Element ||
tNode.type === TNodeType.ElementContainer) &&
tNode.localNames !== null) { tNode.localNames !== null) {
// Divide by 2 to get the number of local refs, // Divide by 2 to get the number of local refs,
// since they are stored as an array that also includes directive indexes, // since they are stored as an array that also includes directive indexes,

15
packages/core/test/acceptance/i18n_spec.ts
View File

@ -299,19 +299,28 @@ onlyInIvy('Ivy i18n logic').describe('runtime i18n', () => {
[computeMsgId( [computeMsgId(
'{$START_TAG_NG_CONTAINER} One {$CLOSE_TAG_NG_CONTAINER}' + '{$START_TAG_NG_CONTAINER} One {$CLOSE_TAG_NG_CONTAINER}' +
'{$START_TAG_DIV} Two {$CLOSE_TAG_DIV}' + '{$START_TAG_DIV} Two {$CLOSE_TAG_DIV}' +
'{$START_TAG_SPAN} Three {$CLOSE_TAG_SPAN}')]: '{$START_TAG_SPAN} Three {$CLOSE_TAG_SPAN}' +
'{$START_TAG_NG_TEMPLATE} Four {$CLOSE_TAG_NG_TEMPLATE}' +
'{$START_TAG_NG_CONTAINER_1}{$CLOSE_TAG_NG_CONTAINER}')]:
'{$START_TAG_NG_CONTAINER} Une {$CLOSE_TAG_NG_CONTAINER}' + '{$START_TAG_NG_CONTAINER} Une {$CLOSE_TAG_NG_CONTAINER}' +
'{$START_TAG_DIV} Deux {$CLOSE_TAG_DIV}' + '{$START_TAG_DIV} Deux {$CLOSE_TAG_DIV}' +
'{$START_TAG_SPAN} Trois {$CLOSE_TAG_SPAN}' '{$START_TAG_SPAN} Trois {$CLOSE_TAG_SPAN}' +
'{$START_TAG_NG_TEMPLATE} Quatre {$CLOSE_TAG_NG_TEMPLATE}' +
'{$START_TAG_NG_CONTAINER_1}{$CLOSE_TAG_NG_CONTAINER}'
}); });
const fixture = initWithTemplate(AppComp, ` const fixture = initWithTemplate(AppComp, `
<div i18n> <div i18n>
<ng-container #localRefA> One </ng-container> <ng-container #localRefA> One </ng-container>
<div #localRefB> Two </div> <div #localRefB> Two </div>
<span #localRefC> Three </span> <span #localRefC> Three </span>
<ng-template #localRefD> Four </ng-template>
<ng-container *ngTemplateOutlet="localRefD"></ng-container>
</div> </div>
`); `);
expect(fixture.nativeElement.textContent).toBe(' Une Deux Trois '); expect(fixture.nativeElement.textContent).toBe(' Une Deux Trois Quatre ');
}); });
it('should handle local refs correctly in case an element is removed in translation', () => { it('should handle local refs correctly in case an element is removed in translation', () => {