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

fix(ivy): correctly set TView.firstChild with runtime i18n (#30920)

Browse Source 
`TView.firstChild` was defined as the first node with index 0, but when we use runtime i18n then the instruction `i18nStart` can be the one with index 0 and the first node will be index 1 or more.
With this fix we set `TView.firstChild` when we see the first node with index 0 or later if `TView.firstChild` is still null.

FW-1367 #resolve
PR Close #30920
This commit is contained in:
Olivier Combe
2019-06-07 18:20:35 +02:00
committed by Igor Minar
parent 2b9a4cc6a6
commit 4155ed439a
3 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -488,10 +488,10 @@ function i18nStartFirstPass(
tView.data[index + HEADER_OFFSET] = tI18n;
}
function appendI18nNode(tNode: TNode, parentTNode: TNode, previousTNode: TNode | null): TNode {
function appendI18nNode(
tNode: TNode, parentTNode: TNode, previousTNode: TNode | null, viewData: LView): TNode {
ngDevMode && ngDevMode.rendererMoveNode++;
const nextNode = tNode.next;
const viewData = getLView();
if (!previousTNode) {
previousTNode = parentTNode;
}
@ -737,7 +737,7 @@ function readCreateOpCodes(
assertDefined(
currentTNode !,
`You need to create or select a node before you can insert it into the DOM`);
previousTNode = appendI18nNode(currentTNode !, destinationTNode, previousTNode);
previousTNode = appendI18nNode(currentTNode !, destinationTNode, previousTNode, viewData);
break;
case I18nMutateOpCode.Select:
const nodeIndex = opCode >>> I18nMutateOpCode.SHIFT_REF;

4
packages/core/src/render3/instructions/shared.ts
View File

@ -277,7 +277,9 @@ function createTNodeAtIndex(
const tParentNode = parentInSameView ? parent as TElementNode | TContainerNode : null;
const tNode = tView.data[adjustedIndex] =
createTNode(tParentNode, type, adjustedIndex, name, attrs);
if (index === 0) {
// The first node is not always the one at index 0, in case of i18n, index 0 can be the
// instruction `i18nStart` and the first node has the index 1 or more
if (index === 0 || !tView.firstChild) {
tView.firstChild = tNode;
}
// Now link ourselves into the tree.