LazyListBox: items are not loaded, if the last is invisible #3356

enonic · Nov 20, 2023 · d0602ec · d0602ec
1 parent eee7815
commit d0602ec
Showing 1 changed file with 16 additions and 11 deletions.
diff --git a/src/main/resources/assets/admin/common/js/ui/selector/list/LazyListBox.ts b/src/main/resources/assets/admin/common/js/ui/selector/list/LazyListBox.ts
@@ -43,35 +43,40 @@ export class LazyListBox<T> extends ListBox<T> {
     }
 
     protected handleLazyLoad(): void {
-    //
+        // must be implemented by subclasses
     }
 
     setItems(items: T[], silent?: boolean): void {
         super.setItems(items, silent);
-
-        if (items.length > 0) {
-            this.addLazyLoad();
-        }
+        this.addLazyLoad();
     }
 
     addItems(items: T[], silent: boolean = false): void {
         super.addItems(items, silent);
-
-        if (items.length > 0) {
-            this.addLazyLoad();
-        }
+        this.addLazyLoad();
     }
 
     private addLazyLoad(): void {
-        if (this.getItemCount() === 0) {
+        const lastVisibleChild = this.getLastVisibleChild();
+        if (!lastVisibleChild) {
             return;
         }
 
         if (!this.observer) {
             this.initIntersectionObserver();
         }
 
-        this.addLazyLoadWhenLastIsVisible(this.getLastChild());
+        this.addLazyLoadWhenLastIsVisible(lastVisibleChild);
+    }
+
+    protected getLastVisibleChild(): Element | undefined {
+        if (!this.isVisible() || this.getItemCount() === 0) {
+            return undefined;
+        }
+
+        return [...this.getChildren()].reverse().find((item: Element) => {
+            return item.isVisible();
+        });
     }
 
     protected addLazyLoadWhenLastIsVisible(itemView: Element): void {