Merge branch 'v18' into modern-togglebutton

primefaces · Oct 20, 2024 · 012459a · 012459a
2 parents fe57ee8 + 384122c
commit 012459a
Show file tree

Hide file tree

Showing 679 changed files with 18,492 additions and 16,622 deletions.
diff --git a/angular.json b/angular.json
@@ -78,7 +78,7 @@
                         "development": {
                             "optimization": false,
                             "extractLicenses": false,
-                            "sourceMap": true
+                            "sourceMap": false
                         }
                     },
                     "defaultConfiguration": "production"

diff --git a/api-generator/themedoc.json b/api-generator/themedoc.json
diff --git a/src/app/components/accordion/accordion.ts b/src/app/components/accordion/accordion.ts
@@ -178,6 +178,18 @@ export class AccordionHeader extends BaseComponent {
     disabled = computed(() => this.pcAccordionPanel.disabled());
 
     ariaControls = computed(() => `${this.pcAccordion.id()}_accordioncontent_${this.pcAccordionPanel.value()}`);
+    /**
+     * A template reference variable that represents the toggle icon in a UI component.
+     * @param {AccordionToggleIconTemplateContext} context - Context of the template
+     * @example
+     * ```html
+     * <ng-template #toggleicon let-active="active"> </ng-template>
+     * ```
+     * @see {@link AccordionToggleIconTemplateContext}
+     * @group Templates
+     */
+    @ContentChild('toggleicon') toggleicon: TemplateRef<AccordionToggleIconTemplateContext> | undefined;
+    @ContentChildren(PrimeTemplate) templates!: QueryList<PrimeTemplate>;
 
     @HostListener('click', ['$event']) onClick() {
         this.changeActiveValue();
@@ -210,19 +222,6 @@ export class AccordionHeader extends BaseComponent {
                 break;
         }
     }
-    /**
-     * A template reference variable that represents the toggle icon in a UI component.
-     * @param {AccordionToggleIconTemplateContext} context - Context of the template
-     * @example
-     * ```html
-     * <ng-template #toggleicon let-active="active"> </ng-template>
-     * ```
-     * @see {@link AccordionToggleIconTemplateContext}
-     * @group Templates
-     */
-    @ContentChild('toggleicon') toggleicon: TemplateRef<AccordionToggleIconTemplateContext> | undefined;
-
-    @ContentChildren(PrimeTemplate) templates!: QueryList<PrimeTemplate>;
 
     ngAfterContentInit() {
         this.templates.forEach((item) => {
@@ -391,13 +390,13 @@ export class AccordionContent extends BaseComponent {
             [attr.id]="getTabHeaderActionId(id)"
             [attr.aria-controls]="getTabContentId(id)"
         >
-            @if (!hasHeaderFacet && !headerTemplate) {
+            @if (!headerTemplate) {
                 {{ header }}
             } @else {
                 @if (headerTemplate) {
                     <ng-container *ngTemplateOutlet="headerTemplate"></ng-container>
                 }
-                @if (hasHeaderFacet) {
+                @if (headerFacet) {
                     <ng-content select="p-header" />
                 }
             }
@@ -584,12 +583,26 @@ export class AccordionTab extends BaseComponent implements AfterContentInit, OnD
             return 'p-accordionheader-toggle-icon icon-start';
         }
     }
-
-    contentTemplate: TemplateRef<any> | undefined;
-
-    headerTemplate: TemplateRef<any> | undefined;
-
-    iconTemplate: TemplateRef<any> | undefined;
+    /**
+     * Content template for the content of the drawer.
+     * @group Templates
+     */
+    @ContentChild('header') headerTemplate: TemplateRef<any> | undefined;
+    /**
+     * Header template for the header of the drawer.
+     * @group Templates
+     */
+    @ContentChild('footer') footerTemplate: TemplateRef<any> | undefined;
+    /**
+     * Template for the header icon.
+     * @group Templates
+     */
+    @ContentChild('icon') iconTemplate: TemplateRef<any> | undefined;
+    /**
+     * Content template for the footer of the drawer.
+     * @group Templates
+     */
+    @ContentChild('content') contentTemplate: TemplateRef<any> | undefined;
 
     loaded: boolean = false;
 
@@ -668,10 +681,6 @@ export class AccordionTab extends BaseComponent implements AfterContentInit, OnD
         return index;
     }
 
-    get hasHeaderFacet(): boolean {
-        return (this.headerFacet as QueryList<Header>) && (this.headerFacet as QueryList<Header>).length > 0;
-    }
-
     onKeydown(event: KeyboardEvent) {
         switch (event.code) {
             case 'Enter':
@@ -1052,7 +1061,7 @@ export class Accordion extends BaseComponent implements BlockableUI, AfterConten
 }
 
 @NgModule({
-    imports: [Accordion, AccordionTab, AccordionPanel, AccordionHeader, AccordionContent],
+    imports: [Accordion, AccordionTab, SharedModule, AccordionPanel, AccordionHeader, AccordionContent],
     exports: [Accordion, AccordionTab, SharedModule, AccordionPanel, AccordionHeader, AccordionContent],
 })
 export class AccordionModule {}
diff --git a/src/app/components/animateonscroll/animateonscroll.ts b/src/app/components/animateonscroll/animateonscroll.ts
@@ -1,17 +1,6 @@
-import { CommonModule, DOCUMENT, isPlatformBrowser } from '@angular/common';
-import {
-    AfterViewInit,
-    Directive,
-    ElementRef,
-    Input,
-    NgModule,
-    Renderer2,
-    OnInit,
-    Inject,
-    PLATFORM_ID,
-    booleanAttribute,
-    numberAttribute,
-} from '@angular/core';
+import { isPlatformBrowser } from '@angular/common';
+import { AfterViewInit, booleanAttribute, Directive, Input, NgModule, numberAttribute, OnInit } from '@angular/core';
+import { BaseComponent } from 'primeng/basecomponent';
 import { DomHandler } from 'primeng/dom';
 
 interface AnimateOnScrollOptions {
@@ -26,11 +15,12 @@ interface AnimateOnScrollOptions {
  */
 @Directive({
     selector: '[pAnimateOnScroll]',
+    standalone: true,
     host: {
         '[class.p-animateonscroll]': 'true',
     },
 })
-export class AnimateOnScroll implements OnInit, AfterViewInit {
+export class AnimateOnScroll extends BaseComponent implements OnInit, AfterViewInit {
     /**
      * Selector to define the CSS class for enter animation.
      * @group Props
@@ -72,21 +62,15 @@ export class AnimateOnScroll implements OnInit, AfterViewInit {
 
     animationEndListener: VoidFunction | undefined;
 
-    constructor(
-        @Inject(DOCUMENT) private document: Document,
-        @Inject(PLATFORM_ID) private platformId: any,
-        private host: ElementRef,
-        public el: ElementRef,
-        public renderer: Renderer2,
-    ) {}
-
     ngOnInit() {
+        super.ngOnInit();
         if (isPlatformBrowser(this.platformId)) {
-            this.renderer.setStyle(this.host.nativeElement, 'opacity', this.enterClass ? '0' : '');
+            this.renderer.setStyle(this.el.nativeElement, 'opacity', this.enterClass ? '0' : '');
         }
     }
 
     ngAfterViewInit() {
+        super.ngAfterViewInit();
         if (isPlatformBrowser(this.platformId)) {
             this.bindIntersectionObserver();
         }
@@ -113,17 +97,17 @@ export class AnimateOnScroll implements OnInit, AfterViewInit {
             this.isObserverActive = true;
         }, this.options);
 
-        setTimeout(() => this.observer.observe(this.host.nativeElement), 0);
+        setTimeout(() => this.observer.observe(this.el.nativeElement), 0);
 
         // Reset
 
         this.resetObserver = new IntersectionObserver(
             ([entry]) => {
                 if (entry.boundingClientRect.top > 0 && !entry.isIntersecting) {
-                    this.host.nativeElement.style.opacity = this.enterClass ? '0' : '';
-                    DomHandler.removeMultipleClasses(this.host.nativeElement, [this.enterClass, this.leaveClass]);
+                    this.el.nativeElement.style.opacity = this.enterClass ? '0' : '';
+                    DomHandler.removeMultipleClasses(this.el.nativeElement, [this.enterClass, this.leaveClass]);
 
-                    this.resetObserver.unobserve(this.host.nativeElement);
+                    this.resetObserver.unobserve(this.el.nativeElement);
                 }
 
                 this.animationState = undefined;
@@ -134,9 +118,9 @@ export class AnimateOnScroll implements OnInit, AfterViewInit {
 
     enter() {
         if (this.animationState !== 'enter' && this.enterClass) {
-            this.host.nativeElement.style.opacity = '';
-            DomHandler.removeMultipleClasses(this.host.nativeElement, this.leaveClass);
-            DomHandler.addMultipleClasses(this.host.nativeElement, this.enterClass);
+            this.el.nativeElement.style.opacity = '';
+            DomHandler.removeMultipleClasses(this.el.nativeElement, this.leaveClass);
+            DomHandler.addMultipleClasses(this.el.nativeElement, this.enterClass);
 
             this.once && this.unbindIntersectionObserver();
 
@@ -147,9 +131,9 @@ export class AnimateOnScroll implements OnInit, AfterViewInit {
 
     leave() {
         if (this.animationState !== 'leave' && this.leaveClass) {
-            this.host.nativeElement.style.opacity = this.enterClass ? '0' : '';
-            DomHandler.removeMultipleClasses(this.host.nativeElement, this.enterClass);
-            DomHandler.addMultipleClasses(this.host.nativeElement, this.leaveClass);
+            this.el.nativeElement.style.opacity = this.enterClass ? '0' : '';
+            DomHandler.removeMultipleClasses(this.el.nativeElement, this.enterClass);
+            DomHandler.addMultipleClasses(this.el.nativeElement, this.leaveClass);
 
             this.bindAnimationEvents();
             this.animationState = 'leave';
@@ -158,9 +142,9 @@ export class AnimateOnScroll implements OnInit, AfterViewInit {
 
     bindAnimationEvents() {
         if (!this.animationEndListener) {
-            this.animationEndListener = this.renderer.listen(this.host.nativeElement, 'animationend', () => {
-                DomHandler.removeMultipleClasses(this.host.nativeElement, [this.enterClass, this.leaveClass]);
-                !this.once && this.resetObserver.observe(this.host.nativeElement);
+            this.animationEndListener = this.renderer.listen(this.el.nativeElement, 'animationend', () => {
+                DomHandler.removeMultipleClasses(this.el.nativeElement, [this.enterClass, this.leaveClass]);
+                !this.once && this.resetObserver.observe(this.el.nativeElement);
                 this.unbindAnimationEvents();
             });
         }
@@ -174,20 +158,21 @@ export class AnimateOnScroll implements OnInit, AfterViewInit {
     }
 
     unbindIntersectionObserver() {
-        this.observer?.unobserve(this.host.nativeElement);
-        this.resetObserver?.unobserve(this.host.nativeElement);
+        this.observer?.unobserve(this.el.nativeElement);
+        this.resetObserver?.unobserve(this.el.nativeElement);
         this.isObserverActive = false;
     }
 
     ngOnDestroy() {
         this.unbindAnimationEvents();
         this.unbindIntersectionObserver();
+
+        super.ngOnDestroy();
     }
 }
 
 @NgModule({
-    imports: [CommonModule],
+    imports: [AnimateOnScroll],
     exports: [AnimateOnScroll],
-    declarations: [AnimateOnScroll],
 })
 export class AnimateOnScrollModule {}