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

fix(core): correctly concatenate static and dynamic binding to class when shadowed (#35350)

Browse Source 
Given:
```
<div class="s1" [class]="null" [ngClass]="exp">
```
Notice that `[class]` binding is not a `string`. As a result the existing logic would not concatenate `[class]` with `class="s1"`. The resulting falsy value would than be sent to `ngClass` which would promptly clear all styles on the `<div>`

The new logic correctly handles falsy values for `[class]` bindings.

Fix #35335

PR Close #35350
This commit is contained in:
Misko Hevery
2020-02-11 16:31:12 -08:00
committed by Alex Rickabaugh
parent be5e75c804
commit 8c75f2155d
2 changed files with 50 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/core/src/render3/instructions/styling.ts
View File

@ -261,8 +261,9 @@ export function checkStylingMap(
ngDevMode && isClassBased === false && staticPrefix !== null &&
assertEqual(
staticPrefix.endsWith(';'), true, 'Expecting static portion to end with \';\'');
if (typeof value === 'string') {
value = concatStringsWithSpace(staticPrefix, value as string);
if (staticPrefix !== null) {
// We want to make sure that falsy values of `value` become empty strings.
value = concatStringsWithSpace(staticPrefix, value ? value : '');
}
// Given `<div [style] my-dir>` such that `my-dir` has `@Input('style')`.
// This takes over the `[style]` binding. (Same for `[class]`)