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

primefaces · Dec 12, 2023 · e046a5c · e046a5c
2 parents 1fba2ff + 660ddee
commit e046a5c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 124 deletions.
diff --git a/angular.json b/angular.json
diff --git a/src/app/components/dropdown/dropdown.ts b/src/app/components/dropdown/dropdown.ts
@@ -933,6 +933,7 @@ export class Dropdown implements OnInit, AfterViewInit, AfterContentInit, AfterV
 
             if (visibleOptions && ObjectUtils.isNotEmpty(visibleOptions)) {
                 this.selectedOption = visibleOptions[this.findSelectedOptionIndex()];
+                this.cd.markForCheck();
             }
         });
     }

diff --git a/src/app/components/listbox/listbox.ts b/src/app/components/listbox/listbox.ts
@@ -207,7 +207,7 @@ export const LISTBOX_VALUE_ACCESSOR: any = {
                         </li>
                         <li *ngIf="!hasFilter() && isEmpty()" class="p-listbox-empty-message" role="option">
                             <ng-container *ngIf="!emptyTemplate; else empty">
-                                {{ emptyMessageText }}
+                                {{ emptyMessage }}
                             </ng-container>
                             <ng-container #empty *ngTemplateOutlet="emptyTemplate"></ng-container>
                         </li>
@@ -219,7 +219,7 @@ export const LISTBOX_VALUE_ACCESSOR: any = {
                 <ng-container *ngTemplateOutlet="footerTemplate; context: { $implicit: modelValue(), options: visibleOptions() }"></ng-container>
             </div>
             <span *ngIf="isEmpty()" role="status" aria-live="polite" class="p-hidden-accessible">
-                {{ emptyMessageText }}
+                {{ emptyMessage }}
             </span>
             <span role="status" aria-live="polite" class="p-hidden-accessible">
                 {{ selectedMessageText }}
-Original file line number
+Diff line change
@@ Expand Up @@
                 if (visibleOptions && ObjectUtils.isNotEmpty(visibleOptions)) {
                     this.selectedOption = visibleOptions[this.findSelectedOptionIndex()];
+                    this.cd.markForCheck();
                 }
             });
         }
@@ Expand Down @@