Merge branch 'main' into feat/settings-trailer-and-launch

src/renderer/src/pages/catalogue/pagination.scss

@@ -1,3 +1,5 @@
+@use "../../scss/globals.scss";
+
 .pagination {
   display: flex;
   gap: 4px;
@@ -18,4 +20,31 @@
       font-size: 16px;
     }
   }
+
+  &__page-input {
+    box-sizing: border-box;
+    width: 40px;
+    min-width: 40px;
+    max-width: 40px;
+    min-height: 40px;
+    border-radius: 8px;
+    border: solid 1px globals.$border-color;
+    background-color: transparent;
+    color: globals.$muted-color;
+    text-align: center;
+    font-size: 12px;
+    padding: 0 6px;
+    outline: none;
+  }
+
+  &__double-chevron {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 0; // remove whitespace node width between SVGs
+  }
+
+  &__double-chevron > svg + svg {
+    margin-left: -8px; // pull the second chevron closer
+  }
 }

src/renderer/src/pages/catalogue/pagination.tsx

@@ -1,8 +1,51 @@
 import { Button } from "@renderer/components/button/button";
 import { ChevronLeftIcon, ChevronRightIcon } from "@primer/octicons-react";
 import { useFormat } from "@renderer/hooks/use-format";
+import { useEffect, useRef, useState } from "react";
+import type { ChangeEvent, KeyboardEvent, RefObject } from "react";
 import "./pagination.scss";
 
+interface JumpControlProps {
+  isOpen: boolean;
+  value: string;
+  totalPages: number;
+  inputRef: RefObject<HTMLInputElement>;
+  onOpen: () => void;
+  onClose: () => void;
+  onChange: (e: ChangeEvent<HTMLInputElement>) => void;
+  onKeyDown: (e: KeyboardEvent<HTMLInputElement>) => void;
+}
+
+function JumpControl({
+  isOpen,
+  value,
+  totalPages,
+  inputRef,
+  onOpen,
+  onClose,
+  onChange,
+  onKeyDown,
+}: JumpControlProps) {
+  return isOpen ? (
+    <input
+      ref={inputRef}
+      type="number"
+      min={1}
+      max={totalPages}
+      className="pagination__page-input"
+      value={value}
+      onChange={onChange}
+      onKeyDown={onKeyDown}
+      onBlur={onClose}
+      aria-label="Go to page"
+    />
+  ) : (
+    <Button theme="outline" className="pagination__button" onClick={onOpen}>
+      ...
+    </Button>
+  );
+}
+
 interface PaginationProps {
   page: number;
   totalPages: number;
@@ -16,20 +59,82 @@ export function Pagination({
 }: PaginationProps) {
   const { formatNumber } = useFormat();
 
+  const [isJumpOpen, setIsJumpOpen] = useState(false);
+  const [jumpValue, setJumpValue] = useState<string>("");
+  const jumpInputRef = useRef<HTMLInputElement | null>(null);
+
+  useEffect(() => {
+    if (isJumpOpen) {
+      setJumpValue("");
+      setTimeout(() => jumpInputRef.current?.focus(), 0);
+    }
+  }, [isJumpOpen, page]);
+
   if (totalPages <= 1) return null;
 
   const visiblePages = 3;
+  const isLastThree = totalPages > 3 && page >= totalPages - 2;
 
   let startPage = Math.max(1, page - 1);
   let endPage = startPage + visiblePages - 1;
 
-  if (endPage > totalPages) {
+  if (isLastThree) {
+    startPage = Math.max(1, totalPages - 2);
+    endPage = totalPages;
+  } else if (endPage > totalPages) {
     endPage = totalPages;
     startPage = Math.max(1, endPage - visiblePages + 1);
   }
 
+  const onJumpChange = (e: ChangeEvent<HTMLInputElement>) => {
+    const val = e.target.value;
+    if (val === "") {
+      setJumpValue("");
+      return;
+    }
+    const num = Number(val);
+    if (Number.isNaN(num)) {
+      return;
+    }
+    if (num < 1) {
+      setJumpValue("1");
+      return;
+    }
+    if (num > totalPages) {
+      setJumpValue(String(totalPages));
+      return;
+    }
+    setJumpValue(val);
+  };
+
+  const onJumpKeyDown = (e: KeyboardEvent<HTMLInputElement>) => {
+    if (e.key === "Enter") {
+      if (jumpValue.trim() === "") return;
+      const parsed = Number(jumpValue);
+      if (Number.isNaN(parsed)) return;
+      const target = Math.max(1, Math.min(totalPages, parsed));
+      onPageChange(target);
+      setIsJumpOpen(false);
+    } else if (e.key === "Escape") {
+      setIsJumpOpen(false);
+    }
+  };
+
   return (
     <div className="pagination">
+      {startPage > 1 && (
+        <Button
+          theme="outline"
+          onClick={() => onPageChange(1)}
+          className="pagination__button"
+        >
+          <span className="pagination__double-chevron">
+            <ChevronLeftIcon />
+            <ChevronLeftIcon />
+          </span>
+        </Button>
+      )}
+
       <Button
         theme="outline"
         onClick={() => onPageChange(page - 1)}
@@ -39,20 +144,25 @@ export function Pagination({
         <ChevronLeftIcon />
       </Button>
 
-      {page > 2 && (
+      {isLastThree && startPage > 1 && (
         <>
           <Button
             theme="outline"
-            onClick={() => onPageChange(1)}
             className="pagination__button"
-            disabled={page === 1}
+            onClick={() => onPageChange(1)}
           >
-            {1}
+            {formatNumber(1)}
           </Button>
-
-          <div className="pagination__ellipsis">
-            <span className="pagination__ellipsis-text">...</span>
-          </div>
+          <JumpControl
+            isOpen={isJumpOpen}
+            value={jumpValue}
+            totalPages={totalPages}
+            inputRef={jumpInputRef}
+            onOpen={() => setIsJumpOpen(true)}
+            onClose={() => setIsJumpOpen(false)}
+            onChange={onJumpChange}
+            onKeyDown={onJumpKeyDown}
+          />
         </>
       )}
 
@@ -70,11 +180,18 @@ export function Pagination({
         </Button>
       ))}
 
-      {page < totalPages - 1 && (
+      {!isLastThree && page < totalPages - 1 && (
         <>
-          <div className="pagination__ellipsis">
-            <span className="pagination__ellipsis-text">...</span>
-          </div>
+          <JumpControl
+            isOpen={isJumpOpen}
+            value={jumpValue}
+            totalPages={totalPages}
+            inputRef={jumpInputRef}
+            onOpen={() => setIsJumpOpen(true)}
+            onClose={() => setIsJumpOpen(false)}
+            onChange={onJumpChange}
+            onKeyDown={onJumpKeyDown}
+          />
 
           <Button
             theme="outline"
@@ -95,6 +212,19 @@ export function Pagination({
       >
         <ChevronRightIcon />
       </Button>
+
+      {endPage < totalPages && (
+        <Button
+          theme="outline"
+          onClick={() => onPageChange(totalPages)}
+          className="pagination__button"
+        >
+          <span className="pagination__double-chevron">
+            <ChevronRightIcon />
+            <ChevronRightIcon />
+          </span>
+        </Button>
+      )}
     </div>
   );
 }