refactor(html-attr): cleanup

xidedix · xidedix · commit 6034a0124724 · 2023-04-07T14:57:01.000+02:00
diff --git a/projects/coreui-angular/src/lib/shared/html-attr.directive.ts b/projects/coreui-angular/src/lib/shared/html-attr.directive.ts
@@ -1,4 +1,4 @@
-import {Directive, ElementRef, Input, OnInit, Renderer2} from '@angular/core';
+import { Directive, ElementRef, Input, OnInit, Renderer2 } from '@angular/core';
 
 @Directive({
   selector: '[cHtmlAttr]',
@@ -7,8 +7,7 @@ import {Directive, ElementRef, Input, OnInit, Renderer2} from '@angular/core';
 })
 export class HtmlAttributesDirective implements OnInit {
 
-  // @ts-ignore
-  @Input() cHtmlAttr: {[key: string]: any };
+  @Input() cHtmlAttr?: { [key: string]: any };
 
   constructor(
     private renderer: Renderer2,
@@ -18,7 +17,7 @@ export class HtmlAttributesDirective implements OnInit {
   ngOnInit(): void {
     const attribs = this.cHtmlAttr;
     for (const attr in attribs) {
-      if (attr === 'style' && typeof(attribs[attr]) === 'object' ) {
+      if (attr === 'style' && typeof (attribs[attr]) === 'object') {
         this.setStyle(attribs[attr]);
       } else if (attr === 'class') {
         this.addClass(attribs[attr]);
@@ -36,16 +35,16 @@ export class HtmlAttributesDirective implements OnInit {
     }
   }
 
-  private addClass(classes: string): void {
+  private addClass(classes: string | string[]): void {
     const classArray = (Array.isArray(classes) ? classes : classes.split(' '));
     classArray.filter((element) => element.length > 0).forEach(element => {
-      this.renderer.addClass(this.el.nativeElement, element );
+      this.renderer.addClass(this.el.nativeElement, element);
     });
   }
 
   private setAttrib(key: string, value: string | null): void {
     value !== null ?
-      this.renderer.setAttribute(this.el.nativeElement, key, value ) :
+      this.renderer.setAttribute(this.el.nativeElement, key, value) :
       this.renderer.removeAttribute(this.el.nativeElement, key);
   }
 }
diff --git a/projects/coreui-icons-angular/src/lib/shared/html-attr.directive.spec.ts b/projects/coreui-icons-angular/src/lib/shared/html-attr.directive.spec.ts
@@ -8,8 +8,7 @@ import { HtmlAttributesDirective } from './html-attr.directive';
   template: `
     <div [cHtmlAttr]="{class: 'test', style: {backgroundColor: 'red'}, id: 'id-1'}"></div>`
 })
-class TestComponent {
-}
+class TestComponent {}
 
 describe('HtmlAttributesDirective', () => {
 
diff --git a/projects/coreui-icons-angular/src/lib/shared/html-attr.directive.ts b/projects/coreui-icons-angular/src/lib/shared/html-attr.directive.ts
@@ -27,10 +27,11 @@ export class HtmlAttributesDirective implements OnInit {
     }
   }
 
-  private setStyle(styles: any): void {
-    // tslint:disable-next-line:forin
+  private setStyle(styles: { [x: string]: any; }): void {
     for (const style in styles) {
-      this.renderer.setStyle(this.el.nativeElement, style, styles[style]);
+      if (style) {
+        this.renderer.setStyle(this.el.nativeElement, style, styles[style]);
+      }
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -27,10 +27,11 @@ export class HtmlAttributesDirective implements OnInit {`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
`30`		`- private setStyle(styles: any): void {`
`31`		`- // tslint:disable-next-line:forin`
	`30`	`+ private setStyle(styles: { [x: string]: any; }): void {`
`32`	`31`	`for (const style in styles) {`
`33`		`- this.renderer.setStyle(this.el.nativeElement, style, styles[style]);`
	`32`	`+ if (style) {`
	`33`	`+ this.renderer.setStyle(this.el.nativeElement, style, styles[style]);`
	`34`	`+ }`
`34`	`35`	`}`
`35`	`36`	`}`
`36`	`37`