@bendyline/docblocks-react 2.2.1 → 2.3.0

package/dist/{ExportToolbarControls-2VB43ITO.js → ExportToolbarControls-6MO4NX6H.js}

@@ -1,3 +1,6 @@
+import {
+  useMenuKeyboard
+} from "./chunk-MRUK56JS.js";
 import {
   loadTransformStyleSummaries
 } from "./chunk-YBEYTVU2.js";
@@ -36,6 +39,8 @@ function loadRunExportModule() {
   runExportModulePromise ?? (runExportModulePromise = import("./run-export-Z5BVFLIR.js"));
   return runExportModulePromise;
 }
+var ExportCancelledError = class extends Error {
+};
 var SHARED_USE_MODES = Object.freeze({
   slideshow: "slideshow",
   video: "video",
@@ -69,10 +74,10 @@ function loadVideoExportModules() {
   return videoExportModulesPromise;
 }
 function exportErrorMessage(caught) {
-  const detail = caught instanceof Error ? caught.message.trim() : "";
+  const detail = caught instanceof Error ? caught.message.replace(/^Error invoking remote method '[^']+': Error:\s*/, "").trim() : "";
   return detail ? `Export failed: ${detail}` : "Export failed. The document could not be exported.";
 }
-function quickLabel(opts, transformSummaries) {
+function quickLabel(opts, transformSummaries, destinationPath) {
   const baseExt = FORMAT_EXTENSIONS[opts.format].toUpperCase().replace(".", "");
   const isRecursiveHtml = opts.format === "html" && opts.includeLinkedDocs;
   const ext = opts.format === "html" && (opts.htmlBundle === "zip" || isRecursiveHtml) ? "ZIP" : baseExt;
@@ -92,13 +97,16 @@ function quickLabel(opts, transformSummaries) {
     if (transform) parts.push(transform.name);
   }
   if (parts.length > 0) {
-    return `Export ${ext} with ${parts.join(" + ")}`;
+    const label2 = `Export ${ext} with ${parts.join(" + ")}`;
+    return destinationPath ? `${label2} to ${destinationPath}` : label2;
   }
-  return `Export ${ext}`;
+  const label = `Export ${ext}`;
+  return destinationPath ? `${label} to ${destinationPath}` : label;
 }
 function ExportToolbarControls({
   selectedFile,
   mediaContainer,
+  mediaProvider,
   saveBlob,
   destinationAdapter,
   trigger = "menu",
@@ -123,9 +131,14 @@ function ExportToolbarControls({
   const [exporting, setExporting] = useState(false);
   const [exportError, setExportError] = useState(null);
   const [destinationTarget, setDestinationTarget] = useState(null);
+  const [quickDestination, setQuickDestination] = useState(null);
+  const [quickDestinationPending, setQuickDestinationPending] = useState(false);
   const destinationRequestRef = useRef(0);
-  const menuRef = useRef(null);
+  const menuContainerRef = useRef(null);
+  const { menuRef, triggerRef, handleMenuKeyDown, handleTriggerKeyDown, closeMenu } = useMenuKeyboard(menuOpen, setMenuOpen);
   const lastOptions = loadLastExportOptions();
+  const quickDestinationKey = lastOptions ? JSON.stringify([selectedFile, lastOptions]) : null;
+  const quickDestinationTarget = quickDestination?.key === quickDestinationKey ? quickDestination.target : null;
   const docThemeId = useMemo(() => {
     const fm = markdownDoc?.frontmatter;
     if (!fm) return null;
@@ -142,12 +155,17 @@ function ExportToolbarControls({
   useEffect(() => {
     if (!menuOpen) return;
     const onPointerDown = (e) => {
-      if (menuRef.current && !menuRef.current.contains(e.target)) {
-        setMenuOpen(false);
+      if (menuContainerRef.current && !menuContainerRef.current.contains(e.target)) {
+        closeMenu(false);
       }
     };
     document.addEventListener("pointerdown", onPointerDown);
     return () => document.removeEventListener("pointerdown", onPointerDown);
+  }, [closeMenu, menuOpen]);
+  useEffect(() => {
+    if (menuOpen) return;
+    setQuickDestination(null);
+    setQuickDestinationPending(false);
   }, [menuOpen]);
   useEffect(() => {
     if (!menuOpen || lastOptions?.format !== "pptx" || !lastOptions.transformStyle || transformSummaries.length > 0) {
@@ -163,9 +181,33 @@ function ExportToolbarControls({
       cancelled = true;
     };
   }, [lastOptions?.format, lastOptions?.transformStyle, menuOpen, transformSummaries.length]);
+  useEffect(() => {
+    if (!menuOpen || !destinationAdapter || !quickDestinationKey) return;
+    const quickOptions = loadLastExportOptions();
+    if (!quickOptions) return;
+    let cancelled = false;
+    setQuickDestination(null);
+    setQuickDestinationPending(true);
+    void loadRunExportModule().then(
+      ({ buildExportFilename }) => destinationAdapter.resolveTarget(buildExportFilename(selectedFile, quickOptions))
+    ).then((target) => {
+      if (!cancelled) setQuickDestination({ key: quickDestinationKey, target });
+    }).catch(() => {
+      if (!cancelled) setQuickDestination(null);
+    }).finally(() => {
+      if (!cancelled) setQuickDestinationPending(false);
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [destinationAdapter, menuOpen, quickDestinationKey, selectedFile]);
   const handleToggleMenu = useCallback(() => {
+    if (!menuOpen && destinationAdapter) {
+      setQuickDestination(null);
+      setQuickDestinationPending(true);
+    }
     setMenuOpen((prev) => !prev);
-  }, []);
+  }, [destinationAdapter, menuOpen]);
   const refreshDestination = useCallback(
     async (options) => {
       if (!destinationAdapter) return;
@@ -245,6 +287,7 @@ function ExportToolbarControls({
         const pickedTarget = await destinationAdapter.pickTarget(filename, destinationTarget);
         if (pickedTarget === null) return;
         setDestinationTarget(pickedTarget);
+        setQuickDestination(null);
       } catch {
       }
     },
@@ -254,7 +297,8 @@ function ExportToolbarControls({
     async (blob, filename, target) => {
       if (!destinationAdapter) return;
       const savedTarget = await destinationAdapter.saveBlob(blob, filename, target);
-      if (savedTarget) setDestinationTarget(savedTarget);
+      if (!savedTarget) throw new ExportCancelledError();
+      setDestinationTarget(savedTarget);
     },
     [destinationAdapter]
   );
@@ -279,7 +323,7 @@ function ExportToolbarControls({
         );
         setDialogOpen(false);
       } catch (caught) {
-        setExportError(exportErrorMessage(caught));
+        if (!(caught instanceof ExportCancelledError)) setExportError(exportErrorMessage(caught));
       } finally {
         setExporting(false);
       }
@@ -303,10 +347,8 @@ function ExportToolbarControls({
       const { runExport } = await loadRunExportModule();
       let quickTarget = null;
       if (destinationAdapter) {
-        const { buildExportFilename } = await loadRunExportModule();
-        quickTarget = await destinationAdapter.resolveTarget(
-          buildExportFilename(selectedFile, lastOptions)
-        );
+        if (!quickDestinationTarget) return;
+        quickTarget = quickDestinationTarget;
       }
       await runExport(
         markdownSource,
@@ -316,7 +358,7 @@ function ExportToolbarControls({
         destinationAdapter ? async (blob, filename) => saveToDestination(blob, filename, quickTarget) : saveBlob
       );
     } catch (caught) {
-      setExportError(exportErrorMessage(caught));
+      if (!(caught instanceof ExportCancelledError)) setExportError(exportErrorMessage(caught));
     } finally {
       setExporting(false);
     }
@@ -327,7 +369,8 @@ function ExportToolbarControls({
     mediaContainer,
     saveBlob,
     saveToDestination,
-    selectedFile
+    selectedFile,
+    quickDestinationTarget
   ]);
   const handleDismissExportError = useCallback(() => {
     setExportError(null);
@@ -347,13 +390,15 @@ function ExportToolbarControls({
         "data-tooltip": exporting ? "Exporting..." : "Export document",
         children: /* @__PURE__ */ jsx(ExportGlyph, {})
       }
-    ) : /* @__PURE__ */ jsxs("div", { className: "db-toolbar-menu", ref: menuRef, children: [
+    ) : /* @__PURE__ */ jsxs("div", { className: "db-toolbar-menu", ref: menuContainerRef, children: [
       /* @__PURE__ */ jsxs(
         "button",
         {
+          ref: triggerRef,
           type: "button",
           className: "db-toolbar-menu-trigger",
           onClick: handleToggleMenu,
+          onKeyDown: handleTriggerKeyDown,
           "aria-label": "Export and share",
           "aria-haspopup": "menu",
           "aria-expanded": menuOpen,
@@ -364,62 +409,85 @@ function ExportToolbarControls({
           ]
         }
       ),
-      menuOpen && /* @__PURE__ */ jsxs("div", { className: "db-toolbar-menu-dropdown", role: "menu", children: [
-        lastOptions && /* @__PURE__ */ jsx(
-          "button",
-          {
-            type: "button",
-            role: "menuitem",
-            className: "db-toolbar-menu-item",
-            onClick: handleQuickExport,
-            disabled: exporting,
-            children: quickLabel(lastOptions, transformSummaries)
-          }
-        ),
-        /* @__PURE__ */ jsx(
-          "button",
-          {
-            type: "button",
-            role: "menuitem",
-            className: "db-toolbar-menu-item",
-            onClick: handleOpenDialog,
-            children: "Export..."
-          }
-        ),
-        /* @__PURE__ */ jsx(
-          "button",
-          {
-            type: "button",
-            role: "menuitem",
-            className: "db-toolbar-menu-item",
-            onClick: handleOpenShareDialog,
-            children: "Share link with content embedded..."
-          }
-        ),
-        showVideoExport && /* @__PURE__ */ jsxs(Fragment, { children: [
-          /* @__PURE__ */ jsx("div", { className: "db-toolbar-menu-divider", role: "separator" }),
-          /* @__PURE__ */ jsx(
-            "button",
-            {
-              type: "button",
-              role: "menuitem",
-              className: "db-toolbar-menu-item",
-              onClick: () => void handleOpenVideoModal("mp4"),
-              children: "Export video..."
-            }
-          ),
-          showAnimatedGifExport && /* @__PURE__ */ jsx(
-            "button",
-            {
-              type: "button",
-              role: "menuitem",
-              className: "db-toolbar-menu-item",
-              onClick: () => void handleOpenVideoModal("gif"),
-              children: "Export animated gif..."
-            }
-          )
-        ] })
-      ] })
+      menuOpen && /* @__PURE__ */ jsxs(
+        "div",
+        {
+          ref: menuRef,
+          className: "db-toolbar-menu-dropdown db-export-toolbar-menu-dropdown",
+          role: "menu",
+          onKeyDown: handleMenuKeyDown,
+          children: [
+            lastOptions && /* @__PURE__ */ jsx(
+              "button",
+              {
+                type: "button",
+                role: "menuitem",
+                tabIndex: -1,
+                className: "db-toolbar-menu-item",
+                onClick: handleQuickExport,
+                disabled: exporting || Boolean(destinationAdapter) && !quickDestinationTarget,
+                title: quickDestinationTarget ? quickLabel(
+                  lastOptions,
+                  transformSummaries,
+                  quickDestinationTarget.displayPath
+                ) : void 0,
+                children: quickDestinationTarget ? quickLabel(
+                  lastOptions,
+                  transformSummaries,
+                  quickDestinationTarget.displayPath
+                ) : quickLabel(lastOptions, transformSummaries) + (destinationAdapter ? quickDestinationPending ? " (finding destination...)" : " (destination unavailable)" : "")
+              }
+            ),
+            /* @__PURE__ */ jsx(
+              "button",
+              {
+                type: "button",
+                role: "menuitem",
+                tabIndex: -1,
+                className: "db-toolbar-menu-item",
+                onClick: handleOpenDialog,
+                children: "Export..."
+              }
+            ),
+            /* @__PURE__ */ jsx(
+              "button",
+              {
+                type: "button",
+                role: "menuitem",
+                tabIndex: -1,
+                className: "db-toolbar-menu-item",
+                onClick: handleOpenShareDialog,
+                children: "Share link with content embedded..."
+              }
+            ),
+            showVideoExport && /* @__PURE__ */ jsxs(Fragment, { children: [
+              /* @__PURE__ */ jsx("div", { className: "db-toolbar-menu-divider", role: "separator" }),
+              /* @__PURE__ */ jsx(
+                "button",
+                {
+                  type: "button",
+                  role: "menuitem",
+                  tabIndex: -1,
+                  className: "db-toolbar-menu-item",
+                  onClick: () => void handleOpenVideoModal("mp4"),
+                  children: "Export video..."
+                }
+              ),
+              showAnimatedGifExport && /* @__PURE__ */ jsx(
+                "button",
+                {
+                  type: "button",
+                  role: "menuitem",
+                  tabIndex: -1,
+                  className: "db-toolbar-menu-item",
+                  onClick: () => void handleOpenVideoModal("gif"),
+                  children: "Export animated gif..."
+                }
+              )
+            ] })
+          ]
+        }
+      )
     ] }),
     dialogOpen && /* @__PURE__ */ jsx(Suspense, { fallback: null, children: /* @__PURE__ */ jsx(
       ExportDialog,
@@ -476,6 +544,7 @@ function ExportToolbarControls({
       {
         doc: videoDoc,
         playerScript: videoModules.playerScript,
+        ...mediaProvider ? { mediaProvider } : {},
         colorScheme,
         uiPalette: videoExportPalette,
         defaultConfig: {

package/dist/{GitToolbarControl-FW3BZFXV.js → GitToolbarControl-VJVK2B4X.js}

@@ -1,10 +1,11 @@
-import {
-  useMenuKeyboard
-} from "./chunk-TFMO7EVO.js";
+import "./chunk-APC4KI4B.js";
 import {
   isFileDirty,
   useGitContext
 } from "./chunk-HFYPTTCH.js";
+import {
+  useMenuKeyboard
+} from "./chunk-MRUK56JS.js";
 
 // src/Git/GitToolbarControl.tsx
 import { useEffect, useRef, useState } from "react";

package/dist/{GitUI-GMH3PAYL.js → GitUI-CAKFVKWY.js}

@@ -1,6 +1,4 @@
-import {
-  useMenuKeyboard
-} from "./chunk-TFMO7EVO.js";
+import "./chunk-APC4KI4B.js";
 import {
   BADGE_GLYPHS,
   BADGE_LABELS,
@@ -9,6 +7,9 @@ import {
   summarizeDirty,
   useGitContext
 } from "./chunk-HFYPTTCH.js";
+import {
+  useMenuKeyboard
+} from "./chunk-MRUK56JS.js";
 import {
   Dialog
 } from "./chunk-LG6HAWCK.js";

package/dist/{chunk-BPGEBGAN.js → chunk-JDJVRDOP.js}

@@ -1,4 +1,24 @@
 // src/editor.ts
+import { useEffect, useState } from "react";
+var PORTRAIT_FORM_FACTOR_QUERY = "(orientation: portrait)";
+function previewViewportPresetForOrientation(isPortrait) {
+  return isPortrait ? "portrait" : "landscape";
+}
+function useResponsivePreviewViewportPreset() {
+  const [isPortrait, setIsPortrait] = useState(() => {
+    if (typeof globalThis.matchMedia !== "function") return false;
+    return globalThis.matchMedia(PORTRAIT_FORM_FACTOR_QUERY).matches;
+  });
+  useEffect(() => {
+    if (typeof globalThis.matchMedia !== "function") return;
+    const query = globalThis.matchMedia(PORTRAIT_FORM_FACTOR_QUERY);
+    const update = () => setIsPortrait(query.matches);
+    update();
+    query.addEventListener("change", update);
+    return () => query.removeEventListener("change", update);
+  }, []);
+  return previewViewportPresetForOrientation(isPortrait);
+}
 var EMPTY_DOCUMENT_PROMPTS = [
   "Start typing your content, or drop images on top of me...",
   "Write anything -- paste markdown, drag in images, or just start typing...",
@@ -64,6 +84,9 @@ function pickEmptyDocumentPrompt(random = Math.random) {
 }
 
 export {
+  PORTRAIT_FORM_FACTOR_QUERY,
+  previewViewportPresetForOrientation,
+  useResponsivePreviewViewportPreset,
   EMPTY_DOCUMENT_PROMPTS,
   pickEmptyDocumentPrompt
 };

package/dist/{chunk-TFMO7EVO.js → chunk-MRUK56JS.js}

@@ -1,5 +1,9 @@
-// src/Git/useMenuKeyboard.ts
-import { useCallback, useEffect, useRef } from "react";
+// src/components/useMenuKeyboard.ts
+import {
+  useCallback,
+  useEffect,
+  useRef
+} from "react";
 function useMenuKeyboard(open, setOpen) {
   const menuRef = useRef(null);
   const triggerRef = useRef(null);
@@ -22,7 +26,7 @@ function useMenuKeyboard(open, setOpen) {
     (returnFocus) => {
       pendingFocusRef.current = "none";
       setOpen(false);
-      if (returnFocus) triggerRef.current?.focus();
+      if (returnFocus) triggerRef.current?.focus({ preventScroll: true });
     },
     [setOpen]
   );
@@ -32,6 +36,17 @@ function useMenuKeyboard(open, setOpen) {
     pendingFocusRef.current = "none";
     focusItem(where === "last" ? items().length - 1 : 0);
   }, [open, focusItem, items]);
+  useEffect(() => {
+    if (!open) return;
+    const handleDocumentKeyDown = (event) => {
+      if (event.key !== "Escape" || event.defaultPrevented) return;
+      event.preventDefault();
+      event.stopPropagation();
+      closeMenu(true);
+    };
+    document.addEventListener("keydown", handleDocumentKeyDown);
+    return () => document.removeEventListener("keydown", handleDocumentKeyDown);
+  }, [closeMenu, open]);
   const handleTriggerKeyDown = useCallback(
     (event) => {
       if (event.key === "ArrowDown" || event.key === "ArrowUp") {
@@ -48,12 +63,16 @@ function useMenuKeyboard(open, setOpen) {
   );
   const handleMenuKeyDown = useCallback(
     (event) => {
-      if (event.key === "Escape" || event.key === "Tab") {
+      if (event.key === "Escape") {
         event.preventDefault();
         event.stopPropagation();
         closeMenu(true);
         return;
       }
+      if (event.key === "Tab") {
+        closeMenu(false);
+        return;
+      }
       const all = items();
       if (all.length === 0) return;
       const current = all.indexOf(document.activeElement);