tinacms 2.2.0 → 2.2.1

package/dist/index.js

@@ -2745,13 +2745,13 @@ var __publicField = (obj, key, value) => {
                   {
                     type: "string",
                     label: "Alt",
-                    name: [templateName, "alt"].join("."),
+                    name: [templateName.replace(/\.props$/, ""), "alt"].join("."),
                     component: "text"
                   },
                   {
                     type: "string",
                     label: "Caption",
-                    name: [templateName, "caption"].join("."),
+                    name: [templateName.replace(/\.props$/, ""), "caption"].join("."),
                     component: "text"
                   }
                 ]
@@ -4520,7 +4520,7 @@ var __publicField = (obj, key, value) => {
       side: "bottom",
       className: cn(
         "rounded-md border bg-white p-4 text-popover-foreground shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
-        "max-h-[30vh] overflow-y-auto",
+        "max-h-[30vh] max-w-[30vh] overflow-y-auto",
         className
       ),
       ...props
@@ -4549,6 +4549,7 @@ var __publicField = (obj, key, value) => {
                         _values
                         _internalSys: _sys {
                           filename
+                          path
                         }
                       }
                     }
@@ -4619,7 +4620,7 @@ var __publicField = (obj, key, value) => {
       Command,
       {
         filter: (value2, search) => {
-          if (value2.includes(search))
+          if (value2.toLowerCase().replace(/\//g, "").includes(search.toLowerCase()))
             return 1;
           return 0;
         }
@@ -4632,26 +4633,26 @@ var __publicField = (obj, key, value) => {
           key: `${collection}-group`,
           heading: collection
         },
-        /* @__PURE__ */ React__namespace.createElement(CommandList, null, edges.map(
-          ({
-            node: {
-              id,
-              _internalSys: { filename },
-              _values: { title, name }
-            }
-          }) => /* @__PURE__ */ React__namespace.createElement(
+        /* @__PURE__ */ React__namespace.createElement(CommandList, null, edges.map(({ node }) => {
+          const { id, _values } = node;
+          return /* @__PURE__ */ React__namespace.createElement(
             CommandItem,
             {
               key: `${id}-option`,
-              value: id || title,
-              onSelect: () => {
-                setValue(id);
+              value: id,
+              onSelect: (currentValue) => {
+                setValue(
+                  currentValue === value ? "" : currentValue
+                );
                 setOpen(false);
               }
             },
-            /* @__PURE__ */ React__namespace.createElement("div", { className: "flex flex-col" }, /* @__PURE__ */ React__namespace.createElement("span", { className: "font-semibold text-sm" }, title || name || id), (title || name) && /* @__PURE__ */ React__namespace.createElement("span", { className: "text-x" }, filename))
-          )
-        ))
+            /* @__PURE__ */ React__namespace.createElement("div", { className: "flex flex-col" }, /* @__PURE__ */ React__namespace.createElement("div", null, (field == null ? void 0 : field.optionComponent) && _values ? field.optionComponent(
+              _values,
+              node._internalSys
+            ) : /* @__PURE__ */ React__namespace.createElement("span", { className: "text-x" }, id)))
+          );
+        }))
       )))
     ))));
   };
@@ -5814,19 +5815,17 @@ var __publicField = (obj, key, value) => {
         return "Required";
     }
   };
