From a3442906b2116400e64645bfff164e873a654976 Mon Sep 17 00:00:00 2001
From: Michael Gartner <michaelgartner@Michaels-Mini.lan>
Date: Tue, 30 Jun 2026 16:30:20 -0600
Subject: [PATCH] Allow bookmarks without shortcuts

---
 src/components/QuickSwitcherDialog.tsx   | 14 +++++----
 src/components/QuickSwitcherSettings.tsx | 37 ++++++++++++++----------
 src/index.ts                             |  2 +-
 src/quickSwitcher.tsx                    | 19 ++++++++----
 src/types/quickSwitcher.ts               |  2 +-
 src/utils/quickSwitcher.ts               |  6 ++--
 tests/quickSwitcher.test.ts              | 14 ++++++++-
 7 files changed, 61 insertions(+), 33 deletions(-)

diff --git a/src/components/QuickSwitcherDialog.tsx b/src/components/QuickSwitcherDialog.tsx
index f9bf2be..3819a7b 100644
--- a/src/components/QuickSwitcherDialog.tsx
+++ b/src/components/QuickSwitcherDialog.tsx
@@ -137,12 +137,14 @@ const QuickSwitcherDialog = ({
                   icon="document-open"
                   key={bookmark.id}
                   labelElement={
-                    <Tag minimal>
-                      {formatShortcutForDisplay({
-                        shortcut: bookmark.shortcut,
-                        isMac,
-                      })}
-                    </Tag>
+                    bookmark.shortcut ? (
+                      <Tag minimal>
+                        {formatShortcutForDisplay({
+                          shortcut: bookmark.shortcut,
+                          isMac,
+                        })}
+                      </Tag>
+                    ) : undefined
                   }
                   multiline
                   onClick={(): void => onOpenBookmark(bookmark)}
diff --git a/src/components/QuickSwitcherSettings.tsx b/src/components/QuickSwitcherSettings.tsx
index 6cdc2fe..65af9d4 100644
--- a/src/components/QuickSwitcherSettings.tsx
+++ b/src/components/QuickSwitcherSettings.tsx
@@ -112,16 +112,21 @@ export const createQuickSwitcherSettingsComponent = ({
         return;
       }
 
-      const normalizedShortcut = normalizeShortcut({ shortcut });
-      if (!normalizedShortcut) {
+      const normalizedShortcut = shortcut
+        ? normalizeShortcut({ shortcut })
+        : null;
+      if (shortcut && !normalizedShortcut) {
         showToast({
-          content: "Capture a shortcut before adding",
+          content: "Capture a valid shortcut or leave it blank",
           intent: "warning",
         });
         return;
       }
 
-      if (!shortcutHasModifier({ shortcut: normalizedShortcut })) {
+      if (
+        normalizedShortcut &&
+        !shortcutHasModifier({ shortcut: normalizedShortcut })
+      ) {
         showToast({
           content: "Shortcut must include at least one modifier key",
           intent: "warning",
@@ -140,9 +145,9 @@ export const createQuickSwitcherSettingsComponent = ({
         return;
       }
 
-      const existingShortcut = bookmarks.find(
-        (bookmark) => bookmark.shortcut === normalizedShortcut,
-      );
+      const existingShortcut = normalizedShortcut
+        ? bookmarks.find((bookmark) => bookmark.shortcut === normalizedShortcut)
+        : null;
       if (existingShortcut) {
         showToast({
           content: `Shortcut already used by "${existingShortcut.title}"`,
@@ -196,12 +201,12 @@ export const createQuickSwitcherSettingsComponent = ({
         </FormGroup>
 
         <FormGroup
-          helperText="Click then press your keys (e.g. Ctrl + Shift + 1)."
+          helperText="Optional. Click then press your keys (e.g. Ctrl + Shift + 1)."
           label="Shortcut"
         >
           <InputGroup
             onKeyDown={onShortcutKeyDown}
-            placeholder="Capture shortcut"
+            placeholder="Capture optional shortcut"
             readOnly
             value={shortcutLabel}
           />
@@ -227,12 +232,14 @@ export const createQuickSwitcherSettingsComponent = ({
                   </div>
                 </div>
                 <div className="flex items-center gap-1">
-                  <Tag minimal>
-                    {formatShortcutForDisplay({
-                      shortcut: bookmark.shortcut,
-                      isMac,
-                    })}
-                  </Tag>
+                  {bookmark.shortcut ? (
+                    <Tag minimal>
+                      {formatShortcutForDisplay({
+                        shortcut: bookmark.shortcut,
+                        isMac,
+                      })}
+                    </Tag>
+                  ) : null}
                   <Button
                     disabled={index === 0}
                     icon="arrow-up"
diff --git a/src/index.ts b/src/index.ts
index 848eec7..63ed3a6 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -32,7 +32,7 @@ export default runExtension(async ({ extensionAPI }) => {
         id: "bookmarked-pages",
         name: "Bookmarked Pages",
         description:
-          "Add Roam pages and assign shortcuts. These bookmarks are the only pages searchable in the dialog.",
+          "Add Roam pages with optional shortcuts. These bookmarks are the only pages searchable in the dialog.",
         action: {
           type: "reactComponent",
           component: settingsComponent,
diff --git a/src/quickSwitcher.tsx b/src/quickSwitcher.tsx
index 52c28a0..074d12e 100644
--- a/src/quickSwitcher.tsx
+++ b/src/quickSwitcher.tsx
@@ -79,18 +79,25 @@ const sanitizeBookmarks = ({
   const seenUrls = new Set<string>();
 
   return bookmarks.reduce<QuickSwitcherBookmark[]>((result, bookmark) => {
-    const normalizedShortcut = normalizeShortcut({
-      shortcut: bookmark.shortcut,
-    });
+    const normalizedShortcut = bookmark.shortcut
+      ? normalizeShortcut({
+          shortcut: bookmark.shortcut,
+        })
+      : null;
     const normalizedUrl = toAbsoluteUrl({ url: bookmark.url });
-    if (!normalizedShortcut || !normalizedUrl) {
+    if (!normalizedUrl || (bookmark.shortcut && !normalizedShortcut)) {
       return result;
     }
-    if (seenShortcuts.has(normalizedShortcut) || seenUrls.has(normalizedUrl)) {
+    if (
+      (normalizedShortcut && seenShortcuts.has(normalizedShortcut)) ||
+      seenUrls.has(normalizedUrl)
+    ) {
       return result;
     }
 
-    seenShortcuts.add(normalizedShortcut);
+    if (normalizedShortcut) {
+      seenShortcuts.add(normalizedShortcut);
+    }
     seenUrls.add(normalizedUrl);
 
     result.push({
diff --git a/src/types/quickSwitcher.ts b/src/types/quickSwitcher.ts
index 22725a9..226ebf3 100644
--- a/src/types/quickSwitcher.ts
+++ b/src/types/quickSwitcher.ts
@@ -3,7 +3,7 @@ export type QuickSwitcherBookmark = {
   title: string;
   url: string;
   pageUid: string | null;
-  shortcut: string;
+  shortcut: string | null;
 };
 
 export type ShortcutKeyboardEvent = {
diff --git a/src/utils/quickSwitcher.ts b/src/utils/quickSwitcher.ts
index e45a737..0db8fe8 100644
--- a/src/utils/quickSwitcher.ts
+++ b/src/utils/quickSwitcher.ts
@@ -392,12 +392,12 @@ const parseStoredBookmark = ({
   const title = typeof value.title === "string" ? value.title.trim() : "";
   const shortcut =
     typeof value.shortcut === "string" ? value.shortcut.trim() : "";
-  if (!url || !title || !shortcut) {
+  if (!url || !title) {
     return null;
   }
 
-  const normalizedShortcut = normalizeShortcut({ shortcut });
-  if (!normalizedShortcut) {
+  const normalizedShortcut = shortcut ? normalizeShortcut({ shortcut }) : null;
+  if (shortcut && !normalizedShortcut) {
     return null;
   }
 
diff --git a/tests/quickSwitcher.test.ts b/tests/quickSwitcher.test.ts
index 39d83c8..a0907c0 100644
--- a/tests/quickSwitcher.test.ts
+++ b/tests/quickSwitcher.test.ts
@@ -142,6 +142,17 @@ test("parses and sanitizes stored bookmarks", () => {
       },
       {
         id: "id-2",
+        title: "No Shortcut",
+        url: "https://roamresearch.com/#/app/graph/page/no-shortcut",
+      },
+      {
+        id: "id-3",
+        title: "Invalid Shortcut",
+        url: "https://roamresearch.com/#/app/graph/page/invalid-shortcut",
+        shortcut: "Ctrl +",
+      },
+      {
+        id: "id-4",
         title: "Invalid",
         url: "",
         shortcut: "Ctrl + 2",
@@ -149,8 +160,9 @@ test("parses and sanitizes stored bookmarks", () => {
     ],
   });
 
-  expect(parsed).toHaveLength(1);
+  expect(parsed).toHaveLength(2);
   expect(parsed[0].shortcut).toBe("ctrl+1");
+  expect(parsed[1].shortcut).toBeNull();
 });
 
 test("resolves relative urls to absolute urls", () => {