tinacms 0.0.0-ef282d9-20241024212433 → 0.0.0-f3aa146-20241112221138

package/dist/admin/types.d.ts

@@ -25,6 +25,9 @@ export interface DocumentNode {
 }
 export interface DocumentForm {
     _values: Object;
+    _sys?: {
+        hasReferences?: boolean;
+    };
 }
 export interface DocumentSys {
     _sys: {

package/dist/index.js

@@ -774,6 +774,22 @@ var __publicField = (obj, key, value) => {
       );
     };
   }
+  function wrapFieldWithNoHeader(Field) {
+    return (props) => {
+      return /* @__PURE__ */ React__namespace.createElement(
+        FieldMeta,
+        {
+          name: props.input.name,
+          label: false,
+          description: "",
+          error: props.meta.error,
+          index: props.index,
+          tinaForm: props.tinaForm
+        },
+        /* @__PURE__ */ React__namespace.createElement(Field, { ...props })
+      );
+    };
+  }
   function wrapFieldWithError(Field) {
     return (props) => {
       return /* @__PURE__ */ React__namespace.createElement(
@@ -850,9 +866,9 @@ var __publicField = (obj, key, value) => {
       "span",
       {
         className: `block font-sans text-xs italic font-light text-gray-400 pt-0.5 whitespace-normal m-0 ${className}`,
-        ...props
-      },
-      children
+        ...props,
+        dangerouslySetInnerHTML: { __html: children }
+      }
     );
   };
   const FieldError = ({
@@ -5710,10 +5726,11 @@ flowchart TD
     return /* @__PURE__ */ React.createElement(
       "button",
       {
-        className: `w-8 px-1 py-2.5 flex items-center justify-center hover:bg-gray-50 text-gray-200 hover:text-red-500 ${disabled && "pointer-events-none opacity-30 cursor-not-allowed"}`,
+        type: "button",
+        className: `w-8 px-1 py-2.5 flex items-center justify-center text-gray-200 hover:opacity-100 opacity-30 hover:bg-gray-50 ${disabled && "pointer-events-none opacity-30 cursor-not-allowed"}`,
         onClick
       },
-      /* @__PURE__ */ React.createElement(TrashIcon, { className: "fill-current transition-colors ease-out duration-100" })
+      /* @__PURE__ */ React.createElement(TrashIcon, { className: "h-5 w-auto fill-current text-red-500 transition-colors duration-150 ease-out" })
     );
   };
   const DragHandle = ({ isDragging }) => {
@@ -5791,27 +5808,35 @@ flowchart TD
       ))))
     ))));
   };
