tinacms 2.7.7 → 2.7.8

package/dist/admin/components/ui/tooltip.d.ts

@@ -0,0 +1,7 @@
+import * as TooltipPrimitive from '@radix-ui/react-tooltip';
+import * as React from 'react';
+declare const TooltipProvider: React.FC<TooltipPrimitive.TooltipProviderProps>;
+declare const Tooltip: React.FC<TooltipPrimitive.TooltipProps>;
+declare const TooltipTrigger: React.ForwardRefExoticComponent<TooltipPrimitive.TooltipTriggerProps & React.RefAttributes<HTMLButtonElement>>;
+declare const TooltipContent: React.ForwardRefExoticComponent<Omit<TooltipPrimitive.TooltipContentProps & React.RefAttributes<HTMLDivElement>, "ref"> & React.RefAttributes<HTMLDivElement>>;
+export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider };

package/dist/admin/pages/CollectionListPage.d.ts

@@ -1,8 +1,8 @@
+import type { Collection } from '@tinacms/schema-tools';
+import { type TinaCMS } from '@tinacms/toolkit';
 import React from 'react';
 import { type NavigateFunction } from 'react-router-dom';
-import { type TinaCMS } from '@tinacms/toolkit';
 import type { CollectionResponse, DocumentSys } from '../types';
-import type { Collection } from '@tinacms/schema-tools';
 export declare const handleNavigate: (navigate: NavigateFunction, cms: TinaCMS, collection: CollectionResponse, collectionDefinition: Collection<true>, document: DocumentSys) => Promise<any>;
 declare const CollectionListPage: () => React.JSX.Element;
 export default CollectionListPage;

package/dist/client.js

@@ -197,4 +197,3 @@
   exports2.createClient = createClient;
   Object.defineProperty(exports2, Symbol.toStringTag, { value: "Module" });
 });
-//# sourceMappingURL=client.js.map

package/dist/client.mjs

@@ -130,4 +130,3 @@ export {
   TinaClient,
   createClient
 };
-//# sourceMappingURL=client.mjs.map

package/dist/index.js

@@ -10886,7 +10886,7 @@ flowchart TD
       "Event Log"
     ));
   };
-  const version = "2.7.7";
+  const version = "2.7.8";
   const Nav = ({
     isLocalMode,
     className = "",
@@ -12761,11 +12761,11 @@ flowchart TD
           }
         };
         return /* @__PURE__ */ React__namespace.createElement(React__namespace.Fragment, null, createBranchModalOpen && /* @__PURE__ */ React__namespace.createElement(
-          CreateBranchModel,
+          CreateBranchModal,
           {
             safeSubmit,
             crudType: tinaForm.crudType,
-            relativePath: tinaForm.relativePath,
+            path: tinaForm.relativePath,
             values: tinaForm.values,
             close: () => setCreateBranchModalOpen(false)
           }
@@ -12881,6 +12881,22 @@ flowchart TD
     relativePath: relativePath2,
     values,
     crudType
+  }) => /* @__PURE__ */ React__namespace.createElement(
+    CreateBranchModal,
+    {
+      close: close2,
+      safeSubmit,
+      path: relativePath2,
+      values,
+      crudType
+    }
+  );
+  const CreateBranchModal = ({
+    close: close2,
+    safeSubmit,
+    path,
+    values,
+    crudType
   }) => {
     const cms = useCMS$1();
     const tinaApi = cms.api.tina;
@@ -12889,7 +12905,7 @@ flowchart TD
     const [error, setError] = React__namespace.useState("");
     const onCreateBranch = (newBranchName2) => {
       localStorage.setItem("tina.createBranchState", "starting");
-      localStorage.setItem("tina.createBranchState.fullPath", relativePath2);
+      localStorage.setItem("tina.createBranchState.fullPath", path);
       localStorage.setItem(
         "tina.createBranchState.values",
         JSON.stringify(values)
@@ -13969,11 +13985,11 @@ flowchart TD
     }
   );
   Editor.displayName = "Editor";
-  const TooltipProvider = TooltipPrimitive__namespace.Provider;
-  const Tooltip = TooltipPrimitive__namespace.Root;
-  const TooltipTrigger = TooltipPrimitive__namespace.Trigger;
+  const TooltipProvider$1 = TooltipPrimitive__namespace.Provider;
+  const Tooltip$1 = TooltipPrimitive__namespace.Root;
+  const TooltipTrigger$1 = TooltipPrimitive__namespace.Trigger;
   const TooltipPortal = TooltipPrimitive__namespace.Portal;
-  const TooltipContent = cn$1.withCn(
+  const TooltipContent$1 = cn$1.withCn(
     cn$1.withProps(TooltipPrimitive__namespace.Content, {
       sideOffset: 4
     }),
@@ -13987,7 +14003,7 @@ flowchart TD
       }, []);
       const component = /* @__PURE__ */ React.createElement(Component, { ref, ...props });
       if (tooltip && mounted) {
-        return /* @__PURE__ */ React.createElement(Tooltip, { ...tooltipProps }, /* @__PURE__ */ React.createElement(TooltipTrigger, { asChild: true }, component), /* @__PURE__ */ React.createElement(TooltipPortal, null, /* @__PURE__ */ React.createElement(TooltipContent, { ...tooltipContentProps }, tooltip)));
+        return /* @__PURE__ */ React.createElement(Tooltip$1, { ...tooltipProps }, /* @__PURE__ */ React.createElement(TooltipTrigger$1, { asChild: true }, component), /* @__PURE__ */ React.createElement(TooltipPortal, null, /* @__PURE__ */ React.createElement(TooltipContent$1, { ...tooltipContentProps }, tooltip)));
       }
       return component;
     });
