tinacms 1.5.21 → 1.5.22

package/dist/client.js

@@ -7,12 +7,22 @@
   const HeadersDefined = typeof Headers === "undefined" ? HeadersPonyfill : Headers;
   const TINA_HOST = "content.tinajs.io";
   class TinaClient {
-    constructor({ token, url, queries }) {
+    constructor({
+      token,
+      url,
+      queries,
+      errorPolicy
+    }) {
       this.apiUrl = url;
       this.readonlyToken = token == null ? void 0 : token.trim();
       this.queries = queries(this);
+      this.errorPolicy = errorPolicy || "throw";
     }
-    async request(args) {
+    async request({
+      errorPolicy,
+      ...args
+    }) {
+      const errorPolicyDefined = errorPolicy || this.errorPolicy;
       const headers = new HeadersDefined();
       if (this.readonlyToken) {
         headers.append("X-API-KEY", this.readonlyToken);
@@ -39,16 +49,16 @@
         );
       }
       const json = await res.json();
-      if (json.errors) {
+      if (json.errors && errorPolicyDefined === "throw") {
         throw new Error(
           `Unable to fetch, please see our FAQ for more information: https://tina.io/docs/errors/faq/
-
         Errors: 
 	${json.errors.map((error) => error.message).join("\n")}`
         );
       }
       return {
         data: json == null ? void 0 : json.data,
+        errors: (json == null ? void 0 : json.errors) || null,
         query: args.query
       };
     }

package/dist/client.mjs

@@ -4,12 +4,22 @@ const fetchDefined = typeof fetch === "undefined" ? fetchPonyfillFN : fetch;
 const HeadersDefined = typeof Headers === "undefined" ? HeadersPonyfill : Headers;
 const TINA_HOST = "content.tinajs.io";
 class TinaClient {
-  constructor({ token, url, queries }) {
+  constructor({
+    token,
+    url,
+    queries,
+    errorPolicy
+  }) {
     this.apiUrl = url;
     this.readonlyToken = token == null ? void 0 : token.trim();
     this.queries = queries(this);
+    this.errorPolicy = errorPolicy || "throw";
   }
-  async request(args) {
+  async request({
+    errorPolicy,
+    ...args
+  }) {
+    const errorPolicyDefined = errorPolicy || this.errorPolicy;
     const headers = new HeadersDefined();
     if (this.readonlyToken) {
       headers.append("X-API-KEY", this.readonlyToken);
@@ -36,16 +46,16 @@ class TinaClient {
       );
     }
     const json = await res.json();
-    if (json.errors) {
+    if (json.errors && errorPolicyDefined === "throw") {
       throw new Error(
         `Unable to fetch, please see our FAQ for more information: https://tina.io/docs/errors/faq/
-
         Errors: 
 	${json.errors.map((error) => error.message).join("\n")}`
       );
     }
     return {
       data: json == null ? void 0 : json.data,
+      errors: (json == null ? void 0 : json.errors) || null,
       query: args.query
     };
   }

package/dist/dev-tools.js

@@ -72,6 +72,7 @@
     return MNode;
   };
   const Node = ({ components, child }) => {
+    var _a, _b, _c, _d, _e;
     const { children, ...props } = child;
     switch (child.type) {
       case "h1":
@@ -147,6 +148,53 @@
           const props2 = child.props ? child.props : {};
           return /* @__PURE__ */ React.createElement(Component, { ...props2 });
         } else {
+          if (child.name === "table") {
+            const firstRowHeader = (_a = child.props) == null ? void 0 : _a.firstRowHeader;
+            const rows = (firstRowHeader ? (_b = child.props) == null ? void 0 : _b.tableRows.filter((_, i) => i !== 0) : (_c = child.props) == null ? void 0 : _c.tableRows) || [];
+            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 }));
+            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 });
+                      }
+                    }
+                  },
+                  content: c.tableCell
+                }
+              );
+            }))), /* @__PURE__ */ React.createElement("tbody", null, rows.map((row, i) => {
+              var _a2;
+              return /* @__PURE__ */ React.createElement(TrComponent, { key: i }, (_a2 = row == null ? void 0 : row.tableCells) == null ? void 0 : _a2.map((c, i2) => {
+                return /* @__PURE__ */ React.createElement(
+                  TinaMarkdown,
+                  {
+                    key: i2,
+                    components: {
+                      p: (props2) => {
+                        if (TdComponent) {
+                          return /* @__PURE__ */ React.createElement(TdComponent, { ...props2 });
+                        } else {
+                          return /* @__PURE__ */ React.createElement("td", { ...props2 });
+                        }
+                      }
+                    },
+                    content: c.tableCell
+                  }
+                );
+              }));
+            })));
+          }
           const ComponentMissing = components["component_missing"];
           if (ComponentMissing) {
             return /* @__PURE__ */ React.createElement(ComponentMissing, { name: child.name });

package/dist/dev-tools.mjs

@@ -69,6 +69,7 @@ const MemoNode = (props) => {
   return MNode;
 };
 const Node = ({ components, child }) => {
+  var _a, _b, _c, _d, _e;
   const { children, ...props } = child;
   switch (child.type) {
     case "h1":
@@ -144,6 +145,53 @@ const Node = ({ components, child }) => {
         const props2 = child.props ? child.props : {};
         return /* @__PURE__ */ React.createElement(Component, { ...props2 });
       } else {
+        if (child.name === "table") {
+          const firstRowHeader = (_a = child.props) == null ? void 0 : _a.firstRowHeader;
+          const rows = (firstRowHeader ? (_b = child.props) == null ? void 0 : _b.tableRows.filter((_, i) => i !== 0) : (_c = child.props) == null ? void 0 : _c.tableRows) || [];
+          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 }));
+          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 });
+                    }
+                  }
+                },
+                content: c.tableCell
+              }
+            );
+          }))), /* @__PURE__ */ React.createElement("tbody", null, rows.map((row, i) => {
+            var _a2;
+            return /* @__PURE__ */ React.createElement(TrComponent, { key: i }, (_a2 = row == null ? void 0 : row.tableCells) == null ? void 0 : _a2.map((c, i2) => {
+              return /* @__PURE__ */ React.createElement(
+                TinaMarkdown,
+                {
+                  key: i2,
+                  components: {
+                    p: (props2) => {
+                      if (TdComponent) {
+                        return /* @__PURE__ */ React.createElement(TdComponent, { ...props2 });
+                      } else {
+                        return /* @__PURE__ */ React.createElement("td", { ...props2 });
+                      }
+                    }
+                  },
+                  content: c.tableCell
+                }
+              );
+            }));
+          })));
+        }
         const ComponentMissing = components["component_missing"];
         if (ComponentMissing) {
           return /* @__PURE__ */ React.createElement(ComponentMissing, { name: child.name });

package/dist/index.d.ts

@@ -19,6 +19,7 @@ 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 };
@@ -57,3 +58,7 @@ 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;

