@bendyline/docblocks-react 2.7.6 → 2.7.8

package/dist/DocumentConflictDialog-4R4QMKBT.js

@@ -0,0 +1,217 @@
+import {
+  GitDiffView
+} from "./chunk-27E2OON2.js";
+import {
+  Dialog
+} from "./chunk-UYJCL6OW.js";
+
+// src/DocBlocksShell/DocumentConflictDialog.tsx
+import { Component, useEffect, useMemo, useState } from "react";
+import { resolveFileKind } from "@bendyline/squisq-editor-react";
+import { MediaContext } from "@bendyline/squisq-react";
+import { LinearDocView } from "@bendyline/squisq-react/page";
+import { markdownToDoc, resolveThemeForDoc } from "@bendyline/squisq/doc";
+import { parseMarkdown } from "@bendyline/squisq/markdown";
+import { jsx, jsxs } from "react/jsx-runtime";
+var DIFF_VIEWS = [
+  { value: "inline", label: "Inline" },
+  { value: "side-by-side", label: "Side by side" },
+  { value: "changes", label: "Changes only" }
+];
+function formattedTime(value) {
+  if (value === null || value === void 0) return null;
+  const date = new Date(value);
+  return Number.isFinite(date.getTime()) ? date.toLocaleString() : null;
+}
+function VersionText({ label, content }) {
+  return /* @__PURE__ */ jsx(
+    "textarea",
+    {
+      className: "db-conflict-preview",
+      "aria-label": `${label} preview`,
+      value: content,
+      readOnly: true,
+      spellCheck: false
+    }
+  );
+}
+var RenderBoundary = class extends Component {
+  constructor() {
+    super(...arguments);
+    this.state = { failed: false, resetKey: this.props.resetKey };
+  }
+  static getDerivedStateFromError() {
+    return { failed: true };
+  }
+  static getDerivedStateFromProps(props, state) {
+    return props.resetKey === state.resetKey ? null : { failed: false, resetKey: props.resetKey };
+  }
+  render() {
+    return this.state.failed ? this.props.fallback : this.props.children;
+  }
+};
+function RenderedVersion({
+  label,
+  content,
+  defaultThemeId
+}) {
+  const rendered = useMemo(() => {
+    try {
+      const doc = markdownToDoc(parseMarkdown(content));
+      return { doc, theme: resolveThemeForDoc(doc, doc.themeId ? void 0 : defaultThemeId) };
+    } catch {
+      return null;
+    }
+  }, [content, defaultThemeId]);
+  const text = /* @__PURE__ */ jsx(VersionText, { label, content });
+  if (!rendered) return text;
+  return /* @__PURE__ */ jsx(RenderBoundary, { resetKey: content, fallback: text, children: /* @__PURE__ */ jsx(
+    "div",
+    {
+      className: "db-conflict-preview db-conflict-preview--rendered",
+      role: "region",
+      "aria-label": `${label} preview`,
+      tabIndex: 0,
+      style: { background: rendered.theme.colors.background },
+      children: /* @__PURE__ */ jsx(
+        LinearDocView,
+        {
+          doc: rendered.doc,
+          theme: rendered.theme,
+          variant: "document",
+          showCover: false,
+          thinMargins: true,
+          animationsEnabled: false
+        }
+      )
+    }
+  ) });
+}
+function DocumentConflictDialog({
+  conflict,
+  fileName,
+  theme,
+  defaultThemeId,
+  mediaProvider,
+  readSavedFile,
+  onUseLocal,
+  onUseSaved,
+  onClose
+}) {
+  const [savedFile, setSavedFile] = useState(null);
+  const [busy, setBusy] = useState(false);
+  const [error, setError] = useState(null);
+  const [diffView, setDiffView] = useState("inline");
+  useEffect(() => {
+    let disposed = false;
+    void readSavedFile().then(
+      (file) => {
+        if (!disposed) setSavedFile(file);
+      },
+      () => {
+        if (!disposed) setSavedFile(null);
+      }
+    );
+    return () => {
+      disposed = true;
+    };
+  }, [readSavedFile, conflict.targetKey, conflict.externalContent, conflict.externalVersion]);
+  const capturedAt = formattedTime(conflict.recoveredDraftCapturedAt);
+  const savedAt = savedFile?.content === conflict.externalContent ? formattedTime(savedFile?.lastModified) : null;
+  const localLabel = conflict.recoveredDraft ? "Recovery draft" : "Your unsaved version";
+  const fileKind = resolveFileKind(fileName);
+  const version = (label, content) => fileKind.mode === "markdown" ? /* @__PURE__ */ jsx(RenderedVersion, { label, content, defaultThemeId }) : /* @__PURE__ */ jsx(VersionText, { label, content });
+  const choose = async (resolve) => {
+    if (busy) return;
+    setBusy(true);
+    setError(null);
+    try {
+      if (await resolve()) onClose();
+      else setError("Could not resolve this conflict. Both versions are still available.");
+    } catch (cause) {
+      setError(cause instanceof Error ? cause.message : "Could not resolve this conflict.");
+    } finally {
+      setBusy(false);
+    }
+  };
+  return /* @__PURE__ */ jsxs(
+    Dialog,
+    {
+      title: "Compare document versions",
+      size: "full",
+      className: "db-conflict-dialog",
+      onClose: () => {
+        if (!busy) onClose();
+      },
+      closeOnBackdrop: !busy,
+      footer: /* @__PURE__ */ jsx("button", { type: "button", disabled: busy, onClick: onClose, children: "Decide later" }),
+      children: [
+        /* @__PURE__ */ jsxs("p", { children: [
+          conflict.recoveredDraft ? "This draft was recovered from a previous session. The saved file may contain newer edits." : "The saved file changed while you had unsaved edits.",
+          " ",
+          "Compare the two versions before choosing. Neither version changes until you choose."
+        ] }),
+        /* @__PURE__ */ jsx(MediaContext.Provider, { value: mediaProvider ?? null, children: /* @__PURE__ */ jsxs(
+          "div",
+          {
+            className: diffView === "side-by-side" ? "db-conflict-columns db-conflict-columns--wide-diff" : "db-conflict-columns",
+            "aria-busy": busy,
+            children: [
+              /* @__PURE__ */ jsxs("section", { className: "db-conflict-version", "aria-label": localLabel, children: [
+                /* @__PURE__ */ jsx("h3", { children: localLabel }),
+                /* @__PURE__ */ jsx("p", { className: "db-conflict-metadata", children: conflict.recoveredDraft ? capturedAt ? `Recovery copy captured: ${capturedAt}` : "Recovery capture time unavailable" : "Not saved in this session" }),
+                version(localLabel, conflict.localContent),
+                /* @__PURE__ */ jsx("p", { className: "db-conflict-consequence", children: "Replaces the saved file with the draft shown above." }),
+                /* @__PURE__ */ jsx("button", { type: "button", disabled: busy, onClick: () => void choose(onUseLocal), children: conflict.recoveredDraft ? "Replace file with draft" : "Keep mine" })
+              ] }),
+              /* @__PURE__ */ jsxs("section", { className: "db-conflict-diff", "aria-label": "Differences", children: [
+                /* @__PURE__ */ jsxs("div", { className: "db-conflict-diff-header", children: [
+                  /* @__PURE__ */ jsx("h3", { children: "Differences" }),
+                  /* @__PURE__ */ jsxs("label", { className: "db-conflict-diff-view", children: [
+                    /* @__PURE__ */ jsx("span", { children: "View" }),
+                    /* @__PURE__ */ jsx(
+                      "select",
+                      {
+                        value: diffView,
+                        onChange: (event) => setDiffView(event.currentTarget.value),
+                        children: DIFF_VIEWS.map((option) => /* @__PURE__ */ jsx("option", { value: option.value, children: option.label }, option.value))
+                      }
+                    )
+                  ] })
+                ] }),
+                /* @__PURE__ */ jsxs("p", { className: "db-conflict-metadata", children: [
+                  "\u2212 Only in ",
+                  localLabel.toLowerCase(),
+                  " \xB7 + Only in the saved file"
+                ] }),
+                /* @__PURE__ */ jsx(
+                  GitDiffView,
+                  {
+                    original: conflict.localContent,
+                    modified: conflict.externalContent ?? "",
+                    fileName,
+                    language: fileKind.language,
+                    theme,
+                    layout: diffView === "side-by-side" ? "side-by-side" : "inline",
+                    changesOnly: diffView === "changes"
+                  }
+                )
+              ] }),
+              /* @__PURE__ */ jsxs("section", { className: "db-conflict-version", "aria-label": "Saved file", children: [
+                /* @__PURE__ */ jsx("h3", { children: "Saved file" }),
+                /* @__PURE__ */ jsx("p", { className: "db-conflict-metadata", children: conflict.externalContent === null ? "File was deleted outside DocBlocks" : savedAt ? `File last modified: ${savedAt}` : "File modification time unavailable" }),
+                conflict.externalContent === null ? /* @__PURE__ */ jsx("div", { className: "db-conflict-preview", children: "The saved file no longer exists." }) : version("Saved file", conflict.externalContent),
+                /* @__PURE__ */ jsx("p", { className: "db-conflict-consequence", children: conflict.externalContent === null ? "Discards the draft and closes this document." : "Discards the draft and opens the saved file shown above." }),
+                /* @__PURE__ */ jsx("button", { type: "button", disabled: busy, onClick: () => void choose(onUseSaved), children: conflict.externalContent === null ? "Accept deletion" : "Use saved file" })
+              ] })
+            ]
+          }
+        ) }),
+        error && /* @__PURE__ */ jsx("p", { role: "alert", children: error })
+      ]
+    }
+  );
+}
+export {
+  DocumentConflictDialog as default
+};

