Merge branch 'master' of https://github.com/primefaces/primeng

primefaces · May 14, 2024 · 4154d61 · 4154d61
2 parents 3038793 + 414793d
commit 4154d61
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 18 deletions.
diff --git a/src/app/components/dialog/dialog.spec.ts b/src/app/components/dialog/dialog.spec.ts
@@ -332,11 +332,7 @@ describe('Dialog', () => {
         fixture.detectChanges();
 
         tick(300);
-        const escapeEvent: any = document.createEvent('CustomEvent');
-        escapeEvent.which = 27;
-        escapeEvent.initEvent('keydown', true, true);
-        document.dispatchEvent(escapeEvent);
-        document.dispatchEvent(escapeEvent as KeyboardEvent);
+        document.dispatchEvent(new KeyboardEvent('keydown', { key: 'Escape' }));
         fixture.detectChanges();
 
         expect(closeSpy).toHaveBeenCalled();

diff --git a/src/app/components/rating/rating.spec.ts b/src/app/components/rating/rating.spec.ts
@@ -62,8 +62,8 @@ describe('Rating', () => {
         fixture.detectChanges();
 
         const starElements = fixture.debugElement.queryAll(By.css('span'));
-        expect(starElements[0].nativeElement.className).toContain('Primeng Rocks!');
-        expect(starElements[0].nativeElement.style.height).toEqual('300px');
+        expect(starElements[1].nativeElement.className).toContain('Primeng Rocks!');
+        expect(starElements[1].nativeElement.style.height).toEqual('300px');
     });
 
     it('should value 3', () => {
@@ -86,11 +86,18 @@ describe('Rating', () => {
         rating.onRate.subscribe((value) => (onRateValue = value));
         rating.onCancel.subscribe((value) => (onCancelRate = value));
         thirdStarEl.parentElement.click();
-        cancelEl.parentElement.click();
         fixture.detectChanges();
 
         expect(onRateValue.value).toEqual(3);
-        expect(onCancelRate).toBeTruthy();
+
+        const cancelspy = spyOn(rating.onCancel, 'emit').and.callThrough();
+        const onModelChangeSpy = spyOn(rating, 'onModelChange').and.callThrough();
+        cancelEl.parentElement.click();
+        fixture.detectChanges();
+
+        expect(onModelChangeSpy).toHaveBeenCalled();
+        expect(rating.value).toEqual(null);
+        expect(cancelspy).toHaveBeenCalled();
     });
 
     it('should clear value', () => {

diff --git a/src/app/components/tree/tree.ts b/src/app/components/tree/tree.ts
@@ -1271,7 +1271,10 @@ export class Tree implements OnInit, AfterContentInit, OnChanges, OnDestroy, Blo
             return;
         } else if (this.selectionMode) {
             if (node.selectable === false) {
+                node.style = '--p-focus-ring-color: none;';
                 return;
+            } else {
+                node.style = '--p-focus-ring-color: var(--primary-color)';
             }
 
             if (this.hasFilteredNodes()) {

diff --git a/src/app/showcase/doc/menubar/routerdoc.ts b/src/app/showcase/doc/menubar/routerdoc.ts
@@ -12,18 +12,25 @@ import { Router } from '@angular/router';
         <div class="card">
             <p-menubar [model]="items">
                 <ng-template pTemplate="item" let-item>
-                    <ng-container *ngIf="item.route; else elseBlock">
+                    <ng-container *ngIf="item.route; else urlRef">
                         <a [routerLink]="item.route" class="p-menuitem-link">
                             <span [class]="item.icon"></span>
                             <span class="ml-2">{{ item.label }}</span>
                         </a>
                     </ng-container>
-                    <ng-template #elseBlock>
-                        <a [href]="item.url" class="p-menuitem-link">
+                    <ng-template #urlRef>
+                        <a *ngIf="item.url; else noLink" [href]="item.url" class="p-menuitem-link">
                             <span [class]="item.icon"></span>
                             <span class="ml-2">{{ item.label }}</span>
                         </a>
                     </ng-template>
+                    <ng-template #noLink>
+                        <div class="p-menuitem-link">
+                            <span [class]="item.icon"></span>
+                            <span class="ml-2">{{ item.label }}</span>
+                            <span class="pi pi-fw pi-angle-down ml-2"></span>
+                        </div>
+                    </ng-template>
                 </ng-template>
             </p-menubar>
         </div>
@@ -78,36 +85,50 @@ export class RouterDoc implements OnInit {
     code: Code = {
         basic: `<p-menubar [model]="items">
     <ng-template pTemplate="item" let-item>
-        <ng-container *ngIf="item.route; else elseBlock">
+        <ng-container *ngIf="item.route; else urlRef">
             <a [routerLink]="item.route" class="p-menuitem-link">
                 <span [class]="item.icon"></span>
                 <span class="ml-2">{{ item.label }}</span>
             </a>
         </ng-container>
-        <ng-template #elseBlock>
-            <a [href]="item.url" class="p-menuitem-link">
+        <ng-template #urlRef>
+            <a *ngIf="item.url; else noLink" [href]="item.url" class="p-menuitem-link">
                 <span [class]="item.icon"></span>
                 <span class="ml-2">{{ item.label }}</span>
             </a>
         </ng-template>
+        <ng-template #noLink>
+            <div class="p-menuitem-link">
+                <span [class]="item.icon"></span>
+                <span class="ml-2">{{ item.label }}</span>
+                <span class="pi pi-fw pi-angle-down ml-2"></span>
+            </div>
+        </ng-template>
     </ng-template>
 </p-menubar>`,
 
         html: `<div class="card">
     <p-menubar [model]="items">
         <ng-template pTemplate="item" let-item>
-            <ng-container *ngIf="item.route; else elseBlock">
+            <ng-container *ngIf="item.route; else urlRef">
                 <a [routerLink]="item.route" class="p-menuitem-link">
                     <span [class]="item.icon"></span>
                     <span class="ml-2">{{ item.label }}</span>
                 </a>
             </ng-container>
-            <ng-template #elseBlock>
-                <a [href]="item.url" class="p-menuitem-link">
+            <ng-template #urlRef>
+                <a *ngIf="item.url; else noLink" [href]="item.url" class="p-menuitem-link">
                     <span [class]="item.icon"></span>
                     <span class="ml-2">{{ item.label }}</span>
                 </a>
             </ng-template>
+            <ng-template #noLink>
+                <div class="p-menuitem-link">
+                    <span [class]="item.icon"></span>
+                    <span class="ml-2">{{ item.label }}</span>
+                    <span class="pi pi-fw pi-angle-down ml-2"></span>
+                </div>
+            </ng-template>
         </ng-template>
     </p-menubar>
 </div>`,