From cf1af94f530c172b776b1d196884642d1198a7ce Mon Sep 17 00:00:00 2001
From: Mary Hipp <maryhipp@Marys-MacBook-Air.local>
Date: Wed, 24 Jul 2024 16:24:23 -0400
Subject: [PATCH] feat(ui): make jump to page a popover

---
 invokeai/frontend/web/public/locales/en.json  |  2 +
 .../ImageGrid/GalleryPagination.tsx           | 88 ++++++++-----------
 .../gallery/components/ImageGrid/JumpTo.tsx   | 77 ++++++++++++++++
 3 files changed, 114 insertions(+), 53 deletions(-)
 create mode 100644 invokeai/frontend/web/src/features/gallery/components/ImageGrid/JumpTo.tsx

diff --git a/invokeai/frontend/web/public/locales/en.json b/invokeai/frontend/web/public/locales/en.json
index 42291b47fb..1d21249278 100644
--- a/invokeai/frontend/web/public/locales/en.json
+++ b/invokeai/frontend/web/public/locales/en.json
@@ -381,7 +381,9 @@
         "featuresWillReset": "If you delete this image, those features will immediately be reset.",
         "galleryImageSize": "Image Size",
         "gallerySettings": "Gallery Settings",
+        "go": "Go",
         "image": "image",
+        "jump": "Jump",
         "loading": "Loading",
         "loadMore": "Load More",
         "newestFirst": "Newest First",
diff --git a/invokeai/frontend/web/src/features/gallery/components/ImageGrid/GalleryPagination.tsx b/invokeai/frontend/web/src/features/gallery/components/ImageGrid/GalleryPagination.tsx
index 7402bb8772..07e33d9085 100644
--- a/invokeai/frontend/web/src/features/gallery/components/ImageGrid/GalleryPagination.tsx
+++ b/invokeai/frontend/web/src/features/gallery/components/ImageGrid/GalleryPagination.tsx
@@ -1,8 +1,10 @@
-import { Button, CompositeNumberInput, Flex, Icon, IconButton, Spacer } from '@invoke-ai/ui-library';
+import { Button, Flex, Icon, IconButton } from '@invoke-ai/ui-library';
 import { ELLIPSIS, useGalleryPagination } from 'features/gallery/hooks/useGalleryPagination';
 import { useCallback } from 'react';
 import { PiCaretLeftBold, PiCaretRightBold, PiDotsThreeBold } from 'react-icons/pi';
 
+import { JumpTo } from './JumpTo';
+
 export const GalleryPagination = () => {
   const { goPrev, goNext, isPrevEnabled, isNextEnabled, pageButtons, goToPage, currentPage, total } =
     useGalleryPagination();
@@ -15,64 +17,44 @@ export const GalleryPagination = () => {
     goNext();
   }, [goNext]);
 
