fixup! perf(ivy): apply static styles/classes directly to an element'…

…s style/className properties
angular · Oct 25, 2019 · 1204c2b · 1204c2b
1 parent 730ee6f
commit 1204c2b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/packages/core/src/render3/instructions/styling.ts b/packages/core/src/render3/instructions/styling.ts
@@ -441,9 +441,7 @@ function normalizeStylingDirectiveInputValue(
     if (isClassBased) {
       value = concatString(initialValue, forceClassesAsString(bindingValue));
     } else {
-      value = concatString(
-          initialValue,
-          forceStylesAsString(bindingValue as{[key: string]: any} | null | undefined, true), ';');
+      value = concatString(initialValue, forceStylesAsString(bindingValue, true), ';');
     }
   }
   return value;

diff --git a/packages/core/src/render3/styling/bindings.ts b/packages/core/src/render3/styling/bindings.ts
@@ -752,7 +752,7 @@ export function writeStylingValueDirectly(
     }
     setClassName(renderer, element, valueToApply);
   } else {
-    valueToApply = forceStylesAsString(value as{[key: string]: any}, true);
+    valueToApply = forceStylesAsString(value, true);
     if (initialValue !== null) {
       valueToApply = initialValue + ';' + valueToApply;
     }

diff --git a/packages/core/src/render3/util/styling_utils.ts b/packages/core/src/render3/util/styling_utils.ts
@@ -296,7 +296,8 @@ export function forceClassesAsString(classes: string | {[key: string]: any} | nu
 }
 
 export function forceStylesAsString(
-    styles: {[key: string]: any} | null | undefined, hyphenateProps: boolean): string {
+    styles: {[key: string]: any} | string | null | undefined, hyphenateProps: boolean): string {
+  if (typeof styles == 'string') return styles;
   let str = '';
   if (styles) {
     const props = Object.keys(styles);