@writedocs/generator 0.7.1 → 0.7.3

package/src/scripts/search.ts

@@ -1,17 +1,33 @@
 // SearchModal.astro's own trigger button (rendered inside TopBar.astro) +
 // overlay/modal. Owns opening/closing the modal, the ⌘K/Ctrl K shortcut,
 // lazy-loading Pagefind on first open, and rendering results.
+
+// The current page's modal, for the ⌘K/Ctrl K shortcut. ClientRouter swaps
+// in a new modal on every navigation and initSearch() runs again for it; the
+// shortcut is one document listener, attached once, that always acts on
+// this. (Attached per page, it piled up one listener per visited page, each
+// still driving that page's detached modal - on a page without a modal of
+// its own, Ctrl K then locked the page's scrolling.)
+let active: { toggle(): void; closeIfOpen(): void } | null = null;
+let shortcutBound = false;
+
 export function initSearch(root: ParentNode) {
+  // No trigger button on a `blank` page (no topbar) - the modal and its
+  // shortcut still work there, as BaseLayout.astro intends.
   const trigger = root.querySelector<HTMLButtonElement>('[data-search-trigger]');
   const overlay = root.querySelector<HTMLElement>('#wd-search-overlay');
   const input = root.querySelector<HTMLInputElement>('#wd-search-input');
   const resultsEl = root.querySelector<HTMLElement>('#wd-search-results');
-  if (!trigger || !overlay || !input || !resultsEl || trigger.dataset.wdInit) return;
-  trigger.dataset.wdInit = 'true';
+  if (!overlay || !input || !resultsEl) {
+    active = null;
+    return;
+  }
+  if (overlay.dataset.wdInit) return;
+  overlay.dataset.wdInit = 'true';
 
   // Most keyboards outside macOS/iOS don't have a command key - "Ctrl K"
   // reads more naturally there than the ⌘ glyph.
-  const kbd = trigger.querySelector('.wd-search-kbd');
+  const kbd = trigger?.querySelector('.wd-search-kbd');
   if (kbd && !/Mac|iPhone|iPad/.test(navigator.userAgent)) {
     kbd.textContent = 'Ctrl K';
   }
@@ -122,10 +138,10 @@ export function initSearch(root: ParentNode) {
   function close() {
     overlay.hidden = true;
     document.body.style.overflow = '';
-    trigger.focus();
+    trigger?.focus();
   }
 
-  trigger.addEventListener('click', open);
+  trigger?.addEventListener('click', open);
   overlay.addEventListener('click', (e) => {
     if (e.target === overlay) close();
   });
@@ -143,13 +159,22 @@ export function initSearch(root: ParentNode) {
       close();
     }
   });
-  document.addEventListener('keydown', (e) => {
-    if ((e.key === 'k' || e.key === 'K') && (e.metaKey || e.ctrlKey)) {
-      e.preventDefault();
-      if (overlay.hidden) open();
-      else close();
-    } else if (e.key === 'Escape' && !overlay.hidden) {
-      close();
-    }
-  });
+  active = {
+    toggle: () => (overlay.hidden ? open() : close()),
+    closeIfOpen: () => {
+      if (!overlay.hidden) close();
+    },
+  };
+  if (!shortcutBound) {
+    shortcutBound = true;
+    document.addEventListener('keydown', (e) => {
+      if (!active) return;
+      if ((e.key === 'k' || e.key === 'K') && (e.metaKey || e.ctrlKey)) {
+        e.preventDefault();
+        active.toggle();
+      } else if (e.key === 'Escape') {
+        active.closeIfOpen();
+      }
+    });
+  }
 }

package/writedocs.schema.json

@@ -692,8 +692,8 @@
         "proxy": {
           "default": true,
           "type": "boolean",
-          "description": "Send \"Try it\" requests through writedocs' proxy, for APIs that don't allow calls from other sites (CORS). Default true.",
-          "markdownDescription": "Send \"Try it\" requests through writedocs' proxy, for APIs that don't allow calls from other sites (CORS). Default true."
+          "description": "When the browser blocks a \"Try it\" request (the API doesn't allow calls from other sites - CORS), retry it through writedocs' proxy. Requests always go to the API directly first. Default true.",
+          "markdownDescription": "When the browser blocks a \"Try it\" request (the API doesn't allow calls from other sites - CORS), retry it through writedocs' proxy. Requests always go to the API directly first. Default true."
         }
       },
       "additionalProperties": false,