@@ -15026,6 +15042,7 @@ flowchart TD
   }
   const protocolAndDomainRE = /^(?:\w+:)?\/\/(\S+)$/;
   const emailLintRE = /mailto:([^?\\]+)/;
+  const telLintRE = /tel:([\d-]+)/;
   const localhostDomainRE = /^localhost[\d:?]*(?:[^\d:?]\S*)?$/;
   const nonLocalhostDomainRE = /^[^\s.]+\.\S{2,}$/;
   const localUrlRE = /^\/\S+/;
@@ -15038,24 +15055,24 @@ flowchart TD
     }
     const generalMatch = string.match(protocolAndDomainRE);
     const emailLinkMatch = string.match(emailLintRE);
+    const telLinkMatch = string.match(telLintRE);
     const localUrlMatch = string.match(localUrlRE);
-    const match = generalMatch || emailLinkMatch || localUrlMatch;
-    if (!match) {
-      return false;
-    }
-    if (localUrlMatch) {
+    if (emailLinkMatch || telLinkMatch || localUrlMatch) {
       return true;
     }
-    const everythingAfterProtocol = match[1];
-    if (!everythingAfterProtocol) {
-      return false;
-    }
-    try {
-      new URL(string);
-    } catch {
-      return false;
+    if (generalMatch) {
+      const everythingAfterProtocol = generalMatch[1];
+      if (!everythingAfterProtocol) {
+        return false;
+      }
+      try {
+        new URL(string);
+      } catch {
+        return false;
+      }
+      return localhostDomainRE.test(everythingAfterProtocol) || nonLocalhostDomainRE.test(everythingAfterProtocol);
     }
-    return localhostDomainRE.test(everythingAfterProtocol) || nonLocalhostDomainRE.test(everythingAfterProtocol);
+    return false;
   };
   const RichEditor = ({ input, tinaForm, field }) => {
     var _a;
@@ -15120,7 +15137,7 @@ flowchart TD
           });
         }
       },
