honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(ivy): missing first argument in `elementStyling` instruction inside `hostBindings` section (#27404) 

The logic that generates first argument for the `elementStyling` instruction was missing the check that directive expression is specified. As a result, in some cases first argument was not added, thus making function invocation incorrect. Now the presence of directive expression is taken into account and the `null` expression is generated as needed.

PR Close #27404
This commit is contained in:
Andrew Kushnir 2018-12-02 15:26:57 -08:00 committed by Igor Minar
parent c61a8b7b14
commit e31992c112
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts
View File

@ -859,6 +859,12 @@ describe('compiler compliance: styling', () => {
'spec.ts': ` 'spec.ts': `
import {Directive, Component, NgModule, HostBinding} from '@angular/core'; import {Directive, Component, NgModule, HostBinding} from '@angular/core';
@Directive({selector: '[myClassDir]'})
export class ClassDirective {
@HostBinding('class')
myClassMap = {red: true};
}
@Directive({selector: '[myWidthDir]'}) @Directive({selector: '[myWidthDir]'})
export class WidthDirective { export class WidthDirective {
@HostBinding('style.width') @HostBinding('style.width')
@ -880,13 +886,13 @@ describe('compiler compliance: styling', () => {
@Component({ @Component({
selector: 'my-component', selector: 'my-component',
template: ' template: '
<div myWidthDir myHeightDir></div> <div myWidthDir myHeightDir myClassDir></div>
', ',
}) })
export class MyComponent { export class MyComponent {
} }
@NgModule({declarations: [MyComponent, WidthDirective, HeightDirective]}) @NgModule({declarations: [MyComponent, WidthDirective, HeightDirective, ClassDirective]})
export class MyModule {} export class MyModule {}
` `
} }
@ -898,6 +904,17 @@ describe('compiler compliance: styling', () => {
const _c2 = ["bar"]; const _c2 = ["bar"];
const _c3 = ["height"]; const _c3 = ["height"];
… …
function ClassDirective_HostBindings(rf, ctx, elIndex) {
if (rf & 1) {
$r3$.ɵallocHostVars(1);
$r3$.ɵelementStyling(null, null, null, ctx);
}
if (rf & 2) {
$r3$.ɵelementStylingMap(elIndex, ctx.myClassMap, null, ctx);
$r3$.ɵelementStylingApply(elIndex, ctx);
}
}
…
function WidthDirective_HostBindings(rf, ctx, elIndex) { function WidthDirective_HostBindings(rf, ctx, elIndex) {
if (rf & 1) { if (rf & 1) {
$r3$.ɵelementStyling(_c0, _c1, null, ctx); $r3$.ɵelementStyling(_c0, _c1, null, ctx);

2
packages/compiler/src/render3/view/styling.ts
View File

@ -205,7 +205,7 @@ export class StylingBuilder {
// can be processed during runtime. These initial class values are bound to // can be processed during runtime. These initial class values are bound to
// a constant because the inital class values do not change (since they're static). // a constant because the inital class values do not change (since they're static).
params.push(constantPool.getConstLiteral(initialClasses, true)); params.push(constantPool.getConstLiteral(initialClasses, true));
} else if (initialStyles || useSanitizer) { } else if (initialStyles || useSanitizer || this._directiveExpr) {
// no point in having an extra `null` value unless there are follow-up params // no point in having an extra `null` value unless there are follow-up params
params.push(o.NULL_EXPR); params.push(o.NULL_EXPR);
} }