tinacms 3.9.4 → 3.10.0

package/dist/index.js

@@ -10,7 +10,7 @@ import React__default, { useState, useCallback, useRef, useEffect, createContext
 import { createPortal } from "react-dom";
 import { clsx } from "clsx";
 import { twMerge } from "tailwind-merge";
-import { withRef, cn as cn$1, withCn, createPrimitiveElement, withVariants, withProps, useComposedRef as useComposedRef$1, PortalBody } from "@udecode/cn";
+import { withRef, cn as cn$1, withCn, createPrimitiveElement, withVariants, withProps, PortalBody, useComposedRef as useComposedRef$1 } from "@udecode/cn";
 import { CodePlugin, UnderlinePlugin, StrikethroughPlugin, ItalicPlugin, BoldPlugin, BasicMarksPlugin } from "@udecode/plate-basic-marks/react";
 import { BlockquotePlugin } from "@udecode/plate-block-quote/react";
 import { CodeBlockPlugin, CodeLinePlugin, CodeSyntaxPlugin } from "@udecode/plate-code-block/react";
@@ -23,7 +23,7 @@ import { SlashInputPlugin, SlashPlugin } from "@udecode/plate-slash-command/reac
 import { TablePlugin, TableRowPlugin, useTableCellElement, TableProvider, useTableElement, useTableMergeState, useTableBordersDropdownMenuContentState, TableCellHeaderPlugin, TableCellPlugin } from "@udecode/plate-table/react";
 import { PlateElement, useReadOnly, useElement, PlateLeaf, useSelected, useFocused, useEditorRef, withRef as withRef$1, useComposedRef, useEditorPlugin, useElementSelector, withHOC, usePluginOption, useRemoveNodeButton, useEditorSelector, ParagraphPlugin, createPlatePlugin, PlateContent, PlateContainer, useEditorState, useMarkToolbarButtonState, useMarkToolbarButton, usePlateEditor, useFormInputProps, useEditorSelection, useEditorReadOnly, useOnClickOutside, useEventEditorValue, Plate } from "@udecode/plate/react";
 import { isLangSupported, formatCodeBlock, insertEmptyCodeBlock, unwrapCodeBlock, isCodeBlockEmpty, isSelectionAtCodeBlockStart } from "@udecode/plate-code-block";
-import { X, Search, ChevronDown, Check, AlertTriangle, BracesIcon, Plus, AlignCenter as AlignCenter$1, AlignJustify, AlignLeft as AlignLeft$1, AlignRight as AlignRight$1, PaintBucket, Quote, ChevronRight, ChevronsUpDown, FileCode, Baseline, RectangleVertical, Combine, Ungroup, MessageSquare, MessageSquarePlus, Trash, GripVertical, Edit2, Smile, ExternalLink, Heading1 as Heading1$1, Heading2 as Heading2$1, Heading3 as Heading3$1, Heading4 as Heading4$1, Heading5 as Heading5$1, Heading6 as Heading6$1, Indent, Keyboard, WrapText, Minus, MoreHorizontal, Outdent, Pilcrow, RotateCcw, RectangleHorizontal, Settings, Highlighter, Strikethrough, Subscript, Superscript, Table as Table$1, Text, Underline, Link2Off, Eye, SeparatorHorizontal, Moon, SunMedium, Twitter, PaintBucketIcon, CombineIcon, SquareSplitHorizontalIcon, Grid2X2Icon, Trash2Icon, ArrowUp, ArrowDown, XIcon, ArrowLeft, ArrowRight, EraserIcon, ChevronDownIcon as ChevronDownIcon$1, ChevronUp, Clock, CalendarCheck, Calendar as Calendar$1, CalendarDays, RotateCw, ChevronLeft, ArrowUpDown, AlertCircle, Image, RefreshCw, Database, CheckCircle2, ImageOff, LoaderCircle, TriangleAlert, FileStack, History, GitBranchIcon, List as List$1, ListOrdered, Grid3x3Icon, CircleX, Link, Unlink } from "lucide-react";
+import { X, Search, ChevronDown, Check, AlertTriangle, BracesIcon, Plus, AlignCenter as AlignCenter$1, AlignJustify, AlignLeft as AlignLeft$1, AlignRight as AlignRight$1, PaintBucket, Quote, ChevronRight, ChevronsUpDown, FileCode, Baseline, RectangleVertical, Combine, Ungroup, MessageSquare, MessageSquarePlus, Trash, GripVertical, Edit2, Smile, ExternalLink, Heading1 as Heading1$1, Heading2 as Heading2$1, Heading3 as Heading3$1, Heading4 as Heading4$1, Heading5 as Heading5$1, Heading6 as Heading6$1, Indent, Keyboard, WrapText, Minus, MoreHorizontal, Outdent, Pilcrow, RotateCcw, RectangleHorizontal, Settings, Highlighter, Strikethrough, Subscript, Superscript, Table as Table$1, Text, Underline, Link2Off, Eye, SeparatorHorizontal, Moon, SunMedium, Twitter, PaintBucketIcon, CombineIcon, SquareSplitHorizontalIcon, Grid2X2Icon, Trash2Icon, ArrowUp, ArrowDown, XIcon, ArrowLeft, ArrowRight, EraserIcon, ChevronDownIcon as ChevronDownIcon$1, ChevronUp, Clock, CalendarCheck, Calendar as Calendar$1, CalendarDays, RotateCw, ChevronLeft, ArrowUpDown, AlertCircle, Image, RefreshCw, Database, CheckCircle2, ImageOff, LoaderCircle, TriangleAlert, FileStack, History, GitBranchIcon, FileText, Globe, List as List$1, ListOrdered, Grid3x3Icon, CircleX, Link, Unlink } from "lucide-react";
 import mermaid from "mermaid";
 import { Slot } from "@radix-ui/react-slot";
 import { cva } from "class-variance-authority";
@@ -36,7 +36,7 @@ import { useHTMLInputCursorState, useComboboxInput } from "@udecode/plate-combob
 import { useComboboxContext, Combobox as Combobox$1, useComboboxStore, ComboboxProvider, Portal, ComboboxPopover, ComboboxItem } from "@ariakit/react";
 import { filterWords } from "@udecode/plate-combobox";
 import { toggleList, unwrapList, getListItemEntry } from "@udecode/plate-list";
-import { normalizeHeadingLevels, ALL_HEADING_LEVELS, canonicalPath, isHeadingLevel, TinaSchema, addNamespaceToSchema, parseURL, resolveForm, normalizePath, validateSchema } from "@tinacms/schema-tools";
+import { normalizeHeadingLevels, ALL_HEADING_LEVELS, ASYNC_POLLER_ERROR, canonicalPath, ERR_BRANCH_EXISTS, ERR_BRANCH_CONFLICT, isHeadingLevel, TinaSchema, addNamespaceToSchema, parseURL, ERR_HAS_REFERENCES, ERR_ALREADY_EXISTS, isValidRelativePath, RELATIVE_PATH_ALLOWED_CHARS_MESSAGE, resolveForm, RELATIVE_PATH_REGEX, normalizePath, ERR_NOT_INDEXED, validateSchema } from "@tinacms/schema-tools";
 import { NAMER, resolveField } from "@tinacms/schema-tools";
 import { useBlockSelected, BlockSelectionPlugin } from "@udecode/plate-selection/react";
 import "@udecode/plate-dnd";
@@ -67,7 +67,7 @@ import { MdKeyboardArrowDown, MdOutlineClear, MdArrowForward, MdAccessTime, MdOu
 import * as dropzone from "react-dropzone";
 import { IoMdArrowDropup, IoMdArrowDropdown, IoMdClose, IoMdRefresh } from "react-icons/io";
 import { Command as Command$3 } from "@udecode/cmdk";
-import { Popover as Popover$4, PopoverButton, Transition, PopoverPanel, TransitionChild, Disclosure, DisclosureButton, DisclosurePanel, Menu, MenuButton, MenuItems, MenuItem } from "@headlessui/react";
+import { Popover as Popover$4, PopoverButton, Transition, PopoverPanel, TransitionChild, Disclosure, DisclosureButton, DisclosurePanel, Menu, MenuButton, MenuItems, MenuItem as MenuItem$1 } from "@headlessui/react";
 import { isHotkey } from "is-hotkey";
 import { AutoformatPlugin } from "@udecode/plate-autoformat/react";
 import { ExitBreakPlugin, SoftBreakPlugin } from "@udecode/plate-break/react";
@@ -77,7 +77,7 @@ import { BaseBlockquotePlugin } from "@udecode/plate-block-quote";
 import { HeadingPlugin } from "@udecode/plate-heading/react";
 import { IndentListPlugin } from "@udecode/plate-indent-list/react";
 import { NodeIdPlugin } from "@udecode/plate-node-id";
-import { offset, flip, useVirtualFloating, getSelectionBoundingClientRect } from "@udecode/plate-floating";
+import { offset, flip, shift, limitShift, useVirtualFloating, getSelectionBoundingClientRect } from "@udecode/plate-floating";
 import { getLinkAttributes } from "@udecode/plate-link";
 import "@heroicons/react/solid";
 import { autoformatSmartQuotes, autoformatPunctuation, autoformatLegal, autoformatArrow, autoformatMath } from "@udecode/plate-autoformat";
@@ -2280,6 +2280,7 @@ const BranchSwitcherDropDownEvent = "branch-switcher-dropdown";
 const BranchSwitcherPRClickedEvent = "branch-switcher-pr-clicked";
 const SavedContentEvent = "saved-content";
 const SaveContentErrorEvent = "save-content-error";
+const EditorialWorkflowSaveEvent = "editorial-workflow-save";
 const FormResetEvent = "form-reset";
 const MediaManagerContentUploadedEvent = "media-manager-content-uploaded";
 const MediaManagerContentDeletedEvent = "media-manager-content-deleted";
@@ -4493,6 +4494,21 @@ function DropdownMenuSeparator({
     }
   );
 }
+const MenuItem = ({ item }) => {
+  const menuItem = /* @__PURE__ */ React.createElement(
+    DropdownMenuItem,
+    {
+      onClick: item.onClick,
+      disabled: item.disabled,
+      variant: item.variant
+    },
+    item.icon && item.icon,
+    item.label
+  );
+  if (!item.tooltip)
+    return menuItem;
+  return /* @__PURE__ */ React.createElement(Tooltip$1, null, /* @__PURE__ */ React.createElement(TooltipTrigger$1, { asChild: true }, /* @__PURE__ */ React.createElement("div", null, menuItem)), /* @__PURE__ */ React.createElement(TooltipPortal, null, /* @__PURE__ */ React.createElement(TooltipContent$1, { side: "left" }, item.tooltip)));
+};
 const DropdownButton = React.forwardRef(
   ({
     variant = "primary",
@@ -4530,17 +4546,7 @@ const DropdownButton = React.forwardRef(
             )
           }
         )
-      )), /* @__PURE__ */ React.createElement(DropdownMenuContent, { align: "end", side: "bottom", className: "z-[100000]" }, items.map((item, index) => /* @__PURE__ */ React.createElement(
-        DropdownMenuItem,
-        {
-          key: index,
-          onClick: item.onClick,
-          disabled: item.disabled,
-          variant: item.variant
-        },
-        item.icon && item.icon,
-        item.label
-      ))));
+      )), /* @__PURE__ */ React.createElement(DropdownMenuContent, { align: "end", side: "bottom", className: "z-[100000]" }, /* @__PURE__ */ React.createElement(TooltipProvider$1, null, items.map((item, index) => /* @__PURE__ */ React.createElement(MenuItem, { key: index, item })))));
     }
     return /* @__PURE__ */ React.createElement("div", { className: cn("inline-flex", className) }, /* @__PURE__ */ React.createElement(
       Button$2,
@@ -4577,19 +4583,10 @@ const DropdownButton = React.forwardRef(
           style: { fill: "none" }
         }
       )
-    )), /* @__PURE__ */ React.createElement(DropdownMenuContent, { align: "end", side: "bottom" }, items.map((item, index) => {
+    )), /* @__PURE__ */ React.createElement(DropdownMenuContent, { align: "end", side: "bottom" }, /* @__PURE__ */ React.createElement(TooltipProvider$1, null, items.map((item, index) => {
       var _a;
-      return /* @__PURE__ */ React.createElement(React.Fragment, { key: index }, /* @__PURE__ */ React.createElement(
-        DropdownMenuItem,
-        {
-          onClick: item.onClick,
-          disabled: item.disabled,
-          variant: item.variant
-        },
-        item.icon && item.icon,
-        item.label
-      ), item.variant === "destructive" && index < items.length - 1 && ((_a = items[index + 1]) == null ? void 0 : _a.variant) !== "destructive" && /* @__PURE__ */ React.createElement(DropdownMenuSeparator, null));
-    }))));
+      return /* @__PURE__ */ React.createElement(React.Fragment, { key: index }, /* @__PURE__ */ React.createElement(MenuItem, { item }), item.variant === "destructive" && index < items.length - 1 && ((_a = items[index + 1]) == null ? void 0 : _a.variant) !== "destructive" && /* @__PURE__ */ React.createElement(DropdownMenuSeparator, null));
+    })))));
   }
 );
 DropdownButton.displayName = "DropdownButton";
