@lavalogic/scoria 0.38.14 → 0.38.15

package/dist/Components/Table/Misc/TableFooter.svelte

@@ -115,20 +115,34 @@
 		}
 		const current = tableContext.paginationRepo.paginationState.pageIndex + 1;
 		const last = tableContext.lastPage;
+		// Empty / no-results case: render a single "1" button rather than
+		// a "0" button. `lastPage` is a 1-indexed count, never 0; a
+		// misbehaving data repo that returns 0 would otherwise leak
+		// through to a "Previous 0 1 Next" strip (see the page-0
+		// regression captured in image 2 of the bug report).
+		if (last < 1) {
+			pageButtons = [1];
+			return;
+		}
 		// `pages` accumulates the dedup'd, sorted button set. The minimum
 		// the user always sees between the Previous and Next arrows is the
 		// current page, the next page (when one exists), and the last
 		// page. On top of that we still surface a small window around the
-		// current page for visual context.
+		// current page for visual context. Every value pushed is clamped
+		// to `[1, last]` defensively so an out-of-range current page (e.g.
+		// a stale `pageIndex` waiting for the next remote reload to
+		// settle) cannot resurface a page-0 button.
 		// eslint-disable-next-line svelte/prefer-svelte-reactivity
 		const pages = new Set<number>();
 		const windowStart = Math.max(1, Math.min(current - 2, last - 4));
 		for (let i = windowStart; i < windowStart + 5 && i <= last; i++) {
 			pages.add(i);
 		}
-		pages.add(current);
-		if (current + 1 <= last) {
-			pages.add(current + 1);
+		if (current >= 1 && current <= last) {
+			pages.add(current);
+			if (current + 1 <= last) {
+				pages.add(current + 1);
+			}
 		}
 		pages.add(last);
 		pageButtons = [...pages].sort((a, b) => a - b);

package/dist/Components/Table/Types/DataRepository/BuiltInRemoteRepository.svelte.js

@@ -235,7 +235,7 @@ export class BuiltInRemoteRepository extends TableDataRepository {
             const transformed = this._applyResponseTransform(raw);
             this._data = [...transformed.rows];
             this._totalRows = transformed.totalRows;
-            this._lastPage = Math.max(0, Math.ceil(transformed.totalRows / this.paginationState.pageSize) - 1);
+            this._lastPage = Math.max(1, Math.ceil(transformed.totalRows / this.paginationState.pageSize));
         }
         catch (e) {
             if (e.name === 'AbortError') {
@@ -490,7 +490,7 @@ export class CustomRemoteRepository extends TableDataRepository {
             }
             this._data = [...response.rows];
             this._totalRows = response.totalRows;
-            this._lastPage = Math.max(0, Math.ceil(response.totalRows / this.paginationState.pageSize) - 1);
+            this._lastPage = Math.max(1, Math.ceil(response.totalRows / this.paginationState.pageSize));
         }
         catch (e) {
             if (e.name === 'AbortError') {

package/dist/Components/Table/Types/DataRepository/LocalTableDataRepository.svelte.d.ts

@@ -91,9 +91,15 @@ export declare class LocalTableDataRepository<T extends object> extends TableDat
     /** Clears every active filter value (keeps filter modes intact). */
     readonly resetFilters: () => void;
     /**
-     * Sets the page size and clamps the current page index so the new
-     * page count covers the current view. Accepts a string so a raw
-     * `<select>` value can be passed through without parsing first.
+     * Sets the page size and resets the page index to 0 (page 1). A
+     * page-size change is a "show me the start of the list at this
+     * density" action; clamping the previous page index forward instead
+     * (e.g. page 5 of size 20 -> page 5 of size 100) leaves the user on
+     * an arbitrary window of the new page-sized result, which does not
+     * match the user's mental model.
+     *
+     * Accepts a string so a raw `<select>` value can be passed through
+     * without parsing first.
      */
     setPageSize: (size: number | string) => void;
     /** Jumps to the given 1-based page number, clamped to the last page. */

package/dist/Components/Table/Types/DataRepository/LocalTableDataRepository.svelte.js

@@ -219,9 +219,15 @@ export class LocalTableDataRepository extends TableDataRepository {
         this.resetToFirstPage();
     };
     /**
-     * Sets the page size and clamps the current page index so the new
-     * page count covers the current view. Accepts a string so a raw
-     * `<select>` value can be passed through without parsing first.
+     * Sets the page size and resets the page index to 0 (page 1). A
+     * page-size change is a "show me the start of the list at this
+     * density" action; clamping the previous page index forward instead
+     * (e.g. page 5 of size 20 -> page 5 of size 100) leaves the user on
+     * an arbitrary window of the new page-sized result, which does not
+     * match the user's mental model.
+     *
+     * Accepts a string so a raw `<select>` value can be passed through
+     * without parsing first.
      */
     setPageSize = (size) => {
         if (typeof size === 'string') {
@@ -231,10 +237,9 @@ export class LocalTableDataRepository extends TableDataRepository {
             console.warn('page size is nan');
             return;
         }
-        const lastIndex = Math.ceil(this._dataRef.value.length / size) - 1;
         this.paginationState = {
             pageSize: size,
-            pageIndex: Math.max(0, Math.min(this.paginationState.pageIndex, lastIndex)),
+            pageIndex: 0,
         };
     };
     /** Jumps to the given 1-based page number, clamped to the last page. */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lavalogic/scoria",
   "description": "Svelte components used for the FloWMS Web Frontend",
-  "version": "0.38.14",
+  "version": "0.38.15",
   "publishConfig": {
     "access": "restricted"
   },