-  const TextareaField = wrapFieldsWithMeta(
-    (props) => {
-      const ref = React__namespace.useRef(null);
-      React__namespace.useEffect(() => {
-        if (ref.current && props.field.experimental_focusIntent) {
-          const el = ref.current;
-          el.focus();
-          el.setSelectionRange(el.value.length, el.value.length);
-        }
-      }, [props.field.experimental_focusIntent, ref]);
-      return /* @__PURE__ */ React__namespace.createElement(TextArea, { ref, ...props.input });
-    }
-  );
+  const TextareaField = wrapFieldsWithMeta((props) => {
+    const ref = React__namespace.useRef(null);
+    React__namespace.useEffect(() => {
+      if (ref.current && props.field.experimental_focusIntent) {
+        const el = ref.current;
+        el.focus();
+        el.setSelectionRange(el.value.length, el.value.length);
+      }
+    }, [props.field.experimental_focusIntent, ref]);
+    return /* @__PURE__ */ React__namespace.createElement(TextArea, { ref, ...props.input });
+  });
   const TextareaFieldPlugin = {
     name: "textarea",
     Component: TextareaField,
@@ -32576,7 +32575,6 @@ This will work when developing locally but NOT when deployed to production.
   exports2.TextArea = TextArea;
   exports2.TextField = TextField;
   exports2.TextFieldPlugin = TextFieldPlugin;
-  exports2.TextareaField = TextareaField;
   exports2.TextareaFieldPlugin = TextareaFieldPlugin;
   exports2.Tina = Tina;
   exports2.TinaAdmin = TinaAdmin;

package/dist/index.mjs

@@ -2768,13 +2768,13 @@ class Form {
                 {
                   type: "string",
                   label: "Alt",
-                  name: [templateName, "alt"].join("."),
+                  name: [templateName.replace(/\.props$/, ""), "alt"].join("."),
                   component: "text"
                 },
                 {
                   type: "string",
                   label: "Caption",
-                  name: [templateName, "caption"].join("."),
+                  name: [templateName.replace(/\.props$/, ""), "caption"].join("."),
                   component: "text"
                 }
               ]
@@ -4543,7 +4543,7 @@ const PopoverContent = React.forwardRef(({ className, align = "center", sideOffs
     side: "bottom",
     className: cn(
       "rounded-md border bg-white p-4 text-popover-foreground shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
-      "max-h-[30vh] overflow-y-auto",
+      "max-h-[30vh] max-w-[30vh] overflow-y-auto",
       className
     ),
     ...props
@@ -4572,6 +4572,7 @@ const useGetOptionSets = (cms, collections) => {
                         _values
                         _internalSys: _sys {
                           filename
+                          path
                         }
                       }
                     }
@@ -4642,7 +4643,7 @@ const ComboboxDemo = ({
     Command,
     {
       filter: (value2, search) => {
-        if (value2.includes(search))
+        if (value2.toLowerCase().replace(/\//g, "").includes(search.toLowerCase()))
           return 1;
         return 0;
       }
@@ -4655,26 +4656,26 @@ const ComboboxDemo = ({
         key: `${collection}-group`,
         heading: collection
       },
-      /* @__PURE__ */ React.createElement(CommandList, null, edges.map(
-        ({
-          node: {
-            id,
-            _internalSys: { filename },
-            _values: { title, name }
-          }
-        }) => /* @__PURE__ */ React.createElement(
+      /* @__PURE__ */ React.createElement(CommandList, null, edges.map(({ node }) => {
+        const { id, _values } = node;
+        return /* @__PURE__ */ React.createElement(
           CommandItem,
           {
             key: `${id}-option`,
-            value: id || title,
-            onSelect: () => {
-              setValue(id);
+            value: id,
+            onSelect: (currentValue) => {
+              setValue(
+                currentValue === value ? "" : currentValue
+              );
               setOpen(false);
             }
           },
-          /* @__PURE__ */ React.createElement("div", { className: "flex flex-col" }, /* @__PURE__ */ React.createElement("span", { className: "font-semibold text-sm" }, title || name || id), (title || name) && /* @__PURE__ */ React.createElement("span", { className: "text-x" }, filename))
-        )
-      ))
+          /* @__PURE__ */ React.createElement("div", { className: "flex flex-col" }, /* @__PURE__ */ React.createElement("div", null, (field == null ? void 0 : field.optionComponent) && _values ? field.optionComponent(
+            _values,
+            node._internalSys
+          ) : /* @__PURE__ */ React.createElement("span", { className: "text-x" }, id)))
+        );
+      }))
     )))
   ))));
 };
@@ -5837,19 +5838,17 @@ const RadioGroupFieldPlugin = {
       return "Required";
   }
 };
-const TextareaField = wrapFieldsWithMeta(
-  (props) => {
-    const ref = React.useRef(null);
-    React.useEffect(() => {
-      if (ref.current && props.field.experimental_focusIntent) {
-        const el = ref.current;
-        el.focus();
-        el.setSelectionRange(el.value.length, el.value.length);
-      }
-    }, [props.field.experimental_focusIntent, ref]);
-    return /* @__PURE__ */ React.createElement(TextArea, { ref, ...props.input });
-  }
-);
+const TextareaField = wrapFieldsWithMeta((props) => {
+  const ref = React.useRef(null);
+  React.useEffect(() => {
+    if (ref.current && props.field.experimental_focusIntent) {
+      const el = ref.current;
+      el.focus();
+      el.setSelectionRange(el.value.length, el.value.length);
+    }
+  }, [props.field.experimental_focusIntent, ref]);
+  return /* @__PURE__ */ React.createElement(TextArea, { ref, ...props.input });
+});
 const TextareaFieldPlugin = {
   name: "textarea",
   Component: TextareaField,
@@ -32593,7 +32592,6 @@ export {
   TextArea,
   TextField,
   TextFieldPlugin,
-  TextareaField,
   TextareaFieldPlugin,
   Tina,
   TinaAdmin,

package/dist/rich-text/index.js

@@ -104,7 +104,7 @@
           const Component2 = components[child.type];
           return /* @__PURE__ */ React.createElement(Component2, { ...props });
         }
-        return /* @__PURE__ */ React.createElement("img", { src: child.url, alt: child.caption });
+        return /* @__PURE__ */ React.createElement("img", { src: child.url, alt: child.alt });
       case "a":
         if (components[child.type]) {
           const Component2 = components[child.type];

package/dist/rich-text/index.mjs

@@ -101,7 +101,7 @@ const Node = ({ components, child }) => {
         const Component2 = components[child.type];
         return /* @__PURE__ */ React.createElement(Component2, { ...props });
       }
-      return /* @__PURE__ */ React.createElement("img", { src: child.url, alt: child.caption });
+      return /* @__PURE__ */ React.createElement("img", { src: child.url, alt: child.alt });
     case "a":
       if (components[child.type]) {
         const Component2 = components[child.type];

package/dist/toolkit/fields/components/reference/index.d.ts

@@ -3,12 +3,18 @@ type Option = {
     value: string;
     label: string;
 };
+type OptionComponent = (props: unknown, _sys: InternalSys) => React.ReactElement | string;
+export interface InternalSys {
+    filename: string;
+    path: string;
+}
 export interface ReferenceFieldProps {
     label?: string;
     name: string;
     component: string;
     collections: string[];
     options: (Option | string)[];
+    optionComponent: OptionComponent;
 }
 export interface ReferenceProps {
     name: string;

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

@@ -1,8 +1,5 @@
 import * as React from 'react';
 import { InputProps } from '../components';
-export declare const TextareaField: (props: import("./wrap-field-with-meta").InputFieldType<{
-    input: InputProps;
-}, {}>) => React.JSX.Element;
 export declare const TextareaFieldPlugin: {
     name: string;
     Component: (props: import("./wrap-field-with-meta").InputFieldType<{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinacms",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "main": "dist/index.js",
   "module": "./dist/index.mjs",
   "exports": {
@@ -117,9 +117,9 @@
     "clsx": "^2.1.1",
     "yup": "^1.4.0",
     "zod": "^3.23.8",
-    "@tinacms/mdx": "1.4.0",
-    "@tinacms/schema-tools": "1.6.0",
-    "@tinacms/search": "1.0.26"
+    "@tinacms/mdx": "1.4.1",
+    "@tinacms/schema-tools": "1.6.1",
+    "@tinacms/search": "1.0.27"
   },
   "devDependencies": {
     "@graphql-tools/utils": "^10.3.3",