Skip to content

Commit 4cf1493

Browse files
committed
feat: refactor components for improved readability and consistency
1 parent 980e9cd commit 4cf1493

File tree

6 files changed

+23
-16
lines changed

6 files changed

+23
-16
lines changed

projects/ng-kit-demo/src/app/autocomplete-demo/autocomplete-demo.component.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import { FormBuilder, FormControl, ReactiveFormsModule } from '@angular/forms';
33
import { AutocompleteComponent } from '@js-smart/ng-kit';
44

55
@Component({
6-
selector: 'ng-kit-autocomplete-demo',
7-
imports: [AutocompleteComponent, ReactiveFormsModule],
8-
templateUrl: './autocomplete-demo.component.html',
9-
styles: []
6+
selector: 'ng-kit-autocomplete-demo',
7+
imports: [AutocompleteComponent, ReactiveFormsModule],
8+
templateUrl: './autocomplete-demo.component.html',
9+
styles: [],
1010
})
1111
export class AutocompleteDemoComponent {
1212
cities: City[] = [
@@ -27,7 +27,9 @@ export class AutocompleteDemoComponent {
2727
constructor(private fb: FormBuilder) {}
2828

2929
displayWith(object: any): string {
30-
if (typeof object === 'string') return object;
30+
if (typeof object === 'string') {
31+
return object;
32+
}
3133
return object && object['location'] ? object['location'] : '';
3234
}
3335
}

projects/ng-kit/src/lib/components/autocomplete/autocomplete.component.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,16 +182,21 @@ export class AutocompleteComponent implements OnInit, OnChanges, AfterContentChe
182182

183183
openOrClosePanel(evt: any, trigger: MatAutocompleteTrigger): void {
184184
evt.stopPropagation();
185-
if (trigger.panelOpen) trigger.closePanel();
186-
else trigger.openPanel();
185+
if (trigger.panelOpen) {
186+
trigger.closePanel();
187+
} else {
188+
trigger.openPanel();
189+
}
187190
}
188191

189192
displayFn(object: any): string {
190193
if (this.displayWith !== undefined && this.displayWith !== null && typeof this.displayWith === 'function') {
191194
this.displayFn = this.displayWith.bind(this);
192195
return this.displayWith(object);
193196
} else {
194-
if (typeof object === 'string') return object;
197+
if (typeof object === 'string') {
198+
return object;
199+
}
195200
return object && object[this.bindLabel()] ? object[this.bindLabel()] : '';
196201
}
197202
}

projects/ng-kit/src/lib/components/ngx-spinner/ngx-spinner.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ describe('NgxSpinnerComponent', () => {
1515
const mockSpinnerSubject = new BehaviorSubject<NgxSpinner>(new NgxSpinner());
1616

1717
// Helper function to create a keyboard event with spies
18-
const createKeyboardEvent = (type: string = 'keydown'): KeyboardEvent => {
18+
const createKeyboardEvent = (type = 'keydown'): KeyboardEvent => {
1919
const event = new KeyboardEvent(type);
2020
spyOn(event, 'preventDefault');
2121
Object.defineProperty(event, 'returnValue', {

projects/ng-kit/src/lib/components/ngx-spinner/ngx-spinner.component.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { animate, state, style, transition, trigger } from '@angular/animations';
2-
import { ChangeDetectorRef, Component, HostListener, OnDestroy, OnInit, ViewChild, input } from '@angular/core';
2+
import { ChangeDetectorRef, Component, HostListener, input, OnDestroy, OnInit, ViewChild } from '@angular/core';
33
import { Subject } from 'rxjs';
44
import { takeUntil } from 'rxjs/operators';
55
import { DEFAULTS, LOADERS, NgxSpinner, PRIMARY_SPINNER, Size } from './ngx-spinner.enum';
@@ -80,22 +80,22 @@ export class NgxSpinnerComponent implements OnDestroy, OnInit {
8080
/**
8181
* Array for spinner's div
8282
*/
83-
divArray: Array<number> = [];
83+
divArray: number[] = [];
8484

8585
/**
8686
* Counter for div
8787
*/
88-
divCount: number = 0;
88+
divCount = 0;
8989

9090
/**
9191
* Show spinner
9292
**/
93-
show: boolean = false;
93+
show = false;
9494

9595
/**
9696
* Unsubscribe from spinner's observable
9797
**/
98-
ngUnsubscribe: Subject<void> = new Subject();
98+
ngUnsubscribe = new Subject<void>();
9999

100100
/**
101101
* Element Reference

projects/ng-kit/src/lib/components/ngx-spinner/ngx-spinner.enum.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export class NgxSpinner {
3232
type?: string;
3333
class?: string;
3434
divCount?: number;
35-
divArray?: Array<number>;
35+
divArray?: number[];
3636
fullScreen?: boolean;
3737
show?: boolean;
3838
zIndex?: number;

projects/ng-kit/src/lib/components/ngx-spinner/ngx-spinner.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export class NgxSpinnerService {
5555
*
5656
* @memberof NgxSpinnerService
5757
*/
58-
hide(name: string = PRIMARY_SPINNER, debounce: number = 10) {
58+
hide(name: string = PRIMARY_SPINNER, debounce = 10) {
5959
return new Promise((resolve, _reject) => {
6060
setTimeout(() => {
6161
this.spinnerObservable.next(new NgxSpinner({ name, show: false }));

0 commit comments

Comments
 (0)