@cqa-lib/cqa-ui 1.0.94 → 1.0.95

package/fesm2020/cqa-lib-cqa-ui.mjs

@@ -1513,7 +1513,13 @@ class DynamicSelectFieldComponent {
         this.searchTextByKey = {};
         this.lastOptionsLength = 0;
         this.loadingMore = false;
+        /**
+         * Guard to ensure load-more is only triggered after the user has scrolled
+         * at least once since opening the panel. Prevents auto-load on open.
+         */
+        this.hasScrolledSinceOpen = false;
         this.onPanelScroll = () => {
+            this.hasScrolledSinceOpen = true;
             if (!this.config?.hasMore || this.loadingMore)
                 return;
             const el = this.panelScrollEl;
@@ -1557,6 +1563,17 @@ class DynamicSelectFieldComponent {
                 this.loadingMore = false;
             }
             this.lastOptionsLength = len;
+            // If consumer indicates no more results, clear loading state and any observers
+            if (!this.config?.hasMore) {
+                this.loadingMore = false;
+                if (this.loadMoreObserver) {
+                    try {
+                        this.loadMoreObserver.disconnect();
+                    }
+                    catch { }
+                    this.loadMoreObserver = undefined;
+                }
+            }
             // If panel is open and hasMore is true, ensure the sentinel is being observed.
             if (this.selectRef?.panelOpen && this.config?.hasMore) {
                 setTimeout(() => this.setupLoadMoreObserver(), 0);
@@ -1722,6 +1739,8 @@ class DynamicSelectFieldComponent {
             if ((this.config?.options || []).length > 0) {
                 this.loadingMore = false;
             }
+            // Ensure we only trigger load-more after a real user scroll
+            this.hasScrolledSinceOpen = false;
         }
         if (!opened) {
             // Reset search text on close so the next open shows full list
@@ -1760,8 +1779,8 @@ class DynamicSelectFieldComponent {
                 input?.focus();
             }, 0);
         }
-        // In serverSearch mode, if no options yet, trigger initial fetch
-        if (this.config?.serverSearch) {
+        // Optional: only trigger initial fetch on open when explicitly requested.
+        if (this.config?.serverSearch && this.toBoolean(this.config?.initialFetchOnOpen)) {
             const key = this.config.key;
             const q = this.searchTextByKey[key] || '';
             try {
@@ -1953,7 +1972,7 @@ class DynamicSelectFieldComponent {
             for (const entry of entries) {
                 if (entry.isIntersecting) {
                     // Request more only if not currently loading and hasMore still true
-                    if (!this.loadingMore && this.config?.hasMore) {
+                    if (this.hasScrolledSinceOpen && !this.loadingMore && this.config?.hasMore) {
                         this.loadingMore = true;
                         const key = this.config?.key || '';
                         const q = this.searchTextByKey[key] || '';