tinacms 3.12.0 → 3.12.1

package/dist/admin/components/GetDocument.d.ts

@@ -1,8 +1,8 @@
 /**
 
 */
-import React from 'react';
 import type { TinaCMS } from '@tinacms/toolkit';
+import React from 'react';
 import type { DocumentForm } from '../types';
 export declare const useGetDocument: (cms: TinaCMS, collectionName: string, relativePath: string) => {
     document: DocumentForm;

package/dist/admin/components/UnableToLoadModal.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+export declare const UnableToLoadModal: ({ message }: {
+    message: string;
+}) => React.JSX.Element;

package/dist/index.js

@@ -52,8 +52,9 @@ import PropTypes from "prop-types";
 import { useSensors, useSensor, PointerSensor, KeyboardSensor, DndContext, closestCenter } from "@dnd-kit/core";
 import { sortableKeyboardCoordinates, SortableContext, verticalListSortingStrategy, useSortable, defaultAnimateLayoutChanges } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
-import { format as format$3, formatDistanceToNow } from "date-fns";
-import { useReactTable, getSortedRowModel, getCoreRowModel, flexRender, getExpandedRowModel, getFilteredRowModel } from "@tanstack/react-table";
+import { buildSchema, print, getIntrospectionQuery, buildClientSchema, parse as parse$3 } from "graphql";
+import { diff as diff$1 } from "@graphql-inspector/core";
+import { processDocumentForIndexing, queryToSearchIndexQuery, optionsToSearchIndexOptions, parseSearchIndexResponse } from "@tinacms/search/index-client";
 import { HexColorPicker } from "react-colorful";
 import { Command as Command$3 } from "@udecode/cmdk";
 import { isHotkey } from "is-hotkey";
@@ -69,12 +70,11 @@ import { offset, flip, shift, limitShift, useVirtualFloating, getSelectionBoundi
 import { getLinkAttributes } from "@udecode/plate-link";
 import { autoformatSmartQuotes, autoformatPunctuation, autoformatLegal, autoformatArrow, autoformatMath } from "@udecode/plate-autoformat";
 import * as yup from "yup";
+import { format as format$3, formatDistanceToNow } from "date-fns";
 import { enUS } from "date-fns/locale";
 import { DayPicker } from "react-day-picker";
 import * as SelectPrimitive from "@radix-ui/react-select";
-import { buildSchema, print, getIntrospectionQuery, buildClientSchema, parse as parse$3 } from "graphql";
-import { diff as diff$1 } from "@graphql-inspector/core";
-import { processDocumentForIndexing, queryToSearchIndexQuery, optionsToSearchIndexOptions, parseSearchIndexResponse } from "@tinacms/search/index-client";
+import { useReactTable, getSortedRowModel, getCoreRowModel, flexRender, getExpandedRowModel, getFilteredRowModel } from "@tanstack/react-table";
 import * as dropzone from "react-dropzone";
 import gql from "graphql-tag";
 import { useLocation, NavLink, useNavigate, useParams, Navigate, Link as Link$1, HashRouter, Routes, Route } from "react-router-dom";
@@ -4225,6 +4225,8 @@ const Button$2 = ({
     medium: `text-sm h-10 px-8`,
     custom: ``
   };
+  const isDisabled = disabled || busy;
+  const inertProps = typeof Tag2 !== "string" || Tag2 === "button" ? { disabled: isDisabled } : isDisabled && { "aria-disabled": true, tabIndex: -1, href: void 0 };
   return /* @__PURE__ */ React.createElement(
     Tag2,
     {
@@ -4236,7 +4238,9 @@ const Button$2 = ({
         roundedClasses[rounded],
         className
       ),
-      ...props
+      ...props,
+      ...inertProps,
+      onClick: isDisabled ? void 0 : props.onClick
     },
     busy ? /* @__PURE__ */ React.createElement(LoadingDots, { color: "currentColor" }) : children
   );
@@ -4279,7 +4283,8 @@ const IconButton = ({
         stateClasses[state],
         className
       ),
-      ...props
+      ...props,
+      disabled: disabled || busy
     },
     children
   );
@@ -4698,6 +4703,56 @@ const SortableProvider = ({
 }) => {
   return /* @__PURE__ */ React__default.createElement(SortableContext, { items, strategy: verticalListSortingStrategy }, children);
 };
+const formatDefaultBranchName = (filePath, crudType) => {
+  let result = filePath;
+  const contentPrefix = "content/";
+  if (result.startsWith(contentPrefix)) {
+    result = result.substring(contentPrefix.length);
+  }
+  const lastDot = result.lastIndexOf(".");
+  const lastSlash = Math.max(result.lastIndexOf("/"), result.lastIndexOf("\\"));
+  if (lastDot > lastSlash && lastDot > 0) {
+    result = result.slice(0, lastDot);
+  }
+  result = normalizeBranchName(result);
+  if (crudType === "delete") {
+    result = `❌-${result}`;
+  }
+  return result;
+};
+const trimRefComponent = (part) => {
+  let result = part.replace(/\.{2,}/g, ".");
+  while (result.startsWith(".")) {
+    result = result.slice(1);
+  }
+  let previous = "";
+  while (previous !== result) {
+    previous = result;
+    if (result.endsWith(".lock")) {
+      result = result.slice(0, -".lock".length);
+    } else if (result.endsWith(".")) {
+      result = result.slice(0, -1);
+    }
+  }
+  return result;
+};
+const normalizeBranchName = (name2) => name2.replace(/[\x00-\x20\x7f~^:?*\[\\]+/g, "-").replace(/@\{/g, "-").split("/").map(trimRefComponent).filter(Boolean).join("/");
+function formatBranchName(str) {
+  let result = "";
+  let replacingInvalidChars = false;
+  for (const char of str.toLowerCase()) {
+    const code = char.charCodeAt(0);
+    const isValid = char === "/" || char === "-" || char === "_" || code >= 48 && code <= 57 || code >= 97 && code <= 122;
+    if (isValid) {
+      result += char;
+      replacingInvalidChars = false;
+    } else if (!replacingInvalidChars) {
+      result += "-";
+      replacingInvalidChars = true;
+    }
+  }
+  return result;
+}
 const textFieldClasses = "shadow-inner focus:shadow-outline focus:border-blue-500 focus:outline-none block text-base placeholder:text-gray-300 px-3 py-2 text-gray-600 w-full bg-white border border-gray-200 transition-all ease-out duration-150 focus:text-gray-900 rounded";
 const disabledClasses$1 = "opacity-50 pointer-events-none cursor-not-allowed";
 const BaseTextField = React.forwardRef(({ className, disabled, ...rest }, ref) => {
@@ -6193,6 +6248,7 @@ const Group$1 = ({ tinaForm, form, field, input, meta, index }) => {
   return /* @__PURE__ */ React__default.createElement(
     ListFieldMeta,
     {
+      "data-test": `list-${field.name}`,
       name: input.name,
       label: field.label,
       description: field.description,
@@ -6203,6 +6259,7 @@ const Group$1 = ({ tinaForm, form, field, input, meta, index }) => {
       actions: (!fixedLength || fixedLength && !isMax) && /* @__PURE__ */ React__default.createElement(
         IconButton,
         {
+          "data-test": `add-item-${field.name}`,
           onClick: addItem,
           disabled: isMax,
           variant: "primary",
@@ -6295,7 +6352,14 @@ const Item$1 = ({
       /* @__PURE__ */ React__default.createElement(GroupLabel, null, title),
       /* @__PURE__ */ React__default.createElement(Pencil, { className: "h-5 w-auto text-gray-200 group-hover:text-inherit transition-colors duration-150 ease-out" })
     ),
-    (!fixedLength || fixedLength && !isMin) && /* @__PURE__ */ React__default.createElement(ItemDeleteButton, { disabled: isMin, onClick: removeItem })
+    (!fixedLength || fixedLength && !isMin) && /* @__PURE__ */ React__default.createElement(
+      ItemDeleteButton,
+      {
+        disabled: isMin,
+        onClick: removeItem,
+        fieldName: `${field.name}.${index}`
+      }
+    )
   )));
 };
 const ItemClickTarget = ({ children, ...props }) => {
@@ -6342,11 +6406,16 @@ const ItemHeader = ({
     children
   );
 };
-const ItemDeleteButton = ({ onClick, disabled = false }) => {
+const ItemDeleteButton = ({
+  onClick,
+  disabled = false,
+  fieldName = ""
+}) => {
   return /* @__PURE__ */ React__default.createElement(
     "button",
     {
       type: "button",
+      "data-test": fieldName ? `delete-item-${fieldName}` : "delete-item",
       className: `w-8 px-1 py-2.5 flex items-center justify-center text-gray-200 hover:opacity-100 opacity-30 hover:bg-gray-50 ${disabled && "pointer-events-none opacity-30 cursor-not-allowed"}`,
       onClick
     },
@@ -6389,7 +6458,8 @@ const PopoverContent = React.forwardRef(({ className, align = "center", sideOffs
 PopoverContent.displayName = PopoverPrimitive.Content.displayName;
 const BlockSelector = ({
   templates,
-  addItem
+  addItem,
+  fieldName
 }) => {
   const showFilter = React.useMemo(() => {
     return Object.entries(templates).length > 6;
@@ -6404,6 +6474,7 @@ const BlockSelector = ({
   return /* @__PURE__ */ React.createElement(Popover, { open, onOpenChange: setOpen }, /* @__PURE__ */ React.createElement(PopoverTrigger, { asChild: true }, /* @__PURE__ */ React.createElement("span", null, /* @__PURE__ */ React.createElement(
     IconButton,
     {
+      "data-test": fieldName ? `add-item-${fieldName}` : void 0,
       variant: open ? "secondary" : "primary",
       size: "small",
       className: `${open ? `rotate-45 pointer-events-none` : ``}`
@@ -6703,7 +6774,8 @@ const constructUrlWithBasePath = (url, basePath) => {
 const BlockSelectorBig = ({
   templates,
   addItem,
-  label
+  label,
+  fieldName
 }) => {
   const FormPortal = useFormPortal();
   const [pickerIsOpen, setPickerIsOpen] = React.useState(false);
@@ -6748,6 +6820,7 @@ const BlockSelectorBig = ({
   return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
     IconButton,
     {
+      "data-test": fieldName ? `add-item-${fieldName}` : void 0,
       variant: pickerIsOpen ? "secondary" : "primary",
       size: "small",
       className: `${pickerIsOpen ? "rotate-45 pointer-events-none" : ""}`,
@@ -6962,6 +7035,7 @@ const Blocks = ({
   return /* @__PURE__ */ React.createElement(
     ListFieldMeta,
     {
+      "data-test": `list-${field.name}`,
       name: input.name,
       label: field.label,
       description: field.description,
@@ -6970,9 +7044,17 @@ const Blocks = ({
       index,
       tinaForm,
       actions: (!fixedLength || fixedLength && !isMax) && // @ts-ignore
-      (!field.visualSelector ? /* @__PURE__ */ React.createElement(BlockSelector, { templates: field.templates, addItem }) : /* @__PURE__ */ React.createElement(
+      (!field.visualSelector ? /* @__PURE__ */ React.createElement(
+        BlockSelector,
+        {
+          templates: field.templates,
+          addItem,
+          fieldName: field.name
+        }
+      ) : /* @__PURE__ */ React.createElement(
         BlockSelectorBig,
         {
+          fieldName: field.name,
           label: field.label || field.name,
           templates: field.templates,
           addItem
@@ -7074,7 +7156,14 @@ const BlockListItem = ({
     /* @__PURE__ */ React.createElement(GroupLabel, null, label || template.label),
     isNew && /* @__PURE__ */ React.createElement("span", { className: "mr-1.5 inline-flex items-center px-1.5 py-0.5 rounded text-[10px] border-[0.5px] border-tina-orange/50 font-semibold bg-tina-orange/10 text-tina-orange leading-none" }, "NEW"),
     /* @__PURE__ */ React.createElement(Pencil, { className: "h-5 w-auto text-gray-200 group-hover:text-inherit transition-colors duration-150 ease-out" })
-  ), (!fixedLength || fixedLength && !isMin) && /* @__PURE__ */ React.createElement(ItemDeleteButton, { disabled: isMin, onClick: removeItem }))));
+  ), (!fixedLength || fixedLength && !isMin) && /* @__PURE__ */ React.createElement(
+    ItemDeleteButton,
+    {
+      disabled: isMin,
+      onClick: removeItem,
+      fieldName: `${field.name}.${index}`
+    }
+  ))));
 };
 const InvalidBlockListItem = ({
   tinaForm,
@@ -7090,7 +7179,13 @@ const InvalidBlockListItem = ({
       isDragging: snapshot.isDragging,
       dragHandleProps: provider.dragHandleProps
     }
-  ), /* @__PURE__ */ React.createElement(ItemClickTarget, null, /* @__PURE__ */ React.createElement(GroupLabel, { error: true }, "Invalid Block")), /* @__PURE__ */ React.createElement(ItemDeleteButton, { onClick: removeItem })));
+  ), /* @__PURE__ */ React.createElement(ItemClickTarget, null, /* @__PURE__ */ React.createElement(GroupLabel, { error: true }, "Invalid Block")), /* @__PURE__ */ React.createElement(
+    ItemDeleteButton,
+    {
+      onClick: removeItem,
+      fieldName: `${field.name}.${index}`
+    }
+  )));
 };
 const BlocksField = Blocks;
 const BlocksFieldPlugin = {
@@ -7148,6 +7243,7 @@ const List = ({ tinaForm, form, field, input, meta, index }) => {
   return /* @__PURE__ */ React.createElement(
     ListFieldMeta,
     {
+      "data-test": `list-${field.name}`,
       name: input.name,
       label: field.label,
       description: field.description,
@@ -7157,6 +7253,7 @@ const List = ({ tinaForm, form, field, input, meta, index }) => {
       actions: /* @__PURE__ */ React.createElement(
         IconButton,
         {
+          "data-test": `add-item-${field.name}`,
           onClick: addItem,
           variant: "primary",
           size: "small",
@@ -7215,7 +7312,14 @@ const Item = ({
       isDragging: snapshot.isDragging,
       dragHandleProps: provider.dragHandleProps
     }
-  ), /* @__PURE__ */ React.createElement(ItemClickTarget, null, /* @__PURE__ */ React.createElement(FieldsBuilder, { padding: false, form: tinaForm, fields })), (!fixedLength || fixedLength && !isMin) && /* @__PURE__ */ React.createElement(ItemDeleteButton, { disabled: isMin, onClick: removeItem })));
+  ), /* @__PURE__ */ React.createElement(ItemClickTarget, null, /* @__PURE__ */ React.createElement(FieldsBuilder, { padding: false, form: tinaForm, fields })), (!fixedLength || fixedLength && !isMin) && /* @__PURE__ */ React.createElement(
+    ItemDeleteButton,
+    {
+      disabled: isMin,
+      onClick: removeItem,
+      fieldName: `${field.name}.${index}`
+    }
+  )));
 };
 const ListField = List;
 const ListFieldPlugin = {
@@ -8647,6 +8751,34 @@ const InfoBox = ({
   InfoBoxComponent.displayName = "InfoBox";
   return InfoBoxComponent;
 };
+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 (error) {
+    }
+    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 (error) {
+      console.log(error);
+    }
+  };
+  return [storedValue, setValue];
+}
 const Badge = ({
   children,
   calloutStyle = "warning",
@@ -8708,11 +8840,6 @@ const useBranchData = () => {
   }, [branchData.currentBranch]);
   return branchData;
 };
-function formatBranchName$1(str) {
-  const pattern = /[^/\w-]+/g;
-  const formattedStr = str.replace(pattern, "");
-  return formattedStr.toLowerCase();
-}
 const BranchSwitcherLegacy = ({
   listBranches,
   createBranch,
@@ -8735,7 +8862,7 @@ const BranchSwitcherLegacy = ({
   const handleCreateBranch = React.useCallback((value) => {
     setListState("loading");
     createBranch({
-      branchName: formatBranchName$1(value),
+      branchName: normalizeBranchName(formatBranchName(value)),
       baseBranch: currentBranch
     }).then(async (createdBranchName) => {
       cms.alerts.success("Branch created.");
@@ -8905,6 +9032,9 @@ const BranchSelector = ({
   ));
 };
 const CreateBranch = ({ currentBranch, newBranchName, onCreateBranch, setNewBranchName }) => {
+  const normalizedBranchName = normalizeBranchName(
+    formatBranchName(newBranchName)
+  );
   return /* @__PURE__ */ React.createElement("div", { className: "border-t border-gray-150 pt-4 mt-3 flex flex-col gap-3" }, /* @__PURE__ */ React.createElement("div", { className: "text-sm" }, "Create a new branch from ", /* @__PURE__ */ React.createElement("b", null, currentBranch), ". Once created you will need to wait for indexing to complete before you can switch branches."), /* @__PURE__ */ React.createElement("div", { className: "flex justify-between items-center w-full gap-3" }, /* @__PURE__ */ React.createElement(
     BaseTextField,
     {
@@ -8918,8 +9048,11 @@ const CreateBranch = ({ currentBranch, newBranchName, onCreateBranch, setNewBran
       className: "flex-0 flex items-center gap-2 whitespace-nowrap",
       size: "medium",
       variant: "white",
-      disabled: newBranchName === "",
-      onClick: () => onCreateBranch(newBranchName)
+      disabled: normalizedBranchName === "",
+      onClick: () => {
+        if (!normalizedBranchName) return;
+        onCreateBranch(normalizedBranchName);
+      }
     },
     /* @__PURE__ */ React.createElement(Plus, { className: "w-5 h-auto opacity-70" }),
     " Create Branch"
@@ -9373,22 +9506,6 @@ const PullRequestCell = ({
   }
   return null;
 };
-function formatBranchName(str) {
-  let result = "";
-  let replacingInvalidChars = false;
-  for (const char of str.toLowerCase()) {
-    const code = char.charCodeAt(0);
-    const isValid = char === "/" || char === "-" || char === "_" || code >= 48 && code <= 57 || code >= 97 && code <= 122;
-    if (isValid) {
-      result += char;
-      replacingInvalidChars = false;
-    } else if (!replacingInvalidChars) {
-      result += "-";
-      replacingInvalidChars = true;
-    }
-  }
-  return result;
-}
 const tableHeadingStyle = "px-3 py-3 text-left text-xs font-bold text-gray-700 tracking-wider sticky top-0 bg-gray-100 z-20 border-b-2 border-gray-200 ";
 const BranchSwitcher = (props) => {
   const cms = useCMS$1();
@@ -9429,7 +9546,7 @@ const EditoralBranchSwitcher = ({
   const handleCreateBranch = React.useCallback((value) => {
     setListState("loading");
     createBranch({
-      branchName: formatBranchName(value),
+      branchName: normalizeBranchName(formatBranchName(value)),
       baseBranch: currentBranch
     }).then(async (createdBranchName) => {
       cms.alerts.success("Branch created.");
@@ -9573,46 +9690,58 @@ const sortBranchListFn = (sortValue) => {
     }
   };
 };
-const BranchCreator = ({ setViewState, handleCreateBranch, currentBranch }) => {
+const BranchCreator = ({
+  setViewState,
+  handleCreateBranch,
+  currentBranch
+}) => {
   const [branchName, setBranchName] = React.useState("");
-  return /* @__PURE__ */ React.createElement("form", null, /* @__PURE__ */ React.createElement("div", { className: "" }, /* @__PURE__ */ React.createElement("p", { className: "text-base text-gray-700 mb-4" }, "Create a new branch from ", /* @__PURE__ */ React.createElement("strong", null, currentBranch), "."), /* @__PURE__ */ React.createElement("div", { className: "mb-3" }, /* @__PURE__ */ React.createElement(FieldLabel, { name: "current-branch-name" }, "Current Branch Name"), /* @__PURE__ */ React.createElement(
-    BaseTextField,
-    {
-      name: "current-branch-name",
-      value: currentBranch,
-      disabled: true
-    }
-  )), /* @__PURE__ */ React.createElement("div", { className: "mb-6" }, /* @__PURE__ */ React.createElement(FieldLabel, { name: "branch-name" }, "New Branch Name"), /* @__PURE__ */ React.createElement(
-    PrefixedTextField,
-    {
-      placeholder: "",
-      name: "branch-name",
-      value: branchName,
-      onChange: (e) => setBranchName(e.target.value)
-    }
-  ))), /* @__PURE__ */ React.createElement("div", { className: "w-full flex justify-between gap-4 items-center" }, /* @__PURE__ */ React.createElement(
-    Button$2,
-    {
-      style: { flexGrow: 1 },
-      onClick: () => {
-        setViewState("list");
+  const normalizedBranchName = normalizeBranchName(
+    formatBranchName(branchName)
+  );
+  return (
+    // Submit is handled by the button below; without this the implicit
+    // submission from pressing Enter in the field reloads the page
+    /* @__PURE__ */ React.createElement("form", { onSubmit: (e) => e.preventDefault() }, /* @__PURE__ */ React.createElement("div", { className: "" }, /* @__PURE__ */ React.createElement("p", { className: "text-base text-gray-700 mb-4" }, "Create a new branch from ", /* @__PURE__ */ React.createElement("strong", null, currentBranch), "."), /* @__PURE__ */ React.createElement("div", { className: "mb-3" }, /* @__PURE__ */ React.createElement(FieldLabel, { name: "current-branch-name" }, "Current Branch Name"), /* @__PURE__ */ React.createElement(
+      BaseTextField,
+      {
+        name: "current-branch-name",
+        value: currentBranch,
+        disabled: true
       }
-    },
-    "Cancel"
-  ), /* @__PURE__ */ React.createElement(
-    Button$2,
-    {
-      variant: "primary",
-      type: "submit",
-      style: { flexGrow: 2 },
-      disabled: branchName === "",
-      onClick: () => {
-        handleCreateBranch("tina/" + branchName);
+    )), /* @__PURE__ */ React.createElement("div", { className: "mb-6" }, /* @__PURE__ */ React.createElement(FieldLabel, { name: "branch-name" }, "New Branch Name"), /* @__PURE__ */ React.createElement(
+      PrefixedTextField,
+      {
+        placeholder: "",
+        name: "branch-name",
+        value: branchName,
+        onChange: (e) => setBranchName(e.target.value)
       }
-    },
-    "Create Branch ",
-    /* @__PURE__ */ React.createElement(GitBranch, { className: "w-5 h-full ml-1 opacity-70" })
-  )));
+    ))), /* @__PURE__ */ React.createElement("div", { className: "w-full flex justify-between gap-4 items-center" }, /* @__PURE__ */ React.createElement(
+      Button$2,
+      {
+        style: { flexGrow: 1 },
+        onClick: () => {
+          setViewState("list");
+        }
+      },
+      "Cancel"
+    ), /* @__PURE__ */ React.createElement(
+      Button$2,
+      {
+        variant: "primary",
+        type: "submit",
+        style: { flexGrow: 2 },
+        disabled: normalizedBranchName === "",
+        onClick: () => {
+          if (!normalizedBranchName) return;
+          handleCreateBranch("tina/" + normalizedBranchName);
+        }
+      },
+      "Create Branch ",
+      /* @__PURE__ */ React.createElement(GitBranch, { className: "w-5 h-full ml-1 opacity-70" })
+    )))
+  );
 };
 const extractPullRequestId = (url) => {
   return url.split("/").pop() || "";
@@ -11580,7 +11709,6 @@ const RenameModal$1 = ({
       variant: "primary",
       disabled: !canSubmit,
       onClick: async () => {
-        if (!canSubmit) return;
         setProcessing(true);
         setError(null);
         try {
@@ -13591,7 +13719,7 @@ const FormModal = ({ plugin, close: close2 }) => {
 const name = "tinacms";
 const type = "module";
 const typings = "dist/index.d.ts";
-const version = "3.12.0";
+const version = "3.12.1";
 const main = "dist/index.js";
 const module$1 = "./dist/index.js";
 const exports$1 = { ".": "./dist/index.js", "./dist/client": "./dist/client.js", "./react": "./dist/react.js", "./dist/react": "./dist/react.js", "./tina-field": "./dist/tina-field.js", "./dist/tina-field": "./dist/tina-field.js", "./dist/rich-text": "./dist/rich-text/index.js", "./dist/rich-text/static": "./dist/rich-text/static.js", "./dist/rich-text/prism": "./dist/rich-text/prism.js" };
@@ -13599,8 +13727,8 @@ const files = ["dist"];
 const buildConfig = { "entryPoints": ["src/index.ts", "src/rich-text/index.tsx", "src/rich-text/static.tsx", "src/rich-text/prism.tsx", "src/react.tsx", "src/tina-field.ts", { "name": "src/client.ts", "target": "node" }] };
 const license = "Apache-2.0";
 const scripts = { "types": "pnpm tsc && pnpm tsc-alias", "build": "tinacms-scripts build", "test": "vitest run", "test-watch": "vitest" };
-const dependencies = { "@ariakit/react": "catalog:", "@dnd-kit/core": "catalog:", "@dnd-kit/sortable": "catalog:", "@dnd-kit/utilities": "catalog:", "@floating-ui/dom": "catalog:", "@floating-ui/react-dom": "catalog:", "@graphql-inspector/core": "^6.2.1", "@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": "catalog:", "@radix-ui/react-toolbar": "catalog:", "@radix-ui/react-tooltip": "catalog:", "@react-hook/window-size": "catalog:", "@tanstack/react-table": "^8.21.3", "@tinacms/bridge": "workspace:^", "@tinacms/mdx": "workspace:^", "@tinacms/schema-tools": "workspace:^", "@tinacms/search": "workspace:^", "@udecode/cmdk": "catalog:", "@udecode/cn": "catalog:", "@udecode/plate": "catalog:", "@udecode/plate-autoformat": "catalog:", "@udecode/plate-basic-marks": "catalog:", "@udecode/plate-block-quote": "catalog:", "@udecode/plate-break": "catalog:", "@udecode/plate-code-block": "catalog:", "@udecode/plate-combobox": "catalog:", "@udecode/plate-dnd": "catalog:", "@udecode/plate-floating": "catalog:", "@udecode/plate-heading": "catalog:", "@udecode/plate-highlight": "catalog:", "@udecode/plate-horizontal-rule": "catalog:", "@udecode/plate-indent-list": "catalog:", "@udecode/plate-link": "catalog:", "@udecode/plate-list": "catalog:", "@udecode/plate-node-id": "catalog:", "@udecode/plate-reset-node": "catalog:", "@udecode/plate-resizable": "catalog:", "@udecode/plate-selection": "catalog:", "@udecode/plate-slash-command": "catalog:", "@udecode/plate-table": "catalog:", "@udecode/plate-trailing-block": "catalog:", "class-variance-authority": "catalog:", "clsx": "catalog:", "cmdk": "catalog:", "color-string": "catalog:", "crypto-js": "catalog:", "date-fns": "4.1.0", "es-toolkit": "^1.42.0", "final-form": "catalog:", "final-form-arrays": "catalog:", "final-form-set-field-data": "catalog:", "graphql": "15.8.0", "graphql-tag": "catalog:", "is-hotkey": "catalog:", "lucide-react": "catalog:", "mermaid": "catalog:", "posthog-js": "^1.347.1", "prism-react-renderer": "catalog:", "prop-types": "catalog:", "react-colorful": "catalog:", "react-day-picker": "^9.13.0", "react-dnd": "catalog:", "react-dnd-html5-backend": "catalog:", "react-dropzone": "catalog:", "react-final-form": "catalog:", "react-router-dom": "catalog:", "react-use": "catalog:", "tailwind-merge": "^2.6.0", "webfontloader": "catalog:", "yup": "^1.6.1", "zod": "catalog:" };
-const devDependencies = { "@graphql-tools/utils": "catalog:", "@testing-library/dom": "catalog:", "@testing-library/jest-dom": "catalog:", "@testing-library/react": "catalog:", "@testing-library/user-event": "catalog:", "@tinacms/scripts": "workspace:*", "@types/atob": "catalog:", "@types/codemirror": "catalog:", "@types/color-string": "catalog:", "@types/node": "^22.13.1", "@types/prop-types": "catalog:", "@types/react": "^18.3.18", "@types/react-dom": "catalog:", "happy-dom": "catalog:", "identity-obj-proxy": "catalog:", "jest-file-snapshot": "^0.7.0", "lowlight": "catalog:", "next": "14.2.35", "react": "^18.3.1", "react-dom": "^18.3.1", "react-is": "^18.3.1", "tsc-alias": "catalog:", "tslib": "catalog:", "typescript": "^5.7.3", "vite": "^5.4.14", "vitest": "^2.1.9" };
+const dependencies = { "@ariakit/react": "catalog:", "@dnd-kit/core": "catalog:", "@dnd-kit/sortable": "catalog:", "@dnd-kit/utilities": "catalog:", "@floating-ui/dom": "catalog:", "@floating-ui/react-dom": "catalog:", "@graphql-inspector/core": "^6.2.1", "@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": "catalog:", "@radix-ui/react-toolbar": "catalog:", "@radix-ui/react-tooltip": "catalog:", "@react-hook/window-size": "catalog:", "@tanstack/react-table": "^8.21.3", "@tinacms/bridge": "workspace:^", "@tinacms/mdx": "workspace:^", "@tinacms/schema-tools": "workspace:^", "@tinacms/search": "workspace:^", "@udecode/cmdk": "catalog:", "@udecode/cn": "catalog:", "@udecode/plate": "catalog:", "@udecode/plate-autoformat": "catalog:", "@udecode/plate-basic-marks": "catalog:", "@udecode/plate-block-quote": "catalog:", "@udecode/plate-break": "catalog:", "@udecode/plate-code-block": "catalog:", "@udecode/plate-combobox": "catalog:", "@udecode/plate-dnd": "catalog:", "@udecode/plate-floating": "catalog:", "@udecode/plate-heading": "catalog:", "@udecode/plate-highlight": "catalog:", "@udecode/plate-horizontal-rule": "catalog:", "@udecode/plate-indent-list": "catalog:", "@udecode/plate-link": "catalog:", "@udecode/plate-list": "catalog:", "@udecode/plate-node-id": "catalog:", "@udecode/plate-reset-node": "catalog:", "@udecode/plate-resizable": "catalog:", "@udecode/plate-selection": "catalog:", "@udecode/plate-slash-command": "catalog:", "@udecode/plate-table": "catalog:", "@udecode/plate-trailing-block": "catalog:", "class-variance-authority": "catalog:", "clsx": "catalog:", "cmdk": "catalog:", "color-string": "catalog:", "date-fns": "4.1.0", "es-toolkit": "^1.42.0", "final-form": "catalog:", "final-form-arrays": "catalog:", "final-form-set-field-data": "catalog:", "graphql": "15.8.0", "graphql-tag": "catalog:", "is-hotkey": "catalog:", "lucide-react": "catalog:", "mermaid": "catalog:", "posthog-js": "^1.347.1", "prism-react-renderer": "catalog:", "prop-types": "catalog:", "react-colorful": "catalog:", "react-day-picker": "^9.13.0", "react-dnd": "catalog:", "react-dnd-html5-backend": "catalog:", "react-dropzone": "catalog:", "react-final-form": "catalog:", "react-router-dom": "catalog:", "react-use": "catalog:", "tailwind-merge": "^2.6.0", "webfontloader": "catalog:", "yup": "^1.6.1", "zod": "catalog:" };
+const devDependencies = { "@graphql-tools/utils": "catalog:", "@testing-library/dom": "catalog:", "@testing-library/jest-dom": "catalog:", "@testing-library/react": "catalog:", "@testing-library/user-event": "catalog:", "@tinacms/scripts": "workspace:*", "@types/atob": "catalog:", "@types/codemirror": "catalog:", "@types/color-string": "catalog:", "@types/node": "^22.13.1", "@types/prop-types": "catalog:", "@types/react": "^18.3.18", "@types/react-dom": "catalog:", "happy-dom": "catalog:", "identity-obj-proxy": "catalog:", "jest-file-snapshot": "^0.7.0", "lowlight": "catalog:", "next": "15.5.21", "react": "^18.3.1", "react-dom": "^18.3.1", "react-is": "^18.3.1", "tsc-alias": "catalog:", "tslib": "catalog:", "typescript": "^5.7.3", "vite": "^5.4.14", "vitest": "^2.1.9" };
 const peerDependencies = { "react": ">=16.14.0", "react-dom": ">=16.14.0" };
 const publishConfig = { "registry": "https://registry.npmjs.org" };
 const repository = { "url": "https://github.com/tinacms/tinacms.git", "directory": "packages/tinacms" };
@@ -16256,34 +16384,6 @@ const BranchPreviewButton = (props) => {
     /* @__PURE__ */ React.createElement(ExternalLink, { className: "h-5 w-auto" })
   );
 };
-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 (error) {
-    }
-    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 (error) {
-      console.log(error);
-    }
-  };
-  return [storedValue, setValue];
-}
 const CREATE_DOCUMENT_GQL = `#graphql
 mutation($collection: String!, $relativePath: String!, $params: DocumentMutation!) {
   createDocument(
@@ -16923,22 +17023,6 @@ const resolveSaveOptions = (lastChoice, disablePublish) => {
   const menu = SAVE_CHOICE_ORDER.filter((choice) => choice !== main2);
   return { main: main2, menu };
 };
-const formatDefaultBranchName = (filePath, crudType) => {
-  let result = filePath;
-  const contentPrefix = "content/";
-  if (result.startsWith(contentPrefix)) {
-    result = result.substring(contentPrefix.length);
-  }
-  const lastDot = result.lastIndexOf(".");
-  const lastSlash = Math.max(result.lastIndexOf("/"), result.lastIndexOf("\\"));
-  if (lastDot > lastSlash && lastDot > 0) {
-    result = result.slice(0, lastDot);
-  }
-  if (crudType === "delete") {
-    result = `❌-${result}`;
-  }
-  return result;
-};
 const CreateBranchModal = ({
   close: close2,
   safeSubmit,
@@ -16954,6 +17038,7 @@ const CreateBranchModal = ({
     formatDefaultBranchName(path, crudType)
   );
   const [isBranchGuardChecking, setIsBranchGuardChecking] = React.useState(false);
+  const normalizedBranchName = normalizeBranchName(newBranchName);
   const branchGuardAbortRef = React.useRef(null);
   const {
     isExecuting,
@@ -16981,7 +17066,7 @@ const CreateBranchModal = ({
     branchGuardAbortRef.current = abortController;
     setIsBranchGuardChecking(true);
     const baseBranch = decodeURIComponent(tinaApi.branch);
-    const targetBranch = `tina/${newBranchName}`;
+    const targetBranch = `tina/${normalizedBranchName}`;
     const { baseBranchExists, targetBranchExists } = await checkBranchGuard(
       tinaApi,
       baseBranch,
@@ -17042,7 +17127,7 @@ const CreateBranchModal = ({
         close2();
       },
       errorMessage,
-      disabled: newBranchName === "" || isBranchGuardChecking,
+      disabled: normalizedBranchName === "" || isBranchGuardChecking,
       onBranchNameChange: (value) => {
         abortBranchGuard();
         reset();
@@ -17200,6 +17285,7 @@ const BranchDeletedModal = ({
   const cms = useCMS$1();
   const tinaApi = cms.api.tina;
   const [newBranchName, setNewBranchName] = React.useState("");
+  const normalizedBranchName = normalizeBranchName(newBranchName);
   const baseBranch = tinaApi.protectedBranches[0] || cms.api.tina.schema.config.config.repoProvider.defaultBranchName || "main";
   const {
     isExecuting,
@@ -17211,7 +17297,7 @@ const BranchDeletedModal = ({
   } = useEditorialWorkflow();
   const handleCreate = async () => {
     const { success } = await executeWorkflow({
-      branchName: `tina/${newBranchName}`,
+      branchName: `tina/${normalizedBranchName}`,
       baseBranch,
       path,
       values,
@@ -17258,7 +17344,7 @@ const BranchDeletedModal = ({
     {
       variant: "primary",
       className: "w-full sm:w-auto",
-      disabled: !newBranchName,
+      disabled: !normalizedBranchName,
       onClick: handleCreate
     },
     /* @__PURE__ */ React.createElement(
@@ -71033,7 +71119,7 @@ const MediaWorkflowOverlay = () => {
     if (state.phase !== "confirming") return;
     const confirmState = state;
     const branchName = confirmState.branchName;
-    const targetBranch = `tina/${branchName}`;
+    const targetBranch = `tina/${normalizeBranchName(branchName)}`;
     abortPreflight();
     const abortController = new AbortController();
     preflightAbortRef.current = abortController;
@@ -71101,7 +71187,7 @@ const MediaWorkflowOverlay = () => {
           state.onCancel();
           setState({ phase: "idle" });
         },
-        disabled: state.branchName === "" || state.isChecking,
+        disabled: normalizeBranchName(state.branchName) === "" || state.isChecking,
         errorMessage: state.errorMessage,
         onBranchNameChange: (branchName) => {
           abortPreflight();
@@ -71315,8 +71401,7 @@ class AbstractAuthProvider {
    */
   async fetchWithToken(input, init) {
     const headers = (init == null ? void 0 : init.headers) || {};
-    const token = await this.getToken();
-    const accessToken = (token == null ? void 0 : token.access_token) ?? (token == null ? void 0 : token.id_token);
+    const accessToken = await this.getAccessToken();
     if (accessToken) {
       headers["Authorization"] = "Bearer " + accessToken;
     }
@@ -71325,6 +71410,10 @@ class AbstractAuthProvider {
       headers: new Headers(headers)
     });
   }
+  async getAccessToken() {
+    const token = await this.getToken();
+    return (token == null ? void 0 : token.access_token) ?? (token == null ? void 0 : token.id_token) ?? null;
+  }
   async authorize(context) {
     return this.getToken();
   }
@@ -71362,6 +71451,7 @@ class TinaCloudAuthProvider extends AbstractAuthProvider {
     __publicField(this, "frontendUrl");
     __publicField(this, "token");
     // used with memory storage
+    __publicField(this, "hasWarnedNoSession", false);
     __publicField(this, "setToken");
     __publicField(this, "getToken");
     this.frontendUrl = frontendUrl;
@@ -71430,12 +71520,24 @@ class TinaCloudAuthProvider extends AbstractAuthProvider {
     }
     const url = `${this.identityApiUrl}/v2/apps/${this.clientId}/currentUser`;
     try {
+      if (!await this.getAccessToken()) {
+        if (!this.hasWarnedNoSession) {
+          this.hasWarnedNoSession = true;
+          console.warn(
+            "TinaCMS: no TinaCloud session found. If login fails, check the console inside the login popup window for the underlying error."
+          );
+        }
+        return null;
+      }
       const res = await this.fetchWithToken(url, {
         method: "GET"
       });
       const val = await res.json();
       if (!res.status.toString().startsWith("2")) {
-        console.error(val.error);
+        console.error(
+          `TinaCMS: TinaCloud session check failed (status ${res.status}).`,
+          (val == null ? void 0 : val.error) ?? val
+        );
         return null;
       }
       return val;
@@ -72396,6 +72498,7 @@ const useTinaAuthRedirect = (params, enabled = true) => {
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
+const SESSION_EXPIRED_MESSAGE = "Your session has ended. Please sign in again to continue editing.";
 const AuthWallInner = ({
   children,
   cms,
@@ -72417,6 +72520,15 @@ const AuthWallInner = ({
   const [showChildren, setShowChildren] = useState(false);
   const [authProps, setAuthProps] = useState({ username: "", password: "" });
   const [authenticated, setAuthenticated] = useState(false);
+  const [sessionExpired, setSessionExpired] = useState(false);
+  React__default.useEffect(
+    () => cms.events.subscribe("cms:session-expired", () => {
+      setSessionExpired(true);
+      setShowChildren(false);
+      setActiveModal("authenticate");
+    }),
+    []
+  );
   React__default.useEffect(() => {
     let mounted = true;
     if (isAuthRedirect) {
@@ -72467,6 +72579,7 @@ const AuthWallInner = ({
   }, [authenticated]);
   const onAuthenticated = async () => {
     setAuthenticated(true);
+    setSessionExpired(false);
     setActiveModal(null);
     cms.events.dispatch({ type: "cms:login" });
   };
@@ -72513,6 +72626,7 @@ const AuthWallInner = ({
     ModalBuilder,
     {
       title: modalTitle,
+      error: sessionExpired ? SESSION_EXPIRED_MESSAGE : void 0,
       message: isTinaCloud ? /* @__PURE__ */ React__default.createElement(
         "img",
         {
@@ -72538,6 +72652,7 @@ const AuthWallInner = ({
     ModalBuilder,
     {
       title: modalTitle,
+      error: sessionExpired ? SESSION_EXPIRED_MESSAGE : void 0,
       message: "",
       close,
       busy: isAuthRedirect,
@@ -72759,9 +72874,14 @@ const TinaCloudProvider = (props) => {
     }
   }, []);
   React__default.useEffect(() => {
-    const setupEditorialWorkflow = () => {
-      client.getProject().then(async (project) => {
-        var _a2;
+    const setupEditorialWorkflow = async () => {
+      var _a2;
+      try {
+        const token = await client.authProvider.getToken();
+        if (!(token == null ? void 0 : token.access_token) && !(token == null ? void 0 : token.id_token)) {
+          return;
+        }
+        const project = await client.getProject();
         if ((_a2 = project == null ? void 0 : project.features) == null ? void 0 : _a2.includes("editorial-workflow")) {
           cms.flags.set("branch-switcher", true);
           client.usingEditorialWorkflow = true;
@@ -72770,7 +72890,9 @@ const TinaCloudProvider = (props) => {
             setCurrentBranch(project.defaultBranch || "main");
           }
         }
-      });
+      } catch (e) {
+        console.error("TinaCMS: unable to load project settings", e);
+      }
     };
     if (isTinaCloud) {
       setupEditorialWorkflow();
@@ -74657,6 +74779,18 @@ const shouldAutoOpenCollectionDocument = ({
   ((_b = (_a = collection.documents) == null ? void 0 : _a.edges) == null ? void 0 : _b.length) === 1 && // Check to make sure the file is not a folder
   ((_e = (_d = (_c = collection.documents) == null ? void 0 : _c.edges[0]) == null ? void 0 : _d.node) == null ? void 0 : _e.__typename) !== "Folder";
 };
+const UnableToLoadModal = ({ message }) => /* @__PURE__ */ React__default.createElement(Modal, null, /* @__PURE__ */ React__default.createElement(PopupModal, null, /* @__PURE__ */ React__default.createElement(ModalHeader, null, "Unable to load"), /* @__PURE__ */ React__default.createElement(ModalBody, { padded: true }, /* @__PURE__ */ React__default.createElement("div", { className: "tina-prose" }, message)), /* @__PURE__ */ React__default.createElement(ModalActions, null, /* @__PURE__ */ React__default.createElement("div", { className: "flex-1" }), /* @__PURE__ */ React__default.createElement(
+  Button$2,
+  {
+    style: { flexGrow: 1 },
+    className: "w-full",
+    variant: "primary",
+    onClick: () => {
+      window.location.reload();
+    }
+  },
+  "Reload"
+))));
 const isValidSortKey = (sortKey, collection) => {
   if (collection.fields) {
     const sortKeys = collection.fields.map((x) => x.name);
@@ -74697,10 +74831,13 @@ const useGetCollection = (cms, collectionName, includeDocuments = true, folder,
   useEffect(() => {
     let cancelled = false;
     const fetchCollection = async () => {
-      if (await api.isAuthenticated() && !folder.loading && !cancelled) {
-        const { name: name2, order } = JSON.parse(sortKey || "{}");
-        const validSortKey = isValidSortKey(name2, collectionExtra) ? name2 : void 0;
-        try {
+      if (folder.loading) {
+        return;
+      }
+      try {
+        if (await api.isAuthenticated() && !cancelled) {
+          const { name: name2, order } = JSON.parse(sortKey || "{}");
+          const validSortKey = isValidSortKey(name2, collectionExtra) ? name2 : void 0;
           const collection2 = await api.fetchCollection(
             collectionName,
             includeDocuments,
@@ -74711,14 +74848,19 @@ const useGetCollection = (cms, collectionName, includeDocuments = true, folder,
             filterArgs
           );
           setCollection(collection2);
-        } catch (error2) {
-          cms.alerts.error(
-            `[${error2.name}] GetCollection failed: ${error2.message}`
-          );
-          console.error(error2);
+        } else if (!cancelled) {
+          cms.events.dispatch({ type: "cms:session-expired" });
           setCollection(void 0);
-          setError(error2);
         }
+      } catch (error2) {
+        cms.alerts.error(
+          `[${error2.name}] GetCollection failed: ${error2.message}`
+        );
+        console.error(error2);
+        setCollection(void 0);
+        setError(error2);
+      }
+      if (!cancelled) {
         setLoading(false);
       }
     };
@@ -74751,8 +74893,11 @@ const useSearchCollection = (cms, collectionName, includeDocuments = true, folde
   useEffect(() => {
     let cancelled = false;
     const searchCollection = async () => {
-      if (await api.isAuthenticated() && !folder.loading && !cancelled) {
-        try {
+      if (folder.loading) {
+        return;
+      }
+      try {
+        if (await api.isAuthenticated() && !cancelled) {
           const response = await cms.api.search.query(search, {
             limit: 15,
             cursor: after,
@@ -74786,14 +74931,19 @@ const useSearchCollection = (cms, collectionName, includeDocuments = true, folde
             }
           };
           setCollection(collectionData);
-        } catch (error2) {
-          cms.alerts.error(
-            `[${error2.name}] GetCollection failed: ${error2.message}`
-          );
-          console.error(error2);
+        } else if (!cancelled) {
+          cms.events.dispatch({ type: "cms:session-expired" });
           setCollection(void 0);
-          setError(error2);
         }
+      } catch (error2) {
+        cms.alerts.error(
+          `[${error2.name}] GetCollection failed: ${error2.message}`
+        );
+        console.error(error2);
+        setCollection(void 0);
+        setError(error2);
+      }
+      if (!cancelled) {
         setLoading(false);
       }
     };
@@ -74851,7 +75001,7 @@ const GetCollection = ({
   );
   useEffect(() => {
     var _a, _b, _c, _d;
-    if (loading) return;
+    if (loading || !collection) return;
     const collectionDefinition = cms.api.tina.schema.getCollection(
       collection.name
     );
@@ -74880,6 +75030,9 @@ const GetCollection = ({
   if (loading) {
     return /* @__PURE__ */ React__default.createElement(LoadingPage, null);
   }
+  if (!collection) {
+    return /* @__PURE__ */ React__default.createElement(UnableToLoadModal, { message: "This collection could not be loaded." });
+  }
   return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, children(collection, loading, reFetchCollection, collectionExtra));
 };
 const createDocument = async (cms, collection, template, mutationInfo, folder, values) => {
@@ -75160,8 +75313,8 @@ const useGetDocument = (cms, collectionName, relativePath) => {
   useEffect(() => {
     let isCancelled = false;
     const fetchDocument = async () => {
-      if (api.isAuthenticated() && !isCancelled) {
-        try {
+      try {
+        if (await api.isAuthenticated() && !isCancelled) {
           const response = await api.fetchDocument(
             collectionName,
             relativePath
@@ -75169,20 +75322,23 @@ const useGetDocument = (cms, collectionName, relativePath) => {
           if (!isCancelled) {
             setDocument(response.document);
           }
-        } catch (error2) {
-          if (!isCancelled) {
-            cms.alerts.error(
-              `[${error2.name}] GetDocument failed: ${error2.message}`
-            );
-            console.error(error2);
-            setDocument(void 0);
-            setError(error2);
-          }
+        } else if (!isCancelled) {
+          cms.events.dispatch({ type: "cms:session-expired" });
+          setDocument(void 0);
         }
+      } catch (error2) {
         if (!isCancelled) {
-          setLoading(false);
+          cms.alerts.error(
+            `[${error2.name}] GetDocument failed: ${error2.message}`
+          );
+          console.error(error2);
+          setDocument(void 0);
+          setError(error2);
         }
       }
+      if (!isCancelled) {
+        setLoading(false);
+      }
     };
     setLoading(true);
     fetchDocument();
@@ -75209,6 +75365,9 @@ const GetDocument = ({
   if (loading) {
     return /* @__PURE__ */ React__default.createElement(LoadingPage, null);
   }
+  if (!document2) {
+    return /* @__PURE__ */ React__default.createElement(UnableToLoadModal, { message: "This document could not be loaded." });
+  }
   return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, children(document2, loading));
 };
 const CollectionDuplicatePage = () => {
@@ -75871,6 +76030,7 @@ export {
   BlocksFieldPlugin,
   BoldIcon$1 as BoldIcon,
   BranchButton,
+  BranchCreator,
   BranchDataProvider,
   BranchItem,
   BranchPreviewButton,

package/dist/internalClient/authProvider.d.ts

@@ -13,6 +13,7 @@ export declare abstract class AbstractAuthProvider implements AuthProvider {
      * @param init fetch function init
      */
     fetchWithToken(input: Input, init: Init): FetchReturn;
+    getAccessToken(): Promise<string | null>;
     authorize(context?: any): Promise<any>;
     isAuthorized(context?: any): Promise<boolean>;
     isAuthenticated(): Promise<boolean>;
@@ -33,6 +34,7 @@ export declare class TinaCloudAuthProvider extends AbstractAuthProvider {
     identityApiUrl: string;
     frontendUrl: string;
     token: TokenObject;
+    hasWarnedNoSession: boolean;
     setToken: (_token: TokenObject | null) => void;
     getToken: () => Promise<TokenObject>;
     constructor({ clientId, identityApiUrl, tokenStorage, frontendUrl, ...options }: {

package/dist/toolkit/fields/plugins/blocks-field-plugin/block-selector-big.d.ts

@@ -1,9 +1,10 @@
 import * as React from 'react';
 import type { BlockTemplate } from '.';
-export declare const BlockSelectorBig: ({ templates, addItem, label, }: {
+export declare const BlockSelectorBig: ({ templates, addItem, label, fieldName, }: {
     templates: {
         [key: string]: BlockTemplate;
     };
     addItem: any;
     label: string | boolean;
+    fieldName?: string;
 }) => React.JSX.Element;

package/dist/toolkit/fields/plugins/blocks-field-plugin/block-selector.d.ts

@@ -1,8 +1,9 @@
 import * as React from 'react';
 import type { BlockTemplate } from '.';
-export declare const BlockSelector: ({ templates, addItem, }: {
+export declare const BlockSelector: ({ templates, addItem, fieldName, }: {
     templates: {
         [key: string]: BlockTemplate;
     };
     addItem: any;
+    fieldName?: string;
 }) => React.JSX.Element;

package/dist/toolkit/fields/plugins/field-props.d.ts

@@ -1,6 +1,17 @@
-import { Field, FormApi } from '../../forms';
+import { Field, Form, FormApi } from '../../forms';
 import { FieldRenderProps } from '../../form-builder';
+/**
+ * Props every field plugin receives.
+ *
+ * `react-final-form` v6 declared `[otherProp: string]: any` on `FieldRenderProps`,
+ * so the extras `FieldsBuilder` passes down type-checked implicitly. v7 dropped
+ * that index signature, so they are declared here instead.
+ */
 export interface FieldProps<InputProps> extends FieldRenderProps<any, HTMLElement> {
     field: Field & InputProps;
     form: FormApi;
+    tinaForm: Form;
+    index?: number;
+    children?: React.ReactNode;
+    experimental_focusIntent?: boolean;
 }

package/dist/toolkit/fields/plugins/group-list-field-plugin.d.ts

@@ -48,9 +48,10 @@ export declare const ItemHeader: ({ isDragging, children, provider, ...props }:
     children: any | any[];
     provider: any;
 } & any) => React.JSX.Element;
-export declare const ItemDeleteButton: ({ onClick, disabled }: {
+export declare const ItemDeleteButton: ({ onClick, disabled, fieldName, }: {
     onClick: any;
     disabled?: boolean;
+    fieldName?: string;
 }) => React.JSX.Element;
 export declare const DragHandle: ({ isDragging, dragHandleProps, }: {
     isDragging: boolean;

package/dist/toolkit/fields/plugins/mdx-field-plugin/index.d.ts

@@ -19,7 +19,11 @@ export declare const MdxFieldPlugin: {
 export declare const MdxFieldPluginExtendible: {
     name: string;
     validate(value: any): string;
-    Component: (props: InputFieldType<InputProps, {
+    Component: (props: InputFieldType<InputProps & {
+        rawMode?: boolean;
+        setRawMode?: (rawMode: boolean) => void;
+        rawEditor?: React.ReactNode;
+    }, {
         templates: MdxTemplate[];
         toolbarOverride?: ToolbarOverrideType[];
         overrides?: ToolbarOverrides;

package/dist/toolkit/plugin-branch-switcher/branch-switcher-legacy.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { Branch, BranchSwitcherProps } from './types';
-export declare function formatBranchName(str: string): string;
+export { formatBranchName } from '../../utils/branch-name';
 export declare const BranchSwitcherLegacy: ({ listBranches, createBranch, chooseBranch, }: BranchSwitcherProps) => React.JSX.Element;
 export declare const getFilteredBranchList: (branchList: Branch[], filter: string, currentBranchName: string) => Branch[];
 export declare const CreateBranch: React.FC<{

package/dist/toolkit/plugin-branch-switcher/branch-switcher.d.ts

@@ -1,12 +1,16 @@
 import * as React from 'react';
 import { Branch, BranchSwitcherProps } from './types';
 export declare const tableHeadingStyle = "px-3 py-3 text-left text-xs font-bold text-gray-700 tracking-wider sticky top-0 bg-gray-100 z-20 border-b-2 border-gray-200 ";
-import { formatBranchName } from './format-branch-name';
-export { formatBranchName };
+export { formatBranchName } from '../../utils/branch-name';
 export declare const BranchSwitcher: (props: BranchSwitcherProps) => React.JSX.Element;
 export declare const EditoralBranchSwitcher: ({ listBranches, createBranch, chooseBranch, setModalTitle, }: BranchSwitcherProps) => React.JSX.Element;
 export declare const getFilteredBranchList: (branchList: Branch[], search: string, currentBranchName: string, filter?: "content" | "all") => Branch[];
 export declare const sortBranchListFn: (sortValue: "default" | "updated" | "name") => (a: Branch, b: Branch) => number;
+export declare const BranchCreator: ({ setViewState, handleCreateBranch, currentBranch, }: {
+    setViewState: any;
+    handleCreateBranch: any;
+    currentBranch: any;
+}) => React.JSX.Element;
 export declare const extractPullRequestId: (url: string) => string;
 export declare const BranchItem: ({ branch, currentBranch, onChange, refreshBranchList, previewFunction, cms, selectedBranch, onSelectBranch, }: {
     branch: Branch;

package/dist/utils/branch-name.d.ts

@@ -0,0 +1,3 @@
+export declare const formatDefaultBranchName: (filePath: string, crudType: string) => string;
+export declare const normalizeBranchName: (name: string) => string;
+export declare function formatBranchName(str: string): string;

package/package.json

@@ -2,7 +2,7 @@
   "name": "tinacms",
   "type": "module",
   "typings": "dist/index.d.ts",
-  "version": "3.12.0",
+  "version": "3.12.1",
   "main": "dist/index.js",
   "module": "./dist/index.js",
   "exports": {
@@ -80,11 +80,10 @@
     "clsx": "^2.1.1",
     "cmdk": "^1.0.4",
     "color-string": "^1.9.1",
-    "crypto-js": "^4.2.0",
     "date-fns": "4.1.0",
     "es-toolkit": "^1.42.0",
-    "final-form": "4.20.10",
-    "final-form-arrays": "^3.1.0",
+    "final-form": "^5.0.1",
+    "final-form-arrays": "^4.0.1",
     "final-form-set-field-data": "^1.0.2",
     "graphql": "15.8.0",
     "graphql-tag": "^2.12.6",
@@ -99,17 +98,17 @@
     "react-dnd": "^16.0.1",
     "react-dnd-html5-backend": "^16.0.1",
     "react-dropzone": "14.2.3",
-    "react-final-form": "^6.5.9",
+    "react-final-form": "^7.0.1",
     "react-router-dom": "^6.30.3",
     "react-use": "^17.6.0",
     "tailwind-merge": "^2.6.0",
     "webfontloader": "1.6.28",
     "yup": "^1.6.1",
     "zod": "^3.24.2",
-    "@tinacms/bridge": "^0.3.1",
-    "@tinacms/mdx": "^2.2.0",
-    "@tinacms/search": "^1.2.23",
-    "@tinacms/schema-tools": "^2.9.0"
+    "@tinacms/search": "^1.2.24",
+    "@tinacms/schema-tools": "^2.9.0",
+    "@tinacms/mdx": "^2.2.1",
+    "@tinacms/bridge": "^0.3.1"
   },
   "devDependencies": {
     "@graphql-tools/utils": "^10.8.1",
@@ -128,7 +127,7 @@
     "identity-obj-proxy": "^3.0.0",
     "jest-file-snapshot": "^0.7.0",
     "lowlight": "^3.3.0",
-    "next": "14.2.35",
+    "next": "15.5.21",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-is": "^18.3.1",
@@ -137,7 +136,7 @@
     "typescript": "^5.7.3",
     "vite": "^5.4.14",
     "vitest": "^2.1.9",
-    "@tinacms/scripts": "1.6.3"
+    "@tinacms/scripts": "1.6.4"
   },
   "peerDependencies": {
     "react": ">=16.14.0",

package/dist/toolkit/plugin-branch-switcher/format-branch-name.d.ts

@@ -1,8 +0,0 @@
-/**
- * Normalizes user-supplied strings into git-ref-safe branch segments.
- * Kept in its own file (no React or workspace-internal imports) so
- * non-React callers like `core/media-store.default.ts` can import it
- * without dragging in the rest of `plugin-branch-switcher` and creating
- * a cycle through `@toolkit/core`.
- */
-export declare function formatBranchName(str: string): string;