Fixes #17176, and remove unused prop

primefaces · Dec 23, 2024 · 8a0d930 · 8a0d930
1 parent 516e7e9
commit 8a0d930
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/packages/primeng/src/popover/popover.interface.ts b/packages/primeng/src/popover/popover.interface.ts
@@ -7,8 +7,9 @@ import { TemplateRef } from '@angular/core';
 export interface PopoverTemplates {
     /**
      * Custom template of content.
+     * @param {Object} context - closeCallback.
      */
-    content(): TemplateRef<any>;
+    content(context: { closeCallback: VoidFunction }): TemplateRef<{ closeCallback: VoidFunction }>;
     /**
      * Custom template of closeicon.
      */

diff --git a/packages/primeng/src/popover/popover.ts b/packages/primeng/src/popover/popover.ts
@@ -61,7 +61,7 @@ import { PopoverStyle } from './style/popoverstyle';
         >
             <div class="p-popover-content" (click)="onContentClick($event)" (mousedown)="onContentClick($event)">
                 <ng-content></ng-content>
-                <ng-container *ngTemplateOutlet="contentTemplate || _contentTemplate"></ng-container>
+                <ng-template *ngTemplateOutlet="contentTemplate || _contentTemplate; context: { closeCallback: onCloseClick.bind(this) }"></ng-template>
             </div>
         </div>
     `,
@@ -111,11 +111,6 @@ export class Popover extends BaseComponent implements AfterContentInit, OnDestro
      * @group Props
      */
     @Input({ transform: booleanAttribute }) dismissable: boolean = true;
-    /**
-     * When enabled, displays a close icon at top right corner.
-     * @group Props
-     */
-    @Input({ transform: booleanAttribute }) showCloseIcon: boolean | undefined;
     /**
      * Inline style of the component.
      * @group Props
@@ -345,10 +340,6 @@ export class Popover extends BaseComponent implements AfterContentInit, OnDestro
 
         if (containerOffset.top < targetOffset.top) {
             addClass(this.container, 'p-popover-flipped');
-
-            if (this.showCloseIcon) {
-                this.renderer.setStyle(this.container, 'margin-top', '-30px');
-            }
         }
     }