From b9f1454f61a1898a6634fd4ff33eacc3cf45e914 Mon Sep 17 00:00:00 2001
From: "antonino.bonanno" <bonanno@net-serv.it>
Date: Thu, 5 Jan 2023 10:14:16 +0100
Subject: [PATCH] fix: optimized progress button and bar components

---
 .../progress-bar/progress-bar.component.html  |  4 +--
 .../progress-bar/progress-bar.component.ts    | 11 +++++---
 .../progress-button.component.html            |  4 +--
 .../progress-button.component.ts              | 27 ++++++++++---------
 .../src/lib/interfaces/core.ts                |  2 +-
 .../progress-bar-button.component.html        |  2 +-
 6 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/projects/design-angular-kit/src/lib/components/core/progress-bar/progress-bar.component.html b/projects/design-angular-kit/src/lib/components/core/progress-bar/progress-bar.component.html
index 55812e37..14475e21 100644
--- a/projects/design-angular-kit/src/lib/components/core/progress-bar/progress-bar.component.html
+++ b/projects/design-angular-kit/src/lib/components/core/progress-bar/progress-bar.component.html
@@ -4,9 +4,9 @@
   </div>
   <div class="progress"
        [class.progress-color]="!!color"
-       [class.progress-indeterminate]="indeterminate === true || indeterminate === 'true'">
+       [class.progress-indeterminate]="isIndeterminate">
 
-    <div *ngIf="indeterminate === true || indeterminate === 'true'; else determinate" class="progress-bar{{bgColor}}" role="progressbar"></div>
+    <div *ngIf="isIndeterminate; else determinate" class="progress-bar{{bgColor}}" role="progressbar"></div>
     <ng-template #determinate>
       <div class="progress-bar{{bgColor}}" role="progressbar" [style.width.%]="value"
            [attr.aria-valuenow]="value" aria-valuemin="0" aria-valuemax="100"></div>
diff --git a/projects/design-angular-kit/src/lib/components/core/progress-bar/progress-bar.component.ts b/projects/design-angular-kit/src/lib/components/core/progress-bar/progress-bar.component.ts
index 09cf3b38..8cf349d1 100644
--- a/projects/design-angular-kit/src/lib/components/core/progress-bar/progress-bar.component.ts
+++ b/projects/design-angular-kit/src/lib/components/core/progress-bar/progress-bar.component.ts
@@ -1,11 +1,12 @@
-import { Component, Input } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
 import { ProgressBarColor } from '../../../interfaces/core';
