fix(scroller): contentEl might be undefined if calling setTimeout

primefaces · Oct 1, 2024 · ab3f8d4 · ab3f8d4
1 parent d6c7ffc
commit ab3f8d4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/app/components/dom/domhandler.ts b/src/app/components/dom/domhandler.ts
@@ -398,7 +398,7 @@ export class DomHandler {
         return height;
     }
 
-    public static getHeight(el): number {
+    public static getHeight(el: HTMLElement): number {
         let height = el.offsetHeight;
         let style = getComputedStyle(el);
 
@@ -407,7 +407,7 @@ export class DomHandler {
         return height;
     }
 
-    public static getWidth(el): number {
+    public static getWidth(el: HTMLElement): number {
         let width = el.offsetWidth;
         let style = getComputedStyle(el);
 

diff --git a/src/app/components/scroller/scroller.ts b/src/app/components/scroller/scroller.ts
@@ -425,7 +425,7 @@ export class Scroller implements OnInit, AfterContentInit, AfterViewChecked, OnD
 
     d_numToleratedItems: any;
 
-    contentEl: any;
+    contentEl: HTMLElement | null | undefined;
 
     contentTemplate: Nullable<TemplateRef<any>>;
 
@@ -461,7 +461,7 @@ export class Scroller implements OnInit, AfterContentInit, AfterViewChecked, OnD
 
     initialized: boolean = false;
 
-    resizeObserver: any;
+    resizeObserver: ResizeObserver | null | undefined;
 
     defaultWidth: number | undefined;
 
@@ -1061,8 +1061,10 @@ export class Scroller implements OnInit, AfterContentInit, AfterViewChecked, OnD
                         this.d_numToleratedItems = this._numToleratedItems;
                         this.defaultWidth = width;
                         this.defaultHeight = height;
-                        this.defaultContentWidth = DomHandler.getWidth(this.contentEl);
-                        this.defaultContentHeight = DomHandler.getHeight(this.contentEl);
+                        if (this.contentEl) {
+                            this.defaultContentWidth = DomHandler.getWidth(this.contentEl);
+                            this.defaultContentHeight = DomHandler.getHeight(this.contentEl);
+                        }
 
                         this.init();
                         this.calculateAutoSize();