package/dist/{ExportDialog-LGWBXIWN.js → ExportDialog-FNFD53SY.js}

@@ -1,9 +1,9 @@
 import {
   ExportDialog
-} from "./chunk-GFK4TCKN.js";
+} from "./chunk-WDNE5TI3.js";
 import "./chunk-H3BK5MK6.js";
 import "./chunk-6MSHXQNB.js";
-import "./chunk-VJPGZCFS.js";
+import "./chunk-UYJCL6OW.js";
 export {
   ExportDialog
 };

package/dist/{ExportToolbarControls-4LYTXGT3.js → ExportToolbarControls-ZOYH4I36.js}

@@ -13,8 +13,9 @@ import {
   hostErrorDetail
 } from "./chunk-UONFWKJ7.js";
 import {
+  PdfReplacementsError,
   buildExportFilename
-} from "./chunk-5O5YTOXG.js";
+} from "./chunk-5YMULR6A.js";
 import {
   OpenAfterSaveCheckbox,
   loadTransformStyleSummaries
@@ -27,7 +28,7 @@ import {
 } from "./chunk-6MSHXQNB.js";
 import {
   Dialog
-} from "./chunk-VJPGZCFS.js";
+} from "./chunk-UYJCL6OW.js";
 
 // src/Export/ExportToolbarControls.tsx
 import {
@@ -39,6 +40,7 @@ import {
   useRef,
   useMemo
 } from "react";
+import { createPortal } from "react-dom";
 import {
   useEditorContext,
   usePreviewSettings,
@@ -66,20 +68,20 @@ function saveOpenAfterExport(value) {
 // src/Export/ExportToolbarControls.tsx
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 var ExportDialog = lazy(
-  () => import("./ExportDialog-LGWBXIWN.js").then((module) => ({ default: module.ExportDialog }))
+  () => import("./ExportDialog-FNFD53SY.js").then((module) => ({ default: module.ExportDialog }))
 );
 var ShareDialog = lazy(
-  () => import("./ShareDialog-PF7D7ORP.js").then((module) => ({ default: module.ShareDialog }))
+  () => import("./ShareDialog-WOWHI6YI.js").then((module) => ({ default: module.ShareDialog }))
 );
 var runExportModulePromise = null;
 function loadRunExportModule() {
-  runExportModulePromise ?? (runExportModulePromise = import("./run-export-SPNNH32M.js"));
+  runExportModulePromise ?? (runExportModulePromise = import("./run-export-C3PLLWLS.js"));
   return runExportModulePromise;
 }
 var ExportCancelledError = class extends Error {
 };
 var AudioExportDialog = lazy(
-  () => import("./AudioExportDialog-EICCBSSE.js").then((module) => ({
+  () => import("./AudioExportDialog-CBMSLQBS.js").then((module) => ({
     default: module.AudioExportDialog
   }))
 );
@@ -114,6 +116,7 @@ function loadVideoExportModules() {
   return videoExportModulesPromise;
 }
 function exportErrorMessage(caught) {
+  if (caught instanceof PdfReplacementsError) return caught.message;
   const detail = hostErrorDetail(caught);
   return detail ? `Export failed: ${detail}` : "Export failed. The document could not be exported.";
 }
@@ -180,11 +183,14 @@ function ExportToolbarControls({
   const [exportError, setExportError] = useState(null);
   const [openAfterSave, setOpenAfterSave] = useState(loadOpenAfterExport);
   const [openError, setOpenError] = useState(null);
+  const [exportCompletion, setExportCompletion] = useState(null);
+  useEffect(() => setExportCompletion(null), [selectedFile]);
   const handleOpenAfterSaveChange = useCallback((checked) => {
     setOpenAfterSave(checked);
     saveOpenAfterExport(checked);
   }, []);
   const [exportNotice, setExportNotice] = useState(null);
+  const [pdfReplacements, setPdfReplacements] = useState(null);
   const [destinationTarget, setDestinationTarget] = useState(null);
   const [quickDestination, setQuickDestination] = useState(null);
   const [quickDestinationPending, setQuickDestinationPending] = useState(false);
@@ -359,8 +365,8 @@ function ExportToolbarControls({
     [destinationAdapter]
   );
   const openSaved = useCallback(
-    async (target) => {
-      if (!openAfterSave || !destinationAdapter?.openSaved) return;
+    async (target, requested = false) => {
+      if (!requested && !openAfterSave || !destinationAdapter?.openSaved) return;
       try {
         await destinationAdapter.openSaved(target);
       } catch (caught) {
@@ -371,11 +377,13 @@ function ExportToolbarControls({
     [destinationAdapter, openAfterSave]
   );
   const handleExport = useCallback(
-    async (opts) => {
+    async (opts, allowPdfReplacements = false) => {
       setExporting(true);
       setExportError(null);
+      setPdfReplacements(null);
       setOpenError(null);
       setExportNotice(null);
+      setExportCompletion(null);
       try {
         let exportTarget = destinationTarget;
         if (!fileShare && destinationAdapter?.pickBeforeSave) {
@@ -396,12 +404,23 @@ function ExportToolbarControls({
             if (outcome === "cancelled") throw new ExportCancelledError();
           } : destinationAdapter ? async (blob, filename) => {
             savedTarget = await saveToDestination(blob, filename, exportTarget);
-          } : saveBlob
+          } : saveBlob,
+          void 0,
+          { allowPdfReplacements }
         );
         setDialogOpen(false);
+        if (!fileShare) {
+          setExportCompletion({
+            filename: buildExportFilename(selectedFile, opts),
+            target: savedTarget
+          });
+        }
         if (result.warnings.length > 0) setExportNotice(result.warnings);
         if (savedTarget) await openSaved(savedTarget);
       } catch (caught) {
+        if (caught instanceof PdfReplacementsError) {
+          setPdfReplacements({ options: opts, quick: false });
+        }
         if (!(caught instanceof ExportCancelledError)) setExportError(exportErrorMessage(caught));
       } finally {
         setExporting(false);
@@ -419,59 +438,79 @@ function ExportToolbarControls({
       openSaved
     ]
   );
-  const handleQuickExport = useCallback(async () => {
-    if (!lastOptions) return;
-    closeMenu(true);
-    setExporting(true);
-    setExportError(null);
-    setOpenError(null);
-    setExportNotice(null);
-    try {
-      saveExportOptions(lastOptions);
-      let quickTarget = null;
-      if (destinationAdapter) {
-        if (destinationAdapter.pickBeforeSave) {
-          const filename = buildExportFilename(selectedFile, lastOptions);
-          quickTarget = await destinationAdapter.pickTarget(filename, quickDestinationTarget);
-          if (!quickTarget) return;
-        } else {
-          if (!quickDestinationTarget) return;
-          quickTarget = quickDestinationTarget;
+  const handleQuickExport = useCallback(
+    async (allowPdfReplacements = false) => {
+      if (!lastOptions) return;
+      closeMenu(true);
+      setExporting(true);
+      setExportError(null);
+      setPdfReplacements(null);
+      setOpenError(null);
+      setExportNotice(null);
+      setExportCompletion(null);
+      try {
+        saveExportOptions(lastOptions);
+        let quickTarget = null;
+        if (destinationAdapter) {
+          if (destinationAdapter.pickBeforeSave) {
+            const filename = buildExportFilename(selectedFile, lastOptions);
+            quickTarget = await destinationAdapter.pickTarget(filename, quickDestinationTarget);
+            if (!quickTarget) return;
+          } else {
+            if (!quickDestinationTarget) return;
+            quickTarget = quickDestinationTarget;
+          }
         }
+        const { runExport } = await loadRunExportModule();
+        let savedTarget;
+        const result = await runExport(
+          markdownSource,
+          selectedFile,
+          lastOptions,
+          mediaContainer,
+          destinationAdapter ? async (blob, filename) => {
+            savedTarget = await saveToDestination(blob, filename, quickTarget);
+          } : saveBlob,
+          void 0,
+          { allowPdfReplacements }
+        );
+        setExportCompletion({
+          filename: buildExportFilename(selectedFile, lastOptions),
+          target: savedTarget
+        });
+        if (result.warnings.length > 0) setExportNotice(result.warnings);
+        if (savedTarget) await openSaved(savedTarget);
+      } catch (caught) {
+        if (caught instanceof PdfReplacementsError) {
+          setPdfReplacements({ options: lastOptions, quick: true });
+        }
+        if (!(caught instanceof ExportCancelledError)) setExportError(exportErrorMessage(caught));
+      } finally {
+        setExporting(false);
       }
-      const { runExport } = await loadRunExportModule();
-      let savedTarget;
-      const result = await runExport(
-        markdownSource,
-        selectedFile,
-        lastOptions,
-        mediaContainer,
-        destinationAdapter ? async (blob, filename) => {
-          savedTarget = await saveToDestination(blob, filename, quickTarget);
-        } : saveBlob
-      );
-      if (result.warnings.length > 0) setExportNotice(result.warnings);
-      if (savedTarget) await openSaved(savedTarget);
-    } catch (caught) {
-      if (!(caught instanceof ExportCancelledError)) setExportError(exportErrorMessage(caught));
-    } finally {
-      setExporting(false);
-    }
-  }, [
-    closeMenu,
-    destinationAdapter,
-    lastOptions,
-    markdownSource,
-    mediaContainer,
-    saveBlob,
-    saveToDestination,
-    selectedFile,
-    quickDestinationTarget,
-    openSaved
-  ]);
+    },
+    [
+      closeMenu,
+      destinationAdapter,
+      lastOptions,
+      markdownSource,
+      mediaContainer,
+      saveBlob,
+      saveToDestination,
+      selectedFile,
+      quickDestinationTarget,
+      openSaved
+    ]
+  );
   const handleDismissExportError = useCallback(() => {
     setExportError(null);
+    setPdfReplacements(null);
   }, []);
+  const handleSaveWithReplacements = useCallback(() => {
+    if (!pdfReplacements) return;
+    if (pdfReplacements.quick) void handleQuickExport(true);
+    else void handleExport(pdfReplacements.options, true);
+  }, [handleExport, handleQuickExport, pdfReplacements]);
   const handleDismissExportNotice = useCallback(() => {
     setExportNotice(null);
   }, []);
@@ -538,7 +577,7 @@ function ExportToolbarControls({
                 role: "menuitem",
                 tabIndex: -1,
                 className: "db-toolbar-menu-item",
-                onClick: handleQuickExport,
+                onClick: () => void handleQuickExport(),
                 disabled: exporting || Boolean(destinationAdapter) && !quickDestinationTarget,
                 title: quickDestinationTarget ? quickLabel(
                   lastOptions,
@@ -665,6 +704,7 @@ function ExportToolbarControls({
         documentThemes,
         exporting,
         error: exportError,
+        errorAction: pdfReplacements ? { label: "Save PDF with replacements", onClick: handleSaveWithReplacements } : null,
         openAfterSave: !fileShare && destinationAdapter?.openSaved ? { checked: openAfterSave, onChange: handleOpenAfterSaveChange } : void 0,
         destination: destinationAdapter && destinationAdapter.showDestination !== false ? {
           value: destinationTarget?.displayPath ?? "",
@@ -692,19 +732,57 @@ function ExportToolbarControls({
       {
         title: "Export Document",
         onClose: handleDismissExportError,
-        footer: /* @__PURE__ */ jsx(
-          "button",
-          {
-            type: "button",
-            className: "db-export-btn db-export-btn--secondary",
-            onClick: handleDismissExportError,
-            children: "Close"
-          }
-        ),
+        footer: /* @__PURE__ */ jsxs(Fragment, { children: [
+          pdfReplacements && /* @__PURE__ */ jsx(
+            "button",
+            {
+              type: "button",
+              className: "db-export-btn db-export-btn--secondary",
+              onClick: handleSaveWithReplacements,
+              disabled: exporting,
+              children: "Save PDF with replacements"
+            }
+          ),
+          /* @__PURE__ */ jsx(
+            "button",
+            {
+              type: "button",
+              className: "db-export-btn db-export-btn--secondary",
+              onClick: handleDismissExportError,
+              children: "Close"
+            }
+          )
+        ] }),
         children: /* @__PURE__ */ jsx("p", { className: "db-export-error", role: "alert", children: exportError })
       }
     ),
     openError && !videoModalOpen && /* @__PURE__ */ jsx(Dialog, { title: "Open saved export", onClose: () => setOpenError(null), children: /* @__PURE__ */ jsx("p", { role: "alert", children: openError }) }),
+    exportCompletion && !dialogOpen && !exportError && !openError && !exportNotice && createPortal(
+      /* @__PURE__ */ jsxs("aside", { className: "db-export-completion", "aria-label": "Export result", children: [
+        /* @__PURE__ */ jsx("p", { role: "status", children: exportCompletion.target ? `Saved ${exportCompletion.target.displayPath}` : !destinationAdapter && !saveBlob ? `Sent ${exportCompletion.filename} to your browser\u2019s downloads.` : `Exported ${exportCompletion.filename}` }),
+        /* @__PURE__ */ jsxs("div", { className: "db-export-completion-actions", children: [
+          exportCompletion.target && destinationAdapter?.openSaved && /* @__PURE__ */ jsx(
+            "button",
+            {
+              type: "button",
+              className: "db-export-btn db-export-btn--primary",
+              onClick: () => void openSaved(exportCompletion.target, true),
+              children: "Open exported file"
+            }
+          ),
+          /* @__PURE__ */ jsx(
+            "button",
+            {
+              type: "button",
+              className: "db-export-btn db-export-btn--secondary",
+              onClick: () => setExportCompletion(null),
+              children: "Dismiss"
+            }
+          )
+        ] })
+      ] }),
+      document.body
+    ),
     exportNotice && !dialogOpen && !exportError && !openError && /* @__PURE__ */ jsx(
       Dialog,
       {