Merge pull request #160 from PasteBar/fix-quick-paste-window-shortcut…

…s-numbers-is-wrong-when-using-search Fix quick paste window shortcuts numbers is wrong when using search
PasteBar · Sep 1, 2024 · 44c879b · 44c879b
2 parents fa21247 + fb264f6
commit 44c879b
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 2 deletions.
diff --git a/.changeset/grumpy-mangos-do.md b/.changeset/grumpy-mangos-do.md
@@ -0,0 +1,5 @@
+---
+'pastebar-app-ui': patch
+---
+
+Update to shortcut for quick copy paste ctrl + number added cmd key press on mac
diff --git a/...s/pastebar-app-ui/src/pages/components/ClipboardHistory/ClipboardHistoryQuickPasteRow.tsx b/...s/pastebar-app-ui/src/pages/components/ClipboardHistory/ClipboardHistoryQuickPasteRow.tsx
@@ -54,6 +54,7 @@ interface ClipboardHistoryQuickPasteRowProps {
   index?: number
   style?: CSSProperties
   isExpanded: boolean
+  isWindows?: boolean
   isWrapText: boolean
   isSelected?: boolean
   isDeleting?: boolean
@@ -125,6 +126,7 @@ export function ClipboardHistoryQuickPasteRowComponent({
   isScrolling = false,
   isPinnedTop = false,
   isPinnedTopFirst = false,
+  isWindows,
   isDisabledPinnedMoveUp = false,
   isDisabledPinnedMoveDown = false,
   isExpanded = false,
@@ -306,7 +308,9 @@ export function ClipboardHistoryQuickPasteRowComponent({
   }, [clipboard?.isLink, hasLinkCard])
 
   const showCopyPasteIndexNumber =
-    isKeyCtrlPressed.value && typeof index !== 'undefined' && index < 10
+    (isKeyCtrlPressed.value || (isKeyAltPressed.value && !isWindows)) &&
+    typeof index !== 'undefined' &&
+    index < 10
 
   const pinnedTopOffsetFirst = !isPinnedTopFirst ? 'top-[-10px]' : 'top-[5px]'
   const bgToolsPanel = `${

diff --git a/packages/pastebar-app-ui/src/pages/components/ClipboardHistory/ClipboardHistoryRow.tsx b/packages/pastebar-app-ui/src/pages/components/ClipboardHistory/ClipboardHistoryRow.tsx
@@ -301,7 +301,9 @@ export function ClipboardHistoryRowComponent({
   }, [clipboard?.isLink, hasLinkCard])
 
   const showCopyPasteIndexNumber =
-    isKeyCtrlPressed.value && typeof index !== 'undefined' && index < 10
+    (isKeyCtrlPressed.value || (isKeyAltPressed.value && !isWindows)) &&
+    typeof index !== 'undefined' &&
+    index < 10
 
   const pinnedTopOffsetFirst = !isPinnedTopFirst ? 'top-[-10px]' : 'top-[5px]'
   const bgToolsPanel = `${

diff --git a/packages/pastebar-app-ui/src/pages/main/ClipboardHistoryPage.tsx b/packages/pastebar-app-ui/src/pages/main/ClipboardHistoryPage.tsx
@@ -317,6 +317,7 @@ export default function ClipboardHistoryPage() {
   useHotkeys(
     [...Array(10).keys()].map(i => `ctrl+${i.toString()}`),
     e => {
+      e.preventDefault()
       const index = e.key === '0' ? 9 : Number(e.key) - 1
       const itemId = clipboardHistory[Number(index)]?.historyId
 
@@ -325,12 +326,35 @@ export default function ClipboardHistoryPage() {
       }
 
       setCopiedItem(itemId)
+    },
+    {
+      enableOnFormTags: ['input'],
+    }
+  )
+
+  useHotkeys(
+    [...Array(10).keys()].map(i => `meta+${i.toString()}`),
+    e => {
+      e.preventDefault()
+      const index = e.key === '0' ? 9 : Number(e.key) - 1
+      const itemId = clipboardHistory[Number(index)]?.historyId
+
+      if (!itemId) {
+        return
+      }
+
+      setCopiedItem(itemId)
+    },
+    {
+      enabled: !isWindows,
+      enableOnFormTags: ['input'],
     }
   )
 
   useHotkeys(
     [...Array(10).keys()].map(i => `ctrl+${isWindows ? 'alt' : 'meta'}+${i.toString()}`),
     e => {
+      e.preventDefault()
       const index = e.key === '0' ? 9 : Number(e.key) - 1
       const itemId = clipboardHistory[Number(index)]?.historyId
 
@@ -339,6 +363,9 @@ export default function ClipboardHistoryPage() {
       }
 
       setPastedItem(itemId)
+    },
+    {
+      enableOnFormTags: ['input'],
     }
   )
 

diff --git a/packages/pastebar-app-ui/src/pages/main/ClipboardHistoryQuickPastePage.tsx b/packages/pastebar-app-ui/src/pages/main/ClipboardHistoryQuickPastePage.tsx
@@ -246,6 +246,28 @@ export default function ClipboardHistoryQuickPastePage() {
       }
 
       invokeCopyPasteHistoryItem(itemId)
+    },
+    {
+      enableOnFormTags: ['input'],
+    }
+  )
+
+  useHotkeys(
+    [...Array(10).keys()].map(i => `meta+${i.toString()}`),
+    e => {
+      e.preventDefault()
+      const index = e.key === '0' ? 9 : Number(e.key) - 1
+      const itemId = clipboardHistory[Number(index)]?.historyId
+
+      if (!itemId) {
+        return
+      }
+
+      invokeCopyPasteHistoryItem(itemId)
+    },
+    {
+      enabled: !isWindows,
+      enableOnFormTags: ['input'],
     }
   )
 
@@ -682,6 +704,7 @@ export default function ClipboardHistoryQuickPastePage() {
                               setSavingItem={setSavingItem}
                               isDeleting={false}
                               isSelected={false}
+                              isWindows={isWindows}
                               setBrokenImageItem={setBrokenImageItem}
                               isBrokenImage={brokenImageItems.includes(historyId)}
                               showTimeAgo={false}
@@ -855,6 +878,7 @@ export default function ClipboardHistoryQuickPastePage() {
                               hasGenerateLinkMetaDataInProgress={clipboardHistoryGenerateLinkMetaDataInProgress.includes(
                                 historyId
                               )}
+                              isWindows={isWindows}
                               setHistoryFilters={setHistoryFilters}
                               setAppFilters={setAppFilters}
                               setSelectHistoryItem={() => {}}