-import { BooleanInput } from '../../../utils/boolean-input';
+import { BooleanInput, isTrueBooleanInput } from '../../../utils/boolean-input';
 
 @Component({
   selector: 'it-progress-bar[value]',
   templateUrl: './progress-bar.component.html',
-  styleUrls: ['./progress-bar.component.scss']
+  styleUrls: ['./progress-bar.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class ProgressBarComponent {
 
@@ -39,4 +40,8 @@ export class ProgressBarComponent {
 
     return ` bg-${this.color}`;
   }
+
+  get isIndeterminate(): boolean {
+    return isTrueBooleanInput(this.indeterminate);
+  }
 }
diff --git a/projects/design-angular-kit/src/lib/components/core/progress-button/progress-button.component.html b/projects/design-angular-kit/src/lib/components/core/progress-button/progress-button.component.html
index bf139b26..79fca330 100644
--- a/projects/design-angular-kit/src/lib/components/core/progress-button/progress-button.component.html
+++ b/projects/design-angular-kit/src/lib/components/core/progress-button/progress-button.component.html
@@ -1,6 +1,6 @@
 <ng-content></ng-content>
 
 <it-progress-bar *ngIf="isProgress"
-                 [value]="progress||0"
-                 [indeterminate]="indeterminate"
+                 [value]="progressValue"
+                 [indeterminate]="isIndeterminate"
                  [color]="progressColor"></it-progress-bar>
diff --git a/projects/design-angular-kit/src/lib/components/core/progress-button/progress-button.component.ts b/projects/design-angular-kit/src/lib/components/core/progress-button/progress-button.component.ts
index 471f40a1..716b64a8 100644
--- a/projects/design-angular-kit/src/lib/components/core/progress-button/progress-button.component.ts
+++ b/projects/design-angular-kit/src/lib/components/core/progress-button/progress-button.component.ts
@@ -1,24 +1,23 @@
-import { Component, Input } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
 import { BooleanInput, isTrueBooleanInput } from '../../../utils/boolean-input';
 import { ProgressBarColor } from '../../../interfaces/core';
 
 @Component({
   selector: 'button[itButton][progress]',
   templateUrl: './progress-button.component.html',
-  styleUrls: ['./progress-button.component.scss']
+  styleUrls: ['./progress-button.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class ProgressButtonComponent {
 
   /**
-   * The progress bar value [0, 100]
-   * @default null
+   * Behavior of the progress bar
+   * - <b>true</b>: Show indeterminate progress bar
+   * - <b>false</b> or <b>undefined</b>: Hide progress bar
+   * - <b>number</b> [0, 100]: Assign a specific value to the progress bar
+   * @default undefined
    */
-  @Input() progress?: number | null = null;
-
-  /**
-   * Show the progress as indeterminate
-   */
-  @Input() indeterminate?: BooleanInput;
+  @Input() progress?: number | BooleanInput;
 
   /**
    * The progress bar color
@@ -26,11 +25,15 @@ export class ProgressButtonComponent {
   @Input() progressColor?: ProgressBarColor;
 
   get isProgress(): boolean {
-    return (this.progress !== null && this.progress !== undefined) || this.isIndeterminate;
+    return typeof this.progress === 'number' || isTrueBooleanInput(this.progress);
+  }
+
+  get progressValue(): number {
+    return typeof this.progress === 'number' ? this.progress : 0;
   }
 
   get isIndeterminate(): boolean {
-    return isTrueBooleanInput(this.indeterminate);
+    return typeof this.progress !== 'number' && isTrueBooleanInput(this.progress);
   }
 
 }
diff --git a/projects/design-angular-kit/src/lib/interfaces/core.ts b/projects/design-angular-kit/src/lib/interfaces/core.ts
index 232f4946..25f5c3cb 100644
--- a/projects/design-angular-kit/src/lib/interfaces/core.ts
+++ b/projects/design-angular-kit/src/lib/interfaces/core.ts
@@ -27,7 +27,7 @@ export type CalloutAppearance = 'default' | 'highlight' | 'more';
 
 export type ElementPlacement = 'top' | 'bottom' | 'left' | 'right';
 
-export type ProgressBarColor = 'success' | 'warning' | 'danger' | 'info';
+export type ProgressBarColor = 'primary' | 'success' | 'warning' | 'danger' | 'info';
 
 export type BadgeColor = 'primary' | 'secondary' | 'success' | 'warning' | 'danger';
 
diff --git a/src/app/progress-bar/progress-bar-button/progress-bar-button.component.html b/src/app/progress-bar/progress-bar-button/progress-bar-button.component.html
index ba3c4983..7e4625e7 100644
--- a/src/app/progress-bar/progress-bar-button/progress-bar-button.component.html
+++ b/src/app/progress-bar/progress-bar-button/progress-bar-button.component.html
@@ -4,7 +4,7 @@ <h3>Pulsante con Progress Bar</h3>
   <div class="row">
     <div class="col-12 col-sm-6">
       <p><strong>Pulsante primario</strong></p>
-      <button itButton="primary" [progress]="null" indeterminate="true" disabled="true">
+      <button itButton="primary" progress="true" disabled="true">
         Label pulsante
         <it-icon name="github" color="white" class="ms-2"></it-icon>
       </button>