ng-virtual-list 19.7.24 → 19.7.25

package/fesm2022/ng-virtual-list.mjs

@@ -2231,11 +2231,25 @@ const validateScrollIteration = (value) => {
         throw Error('The "align" parameter must have the value `none`, `start`, `center` or `end`.');
     }
 };
-const formatScreenReaderMessage = (items, messagePattern) => {
+const formatScreenReaderMessage = (items, messagePattern, scrollSize, isVertical, bounds) => {
     if (!messagePattern) {
         return '';
     }
-    const start = items?.length ? items[0].index + 1 : 0, end = items?.length ? items[items.length - 1].index + 1 : 0;
+    const list = items ?? [], size = isVertical ? bounds.height : bounds.width;
+    let start = Number.NaN, end = Number.NaN, prevItem;
+    for (let i = 0, l = list.length; i < l; i++) {
+        const item = list[i], position = isVertical ? item.measures.y : item.measures.x, itemSize = isVertical ? item.measures.height : item.measures.width;
+        if (((position + itemSize) >= scrollSize) && Number.isNaN(start)) {
+            start = item.index + 1;
+        }
+        if ((position >= (scrollSize + size)) && Number.isNaN(end) && prevItem) {
+            end = prevItem.index + 1;
+        }
+        prevItem = item;
+    }
+    if (Number.isNaN(start) || Number.isNaN(end)) {
+        return '';
+    }
     let formatted = messagePattern ?? '';
     formatted = formatted.replace('$1', `${start}`);
     formatted = formatted.replace('$2', `${end}`);
@@ -2822,8 +2836,8 @@ class NgVirtualListComponent {
             this._trackBox.trackingPropertyName = v;
         })).subscribe();
         const $bounds = toObservable(this._bounds).pipe(filter(b => !!b)), $items = toObservable(this.items).pipe(map(i => !i ? [] : i)), $scrollSize = toObservable(this._scrollSize), $itemSize = toObservable(this.itemSize).pipe(map(v => v <= 0 ? DEFAULT_ITEM_SIZE : v)), $bufferSize = toObservable(this.bufferSize).pipe(map(v => v < 0 ? DEFAULT_BUFFER_SIZE : v)), $maxBufferSize = toObservable(this.maxBufferSize).pipe(map(v => v < 0 ? DEFAULT_BUFFER_SIZE : v)), $itemConfigMap = toObservable(this.itemConfigMap).pipe(map(v => !v ? {} : v)), $snap = toObservable(this.snap), $isVertical = toObservable(this.direction).pipe(map(v => this.getIsVertical(v || DEFAULT_DIRECTION))), $isLazy = toObservable(this.collectionMode).pipe(map(v => this.getIsLazy(v || DEFAULT_COLLECTION_MODE))), $dynamicSize = toObservable(this.dynamicSize), $enabledBufferOptimization = toObservable(this.enabledBufferOptimization), $snappingMethod = toObservable(this.snappingMethod).pipe(map(v => this.getIsSnappingMethodAdvanced(v || DEFAULT_SNAPPING_METHOD))), $methodForSelecting = toObservable(this.methodForSelecting), $selectedIds = toObservable(this.selectedIds), $collapsedIds = toObservable(this.collapsedIds).pipe(map(v => Array.isArray(v) ? v : [])), $collapsedItemIds = toObservable(this._collapsedItemIds).pipe(map(v => Array.isArray(v) ? v : [])), $actualItems = toObservable(this._actualItems), $screenReaderMessage = toObservable(this.screenReaderMessage), $displayItems = this._service.$displayItems, $cacheVersion = toObservable(this._cacheVersion);
-        combineLatest([$displayItems, $screenReaderMessage]).pipe(takeUntilDestroyed(), distinctUntilChanged(), tap(([items, screenReaderMessage]) => {
-            this.screenReaderFormattedMessage.set(formatScreenReaderMessage(items, screenReaderMessage));
+        combineLatest([$displayItems, $screenReaderMessage, $isVertical, $scrollSize, $bounds]).pipe(takeUntilDestroyed(), distinctUntilChanged(), tap(([items, screenReaderMessage, isVertical, scrollSize, bounds]) => {
+            this.screenReaderFormattedMessage.set(formatScreenReaderMessage(items, screenReaderMessage, scrollSize, isVertical, bounds));
         })).subscribe();
         $isLazy.pipe(takeUntilDestroyed(), tap(v => {
             this._trackBox.isLazy = v;