tinacms 1.5.22 → 1.5.23

package/dist/dev-tools.js

@@ -72,7 +72,7 @@
     return MNode;
   };
   const Node = ({ components, child }) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const { children, ...props } = child;
     switch (child.type) {
       case "h1":
@@ -154,23 +154,18 @@
             const header = (_e = (_d = child.props) == null ? void 0 : _d.tableRows) == null ? void 0 : _e.at(0);
             const TableComponent = components["table"] || ((props2) => /* @__PURE__ */ React.createElement("table", { ...props2 }));
             const TrComponent = components["tr"] || ((props2) => /* @__PURE__ */ React.createElement("tr", { ...props2 }));
-            const ThComponent = components["th"] || ((props2) => /* @__PURE__ */ React.createElement("th", { ...props2 }));
-            const TdComponent = components["td"] || ((props2) => /* @__PURE__ */ React.createElement("td", { ...props2 }));
+            const ThComponent = components["th"] || ((props2) => /* @__PURE__ */ React.createElement("th", { style: { textAlign: (props2 == null ? void 0 : props2.align) || "auto" }, ...props2 }));
+            const TdComponent = components["td"] || ((props2) => /* @__PURE__ */ React.createElement("td", { style: { textAlign: (props2 == null ? void 0 : props2.align) || "auto" }, ...props2 }));
+            const align = ((_f = child.props) == null ? void 0 : _f.align) || [];
             return /* @__PURE__ */ React.createElement(TableComponent, null, firstRowHeader && /* @__PURE__ */ React.createElement("thead", null, /* @__PURE__ */ React.createElement(TrComponent, null, header.tableCells.map((c, i) => {
               return /* @__PURE__ */ React.createElement(
                 TinaMarkdown,
                 {
                   key: i,
                   components: {
-                    p: (props2) => {
-                      if (ThComponent) {
-                        return /* @__PURE__ */ React.createElement(ThComponent, { ...props2 });
-                      } else {
-                        return /* @__PURE__ */ React.createElement("th", { ...props2 });
-                      }
-                    }
+                    p: (props2) => /* @__PURE__ */ React.createElement(ThComponent, { align: align[i], ...props2 })
                   },
-                  content: c.tableCell
+                  content: c.value
                 }
               );
             }))), /* @__PURE__ */ React.createElement("tbody", null, rows.map((row, i) => {
@@ -181,15 +176,9 @@
                   {
                     key: i2,
                     components: {
-                      p: (props2) => {
-                        if (TdComponent) {
-                          return /* @__PURE__ */ React.createElement(TdComponent, { ...props2 });
-                        } else {
-                          return /* @__PURE__ */ React.createElement("td", { ...props2 });
-                        }
-                      }
+                      p: (props2) => /* @__PURE__ */ React.createElement(TdComponent, { align: align[i2], ...props2 })
                     },
-                    content: c.tableCell
+                    content: c.value
                   }
                 );
               }));

package/dist/dev-tools.mjs

@@ -69,7 +69,7 @@ const MemoNode = (props) => {
   return MNode;
 };
 const Node = ({ components, child }) => {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
   const { children, ...props } = child;
   switch (child.type) {
     case "h1":
@@ -151,23 +151,18 @@ const Node = ({ components, child }) => {
           const header = (_e = (_d = child.props) == null ? void 0 : _d.tableRows) == null ? void 0 : _e.at(0);
           const TableComponent = components["table"] || ((props2) => /* @__PURE__ */ React.createElement("table", { ...props2 }));
           const TrComponent = components["tr"] || ((props2) => /* @__PURE__ */ React.createElement("tr", { ...props2 }));
-          const ThComponent = components["th"] || ((props2) => /* @__PURE__ */ React.createElement("th", { ...props2 }));
-          const TdComponent = components["td"] || ((props2) => /* @__PURE__ */ React.createElement("td", { ...props2 }));
+          const ThComponent = components["th"] || ((props2) => /* @__PURE__ */ React.createElement("th", { style: { textAlign: (props2 == null ? void 0 : props2.align) || "auto" }, ...props2 }));
+          const TdComponent = components["td"] || ((props2) => /* @__PURE__ */ React.createElement("td", { style: { textAlign: (props2 == null ? void 0 : props2.align) || "auto" }, ...props2 }));
+          const align = ((_f = child.props) == null ? void 0 : _f.align) || [];
           return /* @__PURE__ */ React.createElement(TableComponent, null, firstRowHeader && /* @__PURE__ */ React.createElement("thead", null, /* @__PURE__ */ React.createElement(TrComponent, null, header.tableCells.map((c, i) => {
             return /* @__PURE__ */ React.createElement(
               TinaMarkdown,
               {
                 key: i,
                 components: {
-                  p: (props2) => {
-                    if (ThComponent) {
-                      return /* @__PURE__ */ React.createElement(ThComponent, { ...props2 });
-                    } else {
-                      return /* @__PURE__ */ React.createElement("th", { ...props2 });
-                    }
-                  }
+                  p: (props2) => /* @__PURE__ */ React.createElement(ThComponent, { align: align[i], ...props2 })
                 },
-                content: c.tableCell
+                content: c.value
               }
             );
           }))), /* @__PURE__ */ React.createElement("tbody", null, rows.map((row, i) => {
@@ -178,15 +173,9 @@ const Node = ({ components, child }) => {
                 {
                   key: i2,
                   components: {
-                    p: (props2) => {
-                      if (TdComponent) {
-                        return /* @__PURE__ */ React.createElement(TdComponent, { ...props2 });
-                      } else {
-                        return /* @__PURE__ */ React.createElement("td", { ...props2 });
-                      }
-                    }
+                    p: (props2) => /* @__PURE__ */ React.createElement(TdComponent, { align: align[i2], ...props2 })
                   },
-                  content: c.tableCell
+                  content: c.value
                 }
               );
             }));

package/dist/index.d.ts

@@ -19,7 +19,6 @@ export type { TinaCMSProviderDefaultProps };
 export default TinaCMSProvider2;
 import { MediaStore, TinaCMS } from '@tinacms/toolkit';
 import { formifyCallback } from './hooks/use-graphql-forms';
-import { RichTextTemplate } from '@tinacms/schema-tools';
 export { NAMER, resolveField } from '@tinacms/schema-tools';
 import { TinaSchema, TinaField, Config, Schema, Collection, Template } from '@tinacms/schema-tools';
 export type { Config, Schema, Collection, Template, TinaField, TinaSchema };
@@ -58,7 +57,4 @@ interface MediaStoreClass {
 }
 export declare const defineStaticConfig: (config: Config<(cms: TinaCMS) => TinaCMS, formifyCallback, import("./hooks/use-content-creator").DocumentCreatorArgs, MediaStoreClass, undefined>) => Config<(cms: TinaCMS) => TinaCMS, formifyCallback, import("./hooks/use-content-creator").DocumentCreatorArgs, MediaStoreClass, undefined>;
 export declare const defineConfig: (config: Config<(cms: TinaCMS) => TinaCMS, formifyCallback, import("./hooks/use-content-creator").DocumentCreatorArgs, MediaStoreClass, undefined>) => Config<(cms: TinaCMS) => TinaCMS, formifyCallback, import("./hooks/use-content-creator").DocumentCreatorArgs, MediaStoreClass, undefined>;
-/**
- * Out-of-the-box template for rendering basic markdown tables
- */
-export declare const tinaTableTemplate: RichTextTemplate;
+export { tinaTableTemplate } from './table';

package/dist/index.js

@@ -1810,8 +1810,15 @@ var __publicField = (obj, key, value) => {
         return this.finalForm.subscribe(cb, options2);
       };
       this.handleSubmit = async (values, form, cb) => {
+        var _a;
         try {
-          const response = await this.onSubmit(values, form, cb);
+          const valOverride = await ((_a = this.beforeSubmit) == null ? void 0 : _a.call(this, values));
+          if (valOverride) {
+            for (const [key, value] of Object.entries(valOverride)) {
+              form.change(key, value);
+            }
+          }
+          const response = await this.onSubmit(valOverride || values, form, cb);
           form.initialize(values);
           return response;
         } catch (error) {
@@ -2349,6 +2356,7 @@ var __publicField = (obj, key, value) => {
       {
         name: field.name,
         key: field.name,
+        isEqual: (a, b) => isEqual(field, a, b),
         type,
         parse: parse2 ? (value, name) => parse2(value, name, field) : void 0,
         format: format2 ? (value, name) => format2(value, name, field) : void 0,
@@ -2406,6 +2414,18 @@ var __publicField = (obj, key, value) => {
     }
     return prop;
   }
+  const isEqual = (field, a, b) => {
+    const replacer = (key, value) => {
+      if (key === "id") {
+        return void 0;
+      }
+      return value;
+    };
+    if (field.type === "rich-text") {
+      return JSON.stringify(a, replacer) === JSON.stringify(b, replacer);
+    }
+    return a === b;
+  };
   const FF = reactFinalForm.Form;
   const FormLegacy = ({ form, children }) => {
     const [i, setI] = React__namespace.useState(0);
@@ -2450,7 +2470,7 @@ var __publicField = (obj, key, value) => {
     disabled,
     rounded = "full",
     children,
-    className,
+    className = "",
     ...props
   }) => {
     const baseClasses = "icon-parent inline-flex items-center font-medium focus:outline-none focus:ring-2 focus:shadow-outline text-center inline-flex justify-center transition-all duration-150 ease-out ";
@@ -7113,7 +7133,7 @@ var __publicField = (obj, key, value) => {
             toolbarItems: [
               branch.githubPullRequestUrl && {
                 name: "github-pr",
-                label: "View in Github",
+                label: "View in GitHub",
                 Icon: /* @__PURE__ */ React__namespace.createElement(BiLinkExternal, { className: "w-5 h-auto text-blue-500 opacity-70" }),
                 onMouseDown: () => {
                   window.open(branch.githubPullRequestUrl, "_blank");
@@ -7535,6 +7555,10 @@ var __publicField = (obj, key, value) => {
             `${this.url}/upload_url/${path}`,
             { method: "GET" }
           );
+          if (res.status === 412) {
+            const { message = "Unexpected error generating upload url" } = await res.json();
+            throw new Error(message);
+          }
           const { signedUrl } = await res.json();
           if (!signedUrl) {
             throw new Error("Unexpected error generating upload url");
@@ -10111,7 +10135,7 @@ var __publicField = (obj, key, value) => {
           return {
             error: event.error,
             level: "error",
-            message: `Failed to upload file(s) ${event == null ? void 0 : event.uploaded.map((x) => x.file.name).join(", ")}. See error message: 
+            message: `Failed to upload file(s) ${event == null ? void 0 : event.uploaded.map((x) => x.file.name).join(", ")}. 
 
  ${event == null ? void 0 : event.error.toString()}`
           };
@@ -10822,6 +10846,16 @@ var __publicField = (obj, key, value) => {
     const [createBranchModalOpen, setCreateBranchModalOpen] = React__namespace.useState(false);
     const tinaForm = form.tinaForm;
     const finalForm2 = form.tinaForm.finalForm;
+    const schema = cms.api.tina.schema;
+    React__namespace.useEffect(() => {
+      var _a;
+      const collection = schema.getCollectionByFullPath(tinaForm.relativePath);
+      if ((_a = collection == null ? void 0 : collection.ui) == null ? void 0 : _a.beforeSubmit) {
+        tinaForm.beforeSubmit = (values) => collection.ui.beforeSubmit({ cms, form: tinaForm, values });
+      } else {
+        tinaForm.beforeSubmit = void 0;
+      }
+    }, [tinaForm.relativePath]);
     const moveArrayItem = React__namespace.useCallback(
       (result) => {
         if (!result.destination || !finalForm2)
@@ -10854,18 +10888,7 @@ var __publicField = (obj, key, value) => {
       {
         key: tinaForm.id,
         form: tinaForm.finalForm,
-        onSubmit: async (values, form2, cb) => {
-          var _a, _b;
-          const schema = cms.api.tina.schema;
-          const collection = schema.getCollectionByFullPath(tinaForm.relativePath);
-          const valOverride = ((_a = collection == null ? void 0 : collection.ui) == null ? void 0 : _a.beforeSubmit) ? await ((_b = collection == null ? void 0 : collection.ui) == null ? void 0 : _b.beforeSubmit({ cms, values, form: tinaForm })) : false;
-          if (valOverride) {
-            for (const [key, value] of Object.entries(valOverride)) {
-              form2.change(key, value);
-            }
-          }
-          return tinaForm.onSubmit(valOverride || values, form2, cb);
-        }
+        onSubmit: tinaForm.onSubmit
       },
       ({
         handleSubmit,
@@ -29430,8 +29453,7 @@ This will work when developing locally but NOT when deployed to production.
           setSearch(searchInput);
           setSearchLoaded(false);
         },
-        variant: "primary",
-        type: "submit"
+        variant: "primary"
       },
       "Search ",
       /* @__PURE__ */ React.createElement(BiSearch, { className: "w-5 h-full ml-1.5 opacity-70" })
@@ -29715,13 +29737,13 @@ This will work when developing locally but NOT when deployed to production.
     }
     const defaultItem = customDefaults || // @ts-ignore internal types aren't up to date
     ((_d = template.ui) == null ? void 0 : _d.defaultItem) || // @ts-ignore
-    (template == null ? void 0 : template.defaultItem);
+    (template == null ? void 0 : template.defaultItem) || {};
     const form = React.useMemo(() => {
       var _a2, _b2;
       const folderName = folder.fullyQualifiedName ? folder.name : "";
       return new Form({
         crudType: "create",
-        initialValues: typeof defaultItem === "function" ? defaultItem() : defaultItem,
+        initialValues: typeof defaultItem === "function" ? { ...defaultItem(), _template: templateName } : { ...defaultItem, _template: templateName },
         extraSubscribeValues: { active: true, submitting: true, touched: true },
         onChange: (values) => {
           var _a3, _b3;
@@ -30253,10 +30275,12 @@ This will work when developing locally but NOT when deployed to production.
     redirect,
     children
   }) => {
+    const cms = useCMS$1();
     const navigate = reactRouterDom.useNavigate();
     React.useEffect(() => {
+      const basePath = cms.flags.get("tina-basepath");
       if (redirect) {
-        navigate("/~");
+        navigate(`/~${basePath ? `/${basePath}` : ""}`);
       }
     }, [redirect]);
     return children;
@@ -30500,22 +30524,6 @@ This will work when developing locally but NOT when deployed to production.
       this.mapper = mapper;
     }
   }
-  const defineSchema = (config) => {
-    schemaTools.validateSchema({ schema: config });
-    return config;
-  };
-  const defineLegacyConfig = (config) => {
-    schemaTools.validateSchema({ schema: config.schema });
-    return config;
-  };
-  const defineStaticConfig = (config) => {
-    if (!config.schema) {
-      throw new Error("Static config must have a schema");
-    }
-    schemaTools.validateSchema({ schema: config.schema });
-    return config;
-  };
-  const defineConfig = defineStaticConfig;
   const tinaTableTemplate = {
     name: "table",
     label: "Table",
@@ -30525,6 +30533,13 @@ This will work when developing locally but NOT when deployed to production.
         label: "First row is a header",
         type: "boolean"
       },
+      {
+        name: "align",
+        label: "Align",
+        type: "string",
+        list: true,
+        description: 'Possible values: "left", "right", or "center".'
+      },
       {
         name: "tableRows",
         label: "Rows",
@@ -30537,7 +30552,7 @@ This will work when developing locally but NOT when deployed to production.
                 return {
                   label: value.tableCells.map((cellItem) => {
                     var _a;
-                    return (_a = stringifyCell(cellItem.tableCell)) == null ? void 0 : _a.trim();
+                    return (_a = stringifyCell(cellItem.value)) == null ? void 0 : _a.trim();
                   }).join(" | ")
                 };
               }
@@ -30552,24 +30567,36 @@ This will work when developing locally but NOT when deployed to production.
             list: true,
             type: "object",
             ui: {
-              itemProps: (value) => {
+              itemProps: (cell) => {
                 var _a;
-                if (value) {
-                  if (value.tableCell) {
+                if (cell) {
+                  if (cell.value) {
                     return {
-                      label: (_a = stringifyCell(value.tableCell)) == null ? void 0 : _a.trim()
+                      label: (_a = stringifyCell(cell.value)) == null ? void 0 : _a.trim()
                     };
                   }
                 }
-                return { label: "Table Cell" };
+                return { label: "Value" };
               }
             },
             fields: [
               {
-                label: "Table Cell",
-                description: "Note: table cells do not support block-level elements like headers, code blocks, or lists. Any block-level items other than the first paragraph will be ignored.",
-                name: "tableCell",
-                type: "rich-text"
+                label: "Value",
+                description: "Note: table cells do not support block-level elements like headers, code blocks, or lists. Any block-level items other than the first paragraph will be considered invalid.",
+                name: "value",
+                type: "rich-text",
+                ui: {
+                  validate(value) {
+                    try {
+                      tableCellSchema.parse(value);
+                    } catch (e) {
+                      if (e instanceof zod.z.ZodError) {
+                        return e.errors[0].message;
+                      }
+                      return e.message;
+                    }
+                  }
+                }
               }
             ]
           }
@@ -30577,9 +30604,54 @@ This will work when developing locally but NOT when deployed to production.
       }
     ]
   };
+  const tableCellSchema = zod.z.object({
+    type: zod.z.literal("root"),
+    children: zod.z.array(
+      zod.z.object({
+        type: zod.z.string(),
+        children: zod.z.any().array()
+      })
+    ).refine(
+      (value) => {
+        const firstValue = value[0];
+        return firstValue && firstValue.type === "p";
+      },
+      {
+        message: `Table cell content cannot contain block elements like headers, blockquotes, or lists.`
+      }
+    ).refine(
+      (value) => {
+        var _a;
+        if (value.length > 1) {
+          const secondBlock = value[1];
+          return secondBlock && secondBlock.children.length === 1 && !((_a = secondBlock.children[0]) == null ? void 0 : _a.text);
+        }
+        return true;
+      },
+      {
+        message: `Table cells can only have 1 block level element.`
+      }
+    )
+  });
   const stringifyCell = (cell) => {
     return mdx.stringifyMDX(cell, { name: "body", type: "rich-text" }, () => "");
   };
+  const defineSchema = (config) => {
+    schemaTools.validateSchema({ schema: config });
+    return config;
+  };
+  const defineLegacyConfig = (config) => {
+    schemaTools.validateSchema({ schema: config.schema });
+    return config;
+  };
+  const defineStaticConfig = (config) => {
+    if (!config.schema) {
+      throw new Error("Static config must have a schema");
+    }
+    schemaTools.validateSchema({ schema: config.schema });
+    return config;
+  };
+  const defineConfig = defineStaticConfig;
   Object.defineProperty(exports2, "NAMER", {
     enumerable: true,
     get: () => schemaTools.NAMER

package/dist/index.mjs

@@ -1817,8 +1817,15 @@ class Form {
       return this.finalForm.subscribe(cb, options2);
     };
     this.handleSubmit = async (values, form, cb) => {
+      var _a;
       try {
-        const response = await this.onSubmit(values, form, cb);
+        const valOverride = await ((_a = this.beforeSubmit) == null ? void 0 : _a.call(this, values));
+        if (valOverride) {
+          for (const [key, value] of Object.entries(valOverride)) {
+            form.change(key, value);
+          }
+        }
+        const response = await this.onSubmit(valOverride || values, form, cb);
         form.initialize(values);
         return response;
       } catch (error) {
@@ -2356,6 +2363,7 @@ const InnerField = ({ field, form, fieldPlugins, index, activeFieldName }) => {
     {
       name: field.name,
       key: field.name,
+      isEqual: (a, b) => isEqual(field, a, b),
       type,
       parse: parse2 ? (value, name) => parse2(value, name, field) : void 0,
       format: format2 ? (value, name) => format2(value, name, field) : void 0,
@@ -2413,6 +2421,18 @@ function getProp(name, field, plugin) {
   }
   return prop;
 }
+const isEqual = (field, a, b) => {
+  const replacer = (key, value) => {
+    if (key === "id") {
+      return void 0;
+    }
+    return value;
+  };
+  if (field.type === "rich-text") {
+    return JSON.stringify(a, replacer) === JSON.stringify(b, replacer);
+  }
+  return a === b;
+};
 const FF = Form$1;
 const FormLegacy = ({ form, children }) => {
   const [i, setI] = React.useState(0);
@@ -2457,7 +2477,7 @@ const Button = ({
   disabled,
   rounded = "full",
   children,
-  className,
+  className = "",
   ...props
 }) => {
   const baseClasses = "icon-parent inline-flex items-center font-medium focus:outline-none focus:ring-2 focus:shadow-outline text-center inline-flex justify-center transition-all duration-150 ease-out ";
@@ -7120,7 +7140,7 @@ const BranchSelector = ({
           toolbarItems: [
             branch.githubPullRequestUrl && {
               name: "github-pr",
-              label: "View in Github",
+              label: "View in GitHub",
               Icon: /* @__PURE__ */ React.createElement(BiLinkExternal, { className: "w-5 h-auto text-blue-500 opacity-70" }),
               onMouseDown: () => {
                 window.open(branch.githubPullRequestUrl, "_blank");
@@ -7542,6 +7562,10 @@ class TinaMediaStore {
           `${this.url}/upload_url/${path}`,
           { method: "GET" }
         );
+        if (res.status === 412) {
+          const { message = "Unexpected error generating upload url" } = await res.json();
+          throw new Error(message);
+        }
         const { signedUrl } = await res.json();
         if (!signedUrl) {
           throw new Error("Unexpected error generating upload url");
@@ -10118,7 +10142,7 @@ class TinaCMS extends CMS {
         return {
           error: event.error,
           level: "error",
-          message: `Failed to upload file(s) ${event == null ? void 0 : event.uploaded.map((x) => x.file.name).join(", ")}. See error message: 
+          message: `Failed to upload file(s) ${event == null ? void 0 : event.uploaded.map((x) => x.file.name).join(", ")}. 
 
  ${event == null ? void 0 : event.error.toString()}`
         };
@@ -10829,6 +10853,16 @@ const FormBuilder = ({
   const [createBranchModalOpen, setCreateBranchModalOpen] = React.useState(false);
   const tinaForm = form.tinaForm;
   const finalForm = form.tinaForm.finalForm;
+  const schema = cms.api.tina.schema;
+  React.useEffect(() => {
+    var _a;
+    const collection = schema.getCollectionByFullPath(tinaForm.relativePath);
+    if ((_a = collection == null ? void 0 : collection.ui) == null ? void 0 : _a.beforeSubmit) {
+      tinaForm.beforeSubmit = (values) => collection.ui.beforeSubmit({ cms, form: tinaForm, values });
+    } else {
+      tinaForm.beforeSubmit = void 0;
+    }
+  }, [tinaForm.relativePath]);
   const moveArrayItem = React.useCallback(
     (result) => {
       if (!result.destination || !finalForm)
@@ -10861,18 +10895,7 @@ const FormBuilder = ({
     {
       key: tinaForm.id,
       form: tinaForm.finalForm,
-      onSubmit: async (values, form2, cb) => {
-        var _a, _b;
-        const schema = cms.api.tina.schema;
-        const collection = schema.getCollectionByFullPath(tinaForm.relativePath);
-        const valOverride = ((_a = collection == null ? void 0 : collection.ui) == null ? void 0 : _a.beforeSubmit) ? await ((_b = collection == null ? void 0 : collection.ui) == null ? void 0 : _b.beforeSubmit({ cms, values, form: tinaForm })) : false;
-        if (valOverride) {
-          for (const [key, value] of Object.entries(valOverride)) {
-            form2.change(key, value);
-          }
-        }
-        return tinaForm.onSubmit(valOverride || values, form2, cb);
-      }
+      onSubmit: tinaForm.onSubmit
     },
     ({
       handleSubmit,
@@ -29437,8 +29460,7 @@ const SearchInput = ({
         setSearch(searchInput);
         setSearchLoaded(false);
       },
-      variant: "primary",
-      type: "submit"
+      variant: "primary"
     },
     "Search ",
     /* @__PURE__ */ React__default.createElement(BiSearch, { className: "w-5 h-full ml-1.5 opacity-70" })
@@ -29722,13 +29744,13 @@ const RenderForm$1 = ({
   }
   const defaultItem = customDefaults || // @ts-ignore internal types aren't up to date
   ((_d = template.ui) == null ? void 0 : _d.defaultItem) || // @ts-ignore
-  (template == null ? void 0 : template.defaultItem);
+  (template == null ? void 0 : template.defaultItem) || {};
   const form = useMemo(() => {
     var _a2, _b2;
     const folderName = folder.fullyQualifiedName ? folder.name : "";
     return new Form({
       crudType: "create",
-      initialValues: typeof defaultItem === "function" ? defaultItem() : defaultItem,
+      initialValues: typeof defaultItem === "function" ? { ...defaultItem(), _template: templateName } : { ...defaultItem, _template: templateName },
       extraSubscribeValues: { active: true, submitting: true, touched: true },
       onChange: (values) => {
         var _a3, _b3;
@@ -30260,10 +30282,12 @@ const MaybeRedirectToPreview = ({
   redirect,
   children
 }) => {
+  const cms = useCMS$1();
   const navigate = useNavigate();
   React__default.useEffect(() => {
+    const basePath = cms.flags.get("tina-basepath");
     if (redirect) {
-      navigate("/~");
+      navigate(`/~${basePath ? `/${basePath}` : ""}`);
     }
   }, [redirect]);
   return children;
@@ -30507,22 +30531,6 @@ class RouteMappingPlugin {
     this.mapper = mapper;
   }
 }
-const defineSchema = (config) => {
-  validateSchema({ schema: config });
-  return config;
-};
-const defineLegacyConfig = (config) => {
-  validateSchema({ schema: config.schema });
-  return config;
-};
-const defineStaticConfig = (config) => {
-  if (!config.schema) {
-    throw new Error("Static config must have a schema");
-  }
-  validateSchema({ schema: config.schema });
-  return config;
-};
-const defineConfig = defineStaticConfig;
 const tinaTableTemplate = {
   name: "table",
   label: "Table",
@@ -30532,6 +30540,13 @@ const tinaTableTemplate = {
       label: "First row is a header",
       type: "boolean"
     },
+    {
+      name: "align",
+      label: "Align",
+      type: "string",
+      list: true,
+      description: 'Possible values: "left", "right", or "center".'
+    },
     {
       name: "tableRows",
       label: "Rows",
@@ -30544,7 +30559,7 @@ const tinaTableTemplate = {
               return {
                 label: value.tableCells.map((cellItem) => {
                   var _a;
-                  return (_a = stringifyCell(cellItem.tableCell)) == null ? void 0 : _a.trim();
+                  return (_a = stringifyCell(cellItem.value)) == null ? void 0 : _a.trim();
                 }).join(" | ")
               };
             }
@@ -30559,24 +30574,36 @@ const tinaTableTemplate = {
           list: true,
           type: "object",
           ui: {
-            itemProps: (value) => {
+            itemProps: (cell) => {
               var _a;
-              if (value) {
-                if (value.tableCell) {
+              if (cell) {
+                if (cell.value) {
                   return {
-                    label: (_a = stringifyCell(value.tableCell)) == null ? void 0 : _a.trim()
+                    label: (_a = stringifyCell(cell.value)) == null ? void 0 : _a.trim()
                   };
                 }
               }
-              return { label: "Table Cell" };
+              return { label: "Value" };
             }
           },
           fields: [
             {
-              label: "Table Cell",
-              description: "Note: table cells do not support block-level elements like headers, code blocks, or lists. Any block-level items other than the first paragraph will be ignored.",
-              name: "tableCell",
-              type: "rich-text"
+              label: "Value",
+              description: "Note: table cells do not support block-level elements like headers, code blocks, or lists. Any block-level items other than the first paragraph will be considered invalid.",
+              name: "value",
+              type: "rich-text",
+              ui: {
+                validate(value) {
+                  try {
+                    tableCellSchema.parse(value);
+                  } catch (e) {
+                    if (e instanceof z.ZodError) {
+                      return e.errors[0].message;
+                    }
+                    return e.message;
+                  }
+                }
+              }
             }
           ]
         }
@@ -30584,9 +30611,54 @@ const tinaTableTemplate = {
     }
   ]
 };
+const tableCellSchema = z.object({
+  type: z.literal("root"),
+  children: z.array(
+    z.object({
+      type: z.string(),
+      children: z.any().array()
+    })
+  ).refine(
+    (value) => {
+      const firstValue = value[0];
+      return firstValue && firstValue.type === "p";
+    },
+    {
+      message: `Table cell content cannot contain block elements like headers, blockquotes, or lists.`
+    }
+  ).refine(
+    (value) => {
+      var _a;
+      if (value.length > 1) {
+        const secondBlock = value[1];
+        return secondBlock && secondBlock.children.length === 1 && !((_a = secondBlock.children[0]) == null ? void 0 : _a.text);
+      }
+      return true;
+    },
+    {
+      message: `Table cells can only have 1 block level element.`
+    }
+  )
+});
 const stringifyCell = (cell) => {
   return stringifyMDX(cell, { name: "body", type: "rich-text" }, () => "");
 };
+const defineSchema = (config) => {
+  validateSchema({ schema: config });
+  return config;
+};
+const defineLegacyConfig = (config) => {
+  validateSchema({ schema: config.schema });
+  return config;
+};
+const defineStaticConfig = (config) => {
+  if (!config.schema) {
+    throw new Error("Static config must have a schema");
+  }
+  validateSchema({ schema: config.schema });
+  return config;
+};
+const defineConfig = defineStaticConfig;
 export {
   ActionButton,
   AddIcon,

package/dist/rich-text/index.d.ts

@@ -81,17 +81,13 @@ declare type BaseComponents = {
     html_inline?: {
         value: string;
     };
-    th?: {
-        children: JSX.Element;
-    };
-    td?: {
-        children: JSX.Element;
-    };
-    tr?: {
-        children: JSX.Element;
-    };
     table?: {
-        children: JSX.Element;
+        align?: ('left' | 'right' | 'center')[];
+        tableRows: {
+            tableCells: {
+                value: TinaMarkdownContent;
+            }[];
+        }[];
     };
     component_missing?: {
         name: string;

package/dist/rich-text/index.js

@@ -72,7 +72,7 @@
     return MNode;
   };
   const Node = ({ components, child }) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const { children, ...props } = child;
     switch (child.type) {
       case "h1":
@@ -154,23 +154,18 @@
             const header = (_e = (_d = child.props) == null ? void 0 : _d.tableRows) == null ? void 0 : _e.at(0);
             const TableComponent = components["table"] || ((props2) => /* @__PURE__ */ React.createElement("table", { ...props2 }));
             const TrComponent = components["tr"] || ((props2) => /* @__PURE__ */ React.createElement("tr", { ...props2 }));
-            const ThComponent = components["th"] || ((props2) => /* @__PURE__ */ React.createElement("th", { ...props2 }));
-            const TdComponent = components["td"] || ((props2) => /* @__PURE__ */ React.createElement("td", { ...props2 }));
+            const ThComponent = components["th"] || ((props2) => /* @__PURE__ */ React.createElement("th", { style: { textAlign: (props2 == null ? void 0 : props2.align) || "auto" }, ...props2 }));
+            const TdComponent = components["td"] || ((props2) => /* @__PURE__ */ React.createElement("td", { style: { textAlign: (props2 == null ? void 0 : props2.align) || "auto" }, ...props2 }));
+            const align = ((_f = child.props) == null ? void 0 : _f.align) || [];
             return /* @__PURE__ */ React.createElement(TableComponent, null, firstRowHeader && /* @__PURE__ */ React.createElement("thead", null, /* @__PURE__ */ React.createElement(TrComponent, null, header.tableCells.map((c, i) => {
               return /* @__PURE__ */ React.createElement(
                 TinaMarkdown,
                 {
                   key: i,
                   components: {
-                    p: (props2) => {
-                      if (ThComponent) {
-                        return /* @__PURE__ */ React.createElement(ThComponent, { ...props2 });
-                      } else {
-                        return /* @__PURE__ */ React.createElement("th", { ...props2 });
-                      }
-                    }
+                    p: (props2) => /* @__PURE__ */ React.createElement(ThComponent, { align: align[i], ...props2 })
                   },
-                  content: c.tableCell
+                  content: c.value
                 }
               );
             }))), /* @__PURE__ */ React.createElement("tbody", null, rows.map((row, i) => {
@@ -181,15 +176,9 @@
                   {
                     key: i2,
                     components: {
-                      p: (props2) => {
-                        if (TdComponent) {
-                          return /* @__PURE__ */ React.createElement(TdComponent, { ...props2 });
-                        } else {
-                          return /* @__PURE__ */ React.createElement("td", { ...props2 });
-                        }
-                      }
+                      p: (props2) => /* @__PURE__ */ React.createElement(TdComponent, { align: align[i2], ...props2 })
                     },
-                    content: c.tableCell
+                    content: c.value
                   }
                 );
               }));

package/dist/rich-text/index.mjs

@@ -69,7 +69,7 @@ const MemoNode = (props) => {
   return MNode;
 };
 const Node = ({ components, child }) => {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
   const { children, ...props } = child;
   switch (child.type) {
     case "h1":
@@ -151,23 +151,18 @@ const Node = ({ components, child }) => {
           const header = (_e = (_d = child.props) == null ? void 0 : _d.tableRows) == null ? void 0 : _e.at(0);
           const TableComponent = components["table"] || ((props2) => /* @__PURE__ */ React.createElement("table", { ...props2 }));
           const TrComponent = components["tr"] || ((props2) => /* @__PURE__ */ React.createElement("tr", { ...props2 }));
-          const ThComponent = components["th"] || ((props2) => /* @__PURE__ */ React.createElement("th", { ...props2 }));
-          const TdComponent = components["td"] || ((props2) => /* @__PURE__ */ React.createElement("td", { ...props2 }));
+          const ThComponent = components["th"] || ((props2) => /* @__PURE__ */ React.createElement("th", { style: { textAlign: (props2 == null ? void 0 : props2.align) || "auto" }, ...props2 }));
+          const TdComponent = components["td"] || ((props2) => /* @__PURE__ */ React.createElement("td", { style: { textAlign: (props2 == null ? void 0 : props2.align) || "auto" }, ...props2 }));
+          const align = ((_f = child.props) == null ? void 0 : _f.align) || [];
           return /* @__PURE__ */ React.createElement(TableComponent, null, firstRowHeader && /* @__PURE__ */ React.createElement("thead", null, /* @__PURE__ */ React.createElement(TrComponent, null, header.tableCells.map((c, i) => {
             return /* @__PURE__ */ React.createElement(
               TinaMarkdown,
               {
                 key: i,
                 components: {
-                  p: (props2) => {
-                    if (ThComponent) {
-                      return /* @__PURE__ */ React.createElement(ThComponent, { ...props2 });
-                    } else {
-                      return /* @__PURE__ */ React.createElement("th", { ...props2 });
-                    }
-                  }
+                  p: (props2) => /* @__PURE__ */ React.createElement(ThComponent, { align: align[i], ...props2 })
                 },
-                content: c.tableCell
+                content: c.value
               }
             );
           }))), /* @__PURE__ */ React.createElement("tbody", null, rows.map((row, i) => {
@@ -178,15 +173,9 @@ const Node = ({ components, child }) => {
                 {
                   key: i2,
                   components: {
-                    p: (props2) => {
-                      if (TdComponent) {
-                        return /* @__PURE__ */ React.createElement(TdComponent, { ...props2 });
-                      } else {
-                        return /* @__PURE__ */ React.createElement("td", { ...props2 });
-                      }
-                    }
+                    p: (props2) => /* @__PURE__ */ React.createElement(TdComponent, { align: align[i2], ...props2 })
                   },
-                  content: c.tableCell
+                  content: c.value
                 }
               );
             }));

package/dist/table.d.ts

@@ -0,0 +1,5 @@
+import { RichTextTemplate } from '@tinacms/schema-tools';
+/**
+ * Out-of-the-box template for rendering basic markdown tables
+ */
+export declare const tinaTableTemplate: RichTextTemplate;

package/dist/toolkit/forms/form.d.ts

@@ -44,6 +44,7 @@ export declare class Form<S = any, F extends Field = AnyField> implements Plugin
     loading: boolean;
     relativePath: string;
     crudType?: 'create' | 'update';
+    beforeSubmit?: (values: S) => Promise<void | S>;
     constructor({ id, label, fields, actions, buttons, global, reset, loadInitialValues, onChange, queries, ...options }: FormOptions<S, F>);
     /**
      * A unique identifier for Forms.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinacms",
-  "version": "1.5.22",
+  "version": "1.5.23",
   "main": "dist/index.js",
   "module": "./dist/index.mjs",
   "exports": {
@@ -70,8 +70,8 @@
     "@react-types/shared": "^3.10.0",
     "@sambego/storybook-styles": "^1.0.0",
     "@tinacms/schema-tools": "1.4.13",
-    "@tinacms/search": "1.0.12",
-    "@tinacms/mdx": "1.3.20",
+    "@tinacms/search": "1.0.13",
+    "@tinacms/mdx": "1.3.21",
     "@tinacms/sharedctx": "1.0.2",
     "@udecode/plate-headless": "^21.4.0",
     "atob": "2.1.2",
@@ -80,7 +80,7 @@
     "date-fns": "2.30.0",
     "encoding": "0.1.13",
     "fetch-ponyfill": "^7.1.0",
-    "final-form": "4.20.4",
+    "final-form": "4.20.10",
     "final-form-arrays": "^3.0.1",
     "final-form-set-field-data": "^1.0.2",
     "graphql": "15.8.0",