fix: null check in decorator added (#1784)

* upstream synced with fork * added null check for elementRef * removed changes from new_component and readme * changes removed from readme.md
SAP · Jan 9, 2020 · 56b0914 · 56b0914
1 parent cabd353
commit 56b0914
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/libs/core/src/lib/utils/decorators/apply-css-class.decorator.ts b/libs/core/src/lib/utils/decorators/apply-css-class.decorator.ts
@@ -10,14 +10,19 @@ import { ELEMENT_REF_EXCEPTION } from '../public_api';
  * @param descriptor method
  */
 export function applyCssClass(target: any, propertyKey: string, descriptor: PropertyDescriptor): void {
-    const originalMethod = descriptor.value
-    descriptor.value = function (): string {
-        if (!this.elementRef) { throw ELEMENT_REF_EXCEPTION; }
+    const originalMethod = descriptor.value;
+    descriptor.value = function(): string {
+        if (!this.elementRef) {
+            throw ELEMENT_REF_EXCEPTION;
+        }
 
         const _class = originalMethod.apply(this);
+        const elementRef = this.elementRef();
 
-        (this.elementRef().nativeElement as HTMLElement).classList.value = `${_class} ${this.class}`
+        if (elementRef) {
+            (elementRef.nativeElement as HTMLElement).classList.value = `${_class} ${this.class}`;
+        }
 
         return _class;
-    }
+    };
 }
diff --git a/libs/core/src/lib/utils/decorators/apply-css-style.decorator.ts b/libs/core/src/lib/utils/decorators/apply-css-style.decorator.ts
@@ -11,15 +11,20 @@ import { Hash, ELEMENT_REF_EXCEPTION } from '../public_api';
  */
 export function applyCssStyle(target: any, propertyKey: string, descriptor: PropertyDescriptor): void {
     const originalMethod = descriptor.value;
-    descriptor.value = function (): Hash<number | string> {
-        if (!this.elementRef) { throw ELEMENT_REF_EXCEPTION; }
+    descriptor.value = function(): Hash<number | string> {
+        if (!this.elementRef) {
+            throw ELEMENT_REF_EXCEPTION;
+        }
 
         const _styles: Hash<number | string> = originalMethod.apply(this);
+        const elementRef = this.elementRef();
 
-        Object.keys(_styles).forEach(key => {
-            (this.elementRef().nativeElement as HTMLElement).style[key] = _styles[key];
-        });
+        if (elementRef) {
+            Object.keys(_styles).forEach(key => {
+                (elementRef.nativeElement as HTMLElement).style[key] = _styles[key];
+            });
+        }
 
         return _styles;
-    }
+    };
 }