fix(compiler): Safe property access expressions work in event bindings (#11724)

This commit is contained in:
Chuck Jazdzewski
2016-09-20 14:54:53 -07:00
committed by Igor Minar
parent fdb22bd185
commit a95d65241c
2 changed files with 21 additions and 3 deletions

View File

@ -340,7 +340,7 @@ class _AstToIrVisitor implements cdAst.AstVisitor {
// Notice that the first guard condition is the left hand of the left most safe access node // Notice that the first guard condition is the left hand of the left most safe access node
// which comes in as leftMostSafe to this routine. // which comes in as leftMostSafe to this routine.
let guardedExpression = this.visit(leftMostSafe.receiver, mode); let guardedExpression = this.visit(leftMostSafe.receiver, _Mode.Expression);
let temporary: o.ReadVarExpr; let temporary: o.ReadVarExpr;
if (this.needsTemporary(leftMostSafe.receiver)) { if (this.needsTemporary(leftMostSafe.receiver)) {
// If the expression has method calls or pipes then we need to save the result into a // If the expression has method calls or pipes then we need to save the result into a
@ -369,7 +369,7 @@ class _AstToIrVisitor implements cdAst.AstVisitor {
} }
// Recursively convert the node now without the guarded member access. // Recursively convert the node now without the guarded member access.
const access = this.visit(ast, mode); const access = this.visit(ast, _Mode.Expression);
// Remove the mapping. This is not strictly required as the converter only traverses each node // Remove the mapping. This is not strictly required as the converter only traverses each node
// once but is safer if the conversion is changed to traverse the nodes more than once. // once but is safer if the conversion is changed to traverse the nodes more than once.
@ -381,7 +381,7 @@ class _AstToIrVisitor implements cdAst.AstVisitor {
} }
// Produce the conditional // Produce the conditional
return condition.conditional(o.literal(null), access); return convertToStatementIfNeeded(mode, condition.conditional(o.literal(null), access));
} }
// Given a expression of the form a?.b.c?.d.e the the left most safe node is // Given a expression of the form a?.b.c?.d.e the the left most safe node is

View File

@ -79,6 +79,24 @@ function declareTests({useJit}: {useJit: boolean}) {
expect(fixture.nativeElement).toHaveText('counting method value'); expect(fixture.nativeElement).toHaveText('counting method value');
expect(MyCountingComp.calls).toBe(1); expect(MyCountingComp.calls).toBe(1);
}); });
it('should evalute a conditional in a statement binding', () => {
@Component({selector: 'some-comp', template: '<p (click)="nullValue?.click()"></p>'})
class SomeComponent {
nullValue: SomeReferencedClass;
}
class SomeReferencedClass {
click() {}
}
expect(() => {
const fixture = TestBed.configureTestingModule({declarations: [SomeComponent]})
.createComponent(SomeComponent);
fixture.detectChanges(/* checkNoChanges */ false);
}).not.toThrow();
});
}); });
describe('providers', () => { describe('providers', () => {