-  const Group = wrapFieldWithError(({ tinaForm, field }) => {
-    const cms = useCMS$1();
-    React__namespace.useState(false);
-    return /* @__PURE__ */ React__namespace.createElement(React__namespace.Fragment, null, /* @__PURE__ */ React__namespace.createElement(
-      Header,
-      {
-        onClick: () => {
-          const state = tinaForm.finalForm.getState();
-          if (state.invalid === true) {
-            cms.alerts.error("Cannot navigate away from an invalid form.");
-            return;
+  const Group = wrapFieldWithNoHeader(
+    ({ tinaForm, field }) => {
+      const cms = useCMS$1();
+      return /* @__PURE__ */ React__namespace.createElement(React__namespace.Fragment, null, /* @__PURE__ */ React__namespace.createElement(
+        Header,
+        {
+          onClick: () => {
+            const state = tinaForm.finalForm.getState();
+            if (state.invalid === true) {
+              cms.alerts.error("Cannot navigate away from an invalid form.");
+              return;
+            }
+            cms.dispatch({
+              type: "forms:set-active-field-name",
+              value: { formId: tinaForm.id, fieldName: field.name }
+            });
           }
-          cms.dispatch({
-            type: "forms:set-active-field-name",
-            value: { formId: tinaForm.id, fieldName: field.name }
-          });
-        }
-      },
-      field.label || field.name
-    ));
-  });
+        },
+        field.label || field.name,
+        field.description && /* @__PURE__ */ React__namespace.createElement(
+          "span",
+          {
+            className: `block font-sans text-xs italic font-light text-gray-400 pt-0.5 whitespace-normal m-0`,
+            dangerouslySetInnerHTML: { __html: field.description }
+          }
+        )
+      ));
+    }
+  );
   const Header = ({ onClick, children }) => {
     return /* @__PURE__ */ React__namespace.createElement("div", { className: "pt-1 mb-5" }, /* @__PURE__ */ React__namespace.createElement(
       "button",
@@ -10308,7 +10333,7 @@ flowchart TD
       "Event Log"
     ));
   };
-  const version = "2.3.0";
+  const version = "2.4.0";
   const Nav = ({
     isLocalMode,
     className = "",
@@ -14425,6 +14450,7 @@ flowchart TD
       ToolbarButton,
       {
         showArrow: false,
+        "data-testid": "rich-text-editor-overflow-menu-button",
         className: "lg:min-w-[130px]",
         isDropdown: true,
         pressed: openState.open,
@@ -14478,7 +14504,17 @@ flowchart TD
   };
   const RawMarkdownToolbarButton = cn$1.withRef(({ clear, ...rest }, ref) => {
     const { props } = useRawMarkdownToolbarButton();
-    return /* @__PURE__ */ React.createElement(ToolbarButton, { ref, tooltip: "Link", ...rest, ...props }, /* @__PURE__ */ React.createElement(Icons.raw, null));
+    return /* @__PURE__ */ React.createElement(
+      ToolbarButton,
+      {
+        ref,
+        tooltip: "Link",
+        ...rest,
+        ...props,
+        "data-testid": "markdown-button"
+      },
+      /* @__PURE__ */ React.createElement(Icons.raw, null)
+    );
   });
   function TableDropdownMenu(props) {
     const tableSelected = plateCommon.useEditorSelector(
@@ -30077,6 +30113,7 @@ mutation addPendingDocumentMutation(
                     relativePath
                     filename
                     extension
+                    hasReferences
                   }
                 }
               }
@@ -30168,6 +30205,9 @@ mutation addPendingDocumentMutation(
           document(collection:$collection, relativePath:$relativePath) {
             ... on Document {
               _values
+              _sys {
+                hasReferences
+              }
             }
           }
         }`;
@@ -31894,6 +31934,23 @@ This will work when developing locally but NOT when deployed to production.
             DeleteModal,
             {
               filename: vars.relativePath,
+              checkRefsFunc: async () => {
+                var _a2, _b2;
+                try {
+                  const doc = await admin.fetchDocument(
+                    collection.name,
+                    vars.relativePath,
+                    true
+                  );
+                  return (_b2 = (_a2 = doc == null ? void 0 : doc.document) == null ? void 0 : _a2._sys) == null ? void 0 : _b2.hasReferences;
+                } catch (error) {
+                  cms.alerts.error(
+                    "Document was not found, ask a developer for help or check the console for an error message"
+                  );
+                  console.error(error);
+                  throw error;
+                }
+              },
               deleteFunc: async () => {
                 try {
                   await admin.deleteDocument(vars);
@@ -31902,6 +31959,12 @@ This will work when developing locally but NOT when deployed to production.
                   );
                   reFetchCollection();
                 } catch (error) {
+                  if (error.message.indexOf("has references")) {
+                    cms.alerts.error(
+                      error.message.split("\n	").filter(Boolean)[1]
+                    );
+                    return;
+                  }
                   cms.alerts.warn(
                     "Document was not deleted, ask a developer for help or check the console for an error message"
                   );
@@ -31953,6 +32016,12 @@ This will work when developing locally but NOT when deployed to production.
                   cms.alerts.info("Document was successfully renamed");
                   reFetchCollection();
                 } catch (error) {
+                  if (error.message.indexOf("has references")) {
+                    cms.alerts.error(
+                      error.message.split("\n	").filter(Boolean)[1]
+                    );
+                    return;
+                  }
                   cms.alerts.warn(
                     "Document was not renamed, ask a developer for help or check the console for an error message"
                   );
@@ -32426,8 +32495,19 @@ This will work when developing locally but NOT when deployed to production.
   const NoDocumentsPlaceholder = () => {
     return /* @__PURE__ */ React.createElement("div", { className: "text-center px-5 py-3 flex flex-col items-center justify-center shadow border border-gray-100 bg-gray-50 border-b border-gray-200 w-full max-w-full rounded-lg" }, /* @__PURE__ */ React.createElement("p", { className: "text-base italic font-medium text-gray-300" }, "No documents found."));
   };
-  const DeleteModal = ({ close: close2, deleteFunc, filename }) => {
-    return /* @__PURE__ */ React.createElement(Modal, null, /* @__PURE__ */ React.createElement(PopupModal, null, /* @__PURE__ */ React.createElement(ModalHeader, { close: close2 }, "Delete ", filename), /* @__PURE__ */ React.createElement(ModalBody, { padded: true }, /* @__PURE__ */ React.createElement("p", null, `Are you sure you want to delete ${filename}?`)), /* @__PURE__ */ React.createElement(ModalActions, null, /* @__PURE__ */ React.createElement(Button$1, { style: { flexGrow: 2 }, onClick: close2 }, "Cancel"), /* @__PURE__ */ React.createElement(
+  const DeleteModal = ({
+    close: close2,
+    deleteFunc,
+    checkRefsFunc,
+    filename
+  }) => {
+    const [hasRefs, setHasRefs] = React.useState();
+    React.useEffect(() => {
+      checkRefsFunc().then((result) => {
+        setHasRefs(result);
+      });
+    }, [filename, checkRefsFunc]);
+    return /* @__PURE__ */ React.createElement(Modal, null, /* @__PURE__ */ React.createElement(PopupModal, null, /* @__PURE__ */ React.createElement(ModalHeader, { close: close2 }, "Delete ", filename), /* @__PURE__ */ React.createElement(ModalBody, { padded: true }, /* @__PURE__ */ React.createElement("p", null, `Are you sure you want to delete ${filename}?${hasRefs ? " References to this document will also be deleted." : ""}`)), /* @__PURE__ */ React.createElement(ModalActions, null, /* @__PURE__ */ React.createElement(Button$1, { style: { flexGrow: 2 }, onClick: close2 }, "Cancel"), /* @__PURE__ */ React.createElement(
       Button$1,
       {
         style: { flexGrow: 3 },
@@ -33794,6 +33874,7 @@ This will work when developing locally but NOT when deployed to production.
   exports2.useScreenPlugin = useScreenPlugin;
   exports2.useTinaAuthRedirect = useTinaAuthRedirect;
   exports2.wrapFieldWithError = wrapFieldWithError;
+  exports2.wrapFieldWithNoHeader = wrapFieldWithNoHeader;
   exports2.wrapFieldsWithMeta = wrapFieldsWithMeta;
   Object.defineProperties(exports2, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 });

package/dist/index.mjs

@@ -801,6 +801,22 @@ function wrapFieldsWithMeta(Field2) {
     );
   };
 }
+function wrapFieldWithNoHeader(Field2) {
+  return (props) => {
+    return /* @__PURE__ */ React.createElement(
+      FieldMeta,
+      {
+        name: props.input.name,
+        label: false,
+        description: "",
+        error: props.meta.error,
+        index: props.index,
+        tinaForm: props.tinaForm
+      },
+      /* @__PURE__ */ React.createElement(Field2, { ...props })
+    );
+  };
+}
 function wrapFieldWithError(Field2) {
   return (props) => {
     return /* @__PURE__ */ React.createElement(
@@ -877,9 +893,9 @@ const FieldDescription = ({
     "span",
     {
       className: `block font-sans text-xs italic font-light text-gray-400 pt-0.5 whitespace-normal m-0 ${className}`,
-      ...props
-    },
-    children
+      ...props,
+      dangerouslySetInnerHTML: { __html: children }
+    }
   );
 };
 const FieldError = ({
@@ -5737,10 +5753,11 @@ const ItemDeleteButton = ({ onClick, disabled = false }) => {
   return /* @__PURE__ */ React__default.createElement(
     "button",
     {
-      className: `w-8 px-1 py-2.5 flex items-center justify-center hover:bg-gray-50 text-gray-200 hover:text-red-500 ${disabled && "pointer-events-none opacity-30 cursor-not-allowed"}`,
+      type: "button",
+      className: `w-8 px-1 py-2.5 flex items-center justify-center text-gray-200 hover:opacity-100 opacity-30 hover:bg-gray-50 ${disabled && "pointer-events-none opacity-30 cursor-not-allowed"}`,
       onClick
     },
-    /* @__PURE__ */ React__default.createElement(TrashIcon, { className: "fill-current transition-colors ease-out duration-100" })
+    /* @__PURE__ */ React__default.createElement(TrashIcon, { className: "h-5 w-auto fill-current text-red-500 transition-colors duration-150 ease-out" })
   );
 };
 const DragHandle = ({ isDragging }) => {
@@ -5818,27 +5835,35 @@ const BlockSelector = ({
     ))))
   ))));
 };
-const Group = wrapFieldWithError(({ tinaForm, field }) => {
-  const cms = useCMS$1();
-  React.useState(false);
-  return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
-    Header,
-    {
-      onClick: () => {
-        const state = tinaForm.finalForm.getState();
-        if (state.invalid === true) {
-          cms.alerts.error("Cannot navigate away from an invalid form.");
-          return;
+const Group = wrapFieldWithNoHeader(
+  ({ tinaForm, field }) => {
+    const cms = useCMS$1();
+    return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
+      Header,
+      {
+        onClick: () => {
+          const state = tinaForm.finalForm.getState();
+          if (state.invalid === true) {
+            cms.alerts.error("Cannot navigate away from an invalid form.");
+            return;
+          }
+          cms.dispatch({
+            type: "forms:set-active-field-name",
+            value: { formId: tinaForm.id, fieldName: field.name }
+          });
         }
-        cms.dispatch({
-          type: "forms:set-active-field-name",
-          value: { formId: tinaForm.id, fieldName: field.name }
-        });
-      }
-    },
-    field.label || field.name
-  ));
-});
+      },
+      field.label || field.name,
+      field.description && /* @__PURE__ */ React.createElement(
+        "span",
+        {
+          className: `block font-sans text-xs italic font-light text-gray-400 pt-0.5 whitespace-normal m-0`,
+          dangerouslySetInnerHTML: { __html: field.description }
+        }
+      )
+    ));
+  }
+);
 const Header = ({ onClick, children }) => {
   return /* @__PURE__ */ React.createElement("div", { className: "pt-1 mb-5" }, /* @__PURE__ */ React.createElement(
     "button",
@@ -10335,7 +10360,7 @@ const SyncStatus = ({ cms, setEventsOpen }) => {
     "Event Log"
   ));
 };
-const version = "2.3.0";
+const version = "2.4.0";
 const Nav = ({
   isLocalMode,
   className = "",
@@ -14452,6 +14477,7 @@ function OverflowMenu({
     ToolbarButton,
     {
       showArrow: false,
+      "data-testid": "rich-text-editor-overflow-menu-button",
       className: "lg:min-w-[130px]",
       isDropdown: true,
       pressed: openState.open,
@@ -14505,7 +14531,17 @@ const useRawMarkdownToolbarButton = () => {
 };
 const RawMarkdownToolbarButton = withRef(({ clear, ...rest }, ref) => {
   const { props } = useRawMarkdownToolbarButton();
-  return /* @__PURE__ */ React__default.createElement(ToolbarButton, { ref, tooltip: "Link", ...rest, ...props }, /* @__PURE__ */ React__default.createElement(Icons.raw, null));
+  return /* @__PURE__ */ React__default.createElement(
+    ToolbarButton,
+    {
+      ref,
+      tooltip: "Link",
+      ...rest,
+      ...props,
+      "data-testid": "markdown-button"
+    },
+    /* @__PURE__ */ React__default.createElement(Icons.raw, null)
+  );
 });
 function TableDropdownMenu(props) {
   const tableSelected = useEditorSelector(
@@ -30104,6 +30140,7 @@ class TinaAdminApi {
                     relativePath
                     filename
                     extension
+                    hasReferences
                   }
                 }
               }
@@ -30195,6 +30232,9 @@ class TinaAdminApi {
           document(collection:$collection, relativePath:$relativePath) {
             ... on Document {
               _values
+              _sys {
+                hasReferences
+              }
             }
           }
         }`;
@@ -31921,6 +31961,23 @@ const CollectionListPage = () => {
           DeleteModal,
           {
             filename: vars.relativePath,
+            checkRefsFunc: async () => {
+              var _a2, _b2;
+              try {
+                const doc = await admin.fetchDocument(
+                  collection.name,
+                  vars.relativePath,
+                  true
+                );
+                return (_b2 = (_a2 = doc == null ? void 0 : doc.document) == null ? void 0 : _a2._sys) == null ? void 0 : _b2.hasReferences;
+              } catch (error) {
+                cms.alerts.error(
+                  "Document was not found, ask a developer for help or check the console for an error message"
+                );
+                console.error(error);
+                throw error;
+              }
+            },
             deleteFunc: async () => {
               try {
                 await admin.deleteDocument(vars);
@@ -31929,6 +31986,12 @@ const CollectionListPage = () => {
                 );
                 reFetchCollection();
               } catch (error) {
+                if (error.message.indexOf("has references")) {
+                  cms.alerts.error(
+                    error.message.split("\n	").filter(Boolean)[1]
+                  );
+                  return;
+                }
                 cms.alerts.warn(
                   "Document was not deleted, ask a developer for help or check the console for an error message"
                 );
@@ -31980,6 +32043,12 @@ const CollectionListPage = () => {
                 cms.alerts.info("Document was successfully renamed");
                 reFetchCollection();
               } catch (error) {
+                if (error.message.indexOf("has references")) {
+                  cms.alerts.error(
+                    error.message.split("\n	").filter(Boolean)[1]
+                  );
+                  return;
+                }
                 cms.alerts.warn(
                   "Document was not renamed, ask a developer for help or check the console for an error message"
                 );
@@ -32453,8 +32522,19 @@ const Breadcrumb = ({ folder, navigate, collectionName }) => {
 const NoDocumentsPlaceholder = () => {
   return /* @__PURE__ */ React__default.createElement("div", { className: "text-center px-5 py-3 flex flex-col items-center justify-center shadow border border-gray-100 bg-gray-50 border-b border-gray-200 w-full max-w-full rounded-lg" }, /* @__PURE__ */ React__default.createElement("p", { className: "text-base italic font-medium text-gray-300" }, "No documents found."));
 };
-const DeleteModal = ({ close: close2, deleteFunc, filename }) => {
-  return /* @__PURE__ */ React__default.createElement(Modal, null, /* @__PURE__ */ React__default.createElement(PopupModal, null, /* @__PURE__ */ React__default.createElement(ModalHeader, { close: close2 }, "Delete ", filename), /* @__PURE__ */ React__default.createElement(ModalBody, { padded: true }, /* @__PURE__ */ React__default.createElement("p", null, `Are you sure you want to delete ${filename}?`)), /* @__PURE__ */ React__default.createElement(ModalActions, null, /* @__PURE__ */ React__default.createElement(Button$1, { style: { flexGrow: 2 }, onClick: close2 }, "Cancel"), /* @__PURE__ */ React__default.createElement(
+const DeleteModal = ({
+  close: close2,
+  deleteFunc,
+  checkRefsFunc,
+  filename
+}) => {
+  const [hasRefs, setHasRefs] = React__default.useState();
+  useEffect(() => {
+    checkRefsFunc().then((result) => {
+      setHasRefs(result);
+    });
+  }, [filename, checkRefsFunc]);
+  return /* @__PURE__ */ React__default.createElement(Modal, null, /* @__PURE__ */ React__default.createElement(PopupModal, null, /* @__PURE__ */ React__default.createElement(ModalHeader, { close: close2 }, "Delete ", filename), /* @__PURE__ */ React__default.createElement(ModalBody, { padded: true }, /* @__PURE__ */ React__default.createElement("p", null, `Are you sure you want to delete ${filename}?${hasRefs ? " References to this document will also be deleted." : ""}`)), /* @__PURE__ */ React__default.createElement(ModalActions, null, /* @__PURE__ */ React__default.createElement(Button$1, { style: { flexGrow: 2 }, onClick: close2 }, "Cancel"), /* @__PURE__ */ React__default.createElement(
     Button$1,
     {
       style: { flexGrow: 3 },
@@ -33816,5 +33896,6 @@ export {
   useScreenPlugin,
   useTinaAuthRedirect,
   wrapFieldWithError,
+  wrapFieldWithNoHeader,
   wrapFieldsWithMeta
 };

package/dist/toolkit/fields/plugins/wrap-field-with-meta.d.ts

@@ -3,6 +3,14 @@ import { FieldProps } from './field-props';
 import { Form } from '../../forms';
 export type InputFieldType<ExtraFieldProps, InputProps> = FieldProps<InputProps> & ExtraFieldProps;
 export declare function wrapFieldsWithMeta<ExtraFieldProps = {}, InputProps = {}>(Field: React.FunctionComponent<InputFieldType<ExtraFieldProps, InputProps>> | React.ComponentClass<InputFieldType<ExtraFieldProps, InputProps>>): (props: InputFieldType<ExtraFieldProps, InputProps>) => React.JSX.Element;
+/**
+ * Same as wrapFieldsWithMeta but excludes the label, and description useful for fields that render their label and description
+ */
+export declare function wrapFieldWithNoHeader<ExtraFieldProps = {}, InputProps = {}>(Field: React.FunctionComponent<InputFieldType<ExtraFieldProps, InputProps>> | React.ComponentClass<InputFieldType<ExtraFieldProps, InputProps>>): (props: InputFieldType<ExtraFieldProps, InputProps>) => React.JSX.Element;
+/**
+ * Same as above but excludes the label, useful for fields that have their own label
+ * @deprecated This function is deprecated and will be removed in future versions.
+ */
 export declare function wrapFieldWithError<ExtraFieldProps = {}, InputProps = {}>(Field: React.FunctionComponent<InputFieldType<ExtraFieldProps, InputProps>> | React.ComponentClass<InputFieldType<ExtraFieldProps, InputProps>>): (props: InputFieldType<ExtraFieldProps, InputProps>) => React.JSX.Element;
 interface FieldMetaProps extends React.HTMLAttributes<HTMLElement> {
     name: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinacms",
-  "version": "0.0.0-ef282d9-20241024212433",
+  "version": "0.0.0-f3aa146-20241112221138",
   "main": "dist/index.js",
   "module": "./dist/index.mjs",
   "exports": {
@@ -129,9 +129,9 @@
     "webfontloader": "1.6.28",
     "yup": "^1.4.0",
     "zod": "^3.23.8",
-    "@tinacms/mdx": "0.0.0-ef282d9-20241024212433",
-    "@tinacms/search": "0.0.0-ef282d9-20241024212433",
-    "@tinacms/schema-tools": "0.0.0-ef282d9-20241024212433"
+    "@tinacms/mdx": "0.0.0-f3aa146-20241112221138",
+    "@tinacms/search": "0.0.0-f3aa146-20241112221138",
+    "@tinacms/schema-tools": "0.0.0-f3aa146-20241112221138"
   },
   "devDependencies": {
     "@graphql-tools/utils": "^10.5.4",
@@ -151,7 +151,7 @@
     "@types/react-color": "^3.0.12",
     "@types/react-dom": "^18.3.0",
     "@types/yup": "^0.32.0",
-    "happy-dom": "^14.12.3",
+    "happy-dom": "15.10.2",
     "identity-obj-proxy": "^3.0.0",
     "isomorphic-fetch": "^3.0.0",
     "jest-file-snapshot": "^0.7.0",