-      /* @__PURE__ */ React.createElement(TooltipProvider, null, /* @__PURE__ */ React.createElement(
+      /* @__PURE__ */ React.createElement(TooltipProvider$1, null, /* @__PURE__ */ React.createElement(
         ToolbarProvider,
         {
           tinaForm,
@@ -32651,6 +32668,22 @@ This will work when developing locally but NOT when deployed to production.
   };
   const PageBody = ({ children }) => /* @__PURE__ */ React.createElement("div", { className: "py-8 px-6 xl:px-12" }, children);
   const PageBodyNarrow = ({ children }) => /* @__PURE__ */ React.createElement("div", { className: "py-10 px-6 xl:px-12" }, /* @__PURE__ */ React.createElement("div", { className: "w-full mx-auto max-w-screen-xl" }, children));
+  const TooltipProvider = TooltipPrimitive__namespace.Provider;
+  const Tooltip = TooltipPrimitive__namespace.Root;
+  const TooltipTrigger = TooltipPrimitive__namespace.Trigger;
+  const TooltipContent = React__namespace.forwardRef(({ className, sideOffset = 4, ...props }, ref) => /* @__PURE__ */ React__namespace.createElement(TooltipPrimitive__namespace.Portal, null, /* @__PURE__ */ React__namespace.createElement(
+    TooltipPrimitive__namespace.Content,
+    {
+      ref,
+      sideOffset,
+      className: cn(
+        "z-[10000] overflow-hidden rounded-md bg-[#FFF] px-3 py-1.5 text-xs text-[#504E5E] shadow-sm animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 origin-[--radix-tooltip-content-transform-origin]",
+        className
+      ),
+      ...props
+    }
+  )));
+  TooltipContent.displayName = TooltipPrimitive__namespace.Content.displayName;
   const folderRegex = /^.*\/~\/*(.*)$/;
   const parentFolder = (folder) => {
     return {
@@ -32917,10 +32950,10 @@ This will work when developing locally but NOT when deployed to production.
               close: () => setDeleteModalOpen(false)
             }
           ), deleteModalOpen && cms.api.tina.usingProtectedBranch() && /* @__PURE__ */ React.createElement(
-            CreateBranchModel,
+            CreateBranchModal,
             {
               crudType: "delete",
-              relativePath: `${collectionExtra.path}/${vars.relativePath}`,
+              path: `${collectionExtra.path}/${vars.relativePath}`,
               values: vars,
               close: () => setDeleteModalOpen(false),
               safeSubmit: async () => {
@@ -33091,10 +33124,14 @@ This will work when developing locally but NOT when deployed to production.
               size: "small"
             },
             "Search not configured."
-          )))), /* @__PURE__ */ React.createElement("div", { className: "flex flex-col md:flex-row items-start md:items-end gap-2 md:gap-0 pt-4 lg:pt-0" }, !collection.templates && allowCreate && /* @__PURE__ */ React.createElement(React.Fragment, null, allowCreateNestedFolder && /* @__PURE__ */ React.createElement(
+          )))), allowCreate && /* @__PURE__ */ React.createElement("div", { className: "flex flex-col md:flex-row items-start md:items-end gap-2 md:gap-0 pt-4 lg:pt-0" }, allowCreateNestedFolder && /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(TooltipProvider, null, /* @__PURE__ */ React.createElement(Tooltip, null, /* @__PURE__ */ React.createElement(TooltipTrigger, { asChild: true }, /* @__PURE__ */ React.createElement("span", null, /* @__PURE__ */ React.createElement(
             reactRouterDom.Link,
             {
               onMouseDown: (evt) => {
+                if (collection.templates) {
+                  evt.preventDefault();
+                  return;
+                }
                 setVars((old) => ({
                   ...old,
                   collection: collectionName,
@@ -33104,12 +33141,32 @@ This will work when developing locally but NOT when deployed to production.
                 evt.stopPropagation();
               },
               to: "/collections/new-folder",
-              className: "icon-parent inline-flex items-center font-medium focus:outline-none focus:ring-2 focus:shadow-outline text-center rounded-full justify-center transition-all duration-150 ease-out whitespace-nowrap shadow text-blue-500 bg-white hover:bg-[#f1f5f9] focus:ring-white focus:ring-blue-500 w-full md:w-auto text-sm h-10 px-6 mr-4"
+              className: cn(
+                "icon-parent inline-flex items-center font-medium focus:outline-none focus:ring-2 focus:shadow-outline text-center rounded-full justify-center transition-all duration-150 ease-out whitespace-nowrap shadow text-blue-500 bg-white hover:bg-[#f1f5f9] focus:ring-white focus:ring-blue-500 w-full md:w-auto text-sm h-10 px-6 mr-4",
+                collection.templates && "opacity-50 pointer-events-none cursor-not-allowed"
+              ),
+              "aria-disabled": !!collection.templates,
+              tabIndex: collection.templates ? -1 : 0
             },
             /* @__PURE__ */ React.createElement(FaFolder, { className: "mr-2" }),
-            "Add Folder",
-            " "
-          ), /* @__PURE__ */ React.createElement(
+            "Add Folder"
+          ))), collection.templates && /* @__PURE__ */ React.createElement(
+            TooltipContent,
+            {
+              side: "top",
+              align: "center"
+            },
+            /* @__PURE__ */ React.createElement("p", null, "Folders can’t be manually added when using templates.", /* @__PURE__ */ React.createElement("br", null), "See the docs -", " ", /* @__PURE__ */ React.createElement(
+              "a",
+              {
+                href: "https://tina.io/docs/reference/templates",
+                target: "_blank",
+                rel: "noopener noreferrer",
+                className: "underline text-blue-500"
+              },
+              "https://tina.io/docs/reference/templates"
+            ))
+          )))), !collection.templates && /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
             reactRouterDom.Link,
             {
               to: `/${folder.fullyQualifiedName ? [
@@ -33128,7 +33185,7 @@ This will work when developing locally but NOT when deployed to production.
             /* @__PURE__ */ React.createElement(FaFile, { className: "mr-2" }),
             "Add Files",
             " "
-          )), collection.templates && allowCreate && /* @__PURE__ */ React.createElement(
+          )), collection.templates && /* @__PURE__ */ React.createElement(
             TemplateMenu,
             {
               collectionName,
@@ -34243,7 +34300,7 @@ This will work when developing locally but NOT when deployed to production.
     const form = React.useMemo(() => {
       return new Form({
         // id is the full document path
-        id: `${schemaCollection.path}/${relativePath2}`,
+        id: schemaTools.canonicalPath(`${schemaCollection.path}/${relativePath2}`),
         label: "form",
         fields: formInfo.fields,
         initialValues: document2._values,
@@ -34406,7 +34463,10 @@ This will work when developing locally but NOT when deployed to production.
             const collection = tinaApi.schema.getCollectionByFullPath(fullPath);
             const api = new TinaAdminApi(cms);
             const params = api.schema.transformPayload(collection.name, values);
-            const relativePath2 = fullPath.replace(`${collection.path}/`, "");
+            const relativePath2 = pathRelativeToCollection(
+              collection.path,
+              fullPath
+            );
             if (await api.isAuthenticated()) {
               if (kind === "delete") {
                 await api.deleteDocument(values);
@@ -34472,6 +34532,16 @@ This will work when developing locally but NOT when deployed to production.
     ), (state === "starting" || state === "creatingBranch") && /* @__PURE__ */ React.createElement("p", null, "Creating branch…"), state === "indexing" && /* @__PURE__ */ React.createElement("p", null, "Indexing Content…"), state === "submitting" && /* @__PURE__ */ React.createElement("p", null, "Saving content…"), state === "creatingPR" && /* @__PURE__ */ React.createElement("p", null, "Creating Pull Request…"), state === "error" && /* @__PURE__ */ React.createElement("p", { className: "flex items-center gap-1 text-red-700" }, /* @__PURE__ */ React.createElement(BiError, { className: "w-7 h-auto text-red-400 flex-shrink-0" }), " ", /* @__PURE__ */ React.createElement("b", null, "Error:"), " ", errorMessage, " "));
   };
   const Wrapper = ({ children }) => /* @__PURE__ */ React.createElement("div", { className: "w-full h-full flex flex-col justify-center items-center gap-4 p-6 text-xl text-gray-700" }, children);
+  const pathRelativeToCollection = (collectionPath, fullPath) => {
+    const cleanCollectionPath = schemaTools.canonicalPath(collectionPath) + "/";
+    const cleanFullPath = schemaTools.canonicalPath(fullPath);
+    if (cleanFullPath.startsWith(cleanCollectionPath)) {
+      return cleanFullPath.substring(cleanCollectionPath.length);
+    }
+    throw new Error(
+      `Path ${fullPath} not within collection path ${collectionPath}`
+    );
+  };
   const Redirect = () => {
     React.useEffect(() => {
       if (window) {
@@ -34898,6 +34968,7 @@ This will work when developing locally but NOT when deployed to production.
   exports2.ColorField = ColorField;
   exports2.ColorFieldPlugin = ColorFieldPlugin;
   exports2.ColorPicker = ColorPicker;
+  exports2.CreateBranchModal = CreateBranchModal;
   exports2.CreateBranchModel = CreateBranchModel;
   exports2.CursorPaginator = CursorPaginator;
   exports2.DEFAULT_LOCAL_TINA_GQL_SERVER_URL = DEFAULT_LOCAL_TINA_GQL_SERVER_URL;
@@ -35082,4 +35153,3 @@ This will work when developing locally but NOT when deployed to production.
   exports2.wrapFieldsWithMeta = wrapFieldsWithMeta;
   Object.defineProperties(exports2, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 });
-//# sourceMappingURL=index.js.map

package/dist/index.mjs

@@ -54,7 +54,7 @@ import { ELEMENT_PARAGRAPH as ELEMENT_PARAGRAPH$1 } from "@udecode/plate-paragra
 import { ELEMENT_BLOCKQUOTE as ELEMENT_BLOCKQUOTE$1 } from "@udecode/plate-block-quote";
 import { useFloatingToolbarState, offset, flip, useFloatingToolbar } from "@udecode/plate-floating";
 import { getIntrospectionQuery, buildClientSchema, print, parse as parse$3, buildSchema } from "graphql";
-import { TinaSchema, addNamespaceToSchema, parseURL, resolveForm, normalizePath, validateSchema } from "@tinacms/schema-tools";
+import { TinaSchema, addNamespaceToSchema, parseURL, resolveForm, normalizePath, canonicalPath, validateSchema } from "@tinacms/schema-tools";
 import { NAMER, resolveField } from "@tinacms/schema-tools";
 import gql from "graphql-tag";
 import { diff } from "@graphql-inspector/core";
@@ -10913,7 +10913,7 @@ const SyncStatus = ({ cms, setEventsOpen }) => {
     "Event Log"
   ));
 };
-const version = "2.7.7";
+const version = "2.7.8";
 const Nav = ({
   isLocalMode,
   className = "",
@@ -12788,11 +12788,11 @@ const FormBuilder = ({
         }
       };
       return /* @__PURE__ */ React.createElement(React.Fragment, null, createBranchModalOpen && /* @__PURE__ */ React.createElement(
-        CreateBranchModel,
+        CreateBranchModal,
         {
           safeSubmit,
           crudType: tinaForm.crudType,
-          relativePath: tinaForm.relativePath,
+          path: tinaForm.relativePath,
           values: tinaForm.values,
           close: () => setCreateBranchModalOpen(false)
         }
@@ -12908,6 +12908,22 @@ const CreateBranchModel = ({
   relativePath: relativePath2,
   values,
   crudType
+}) => /* @__PURE__ */ React.createElement(
+  CreateBranchModal,
+  {
+    close: close2,
+    safeSubmit,
+    path: relativePath2,
+    values,
+    crudType
+  }
+);
+const CreateBranchModal = ({
+  close: close2,
+  safeSubmit,
+  path,
+  values,
+  crudType
 }) => {
   const cms = useCMS$1();
   const tinaApi = cms.api.tina;
@@ -12916,7 +12932,7 @@ const CreateBranchModel = ({
   const [error, setError] = React.useState("");
   const onCreateBranch = (newBranchName2) => {
     localStorage.setItem("tina.createBranchState", "starting");
-    localStorage.setItem("tina.createBranchState.fullPath", relativePath2);
+    localStorage.setItem("tina.createBranchState.fullPath", path);
     localStorage.setItem(
       "tina.createBranchState.values",
       JSON.stringify(values)
@@ -13996,11 +14012,11 @@ const Editor = React__default.forwardRef(
   }
 );
 Editor.displayName = "Editor";
-const TooltipProvider = TooltipPrimitive.Provider;
-const Tooltip = TooltipPrimitive.Root;
-const TooltipTrigger = TooltipPrimitive.Trigger;
+const TooltipProvider$1 = TooltipPrimitive.Provider;
+const Tooltip$1 = TooltipPrimitive.Root;
+const TooltipTrigger$1 = TooltipPrimitive.Trigger;
 const TooltipPortal = TooltipPrimitive.Portal;
-const TooltipContent = withCn(
+const TooltipContent$1 = withCn(
   withProps(TooltipPrimitive.Content, {
     sideOffset: 4
   }),
@@ -14014,7 +14030,7 @@ function withTooltip(Component) {
     }, []);
     const component = /* @__PURE__ */ React__default.createElement(Component, { ref, ...props });
     if (tooltip && mounted) {
-      return /* @__PURE__ */ React__default.createElement(Tooltip, { ...tooltipProps }, /* @__PURE__ */ React__default.createElement(TooltipTrigger, { asChild: true }, component), /* @__PURE__ */ React__default.createElement(TooltipPortal, null, /* @__PURE__ */ React__default.createElement(TooltipContent, { ...tooltipContentProps }, tooltip)));
+      return /* @__PURE__ */ React__default.createElement(Tooltip$1, { ...tooltipProps }, /* @__PURE__ */ React__default.createElement(TooltipTrigger$1, { asChild: true }, component), /* @__PURE__ */ React__default.createElement(TooltipPortal, null, /* @__PURE__ */ React__default.createElement(TooltipContent$1, { ...tooltipContentProps }, tooltip)));
     }
     return component;
   });
@@ -15053,6 +15069,7 @@ function LinkFloatingToolbar({ state }) {
 }
 const protocolAndDomainRE = /^(?:\w+:)?\/\/(\S+)$/;
 const emailLintRE = /mailto:([^?\\]+)/;
+const telLintRE = /tel:([\d-]+)/;
 const localhostDomainRE = /^localhost[\d:?]*(?:[^\d:?]\S*)?$/;
 const nonLocalhostDomainRE = /^[^\s.]+\.\S{2,}$/;
 const localUrlRE = /^\/\S+/;
@@ -15065,24 +15082,24 @@ const isUrl = (string) => {
   }
   const generalMatch = string.match(protocolAndDomainRE);
   const emailLinkMatch = string.match(emailLintRE);
+  const telLinkMatch = string.match(telLintRE);
   const localUrlMatch = string.match(localUrlRE);
-  const match = generalMatch || emailLinkMatch || localUrlMatch;
-  if (!match) {
-    return false;
-  }
-  if (localUrlMatch) {
+  if (emailLinkMatch || telLinkMatch || localUrlMatch) {
     return true;
   }
-  const everythingAfterProtocol = match[1];
-  if (!everythingAfterProtocol) {
-    return false;
-  }
-  try {
-    new URL(string);
-  } catch {
-    return false;
+  if (generalMatch) {
+    const everythingAfterProtocol = generalMatch[1];
+    if (!everythingAfterProtocol) {
+      return false;
+    }
+    try {
+      new URL(string);
+    } catch {
+      return false;
+    }
+    return localhostDomainRE.test(everythingAfterProtocol) || nonLocalhostDomainRE.test(everythingAfterProtocol);
   }
-  return localhostDomainRE.test(everythingAfterProtocol) || nonLocalhostDomainRE.test(everythingAfterProtocol);
+  return false;
 };
 const RichEditor = ({ input, tinaForm, field }) => {
   var _a;
@@ -15147,7 +15164,7 @@ const RichEditor = ({ input, tinaForm, field }) => {
         });
       }
     },
-    /* @__PURE__ */ React__default.createElement(TooltipProvider, null, /* @__PURE__ */ React__default.createElement(
+    /* @__PURE__ */ React__default.createElement(TooltipProvider$1, null, /* @__PURE__ */ React__default.createElement(
       ToolbarProvider,
       {
         tinaForm,
@@ -32678,6 +32695,22 @@ const PageHeader = ({
 };
 const PageBody = ({ children }) => /* @__PURE__ */ React__default.createElement("div", { className: "py-8 px-6 xl:px-12" }, children);
 const PageBodyNarrow = ({ children }) => /* @__PURE__ */ React__default.createElement("div", { className: "py-10 px-6 xl:px-12" }, /* @__PURE__ */ React__default.createElement("div", { className: "w-full mx-auto max-w-screen-xl" }, children));
+const TooltipProvider = TooltipPrimitive.Provider;
+const Tooltip = TooltipPrimitive.Root;
+const TooltipTrigger = TooltipPrimitive.Trigger;
+const TooltipContent = React.forwardRef(({ className, sideOffset = 4, ...props }, ref) => /* @__PURE__ */ React.createElement(TooltipPrimitive.Portal, null, /* @__PURE__ */ React.createElement(
+  TooltipPrimitive.Content,
+  {
+    ref,
+    sideOffset,
+    className: cn(
+      "z-[10000] overflow-hidden rounded-md bg-[#FFF] px-3 py-1.5 text-xs text-[#504E5E] shadow-sm animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 origin-[--radix-tooltip-content-transform-origin]",
+      className
+    ),
+    ...props
+  }
+)));
+TooltipContent.displayName = TooltipPrimitive.Content.displayName;
 const folderRegex = /^.*\/~\/*(.*)$/;
 const parentFolder = (folder) => {
   return {
@@ -32944,10 +32977,10 @@ const CollectionListPage = () => {
             close: () => setDeleteModalOpen(false)
           }
         ), deleteModalOpen && cms.api.tina.usingProtectedBranch() && /* @__PURE__ */ React__default.createElement(
-          CreateBranchModel,
+          CreateBranchModal,
           {
             crudType: "delete",
-            relativePath: `${collectionExtra.path}/${vars.relativePath}`,
+            path: `${collectionExtra.path}/${vars.relativePath}`,
             values: vars,
             close: () => setDeleteModalOpen(false),
             safeSubmit: async () => {
@@ -33118,10 +33151,14 @@ const CollectionListPage = () => {
             size: "small"
           },
           "Search not configured."
-        )))), /* @__PURE__ */ React__default.createElement("div", { className: "flex flex-col md:flex-row items-start md:items-end gap-2 md:gap-0 pt-4 lg:pt-0" }, !collection.templates && allowCreate && /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, allowCreateNestedFolder && /* @__PURE__ */ React__default.createElement(
+        )))), allowCreate && /* @__PURE__ */ React__default.createElement("div", { className: "flex flex-col md:flex-row items-start md:items-end gap-2 md:gap-0 pt-4 lg:pt-0" }, allowCreateNestedFolder && /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, /* @__PURE__ */ React__default.createElement(TooltipProvider, null, /* @__PURE__ */ React__default.createElement(Tooltip, null, /* @__PURE__ */ React__default.createElement(TooltipTrigger, { asChild: true }, /* @__PURE__ */ React__default.createElement("span", null, /* @__PURE__ */ React__default.createElement(
           Link,
           {
             onMouseDown: (evt) => {
+              if (collection.templates) {
+                evt.preventDefault();
+                return;
+              }
               setVars((old) => ({
                 ...old,
                 collection: collectionName,
@@ -33131,12 +33168,32 @@ const CollectionListPage = () => {
               evt.stopPropagation();
             },
             to: "/collections/new-folder",
-            className: "icon-parent inline-flex items-center font-medium focus:outline-none focus:ring-2 focus:shadow-outline text-center rounded-full justify-center transition-all duration-150 ease-out whitespace-nowrap shadow text-blue-500 bg-white hover:bg-[#f1f5f9] focus:ring-white focus:ring-blue-500 w-full md:w-auto text-sm h-10 px-6 mr-4"
+            className: cn(
+              "icon-parent inline-flex items-center font-medium focus:outline-none focus:ring-2 focus:shadow-outline text-center rounded-full justify-center transition-all duration-150 ease-out whitespace-nowrap shadow text-blue-500 bg-white hover:bg-[#f1f5f9] focus:ring-white focus:ring-blue-500 w-full md:w-auto text-sm h-10 px-6 mr-4",
+              collection.templates && "opacity-50 pointer-events-none cursor-not-allowed"
+            ),
+            "aria-disabled": !!collection.templates,
+            tabIndex: collection.templates ? -1 : 0
           },
           /* @__PURE__ */ React__default.createElement(FaFolder, { className: "mr-2" }),
-          "Add Folder",
-          " "
-        ), /* @__PURE__ */ React__default.createElement(
+          "Add Folder"
+        ))), collection.templates && /* @__PURE__ */ React__default.createElement(
+          TooltipContent,
+          {
+            side: "top",
+            align: "center"
+          },
+          /* @__PURE__ */ React__default.createElement("p", null, "Folders can’t be manually added when using templates.", /* @__PURE__ */ React__default.createElement("br", null), "See the docs -", " ", /* @__PURE__ */ React__default.createElement(
+            "a",
+            {
+              href: "https://tina.io/docs/reference/templates",
+              target: "_blank",
+              rel: "noopener noreferrer",
+              className: "underline text-blue-500"
+            },
+            "https://tina.io/docs/reference/templates"
+          ))
+        )))), !collection.templates && /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, /* @__PURE__ */ React__default.createElement(
           Link,
           {
             to: `/${folder.fullyQualifiedName ? [
@@ -33155,7 +33212,7 @@ const CollectionListPage = () => {
           /* @__PURE__ */ React__default.createElement(FaFile, { className: "mr-2" }),
           "Add Files",
           " "
-        )), collection.templates && allowCreate && /* @__PURE__ */ React__default.createElement(
+        )), collection.templates && /* @__PURE__ */ React__default.createElement(
           TemplateMenu,
           {
             collectionName,
@@ -34270,7 +34327,7 @@ const RenderForm = ({
   const form = useMemo(() => {
     return new Form({
       // id is the full document path
-      id: `${schemaCollection.path}/${relativePath2}`,
+      id: canonicalPath(`${schemaCollection.path}/${relativePath2}`),
       label: "form",
       fields: formInfo.fields,
       initialValues: document2._values,
@@ -34433,7 +34490,10 @@ const IndexingPage = () => {
           const collection = tinaApi.schema.getCollectionByFullPath(fullPath);
           const api = new TinaAdminApi(cms);
           const params = api.schema.transformPayload(collection.name, values);
-          const relativePath2 = fullPath.replace(`${collection.path}/`, "");
+          const relativePath2 = pathRelativeToCollection(
+            collection.path,
+            fullPath
+          );
           if (await api.isAuthenticated()) {
             if (kind === "delete") {
               await api.deleteDocument(values);
@@ -34499,6 +34559,16 @@ const IndexingPage = () => {
   ), (state === "starting" || state === "creatingBranch") && /* @__PURE__ */ React__default.createElement("p", null, "Creating branch…"), state === "indexing" && /* @__PURE__ */ React__default.createElement("p", null, "Indexing Content…"), state === "submitting" && /* @__PURE__ */ React__default.createElement("p", null, "Saving content…"), state === "creatingPR" && /* @__PURE__ */ React__default.createElement("p", null, "Creating Pull Request…"), state === "error" && /* @__PURE__ */ React__default.createElement("p", { className: "flex items-center gap-1 text-red-700" }, /* @__PURE__ */ React__default.createElement(BiError, { className: "w-7 h-auto text-red-400 flex-shrink-0" }), " ", /* @__PURE__ */ React__default.createElement("b", null, "Error:"), " ", errorMessage, " "));
 };
 const Wrapper = ({ children }) => /* @__PURE__ */ React__default.createElement("div", { className: "w-full h-full flex flex-col justify-center items-center gap-4 p-6 text-xl text-gray-700" }, children);
+const pathRelativeToCollection = (collectionPath, fullPath) => {
+  const cleanCollectionPath = canonicalPath(collectionPath) + "/";
+  const cleanFullPath = canonicalPath(fullPath);
+  if (cleanFullPath.startsWith(cleanCollectionPath)) {
+    return cleanFullPath.substring(cleanCollectionPath.length);
+  }
+  throw new Error(
+    `Path ${fullPath} not within collection path ${collectionPath}`
+  );
+};
 const Redirect = () => {
   React__default.useEffect(() => {
     if (window) {
@@ -34918,6 +34988,7 @@ export {
   ColorField,
   ColorFieldPlugin,
   ColorPicker,
+  CreateBranchModal,
   CreateBranchModel,
   CursorPaginator,
   DEFAULT_LOCAL_TINA_GQL_SERVER_URL,
@@ -35103,4 +35174,3 @@ export {
   wrapFieldWithNoHeader,
   wrapFieldsWithMeta
 };
-//# sourceMappingURL=index.mjs.map

package/dist/node-cache-5e8db9f0.mjs

@@ -61,4 +61,3 @@ export {
   NodeCache,
   makeCacheDir
 };
-//# sourceMappingURL=node-cache-5e8db9f0.mjs.map

package/dist/react.js

@@ -247,4 +247,3 @@
   exports2.useTina = useTina;
   Object.defineProperty(exports2, Symbol.toStringTag, { value: "Module" });
 });
-//# sourceMappingURL=react.js.map

package/dist/react.mjs

@@ -244,4 +244,3 @@ export {
   useEditState,
   useTina
 };
-//# sourceMappingURL=react.mjs.map

package/dist/rich-text/index.js

@@ -244,4 +244,3 @@
   exports2.TinaMarkdown = TinaMarkdown;
   Object.defineProperty(exports2, Symbol.toStringTag, { value: "Module" });
 });
-//# sourceMappingURL=index.js.map

package/dist/rich-text/index.mjs

@@ -241,4 +241,3 @@ const Node = ({ components, child }) => {
 export {
   TinaMarkdown
 };
-//# sourceMappingURL=index.mjs.map

package/dist/rich-text/prism.js

@@ -16,4 +16,3 @@
   exports2.Prism = Prism;
   Object.defineProperty(exports2, Symbol.toStringTag, { value: "Module" });
 });
-//# sourceMappingURL=prism.js.map

package/dist/rich-text/prism.mjs

@@ -14,4 +14,3 @@ const Prism = (props) => {
 export {
   Prism
 };
-//# sourceMappingURL=prism.mjs.map