fix(primeng/p-button): spinner style not working propely

Fixes primefaces#13148.
nbrown-ScottLogic · Jun 12, 2023 · a483588 · a483588
1 parent 229bb94
commit a483588
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/app/components/button/button.ts b/src/app/components/button/button.ts
@@ -239,7 +239,7 @@ export class ButtonDirective implements AfterViewInit, OnDestroy {
             <ng-container *ngIf="loading">
                 <ng-container *ngIf="!loadingIconTemplate">
                     <span *ngIf="loadingIcon" [class]="'p-button-loading-icon' + icon" [ngClass]="iconClass()"></span>
-                    <SpinnerIcon *ngIf="!loadingIcon" [styleClass]="iconClass() + ' p-button-loading-icon'" [spin]="true" />
+                    <SpinnerIcon *ngIf="!loadingIcon" [styleClass]="spinnerIconClass()" [spin]="true" />
                 </ng-container>
                 <span *ngIf="loadingIconTemplate" class="p-button-loading-icon">
                     <ng-template *ngTemplateOutlet="loadingIconTemplate"></ng-template>
@@ -349,6 +349,12 @@ export class Button implements AfterContentInit {
 
     @ContentChildren(PrimeTemplate) templates: QueryList<PrimeTemplate> | undefined;
 
+    spinnerIconClass(): string {
+        return Object.entries(this.iconClass())
+            .filter(([, value]) => !!value)
+            .reduce((acc, [key]) => acc + ` ${key}`, 'p-button-loading-icon');
+    }
+
     iconClass() {
         return {
             'p-button-icon': true,

diff --git a/src/app/components/contextmenu/contextmenu.ts b/src/app/components/contextmenu/contextmenu.ts
@@ -342,15 +342,15 @@ export class ContextMenu implements AfterViewInit, OnDestroy {
         if (this.global) {
             const documentTarget: any = this.el ? this.el.nativeElement.ownerDocument : 'document';
             this.triggerEventListener = this.renderer.listen(documentTarget, this.triggerEvent, (event) => {
-                if(this.containerViewChild && this.containerViewChild.nativeElement.style.display !== 'none') {
+                if (this.containerViewChild && this.containerViewChild.nativeElement.style.display !== 'none') {
                     this.hide();
                 }
                 this.show(event);
                 event.preventDefault();
             });
         } else if (this.target) {
             this.triggerEventListener = this.renderer.listen(this.target, this.triggerEvent, (event) => {
-                if(this.containerViewChild && this.containerViewChild.nativeElement.style.display !== 'none') {
+                if (this.containerViewChild && this.containerViewChild.nativeElement.style.display !== 'none') {
                     this.hide();
                 }
                 this.show(event);