-  const onChangeJumpTo = useCallback(
-    (v: number) => {
-      goToPage(v - 1);
-    },
-    [goToPage]
-  );
-
   if (!total) {
     return null;
   }
 
   return (
-    <Flex justifyContent="space-between" alignItems="center" w="full">
-      <Spacer w="auto" />
-      <Flex flexGrow="1" justifyContent="center">
-        <Flex gap={1} alignItems="center">
-          <IconButton
-            size="xs"
-            aria-label="prev"
-            icon={<PiCaretLeftBold />}
-            onClick={onClickPrev}
-            isDisabled={!isPrevEnabled}
-            variant="ghost"
-          />
-          {pageButtons.map((page, i) => {
-            if (page === ELLIPSIS) {
-              return <Icon as={PiDotsThreeBold} boxSize="4" key={`ellipsis-${i}`} />;
-            }
-            return (
-              <Button
-                size="xs"
-                key={page}
-                onClick={goToPage.bind(null, page - 1)}
-                variant={currentPage === page - 1 ? 'solid' : 'outline'}
-              >
-                {page}
-              </Button>
-            );
-          })}
-          <IconButton
-            size="xs"
-            aria-label="next"
-            icon={<PiCaretRightBold />}
-            onClick={onClickNext}
-            isDisabled={!isNextEnabled}
-            variant="ghost"
-          />
-        </Flex>
-      </Flex>
-      <CompositeNumberInput
-        size="xs"
-        maxW="60px"
-        value={currentPage + 1}
-        min={1}
-        max={total}
-        step={1}
-        onChange={onChangeJumpTo}
+    <Flex justifyContent="center" alignItems="center" w="full" gap={1}>
+      <IconButton
+        size="sm"
+        aria-label="prev"
+        icon={<PiCaretLeftBold />}
+        onClick={onClickPrev}
+        isDisabled={!isPrevEnabled}
+        variant="ghost"
       />
+      {pageButtons.map((page, i) => {
+        if (page === ELLIPSIS) {
+          return <Icon as={PiDotsThreeBold} boxSize="4" key={`ellipsis-${i}`} />;
+        }
+        return (
+          <Button
+            size="sm"
+            key={page}
+            onClick={goToPage.bind(null, page - 1)}
+            variant={currentPage === page - 1 ? 'solid' : 'outline'}
+          >
+            {page}
+          </Button>
+        );
+      })}
+      <IconButton
+        size="sm"
+        aria-label="next"
+        icon={<PiCaretRightBold />}
+        onClick={onClickNext}
+        isDisabled={!isNextEnabled}
+        variant="ghost"
+      />
+      <JumpTo />
     </Flex>
   );
 };
diff --git a/invokeai/frontend/web/src/features/gallery/components/ImageGrid/JumpTo.tsx b/invokeai/frontend/web/src/features/gallery/components/ImageGrid/JumpTo.tsx
new file mode 100644
index 0000000000..9f268cddb6
--- /dev/null
+++ b/invokeai/frontend/web/src/features/gallery/components/ImageGrid/JumpTo.tsx
@@ -0,0 +1,77 @@
+import {
+  Button,
+  CompositeNumberInput,
+  Flex,
+  FormControl,
+  Popover,
+  PopoverArrow,
+  PopoverBody,
+  PopoverContent,
+  PopoverTrigger,
+  useDisclosure,
+} from '@invoke-ai/ui-library';
+import { useGalleryPagination } from 'features/gallery/hooks/useGalleryPagination';
+import { useCallback, useEffect, useState } from 'react';
+import { useHotkeys } from 'react-hotkeys-hook';
+import { useTranslation } from 'react-i18next';
+
+export const JumpTo = () => {
+  const { t } = useTranslation();
+  const { goToPage, currentPage, pages } = useGalleryPagination();
+  const [newPage, setNewPage] = useState(currentPage);
+  const { isOpen, onToggle, onClose } = useDisclosure();
+
+  const onChangeJumpTo = useCallback((v: number) => {
+    setNewPage(v - 1);
+  }, []);
+
+  const onClickGo = useCallback(() => {
+    goToPage(newPage);
+    onClose();
+  }, [newPage, goToPage, onClose]);
+
+  useHotkeys(
+    'enter',
+    () => {
+      if (isOpen) {
+        onClickGo();
+      }
+    },
+    [isOpen, onClickGo]
+  );
+
+  useEffect(() => {
+    setNewPage(currentPage);
+  }, [currentPage]);
+
+  return (
+    <Popover isOpen={isOpen} onClose={onClose}>
+      <PopoverTrigger>
+        <Button aria-label={t('gallery.jump')} size="xs" onClick={onToggle}>
+          {t('gallery.jump')}
+        </Button>
+      </PopoverTrigger>
+      <PopoverContent>
+        <PopoverArrow />
+        <PopoverBody>
+          <Flex gap={2}>
+            <FormControl>
+              <CompositeNumberInput
+                size="sm"
+                maxW="60px"
+                value={newPage + 1}
+                min={1}
+                max={pages}
+                step={1}
+                onChange={onChangeJumpTo}
+              />
+              <Button size="sm" onClick={onClickGo}>
+                {t('gallery.go')}
+              </Button>
+            </FormControl>
+          </Flex>
+        </PopoverBody>
+      </PopoverContent>
+    </Popover>
+  );
+};