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

fix(ivy): Class selector directives execute properly on container elements (#29383)

Browse Source 
PR Close #29383
This commit is contained in:
Ben Lesh
2019-03-18 14:52:30 -07:00
committed by Matias Niemelä
parent 68a9fe817c
commit 10734ac607
4 changed files with 92 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
packages/core/src/render3/instructions/instructions.ts
View File

@ -547,6 +547,13 @@ export function elementContainerStart(
const tNode =
createNodeAtIndex(index, TNodeType.ElementContainer, native, tagName, attrs || null);
if (attrs) {
// While ng-container doesn't necessarily support styling, we use the style context to identify
// and execute directives on the ng-container.
setNodeStylingTemplate(tView, tNode, attrs, 0);
}
appendChild(native, tNode, lView);
createDirectivesAndLocals(tView, lView, localRefs);
attachPatchData(native, lView);
@ -559,6 +566,25 @@ export function elementContainerStart(
executeContentQueries(tView, tNode, lView);
}
/**
* Appropriately sets `stylingTemplate` on a TNode
*
* Does not apply styles to DOM nodes
*
* @param tNode The node whose `stylingTemplate` to set
* @param attrs The attribute array source to set the attributes from
* @param attrsStartIndex Optional start index to start processing the `attrs` from
*/
function setNodeStylingTemplate(
tView: TView, tNode: TNode, attrs: TAttributes, attrsStartIndex: number) {
if (tView.firstTemplatePass && !tNode.stylingTemplate) {
const stylingAttrsStartIndex = attrsStylingIndexOf(attrs, attrsStartIndex);
if (stylingAttrsStartIndex >= 0) {
tNode.stylingTemplate = initializeStaticStylingContext(attrs, stylingAttrsStartIndex);
}
}
}
function executeContentQueries(tView: TView, tNode: TNode, lView: LView) {
if (isContentQueryHost(tNode)) {
const start = tNode.directiveStart;
@ -636,12 +662,7 @@ export function elementStart(
// value is evaluated). When the template is allocated (when it turns into a context)
// then the styling template is locked and cannot be further extended (it can only be
// instantiated into a context per element)
if (tView.firstTemplatePass && !tNode.stylingTemplate) {
const stylingAttrsStartIndex = attrsStylingIndexOf(attrs, lastAttrIndex);
if (stylingAttrsStartIndex >= 0) {
tNode.stylingTemplate = initializeStaticStylingContext(attrs, stylingAttrsStartIndex);
}
}
setNodeStylingTemplate(tView, tNode, attrs, lastAttrIndex);
if (tNode.stylingTemplate) {
// the initial style/class values are rendered immediately after having been