package/dist/index.js

@@ -1,6 +1,6 @@
 (function(global, factory) {
-  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("zod"), require("react"), require("react-dom"), require("@udecode/plate-headless"), require("@monaco-editor/react"), require("slate-react"), require("@headlessui/react"), require("slate"), require("final-form-arrays"), require("final-form-set-field-data"), require("final-form"), require("react-final-form"), require("prop-types"), require("react-beautiful-dnd"), require("@radix-ui/react-popover"), require("react-color"), require("color-string"), require("react-dropzone"), require("is-hotkey"), require("@floating-ui/dom"), require("moment"), require("date-fns"), require("@react-hook/window-size"), require("@tinacms/sharedctx"), require("graphql"), require("graphql-tag"), require("@tinacms/schema-tools"), require("yup"), require("@graphql-inspector/core"), require("react-router-dom")) : typeof define === "function" && define.amd ? define(["exports", "zod", "react", "react-dom", "@udecode/plate-headless", "@monaco-editor/react", "slate-react", "@headlessui/react", "slate", "final-form-arrays", "final-form-set-field-data", "final-form", "react-final-form", "prop-types", "react-beautiful-dnd", "@radix-ui/react-popover", "react-color", "color-string", "react-dropzone", "is-hotkey", "@floating-ui/dom", "moment", "date-fns", "@react-hook/window-size", "@tinacms/sharedctx", "graphql", "graphql-tag", "@tinacms/schema-tools", "yup", "@graphql-inspector/core", "react-router-dom"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global.tinacms = {}, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP));
-})(this, function(exports2, zod, React, reactDom, plateHeadless, MonacoEditor, slateReact, react, slate, arrayMutators, setFieldData, finalForm, reactFinalForm, PropTypes, reactBeautifulDnd, Popover$1, pkg$1, pkg, dropzone, isHotkey, dom, moment, dateFns, windowSize, sharedctx, graphql, gql$1, schemaTools, yup, core, reactRouterDom) {
+  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("zod"), require("react"), require("react-dom"), require("@udecode/plate-headless"), require("@monaco-editor/react"), require("slate-react"), require("@headlessui/react"), require("slate"), require("final-form-arrays"), require("final-form-set-field-data"), require("final-form"), require("react-final-form"), require("prop-types"), require("react-beautiful-dnd"), require("@radix-ui/react-popover"), require("react-color"), require("color-string"), require("react-dropzone"), require("@tinacms/sharedctx"), require("is-hotkey"), require("@floating-ui/dom"), require("moment"), require("date-fns"), require("@react-hook/window-size"), require("graphql"), require("graphql-tag"), require("@tinacms/schema-tools"), require("yup"), require("@graphql-inspector/core"), require("react-router-dom"), require("@tinacms/mdx")) : typeof define === "function" && define.amd ? define(["exports", "zod", "react", "react-dom", "@udecode/plate-headless", "@monaco-editor/react", "slate-react", "@headlessui/react", "slate", "final-form-arrays", "final-form-set-field-data", "final-form", "react-final-form", "prop-types", "react-beautiful-dnd", "@radix-ui/react-popover", "react-color", "color-string", "react-dropzone", "@tinacms/sharedctx", "is-hotkey", "@floating-ui/dom", "moment", "date-fns", "@react-hook/window-size", "graphql", "graphql-tag", "@tinacms/schema-tools", "yup", "@graphql-inspector/core", "react-router-dom", "@tinacms/mdx"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global.tinacms = {}, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP));
+})(this, function(exports2, zod, React, reactDom, plateHeadless, MonacoEditor, slateReact, react, slate, arrayMutators, setFieldData, finalForm, reactFinalForm, PropTypes, reactBeautifulDnd, Popover$1, pkg$1, pkg, dropzone, sharedctx, isHotkey, dom, moment, dateFns, windowSize, graphql, gql$1, schemaTools, yup, core, reactRouterDom, mdx) {
   "use strict";var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => {
@@ -11105,7 +11105,7 @@ var __publicField = (obj, key, value) => {
   };
   const NestedForm = (props) => {
     const FormPortal = useFormPortal();
-    const id = React.useMemo(() => uuid(), [props.id]);
+    const id = React.useMemo(() => uuid(), [props.id, props.initialValues]);
     const form = React.useMemo(() => {
       return new Form({
         ...props,
@@ -11116,7 +11116,7 @@ var __publicField = (obj, key, value) => {
         onSubmit: () => {
         }
       });
-    }, [id]);
+    }, [id, props.onChange]);
     return /* @__PURE__ */ React.createElement(FormPortal, null, ({ zIndexShift }) => /* @__PURE__ */ React.createElement(GroupPanel, { isExpanded: true, style: { zIndex: zIndexShift + 1e3 } }, /* @__PURE__ */ React.createElement(PanelHeader$1, { onClick: props.onClose }, props.label), /* @__PURE__ */ React.createElement(FormBuilder, { form: { tinaForm: form }, hideFooter: true })));
   };
   const handleCloseBase = (editor, element) => {
@@ -11997,26 +11997,38 @@ var __publicField = (obj, key, value) => {
     }
     plateHeadless.wrapNodes(editor, baseLink, { split: true });
   };
+  const matchLink = (n) => !slate.Editor.isEditor(n) && slate.Element.isElement(n) && n.type === plateHeadless.ELEMENT_LINK;
   const LinkForm = (props) => {
+    const [initialValues, setInitialValues] = React.useState({ url: "", title: "" });
+    const [formValues, setFormValues] = React.useState({});
     const editor = plateHeadless.useEditorState();
     const selection = React.useMemo(() => editor.selection, []);
-    const handleChange = (values) => {
+    React.useEffect(() => {
+      const [link] = getLinks(editor);
+      setInitialValues({
+        url: link && link[0].url ? link[0].url : "",
+        title: link && link[0].title ? link[0].title : ""
+      });
+    }, [editor, setInitialValues]);
+    const handleUpdate = React.useCallback(() => {
       const linksInSelection = plateHeadless.getNodeEntries(editor, {
-        match: (n) => !slate.Editor.isEditor(n) && slate.Element.isElement(n) && n.type === plateHeadless.ELEMENT_LINK,
+        match: matchLink,
         at: selection
       });
       if (linksInSelection) {
         for (const [, location] of linksInSelection) {
-          plateHeadless.setNodes(editor, values, {
-            match: (n) => {
-              return !slate.Editor.isEditor(n) && slate.Element.isElement(n) && n.type === plateHeadless.ELEMENT_LINK;
-            },
+          plateHeadless.setNodes(editor, formValues, {
+            match: matchLink,
             at: location
           });
         }
       }
-    };
-    const [link] = getLinks(editor);
+      props.onClose();
+    }, [editor, formValues]);
+    const UpdateLink = React.useCallback(
+      () => /* @__PURE__ */ React.createElement(Button, { variant: "primary", onClick: handleUpdate }, "Update Link"),
+      [handleUpdate]
+    );
     return /* @__PURE__ */ React.createElement(
       NestedForm,
       {
@@ -12024,32 +12036,35 @@ var __publicField = (obj, key, value) => {
         label: "Link",
         fields: [
           { label: "URL", name: "url", component: "text" },
-          { label: "Title", name: "title", component: "text" }
+          { label: "Title", name: "title", component: "text" },
+          { component: UpdateLink, name: "update" }
         ],
-        initialValues: {
-          url: link ? link[0].url : "",
-          title: link ? link[0].title : ""
-        },
-        onChange: handleChange,
-        onClose: props.onClose
+        initialValues,
+        onChange: (values) => setFormValues(values),
+        onClose: () => {
+          if (initialValues.title === "" && initialValues.url === "") {
+            unwrapLink(editor, selection);
+          }
+          props.onClose();
+        }
       }
     );
   };
-  const isLinkActive = (editor) => {
-    const [link] = getLinks(editor);
-    return !!link;
-  };
   const unwrapLink = (editor, selection) => {
     plateHeadless.unwrapNodes(editor, {
-      match: (n) => !slate.Editor.isEditor(n) && slate.Element.isElement(n) && n.type === plateHeadless.ELEMENT_LINK,
+      match: matchLink,
       at: selection || void 0
     });
   };
   const getLinks = (editor) => {
     return plateHeadless.getNodeEntries(editor, {
-      match: (n) => !slate.Editor.isEditor(n) && slate.Element.isElement(n) && n.type === plateHeadless.ELEMENT_LINK
+      match: matchLink
     });
   };
+  const isLinkActive = (editor) => {
+    const [link] = getLinks(editor);
+    return !!link;
+  };
   const ToolbarItem = ({
     hidden,
     label,
@@ -26220,7 +26235,7 @@ var __publicField = (obj, key, value) => {
       data["_id"] = `${collection.name}:${relPath}`;
       data["_relativePath"] = relPath;
     }
-    for (const f of collection.fields || (field == null ? void 0 : field.fields) || []) {
+    for (const f of (field == null ? void 0 : field.fields) || collection.fields || []) {
       if (!f.searchable) {
         delete data[f.name];
         continue;
@@ -30501,6 +30516,70 @@ This will work when developing locally but NOT when deployed to production.
     return config;
   };
   const defineConfig = defineStaticConfig;
+  const tinaTableTemplate = {
+    name: "table",
+    label: "Table",
+    fields: [
+      {
+        name: "firstRowHeader",
+        label: "First row is a header",
+        type: "boolean"
+      },
+      {
+        name: "tableRows",
+        label: "Rows",
+        type: "object",
+        list: true,
+        ui: {
+          itemProps: (value) => {
+            if (value == null ? void 0 : value.tableCells) {
+              if (Array.isArray(value.tableCells)) {
+                return {
+                  label: value.tableCells.map((cellItem) => {
+                    var _a;
+                    return (_a = stringifyCell(cellItem.tableCell)) == null ? void 0 : _a.trim();
+                  }).join(" | ")
+                };
+              }
+            }
+            return { label: "Row" };
+          }
+        },
+        fields: [
+          {
+            name: "tableCells",
+            label: "Table Cells",
+            list: true,
+            type: "object",
+            ui: {
+              itemProps: (value) => {
+                var _a;
+                if (value) {
+                  if (value.tableCell) {
+                    return {
+                      label: (_a = stringifyCell(value.tableCell)) == null ? void 0 : _a.trim()
+                    };
+                  }
+                }
+                return { label: "Table Cell" };
+              }
+            },
+            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"
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  };
+  const stringifyCell = (cell) => {
+    return mdx.stringifyMDX(cell, { name: "body", type: "rich-text" }, () => "");
+  };
   Object.defineProperty(exports2, "NAMER", {
     enumerable: true,
     get: () => schemaTools.NAMER
@@ -30713,6 +30792,7 @@ This will work when developing locally but NOT when deployed to production.
   exports2.selectFieldClasses = selectFieldClasses;
   exports2.staticRequest = staticRequest;
   exports2.textFieldClasses = textFieldClasses;
+  exports2.tinaTableTemplate = tinaTableTemplate;
   exports2.useBranchData = useBranchData;
   exports2.useCMS = useCMS$1;
   exports2.useDismissible = useDismissible;

package/dist/index.mjs

@@ -23,12 +23,12 @@ import * as Popover$1 from "@radix-ui/react-popover";
 import * as pkg$1 from "react-color";
 import * as pkg from "color-string";
 import * as dropzone from "react-dropzone";
+import { EditContext, useEditState, setEditing } from "@tinacms/sharedctx";
 import { isHotkey } from "is-hotkey";
 import { computePosition, flip, shift } from "@floating-ui/dom";
 import moment from "moment";
 import { formatDistanceToNow } from "date-fns";
 import { useWindowWidth } from "@react-hook/window-size";
-import { EditContext, useEditState, setEditing } from "@tinacms/sharedctx";
 import { getIntrospectionQuery, buildClientSchema, print, parse as parse$3, buildSchema } from "graphql";
 import gql$1 from "graphql-tag";
 import { TinaSchema, addNamespaceToSchema, parseURL, resolveForm, normalizePath, validateSchema } from "@tinacms/schema-tools";
@@ -36,6 +36,7 @@ import { NAMER, resolveField } from "@tinacms/schema-tools";
 import * as yup from "yup";
 import { diff } from "@graphql-inspector/core";
 import { NavLink, useSearchParams, useNavigate, useLocation, useParams, Link, HashRouter, Routes, Route } from "react-router-dom";
+import { stringifyMDX } from "@tinacms/mdx";
 function popupWindow(url, title, window2, w, h) {
   const y = window2.top.outerHeight / 2 + window2.top.screenY - h / 2;
   const x = window2.top.outerWidth / 2 + window2.top.screenX - w / 2;
@@ -11111,7 +11112,7 @@ const PrefixedTextField = ({ prefix = "tina/", ...props }) => {
 };
 const NestedForm = (props) => {
   const FormPortal = useFormPortal();
-  const id = React__default.useMemo(() => uuid(), [props.id]);
+  const id = React__default.useMemo(() => uuid(), [props.id, props.initialValues]);
   const form = React__default.useMemo(() => {
     return new Form({
       ...props,
@@ -11122,7 +11123,7 @@ const NestedForm = (props) => {
       onSubmit: () => {
       }
     });
-  }, [id]);
+  }, [id, props.onChange]);
   return /* @__PURE__ */ React__default.createElement(FormPortal, null, ({ zIndexShift }) => /* @__PURE__ */ React__default.createElement(GroupPanel, { isExpanded: true, style: { zIndex: zIndexShift + 1e3 } }, /* @__PURE__ */ React__default.createElement(PanelHeader$1, { onClick: props.onClose }, props.label), /* @__PURE__ */ React__default.createElement(FormBuilder, { form: { tinaForm: form }, hideFooter: true })));
 };
 const handleCloseBase = (editor, element) => {
@@ -12003,26 +12004,38 @@ const wrapOrRewrapLink = (editor) => {
   }
   wrapNodes(editor, baseLink, { split: true });
 };
+const matchLink = (n) => !Editor.isEditor(n) && Element.isElement(n) && n.type === ELEMENT_LINK;
 const LinkForm = (props) => {
+  const [initialValues, setInitialValues] = React__default.useState({ url: "", title: "" });
+  const [formValues, setFormValues] = React__default.useState({});
   const editor = useEditorState();
   const selection = React__default.useMemo(() => editor.selection, []);
-  const handleChange = (values) => {
+  useEffect(() => {
+    const [link] = getLinks(editor);
+    setInitialValues({
+      url: link && link[0].url ? link[0].url : "",
+      title: link && link[0].title ? link[0].title : ""
+    });
+  }, [editor, setInitialValues]);
+  const handleUpdate = React__default.useCallback(() => {
     const linksInSelection = getNodeEntries(editor, {
-      match: (n) => !Editor.isEditor(n) && Element.isElement(n) && n.type === ELEMENT_LINK,
+      match: matchLink,
       at: selection
     });
     if (linksInSelection) {
       for (const [, location] of linksInSelection) {
-        setNodes(editor, values, {
-          match: (n) => {
-            return !Editor.isEditor(n) && Element.isElement(n) && n.type === ELEMENT_LINK;
-          },
+        setNodes(editor, formValues, {
+          match: matchLink,
           at: location
         });
       }
     }
-  };
-  const [link] = getLinks(editor);
+    props.onClose();
+  }, [editor, formValues]);
+  const UpdateLink = React__default.useCallback(
+    () => /* @__PURE__ */ React__default.createElement(Button, { variant: "primary", onClick: handleUpdate }, "Update Link"),
+    [handleUpdate]
+  );
   return /* @__PURE__ */ React__default.createElement(
     NestedForm,
     {
@@ -12030,32 +12043,35 @@ const LinkForm = (props) => {
       label: "Link",
       fields: [
         { label: "URL", name: "url", component: "text" },
-        { label: "Title", name: "title", component: "text" }
+        { label: "Title", name: "title", component: "text" },
+        { component: UpdateLink, name: "update" }
       ],
-      initialValues: {
-        url: link ? link[0].url : "",
-        title: link ? link[0].title : ""
-      },
-      onChange: handleChange,
-      onClose: props.onClose
+      initialValues,
+      onChange: (values) => setFormValues(values),
+      onClose: () => {
+        if (initialValues.title === "" && initialValues.url === "") {
+          unwrapLink(editor, selection);
+        }
+        props.onClose();
+      }
     }
   );
 };
-const isLinkActive = (editor) => {
-  const [link] = getLinks(editor);
-  return !!link;
-};
 const unwrapLink = (editor, selection) => {
   unwrapNodes(editor, {
-    match: (n) => !Editor.isEditor(n) && Element.isElement(n) && n.type === ELEMENT_LINK,
+    match: matchLink,
     at: selection || void 0
   });
 };
 const getLinks = (editor) => {
   return getNodeEntries(editor, {
-    match: (n) => !Editor.isEditor(n) && Element.isElement(n) && n.type === ELEMENT_LINK
+    match: matchLink
   });
 };
+const isLinkActive = (editor) => {
+  const [link] = getLinks(editor);
+  return !!link;
+};
 const ToolbarItem = ({
   hidden,
   label,
@@ -26226,7 +26242,7 @@ const processDocumentForIndexing = (data, path, collection, textIndexLength, fie
     data["_id"] = `${collection.name}:${relPath}`;
     data["_relativePath"] = relPath;
   }
-  for (const f of collection.fields || (field == null ? void 0 : field.fields) || []) {
+  for (const f of (field == null ? void 0 : field.fields) || collection.fields || []) {
     if (!f.searchable) {
       delete data[f.name];
       continue;
@@ -30507,6 +30523,70 @@ const defineStaticConfig = (config) => {
   return config;
 };
 const defineConfig = defineStaticConfig;
+const tinaTableTemplate = {
+  name: "table",
+  label: "Table",
+  fields: [
+    {
+      name: "firstRowHeader",
+      label: "First row is a header",
+      type: "boolean"
+    },
+    {
+      name: "tableRows",
+      label: "Rows",
+      type: "object",
+      list: true,
+      ui: {
+        itemProps: (value) => {
+          if (value == null ? void 0 : value.tableCells) {
+            if (Array.isArray(value.tableCells)) {
+              return {
+                label: value.tableCells.map((cellItem) => {
+                  var _a;
+                  return (_a = stringifyCell(cellItem.tableCell)) == null ? void 0 : _a.trim();
+                }).join(" | ")
+              };
+            }
+          }
+          return { label: "Row" };
+        }
+      },
+      fields: [
+        {
+          name: "tableCells",
+          label: "Table Cells",
+          list: true,
+          type: "object",
+          ui: {
+            itemProps: (value) => {
+              var _a;
+              if (value) {
+                if (value.tableCell) {
+                  return {
+                    label: (_a = stringifyCell(value.tableCell)) == null ? void 0 : _a.trim()
+                  };
+                }
+              }
+              return { label: "Table Cell" };
+            }
+          },
+          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"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+};
+const stringifyCell = (cell) => {
+  return stringifyMDX(cell, { name: "body", type: "rich-text" }, () => "");
+};
 export {
   ActionButton,
   AddIcon,
@@ -30714,6 +30794,7 @@ export {
   selectFieldClasses,
   staticRequest,
   textFieldClasses,
+  tinaTableTemplate,
   useBranchData,
   useCMS$1 as useCMS,
   useDismissible,

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

@@ -81,6 +81,18 @@ declare type BaseComponents = {
     html_inline?: {
         value: string;
     };
+    th?: {
+        children: JSX.Element;
+    };
+    td?: {
+        children: JSX.Element;
+    };
+    tr?: {
+        children: JSX.Element;
+    };
+    table?: {
+        children: JSX.Element;
+    };
     component_missing?: {
         name: string;
     };

package/dist/rich-text/index.js

@@ -72,6 +72,7 @@
     return MNode;
   };
   const Node = ({ components, child }) => {
+    var _a, _b, _c, _d, _e;
     const { children, ...props } = child;
     switch (child.type) {
       case "h1":
@@ -147,6 +148,53 @@
           const props2 = child.props ? child.props : {};
           return /* @__PURE__ */ React.createElement(Component, { ...props2 });
         } else {
+          if (child.name === "table") {
+            const firstRowHeader = (_a = child.props) == null ? void 0 : _a.firstRowHeader;
+            const rows = (firstRowHeader ? (_b = child.props) == null ? void 0 : _b.tableRows.filter((_, i) => i !== 0) : (_c = child.props) == null ? void 0 : _c.tableRows) || [];
+            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 }));
+            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 });
+                      }
+                    }
+                  },
+                  content: c.tableCell
+                }
+              );
+            }))), /* @__PURE__ */ React.createElement("tbody", null, rows.map((row, i) => {
+              var _a2;
+              return /* @__PURE__ */ React.createElement(TrComponent, { key: i }, (_a2 = row == null ? void 0 : row.tableCells) == null ? void 0 : _a2.map((c, i2) => {
+                return /* @__PURE__ */ React.createElement(
+                  TinaMarkdown,
+                  {
+                    key: i2,
+                    components: {
+                      p: (props2) => {
+                        if (TdComponent) {
+                          return /* @__PURE__ */ React.createElement(TdComponent, { ...props2 });
+                        } else {
+                          return /* @__PURE__ */ React.createElement("td", { ...props2 });
+                        }
+                      }
+                    },
+                    content: c.tableCell
+                  }
+                );
+              }));
+            })));
+          }
           const ComponentMissing = components["component_missing"];
           if (ComponentMissing) {
             return /* @__PURE__ */ React.createElement(ComponentMissing, { name: child.name });

package/dist/rich-text/index.mjs

@@ -69,6 +69,7 @@ const MemoNode = (props) => {
   return MNode;
 };
 const Node = ({ components, child }) => {
+  var _a, _b, _c, _d, _e;
   const { children, ...props } = child;
   switch (child.type) {
     case "h1":
@@ -144,6 +145,53 @@ const Node = ({ components, child }) => {
         const props2 = child.props ? child.props : {};
         return /* @__PURE__ */ React.createElement(Component, { ...props2 });
       } else {
+        if (child.name === "table") {
+          const firstRowHeader = (_a = child.props) == null ? void 0 : _a.firstRowHeader;
+          const rows = (firstRowHeader ? (_b = child.props) == null ? void 0 : _b.tableRows.filter((_, i) => i !== 0) : (_c = child.props) == null ? void 0 : _c.tableRows) || [];
+          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 }));
+          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 });
+                    }
+                  }
+                },
+                content: c.tableCell
+              }
+            );
+          }))), /* @__PURE__ */ React.createElement("tbody", null, rows.map((row, i) => {
+            var _a2;
+            return /* @__PURE__ */ React.createElement(TrComponent, { key: i }, (_a2 = row == null ? void 0 : row.tableCells) == null ? void 0 : _a2.map((c, i2) => {
+              return /* @__PURE__ */ React.createElement(
+                TinaMarkdown,
+                {
+                  key: i2,
+                  components: {
+                    p: (props2) => {
+                      if (TdComponent) {
+                        return /* @__PURE__ */ React.createElement(TdComponent, { ...props2 });
+                      } else {
+                        return /* @__PURE__ */ React.createElement("td", { ...props2 });
+                      }
+                    }
+                  },
+                  content: c.tableCell
+                }
+              );
+            }));
+          })));
+        }
         const ComponentMissing = components["component_missing"];
         if (ComponentMissing) {
           return /* @__PURE__ */ React.createElement(ComponentMissing, { name: child.name });

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

@@ -9,6 +9,6 @@ declare type LinkElement = {
 };
 export declare const wrapOrRewrapLink: (editor: any) => void;
 export declare const LinkForm: (props: any) => JSX.Element;
-export declare const isLinkActive: (editor: any) => boolean;
 export declare const unwrapLink: (editor: PlateEditor, selection?: BaseRange) => void;
 export declare const getLinks: (editor: any) => Generator<import("@udecode/plate-headless").TNodeEntry<LinkElement>, void, undefined>;
+export declare const isLinkActive: (editor: any) => boolean;

package/dist/unifiedClient/index.d.ts

@@ -1,12 +1,16 @@
+import type { GraphQLError } from 'graphql';
+import type { Config } from '@tinacms/schema-tools';
 export declare const TINA_HOST = "content.tinajs.io";
 export interface TinaClientArgs<GenQueries = Record<string, unknown>> {
     url: string;
     token?: string;
     queries: (client: TinaClient<GenQueries>) => GenQueries;
+    errorPolicy?: Config['client']['errorPolicy'];
 }
 export declare type TinaClientRequestArgs = {
     variables?: Record<string, any>;
     query: string;
+    errorPolicy?: 'throw' | 'include';
 } & Partial<Omit<TinaClientArgs, 'queries'>>;
 export declare type TinaClientURLParts = {
     host: string;
@@ -17,13 +21,12 @@ export declare type TinaClientURLParts = {
 export declare class TinaClient<GenQueries> {
     apiUrl: string;
     readonlyToken?: string;
-    /**
-     *
-     */
     queries: GenQueries;
-    constructor({ token, url, queries }: TinaClientArgs<GenQueries>);
-    request<DataType extends Record<string, any> = any>(args: TinaClientRequestArgs): Promise<{
+    errorPolicy: Config['client']['errorPolicy'];
+    constructor({ token, url, queries, errorPolicy, }: TinaClientArgs<GenQueries>);
+    request<DataType extends Record<string, any> = any>({ errorPolicy, ...args }: TinaClientRequestArgs): Promise<{
         data: DataType;
+        errors: GraphQLError[];
         query: string;
     }>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinacms",
-  "version": "1.5.21",
+  "version": "1.5.22",
   "main": "dist/index.js",
   "module": "./dist/index.mjs",
   "exports": {
@@ -69,8 +69,9 @@
     "@react-types/combobox": "^3.2.0",
     "@react-types/shared": "^3.10.0",
     "@sambego/storybook-styles": "^1.0.0",
-    "@tinacms/schema-tools": "1.4.12",
-    "@tinacms/search": "1.0.11",
+    "@tinacms/schema-tools": "1.4.13",
+    "@tinacms/search": "1.0.12",
+    "@tinacms/mdx": "1.3.20",
     "@tinacms/sharedctx": "1.0.2",
     "@udecode/plate-headless": "^21.4.0",
     "atob": "2.1.2",