@lavalogic/scoria 0.38.6 → 0.38.7

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

@@ -111,17 +111,27 @@
 	$effect(() => {
 		if (tableContext.paginationRepo?.paginationState.pageIndex == null) {
 			pageButtons = [1];
-		} else {
-			const startingPage = Math.min(
-				tableContext.lastPage - 2,
-				tableContext.paginationRepo.paginationState.pageIndex - 1
-			);
-			const pageToStartWith = Math.max(1, Math.min(startingPage, tableContext.lastPage - 4));
-
-			pageButtons = new Array<number>(Math.min(tableContext.lastPage, 5))
-				.fill(pageToStartWith)
-				.map((item, index) => item + index);
+			return;
 		}
+		const current = tableContext.paginationRepo.paginationState.pageIndex + 1;
+		const last = tableContext.lastPage;
+		// `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.
+		// 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);
+		}
+		pages.add(last);
+		pageButtons = [...pages].sort((a, b) => a - b);
 	});
 
 	let hasNoSelectedItems = $derived(tableContext.selectedItems.size == 0);
@@ -250,6 +260,11 @@
 					id="{tableContext.tableName}-jump-to-page"
 					value={pageValue}
 					oninput={onNumberInput}
+					onfocus={(e) => {
+						// Select the existing value so typing replaces it, instead of
+						// appending to it (typing "5" on a "4" otherwise yields "45").
+						(e.target as HTMLInputElement).select();
+					}}
 					disabled={tableContext.showSelectedOnly}
 				/>
 			</div>

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

@@ -68,8 +68,11 @@ export declare class BuiltInRemoteRepository<TRow extends object> extends TableD
     readonly setFilterMode: (id: string, mode: FilterMode) => void;
     readonly filterBy: (id: string, value: unknown) => void;
     readonly resetFilters: () => void;
+    /** Jumps to the given 1-based page number, clamped at >= 1. */
     readonly setPage: (page: number) => void;
+    /** Advances to the next page. */
     readonly nextPage: () => void;
+    /** Returns to the previous page, clamped at >= 1. */
     readonly prevPage: () => void;
     readonly setPageSize: (size: number | string) => void;
     readonly updateSorting: (next: SortingState | ((prev: SortingState) => SortingState)) => void;
@@ -121,8 +124,11 @@ export declare class CustomRemoteRepository<TRow extends object> extends TableDa
     readonly setFilterMode: (id: string, mode: FilterMode) => void;
     readonly filterBy: (id: string, value: unknown) => void;
     readonly resetFilters: () => void;
+    /** Jumps to the given 1-based page number, clamped at >= 1. */
     readonly setPage: (page: number) => void;
+    /** Advances to the next page. */
     readonly nextPage: () => void;
+    /** Returns to the previous page, clamped at >= 1. */
     readonly prevPage: () => void;
     readonly setPageSize: (size: number | string) => void;
     readonly updateSorting: (next: SortingState | ((prev: SortingState) => SortingState)) => void;

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

@@ -118,15 +118,29 @@ export class BuiltInRemoteRepository extends TableDataRepository {
         this._filtering = [];
         this.scheduleReload();
     };
+    /** Jumps to the given 1-based page number, clamped at >= 1. */
     setPage = (page) => {
-        this.paginationState = { ...this.paginationState, pageIndex: page };
+        this.paginationState = {
+            ...this.paginationState,
+            pageIndex: Math.max(0, page - 1),
+        };
         this.scheduleReload({ immediate: true });
     };
+    /** Advances to the next page. */
     nextPage = () => {
-        this.setPage(this.paginationState.pageIndex + 1);
+        this.paginationState = {
+            ...this.paginationState,
+            pageIndex: this.paginationState.pageIndex + 1,
+        };
+        this.scheduleReload({ immediate: true });
     };
+    /** Returns to the previous page, clamped at >= 1. */
     prevPage = () => {
-        this.setPage(Math.max(0, this.paginationState.pageIndex - 1));
+        this.paginationState = {
+            ...this.paginationState,
+            pageIndex: Math.max(0, this.paginationState.pageIndex - 1),
+        };
+        this.scheduleReload({ immediate: true });
     };
     setPageSize = (size) => {
         const parsed = typeof size === 'number' ? size : Number.parseInt(size, 10);
@@ -379,15 +393,29 @@ export class CustomRemoteRepository extends TableDataRepository {
         this._filtering = [];
         void this.reload();
     };
+    /** Jumps to the given 1-based page number, clamped at >= 1. */
     setPage = (page) => {
-        this.paginationState = { ...this.paginationState, pageIndex: page };
+        this.paginationState = {
+            ...this.paginationState,
+            pageIndex: Math.max(0, page - 1),
+        };
         void this.reload();
     };
+    /** Advances to the next page. */
     nextPage = () => {
-        this.setPage(this.paginationState.pageIndex + 1);
+        this.paginationState = {
+            ...this.paginationState,
+            pageIndex: this.paginationState.pageIndex + 1,
+        };
+        void this.reload();
     };
+    /** Returns to the previous page, clamped at >= 1. */
     prevPage = () => {
-        this.setPage(Math.max(0, this.paginationState.pageIndex - 1));
+        this.paginationState = {
+            ...this.paginationState,
+            pageIndex: Math.max(0, this.paginationState.pageIndex - 1),
+        };
+        void this.reload();
     };
     setPageSize = (size) => {
         const parsed = typeof size === 'number' ? size : Number.parseInt(size, 10);

package/package.json

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