@@ -8780,7 +8777,7 @@ const BranchSwitcherLegacy = ({
             return newBranchList;
           });
         }).catch((e) => {
-          if (e.message === "AsyncPoller: cancelled")
+          if (e.message === ASYNC_POLLER_ERROR.CANCELLED)
             return;
           console.error(e);
         });
@@ -9508,7 +9505,7 @@ const EditoralBranchSwitcher = ({
             return newBranchList;
           });
         }).catch((e) => {
-          if (e.message === "AsyncPoller: cancelled")
+          if (e.message === ASYNC_POLLER_ERROR.CANCELLED)
             return;
           console.error(e);
         });
@@ -13264,7 +13261,7 @@ const FormModal = ({ plugin, close: close2 }) => {
 const name = "tinacms";
 const type = "module";
 const typings = "dist/index.d.ts";
-const version$1 = "3.9.4";
+const version$1 = "3.10.0";
 const main = "dist/index.js";
 const module = "./dist/index.js";
 const exports = {
@@ -13313,13 +13310,12 @@ const dependencies = {
   "@headlessui/react": "2.1.8",
   "@heroicons/react": "^1.0.6",
   "@monaco-editor/react": "catalog:",
-  "@radix-ui/react-checkbox": "catalog:",
   "@radix-ui/react-dialog": "catalog:",
   "@radix-ui/react-dropdown-menu": "catalog:",
   "@radix-ui/react-popover": "catalog:",
   "@radix-ui/react-select": "catalog:",
   "@radix-ui/react-separator": "catalog:",
-  "@radix-ui/react-slot": "^1.1.2",
+  "@radix-ui/react-slot": "catalog:",
   "@radix-ui/react-toolbar": "catalog:",
   "@radix-ui/react-tooltip": "catalog:",
   "@react-hook/window-size": "catalog:",
@@ -16370,9 +16366,9 @@ const getEditorialWorkflowErrorMessage = (e) => {
         break;
     }
   } else if (err.message) {
-    if (err.message.toLowerCase().includes("already exists")) {
+    if (err.message.toLowerCase().includes(ERR_BRANCH_EXISTS)) {
       errMessage = "A branch with this name already exists";
-    } else if (err.message.toLowerCase().includes("conflict")) {
+    } else if (err.message.toLowerCase().includes(ERR_BRANCH_CONFLICT)) {
       errMessage = err.message;
     }
   }
@@ -16412,12 +16408,13 @@ function useEditorialWorkflow() {
     values,
     crudType,
     tinaForm,
-    signal
+    signal,
+    isDraft
   }) => {
     var _a;
     try {
       if (signal == null ? void 0 : signal.aborted)
-        return false;
+        return { success: false };
       const targetBranchExists = await checkTargetBranchExists(
         tinaApi,
         branchName,
@@ -16425,12 +16422,12 @@ function useEditorialWorkflow() {
         signal
       );
       if (signal == null ? void 0 : signal.aborted)
-        return false;
+        return { success: false };
       if (targetBranchExists) {
         setErrorMessage(TARGET_BRANCH_EXISTS_ERROR);
         setIsExecuting(false);
         setCurrentStep(0);
-        return false;
+        return { success: false, error: TARGET_BRANCH_EXISTS_ERROR };
       }
       setIsExecuting(true);
       setCurrentStep(1);
@@ -16456,6 +16453,7 @@ function useEditorialWorkflow() {
         branchName,
         baseBranch,
         prTitle: getEditorialWorkflowPrTitle(branchName),
+        isDraft,
         graphQLContentOp: {
           query: graphql2,
           variables: {
@@ -16501,14 +16499,14 @@ function useEditorialWorkflow() {
         const folderPath = relativePath.includes("/") ? relativePath.substring(0, relativePath.lastIndexOf("/")) : "";
         window.location.hash = `#/collections/${collection.name}${folderPath ? `/${folderPath}` : ""}`;
       }
-      return true;
+      return { success: true };
     } catch (e) {
       console.error(e);
       const errMessage = getEditorialWorkflowErrorMessage(e);
       setErrorMessage(errMessage);
       setIsExecuting(false);
       setCurrentStep(0);
-      return false;
+      return { success: false, error: errMessage };
     }
   };
   return {
@@ -16604,6 +16602,41 @@ const EditorialWorkflowProgressModal = ({
     elapsedTime
   }
 ))));
+function useLocalStorage(key, initialValue) {
+  const [storedValue, setStoredValue] = React.useState(() => {
+    try {
+      const valueFromStorage = typeof window !== "undefined" && window.localStorage && window.localStorage.getItem(key);
+      if (valueFromStorage != null) {
+        return JSON.parse(valueFromStorage);
+      }
+    } catch (error2) {
+    }
+    return initialValue;
+  });
+  React.useEffect(() => {
+    const valueFromStorage = window.localStorage && window.localStorage.getItem(key);
+    if (valueFromStorage != null && valueFromStorage != void 0) {
+      setStoredValue(JSON.parse(valueFromStorage));
+    }
+  }, [key]);
+  const setValue = (value) => {
+    try {
+      const valueToStore = value instanceof Function ? value(storedValue) : value;
+      setStoredValue(valueToStore);
+      localStorage.setItem(key, JSON.stringify(valueToStore));
+    } catch (error2) {
+      console.log(error2);
+    }
+  };
+  return [storedValue, setValue];
+}
+const SAVE_CHOICE_KEY = "tina.editorialWorkflow.saveChoice";
+const SAVE_CHOICE_ORDER = ["draft", "review", "publish"];
+const resolveSaveOptions = (lastChoice, disablePublish) => {
+  const main2 = lastChoice === "publish" && disablePublish ? "draft" : lastChoice;
+  const menu = SAVE_CHOICE_ORDER.filter((choice) => choice !== main2);
+  return { main: main2, menu };
+};
 const formatDefaultBranchName = (filePath, crudType) => {
   let result = filePath;
   const contentPrefix = "content/";
@@ -16656,7 +16689,7 @@ const CreateBranchModal = ({
       (_a = branchGuardAbortRef.current) == null ? void 0 : _a.abort();
     };
   }, []);
-  const executeEditorialWorkflow = async () => {
+  const executeEditorialWorkflow = async (isDraft) => {
     abortBranchGuard();
     const abortController = new AbortController();
     branchGuardAbortRef.current = abortController;
@@ -16680,18 +16713,26 @@ const CreateBranchModal = ({
       return;
     }
     setIsBranchGuardChecking(false);
-    const success = await executeWorkflow({
+    const { success, error: error2 } = await executeWorkflow({
       branchName: targetBranch,
       baseBranch,
       path,
       values,
       crudType,
       tinaForm,
-      signal: abortController.signal
+      signal: abortController.signal,
+      isDraft
     });
     if (branchGuardAbortRef.current === abortController) {
       branchGuardAbortRef.current = null;
     }
+    if (abortController.signal.aborted)
+      return;
+    captureEvent(EditorialWorkflowSaveEvent, {
+      choice: isDraft ? "draft" : "review",
+      success,
+      error: error2
+    });
     if (success) {
       close2();
     }
@@ -16725,8 +16766,10 @@ const CreateBranchModal = ({
       onSaveToProtectedBranch: () => {
         abortBranchGuard();
         close2();
-        safeSubmit();
-      }
+        safeSubmit("publish");
+      },
+      showSaveOptions: true,
+      disablePublish: !!tinaApi.usingProtectedBranch()
     }
   );
 };
@@ -16737,8 +16780,36 @@ const CreateBranchPromptModal = ({
   errorMessage,
   onBranchNameChange,
   onCreateBranch,
-  onSaveToProtectedBranch
+  onSaveToProtectedBranch,
+  showSaveOptions = false,
+  disablePublish = false
 }) => {
+  const [lastChoice, setLastChoice] = useLocalStorage(
+    SAVE_CHOICE_KEY,
+    "draft"
+  );
+  const { main: main2, menu } = resolveSaveOptions(lastChoice, disablePublish);
+  const choices = {
+    draft: {
+      label: "Save draft",
+      Icon: FileText,
+      run: () => onCreateBranch(true)
+    },
+    review: {
+      label: "Save (ready for review)",
+      Icon: Eye,
+      run: () => onCreateBranch(false)
+    },
+    publish: {
+      label: "Save and publish",
+      Icon: Globe,
+      run: onSaveToProtectedBranch,
+      disabled: disablePublish,
+      tooltip: disablePublish ? "This branch is protected. Save a draft or send it for review instead." : void 0
+    }
+  };
+  const mainChoice = choices[main2] ?? choices.draft;
+  const MainIcon = mainChoice.Icon;
   return /* @__PURE__ */ React.createElement(Modal, { className: "flex" }, /* @__PURE__ */ React.createElement(PopupModal, { className: "w-auto" }, /* @__PURE__ */ React.createElement(ModalHeader, { close: close2 }, /* @__PURE__ */ React.createElement("div", { className: "flex items-center justify-between w-full" }, /* @__PURE__ */ React.createElement("div", { className: "flex items-center" }, "Save changes to new branch"))), /* @__PURE__ */ React.createElement(ModalBody, { padded: true }, /* @__PURE__ */ React.createElement("div", { className: "max-w-sm" }, errorMessage && /* @__PURE__ */ React.createElement("div", { className: "flex items-center gap-1 text-red-700 py-2 px-3 mb-4 bg-red-50 border border-red-200 rounded" }, /* @__PURE__ */ React.createElement(BiError, { className: "w-5 h-auto text-red-400 flex-shrink-0" }), /* @__PURE__ */ React.createElement("span", { className: "text-sm" }, /* @__PURE__ */ React.createElement("b", null, "Error:"), " ", errorMessage)), /* @__PURE__ */ React.createElement("p", { className: "text-lg text-gray-700 font-bold mb-2" }, "First, let's create a copy"), /* @__PURE__ */ React.createElement("p", { className: "text-sm text-gray-700 mb-4 max-w-sm" }, "To make changes, you need to create a copy then get it approved and merged for it to go live.", /* @__PURE__ */ React.createElement("br", null), /* @__PURE__ */ React.createElement("br", null), /* @__PURE__ */ React.createElement("span", { className: "text-gray-500" }, "Learn more about "), /* @__PURE__ */ React.createElement(
     "a",
     {
@@ -16766,14 +16837,39 @@ const CreateBranchPromptModal = ({
       onClick: close2
     },
     "Cancel"
-  ), /* @__PURE__ */ React.createElement(
+  ), showSaveOptions ? /* @__PURE__ */ React.createElement(
+    DropdownButton,
+    {
+      variant: "primary",
+      align: "start",
+      className: "w-full sm:w-auto",
+      disabled,
+      onMainAction: mainChoice.run,
+      items: menu.map((choice) => {
+        const option = choices[choice];
+        const OptionIcon = option.Icon;
+        return {
+          label: option.label,
+          icon: /* @__PURE__ */ React.createElement(OptionIcon, { className: "w-4 h-4" }),
+          disabled: option.disabled,
+          tooltip: option.tooltip,
+          onClick: () => {
+            setLastChoice(choice);
+            option.run();
+          }
+        };
+      })
+    },
+    /* @__PURE__ */ React.createElement(MainIcon, { className: "w-4 h-4 mr-1", style: { fill: "none" } }),
+    mainChoice.label
+  ) : /* @__PURE__ */ React.createElement(
     DropdownButton,
     {
       variant: "primary",
       align: "start",
       className: "w-full sm:w-auto",
       disabled,
-      onMainAction: onCreateBranch,
+      onMainAction: () => onCreateBranch(false),
       items: [
         {
           label: "Save to Protected Branch",
@@ -16782,7 +16878,13 @@ const CreateBranchPromptModal = ({
         }
       ]
     },
-    /* @__PURE__ */ React.createElement(GitBranchIcon, { className: "w-4 h-4 mr-1", style: { fill: "none" } }),
+    /* @__PURE__ */ React.createElement(
+      GitBranchIcon,
+      {
+        className: "w-4 h-4 mr-1",
+        style: { fill: "none" }
+      }
+    ),
     "Save to a new branch"
   ))));
 };
@@ -16822,7 +16924,7 @@ const BranchDeletedModal = ({
     reset
   } = useEditorialWorkflow();
   const handleCreate = async () => {
-    const success = await executeWorkflow({
+    const { success } = await executeWorkflow({
       branchName: `tina/${newBranchName}`,
       baseBranch,
       path,
@@ -16999,7 +17101,16 @@ const FormBuilder = ({
     }) => {
       const usingProtectedBranch = cms.api.tina.usingProtectedBranch();
       const canSubmit = !pristine && !submitting && !hasValidationErrors && !(invalid && !dirtySinceLastSubmit);
-      const safeSubmit = async () => {
+      const safeSubmit = async (editorialWorkflowChoice) => {
+        const captureWorkflowChoice = (success, error2) => {
+          if (editorialWorkflowChoice) {
+            captureEvent(EditorialWorkflowSaveEvent, {
+              choice: editorialWorkflowChoice,
+              success,
+              error: error2
+            });
+          }
+        };
         if (canSubmit) {
           const alertsBefore = new Set(cms.alerts.all.map((a) => a.id));
           console.debug(
@@ -17022,6 +17133,7 @@ const FormBuilder = ({
                   cms.alerts.dismiss(alert);
                 }
               }
+              captureWorkflowChoice(false, errorMsg);
               setDeletedBranchModalOpen(true);
               return;
             }
@@ -17029,10 +17141,12 @@ const FormBuilder = ({
               documentPath: tinaForm.path,
               error: errorMsg
             });
+            captureWorkflowChoice(false, errorMsg);
           } else {
             captureEvent(SavedContentEvent, {
               documentPath: tinaForm.path
             });
+            captureWorkflowChoice(true);
           }
         } else {
           console.debug(
@@ -18909,7 +19023,7 @@ const useCreateEditor = ({
   });
 };
 const popoverVariants = cva(
-  "z-50 w-auto rounded-md border bg-popover p-1 text-popover-foreground shadow-md outline-hidden"
+  "z-[999999] w-auto rounded-md border bg-popover p-1 text-popover-foreground shadow-md outline-hidden"
 );
 const inputVariants = cva(
   "flex h-[28px] w-full rounded-md border-none bg-transparent px-1.5 py-1 text-base placeholder:text-muted-foreground focus-visible:ring-transparent focus-visible:outline-none md:text-sm"
@@ -18943,7 +19057,8 @@ function LinkFloatingToolbar({
         flip({
           fallbackPlacements: ["bottom-end", "top-start", "top-end"],
           padding: 12
-        })
+        }),
+        shift({ padding: 8, limiter: limitShift() })
       ],
       placement: activeSuggestionId || activeCommentId ? "top-start" : "bottom-start"
     };
@@ -19063,13 +19178,13 @@ function LinkFloatingToolbar({
     },
     /* @__PURE__ */ React.createElement(Unlink, { width: 18 })
   ));
-  return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
+  return /* @__PURE__ */ React.createElement(PortalBody, null, /* @__PURE__ */ React.createElement(
     "div",
     {
       ref: insertRef,
       className: popoverVariants(),
       ...insertProps,
-      style: insertProps.style
+      style: { ...insertProps.style }
     },
     input
   ), /* @__PURE__ */ React.createElement(
@@ -19078,7 +19193,7 @@ function LinkFloatingToolbar({
       ref: editRef,
       className: popoverVariants(),
       ...editProps,
-      style: editProps.style
+      style: { ...editProps.style }
     },
     editContent
   ));
@@ -70525,25 +70640,6 @@ class FormMetaPlugin {
     this.Component = options.Component;
   }
 }
-function useLocalStorage(key, initialValue) {
-  const [storedValue, setStoredValue] = React.useState(initialValue);
-  React.useEffect(() => {
-    const valueFromStorage = window.localStorage && window.localStorage.getItem(key);
-    if (valueFromStorage != null && valueFromStorage != void 0) {
-      setStoredValue(JSON.parse(valueFromStorage));
-    }
-  }, [key]);
-  const setValue = (value) => {
-    try {
-      const valueToStore = value instanceof Function ? value(storedValue) : value;
-      setStoredValue(valueToStore);
-      localStorage.setItem(key, JSON.stringify(valueToStore));
-    } catch (error2) {
-      console.log(error2);
-    }
-  };
-  return [storedValue, setValue];
-}
 const MediaWorkflowOverlay = () => {
   const cms = useCMS$1();
   const { setCurrentBranch } = useBranchData();
@@ -70739,13 +70835,13 @@ function asyncPoll(fn, pollInterval = 5 * 1e3, pollTimeout = 30 * 1e3) {
     Promise.resolve(fn()).then((result) => {
       const now = (/* @__PURE__ */ new Date()).getTime();
       if (stop) {
-        reject(new Error("AsyncPoller: cancelled"));
+        reject(new Error(ASYNC_POLLER_ERROR.CANCELLED));
       } else if (result.done) {
         resolve(result.data);
       } else if (now < endTime) {
         setTimeout(checkCondition, pollInterval, resolve, reject);
       } else {
-        reject(new Error("AsyncPoller: reached timeout"));
+        reject(new Error(ASYNC_POLLER_ERROR.TIMEOUT));
       }
     }).catch((err) => {
       reject(err);
@@ -71359,9 +71455,7 @@ mutation addPendingDocumentMutation(
               if (result.status === "unknown") {
                 unknownCount++;
                 if (unknownCount > 5) {
-                  throw new Error(
-                    "AsyncPoller: status unknown for too long, please check indexing progress the TinaCloud dashboard"
-                  );
+                  throw new Error(ASYNC_POLLER_ERROR.STATUS_UNKNOWN);
                 }
               }
               return Promise.resolve({
@@ -71381,7 +71475,7 @@ mutation addPendingDocumentMutation(
       );
       return [prom, cancel];
     } catch (error2) {
-      if (error2.message === "AsyncPoller: reached timeout") {
+      if (error2.message === ASYNC_POLLER_ERROR.TIMEOUT) {
         console.warn(error2);
         return [Promise.resolve({ status: "timeout" }), () => {
         }];
@@ -71575,6 +71669,7 @@ mutation addPendingDocumentMutation(
           branchName: options.branchName,
           baseBranch: options.baseBranch,
           prTitle: options.prTitle,
+          isDraft: options.isDraft,
           graphQLContentOp: options.graphQLContentOp
         },
         "Failed to start editorial workflow"
@@ -73014,7 +73109,7 @@ const TemplateMenu = ({
       leaveFrom: "transform opacity-100 scale-100",
       leaveTo: "transform opacity-0 scale-95"
     },
-    /* @__PURE__ */ React__default.createElement(MenuItems, { className: "origin-top-right absolute right-0 mt-2 z-menu w-56 rounded shadow-lg bg-white ring-1 ring-black ring-opacity-5 focus:outline-none" }, /* @__PURE__ */ React__default.createElement("div", { className: "py-1" }, templates.map((template) => /* @__PURE__ */ React__default.createElement(MenuItem, { key: `${template.label}-${template.name}` }, ({ focus }) => /* @__PURE__ */ React__default.createElement(
+    /* @__PURE__ */ React__default.createElement(MenuItems, { className: "origin-top-right absolute right-0 mt-2 z-menu w-56 rounded shadow-lg bg-white ring-1 ring-black ring-opacity-5 focus:outline-none" }, /* @__PURE__ */ React__default.createElement("div", { className: "py-1" }, templates.map((template) => /* @__PURE__ */ React__default.createElement(MenuItem$1, { key: `${template.label}-${template.name}` }, ({ focus }) => /* @__PURE__ */ React__default.createElement(
       Link$1,
       {
         to: `/${folder.fullyQualifiedName ? [
@@ -73238,7 +73333,7 @@ const CollectionListPage = () => {
                 );
                 reFetchCollection();
               } catch (error2) {
-                if (error2.message.indexOf("has references")) {
+                if (error2.message.includes(ERR_HAS_REFERENCES)) {
                   cms.alerts.error(
                     error2.message.split("\n	").filter(Boolean)[1]
                   );
@@ -73248,7 +73343,6 @@ const CollectionListPage = () => {
                   "Document was not deleted, ask a developer for help or check the console for an error message"
                 );
                 console.error(error2);
-                throw error2;
               }
             },
             close: () => setDeleteModalOpen(false)
@@ -73300,11 +73394,11 @@ const CollectionListPage = () => {
                 );
                 reFetchCollection();
               } catch (error2) {
-                if (error2.message && error2.message.includes("already exists")) {
+                if (error2.message && error2.message.includes(ERR_ALREADY_EXISTS)) {
                   cms.alerts.error(
                     `Document was not renamed. The filename "${vars.newRelativePath}" is already used by another document, please choose a different name.`
                   );
-                } else if (error2.message && error2.message.includes("has references")) {
+                } else if (error2.message && error2.message.includes(ERR_HAS_REFERENCES)) {
                   cms.alerts.error(
                     error2.message.split("\n	").filter(Boolean)[1]
                   );
@@ -73346,7 +73440,7 @@ const CollectionListPage = () => {
                 );
                 cms.alerts.info("Folder was successfully created");
               } catch (error2) {
-                if (error2.message && error2.message.includes("already exists")) {
+                if (error2.message && error2.message.includes(ERR_ALREADY_EXISTS)) {
                   cms.alerts.error(
                     `Folder was not created, folder with name "${vars.folderName}" already exists ${folder.name ? `in ${folder.name}` : ""}`
                   );
@@ -73932,38 +74026,56 @@ const FolderModal = ({
   validationRegex
 }) => {
   const [isFolderNameValid, setIsFolderNameValid] = useState(false);
+  const [validationMessage, setValidationMessage] = useState(
+    null
+  );
   const [isInteracted, setIsInteracted] = useState(false);
   useEffect(() => {
     validateFolderName(folderName);
   }, [folderName]);
   const validateFolderName = (name2) => {
-    if (!validationRegex || !name2.trim()) {
-      setIsFolderNameValid(!!name2.trim());
-      return !!name2.trim();
+    if (!name2.trim()) {
+      setIsFolderNameValid(false);
+      setValidationMessage(null);
+      return false;
     }
-    try {
-      const regex = new RegExp(validationRegex);
-      const valid = regex.test(name2);
-      setIsFolderNameValid(valid);
-      return valid;
-    } catch (error2) {
+    if (!isValidRelativePath(name2)) {
       setIsFolderNameValid(false);
+      setValidationMessage(RELATIVE_PATH_ALLOWED_CHARS_MESSAGE);
       return false;
     }
+    if (validationRegex) {
+      let passesCustomRegex = false;
+      try {
+        passesCustomRegex = new RegExp(validationRegex).test(name2);
+      } catch (error2) {
+        passesCustomRegex = false;
+      }
+      if (!passesCustomRegex) {
+        setIsFolderNameValid(false);
+        setValidationMessage(
+          "Folder name is not valid, please enter a valid folder name."
+        );
+        return false;
+      }
+    }
+    setIsFolderNameValid(true);
+    setValidationMessage(null);
+    return true;
   };
   return /* @__PURE__ */ React__default.createElement(Modal, null, /* @__PURE__ */ React__default.createElement(PopupModal, null, /* @__PURE__ */ React__default.createElement(ModalHeader, { close: close2 }, "Create Folder"), /* @__PURE__ */ React__default.createElement(ModalBody, { padded: true }, /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, /* @__PURE__ */ React__default.createElement(
     BaseTextField,
     {
       placeholder: "Enter the name of the new folder",
       value: folderName,
-      className: `mb-4 ${!isFolderNameValid && isInteracted ? "border-red-500" : ""}`,
+      className: `mb-4 ${isInteracted && validationMessage ? "border-red-500" : ""}`,
       onChange: (event) => {
         setFolderName(event.target.value);
         setIsInteracted(true);
         validateFolderName(event.target.value);
       }
     }
-  ), !isFolderNameValid && isInteracted && /* @__PURE__ */ React__default.createElement("p", { className: "text-red-500 text-sm pl-1" }, "Folder name is not valid – please enter a valid folder name."))), /* @__PURE__ */ React__default.createElement(ModalActions, null, /* @__PURE__ */ React__default.createElement(Button$2, { style: { flexGrow: 2 }, onClick: close2 }, "Cancel"), /* @__PURE__ */ React__default.createElement(
+  ), isInteracted && validationMessage && /* @__PURE__ */ React__default.createElement("p", { className: "text-red-500 text-sm pl-1" }, validationMessage))), /* @__PURE__ */ React__default.createElement(ModalActions, null, /* @__PURE__ */ React__default.createElement(Button$2, { style: { flexGrow: 2 }, onClick: close2 }, "Cancel"), /* @__PURE__ */ React__default.createElement(
     Button$2,
     {
       style: { flexGrow: 3 },
@@ -74403,9 +74515,8 @@ const RenderForm$1 = ({
         }
         return true;
       }
-      const isValid = /^[\.\-_\/a-zA-Z0-9]*$/.test(value);
-      if (value && !isValid) {
-        return "Must contain only a-z, A-Z, 0-9, -, _, ., or /.";
+      if (!RELATIVE_PATH_REGEX.test(value)) {
+        return RELATIVE_PATH_ALLOWED_CHARS_MESSAGE;
       }
       if (((_a2 = schemaCollection.match) == null ? void 0 : _a2.exclude) || ((_b2 = schemaCollection.match) == null ? void 0 : _b2.include)) {
         const filePath = `${normalizePath(schemaCollection.path)}/${value}.${schemaCollection.format || "md"}`;
@@ -74467,7 +74578,7 @@ const RenderForm$1 = ({
           }, 10);
         } catch (error2) {
           const defaultErrorText = "There was a problem saving your document.";
-          if (error2.message && error2.message.includes("already exists")) {
+          if (error2.message && error2.message.includes(ERR_ALREADY_EXISTS)) {
             cms.alerts.error(
               `${defaultErrorText} The filename "${form.values.filename}.${collection.format || "md"}" is already used for another document, please modify it.`
             );
@@ -74928,7 +75039,7 @@ const CheckSchema = ({
           );
         }
       }).catch((error2) => {
-        if (error2.message.includes("has not been indexed by TinaCloud")) {
+        if (error2.message.includes(ERR_NOT_INDEXED)) {
           setSchemaMissingError(true);
         } else {
           console.error("Unexpected error checking schema:", error2);

package/dist/internalClient/index.d.ts

@@ -170,6 +170,7 @@ export declare class Client {
         branchName: string;
         baseBranch: string;
         prTitle?: string;
+        isDraft?: boolean;
         graphQLContentOp?: {
             query: string;
             variables: Record<string, unknown>;

package/dist/lib/posthog/posthog.d.ts

@@ -23,6 +23,12 @@ export type SaveContentErrorPayload = {
     documentPath?: string;
     error?: string;
 };
+export declare const EditorialWorkflowSaveEvent: string;
+export type EditorialWorkflowSavePayload = {
+    choice: 'draft' | 'review' | 'publish';
+    success: boolean;
+    error?: string;
+};
 export declare const FormResetEvent: string;
 export declare const MediaManagerContentUploadedEvent: string;
 export type MediaManagerContentUploadedPayload = {

package/dist/react.js

@@ -147,17 +147,24 @@ function useTina(props) {
 }
 function useEditState() {
   const [edit, setEdit] = React.useState(false);
+  const trustedAdminOrigins = useTrustedAdminOrigins();
   React.useEffect(() => {
-    if (typeof window !== "undefined") {
-      parent.postMessage({ type: "isEditMode" }, window.location.origin);
-      window.addEventListener("message", (event) => {
-        var _a;
-        if (((_a = event.data) == null ? void 0 : _a.type) === "tina:editMode") {
-          setEdit(true);
-        }
-      });
-    }
-  }, []);
+    if (typeof window === "undefined")
+      return;
+    parent.postMessage({ type: "isEditMode" }, window.location.origin);
+    const handleMessage = (event) => {
+      var _a;
+      if (!isFromAdmin(event, trustedAdminOrigins))
+        return;
+      if (((_a = event.data) == null ? void 0 : _a.type) === "tina:editMode") {
+        setEdit(true);
+      }
+    };
+    window.addEventListener("message", handleMessage);
+    return () => {
+      window.removeEventListener("message", handleMessage);
+    };
+  }, [trustedAdminOrigins]);
   return { edit };
 }
 export {

package/dist/toolkit/form-builder/create-branch-modal.d.ts

@@ -1,7 +1,8 @@
 import * as React from 'react';
 import { Form } from '../forms';
+import { type SaveChoice } from './save-options';
 export declare const CreateBranchModal: ({ close, safeSubmit, path, values, crudType, tinaForm, onBaseBranchDeleted, }: {
-    safeSubmit: () => Promise<void>;
+    safeSubmit: (editorialWorkflowChoice?: SaveChoice) => Promise<void>;
     close: () => void;
     path: string;
     values: Record<string, unknown>;
@@ -9,14 +10,16 @@ export declare const CreateBranchModal: ({ close, safeSubmit, path, values, crud
     tinaForm?: Form;
     onBaseBranchDeleted?: () => void;
 }) => React.JSX.Element;
-export declare const CreateBranchPromptModal: ({ branchName, close, disabled, errorMessage, onBranchNameChange, onCreateBranch, onSaveToProtectedBranch, }: {
+export declare const CreateBranchPromptModal: ({ branchName, close, disabled, errorMessage, onBranchNameChange, onCreateBranch, onSaveToProtectedBranch, showSaveOptions, disablePublish, }: {
     branchName: string;
     close: () => void;
     disabled?: boolean;
     errorMessage?: string;
     onBranchNameChange: (value: string) => void;
-    onCreateBranch: () => void;
+    onCreateBranch: (isDraft: boolean) => void;
     onSaveToProtectedBranch: () => void;
+    showSaveOptions?: boolean;
+    disablePublish?: boolean;
 }) => React.JSX.Element;
 export declare const PrefixedTextField: ({ label, prefix, ...props }: {
     [x: string]: any;

package/dist/toolkit/form-builder/save-options.d.ts

@@ -0,0 +1,7 @@
+export type SaveChoice = 'draft' | 'review' | 'publish';
+export declare const SAVE_CHOICE_KEY = "tina.editorialWorkflow.saveChoice";
+export declare const SAVE_CHOICE_ORDER: SaveChoice[];
+export declare const resolveSaveOptions: (lastChoice: SaveChoice, disablePublish: boolean) => {
+    main: SaveChoice;
+    menu: SaveChoice[];
+};

package/dist/toolkit/form-builder/use-editorial-workflow.d.ts

@@ -13,14 +13,18 @@ export interface ExecuteWorkflowOptions {
     crudType: string;
     tinaForm?: Form;
     signal?: AbortSignal;
+    isDraft?: boolean;
 }
 export interface UseEditorialWorkflowResult {
     isExecuting: boolean;
     errorMessage: string;
     currentStep: number;
     elapsedTime: number;
-    /** Returns true on success, false on failure (error captured in errorMessage) */
-    executeWorkflow: (opts: ExecuteWorkflowOptions) => Promise<boolean>;
+    /** Resolves with the outcome; on failure `error` holds the message. */
+    executeWorkflow: (opts: ExecuteWorkflowOptions) => Promise<{
+        success: boolean;
+        error?: string;
+    }>;
     /** Reset error/executing state so the form can be retried */
     reset: () => void;
 }

package/dist/toolkit/styles/dropdown-button.d.ts

@@ -6,6 +6,8 @@ export interface DropdownButtonItem {
     variant?: 'default' | 'destructive';
     icon?: React.ReactNode;
     disabled?: boolean;
+    /** Optional hover tooltip. Shown even when the item is disabled. */
+    tooltip?: string;
 }
 export interface DropdownButtonProps extends Omit<ButtonProps, 'onClick'> {
     /**

package/package.json

@@ -2,7 +2,7 @@
   "name": "tinacms",
   "type": "module",
   "typings": "dist/index.d.ts",
-  "version": "3.9.4",
+  "version": "3.10.0",
   "main": "dist/index.js",
   "module": "./dist/index.js",
   "exports": {
@@ -45,15 +45,14 @@
     "@headlessui/react": "2.1.8",
     "@heroicons/react": "^1.0.6",
     "@monaco-editor/react": "4.7.0-rc.0",
-    "@radix-ui/react-checkbox": "^1.1.4",
-    "@radix-ui/react-dialog": "^1.1.6",
-    "@radix-ui/react-dropdown-menu": "^2.1.6",
-    "@radix-ui/react-popover": "^1.1.15",
-    "@radix-ui/react-select": "^2.2.6",
-    "@radix-ui/react-separator": "^1.1.2",
-    "@radix-ui/react-slot": "^1.1.2",
-    "@radix-ui/react-toolbar": "^1.1.2",
-    "@radix-ui/react-tooltip": "^1.2.8",
+    "@radix-ui/react-dialog": "^1.1.18",
+    "@radix-ui/react-dropdown-menu": "^2.1.19",
+    "@radix-ui/react-popover": "^1.1.18",
+    "@radix-ui/react-select": "^2.3.2",
+    "@radix-ui/react-separator": "^1.1.11",
+    "@radix-ui/react-slot": "^1.3.0",
+    "@radix-ui/react-toolbar": "^1.1.14",
+    "@radix-ui/react-tooltip": "^1.2.11",
     "@react-hook/window-size": "^3.1.1",
     "@tanstack/react-table": "^8.21.3",
     "@udecode/cmdk": "^0.2.1",
@@ -114,9 +113,9 @@
     "yup": "^1.6.1",
     "zod": "^3.24.2",
     "@tinacms/bridge": "0.3.0",
-    "@tinacms/search": "1.2.20",
-    "@tinacms/mdx": "2.1.8",
-    "@tinacms/schema-tools": "2.8.2"
+    "@tinacms/schema-tools": "2.8.3",
+    "@tinacms/search": "1.2.21",
+    "@tinacms/mdx": "2.1.9"
   },
   "devDependencies": {
     "@graphql-tools/utils": "^10.8.1",