tinacms 3.1.3 → 3.3.0

package/dist/index.js

@@ -7,7 +7,7 @@ var __publicField = (obj, key, value) => {
 var _a;
 import { z } from "zod";
 import * as React from "react";
-import React__default, { useState, useCallback, useContext, createContext, forwardRef, useRef, useReducer, useMemo, useEffect, useLayoutEffect, Component, memo as memo$1, useDebugValue, useId, startTransition, useImperativeHandle } from "react";
+import React__default, { useState, useCallback, useContext, createContext, forwardRef, useRef, useReducer, useMemo, useEffect, useLayoutEffect, Component, memo, useDebugValue, useId, startTransition, useImperativeHandle } from "react";
 import ReactDOM, { createPortal } from "react-dom";
 import { createForm, FORM_ERROR, getIn } from "final-form";
 import arrayMutators from "final-form-arrays";
@@ -1402,6 +1402,7 @@ function wrapFieldsWithMeta(Field2) {
         error: props.meta.error,
         index: props.index,
         tinaForm: props.tinaForm,
+        field: props.field,
         focusIntent: props.field.focusIntent,
         hoverIntent: props.field.hoverIntent
       },
@@ -1454,6 +1455,7 @@ const FieldMeta = ({
   children,
   index,
   tinaForm,
+  field,
   focusIntent,
   hoverIntent,
   ...props
@@ -1481,6 +1483,7 @@ const FieldMeta = ({
     FieldWrapper,
     {
       margin,
+      field,
       onMouseOver: () => setHoveredField({ id: tinaForm.id, fieldName: name }),
       onMouseOut: () => setHoveredField({ id: null, fieldName: null }),
       onClick: handleClick,
@@ -1497,9 +1500,10 @@ const FieldMeta = ({
 const FieldWrapper = ({
   margin,
   children,
+  field,
   "data-tina-field-active": dataActive,
   "data-tina-field-hovering": dataHovering,
-  ...restProps
+  ...props
 }) => {
   const isActive = dataActive === "true";
   const isHovering = dataHovering === "true";
@@ -1521,10 +1525,10 @@ const FieldWrapper = ({
   return /* @__PURE__ */ React.createElement(
     "div",
     {
-      className: `relative ${margin ? `mb-5 last:mb-0` : ``} ${getFieldStateClasses()}`,
+      className: `relative w-full px-2 ${margin ? "mb-5 last:mb-0" : ""} ${(field == null ? void 0 : field.width) === "half" ? "@sm:w-1/2" : ""} ${getFieldStateClasses()}`,
       "data-tina-field-active": dataActive,
       "data-tina-field-hovering": dataHovering,
-      ...restProps
+      ...props
     },
     children
   );
@@ -1991,21 +1995,29 @@ function isDraftable$1(value) {
   return isPlainObject$4(value) || Array.isArray(value) || !!value[DRAFTABLE] || !!((_a2 = value.constructor) == null ? void 0 : _a2[DRAFTABLE]) || isMap$2(value) || isSet$2(value);
 }
 var objectCtorString$1 = Object.prototype.constructor.toString();
+var cachedCtorStrings = /* @__PURE__ */ new WeakMap();
 function isPlainObject$4(value) {
   if (!value || typeof value !== "object")
     return false;
-  const proto = getPrototypeOf(value);
-  if (proto === null) {
+  const proto = Object.getPrototypeOf(value);
+  if (proto === null || proto === Object.prototype)
     return true;
-  }
   const Ctor = Object.hasOwnProperty.call(proto, "constructor") && proto.constructor;
   if (Ctor === Object)
     return true;
-  return typeof Ctor == "function" && Function.toString.call(Ctor) === objectCtorString$1;
+  if (typeof Ctor !== "function")
+    return false;
+  let ctorString = cachedCtorStrings.get(Ctor);
+  if (ctorString === void 0) {
+    ctorString = Function.toString.call(Ctor);
+    cachedCtorStrings.set(Ctor, ctorString);
+  }
+  return ctorString === objectCtorString$1;
 }
-function each(obj, iter) {
+function each(obj, iter, strict = true) {
   if (getArchtype(obj) === 0) {
-    Reflect.ownKeys(obj).forEach((key) => {
+    const keys2 = strict ? Reflect.ownKeys(obj) : Object.keys(obj);
+    keys2.forEach((key) => {
       iter(key, obj[key], obj);
     });
   } else {
@@ -2088,17 +2100,27 @@ function freeze$1(obj, deep = false) {
   if (isFrozen(obj) || isDraft$1(obj) || !isDraftable$1(obj))
     return obj;
   if (getArchtype(obj) > 1) {
-    obj.set = obj.add = obj.clear = obj.delete = dontMutateFrozenCollections;
+    Object.defineProperties(obj, {
+      set: dontMutateMethodOverride,
+      add: dontMutateMethodOverride,
+      clear: dontMutateMethodOverride,
+      delete: dontMutateMethodOverride
+    });
   }
   Object.freeze(obj);
   if (deep)
-    Object.entries(obj).forEach(([key, value]) => freeze$1(value, true));
+    Object.values(obj).forEach((value) => freeze$1(value, true));
   return obj;
 }
 function dontMutateFrozenCollections() {
   die(2);
 }
+var dontMutateMethodOverride = {
+  value: dontMutateFrozenCollections
+};
 function isFrozen(obj) {
+  if (obj === null || typeof obj !== "object")
+    return true;
   return Object.isFrozen(obj);
 }
 var plugins = {};
@@ -2186,11 +2208,13 @@ function processResult(result, scope) {
 function finalize(rootScope, value, path3) {
   if (isFrozen(value))
     return value;
+  const useStrictIteration = rootScope.immer_.shouldUseStrictIteration();
   const state = value[DRAFT_STATE];
   if (!state) {
     each(
       value,
-      (key, childValue) => finalizeProperty(rootScope, state, value, key, childValue, path3)
+      (key, childValue) => finalizeProperty(rootScope, state, value, key, childValue, path3),
+      useStrictIteration
     );
     return value;
   }
@@ -2213,7 +2237,16 @@ function finalize(rootScope, value, path3) {
     }
     each(
       resultEach,
-      (key, childValue) => finalizeProperty(rootScope, state, result, key, childValue, path3, isSet2)
+      (key, childValue) => finalizeProperty(
+        rootScope,
+        state,
+        result,
+        key,
+        childValue,
+        path3,
+        isSet2
+      ),
+      useStrictIteration
     );
     maybeFreeze(rootScope, result, false);
     if (path3 && rootScope.patches_) {
@@ -2228,6 +2261,16 @@ function finalize(rootScope, value, path3) {
   return state.copy_;
 }
 function finalizeProperty(rootScope, parentState, targetObject, prop2, childValue, rootPath, targetIsSet) {
+  if (childValue == null) {
+    return;
+  }
+  if (typeof childValue !== "object" && !targetIsSet) {
+    return;
+  }
+  const childIsFrozen = isFrozen(childValue);
+  if (childIsFrozen && !targetIsSet) {
+    return;
+  }
   if (process.env.NODE_ENV !== "production" && childValue === targetObject)
     die(5);
   if (isDraft$1(childValue)) {
@@ -2242,12 +2285,15 @@ function finalizeProperty(rootScope, parentState, targetObject, prop2, childValu
   } else if (targetIsSet) {
     targetObject.add(childValue);
   }
-  if (isDraftable$1(childValue) && !isFrozen(childValue)) {
+  if (isDraftable$1(childValue) && !childIsFrozen) {
     if (!rootScope.immer_.autoFreeze_ && rootScope.unfinalizedDrafts_ < 1) {
       return;
     }
+    if (parentState && parentState.base_ && parentState.base_[prop2] === childValue && childIsFrozen) {
+      return;
+    }
     finalize(rootScope, childValue);
-    if ((!parentState || !parentState.scope_.parent_) && typeof prop2 !== "symbol" && Object.prototype.propertyIsEnumerable.call(targetObject, prop2))
+    if ((!parentState || !parentState.scope_.parent_) && typeof prop2 !== "symbol" && (isMap$2(targetObject) ? targetObject.has(prop2) : Object.prototype.propertyIsEnumerable.call(targetObject, prop2)))
       maybeFreeze(rootScope, childValue);
   }
 }
@@ -2443,6 +2489,7 @@ var Immer2 = class {
   constructor(config) {
     this.autoFreeze_ = true;
     this.useStrictShallowCopy_ = false;
+    this.useStrictIteration_ = true;
     this.produce = (base, recipe, patchListener) => {
       if (typeof base === "function" && typeof recipe !== "function") {
         const defaultBase = recipe;
@@ -2505,6 +2552,8 @@ var Immer2 = class {
       this.setAutoFreeze(config.autoFreeze);
     if (typeof (config == null ? void 0 : config.useStrictShallowCopy) === "boolean")
       this.setUseStrictShallowCopy(config.useStrictShallowCopy);
+    if (typeof (config == null ? void 0 : config.useStrictIteration) === "boolean")
+      this.setUseStrictIteration(config.useStrictIteration);
   }
   createDraft(base) {
     if (!isDraftable$1(base))
@@ -2541,6 +2590,18 @@ var Immer2 = class {
   setUseStrictShallowCopy(value) {
     this.useStrictShallowCopy_ = value;
   }
+  /**
+   * Pass false to use faster iteration that skips non-enumerable properties
+   * but still handles symbols for compatibility.
+   *
+   * By default, strict iteration is enabled (includes all own properties).
+   */
+  setUseStrictIteration(value) {
+    this.useStrictIteration_ = value;
+  }
+  shouldUseStrictIteration() {
+    return this.useStrictIteration_;
+  }
   applyPatches(base, patches) {
     let i2;
     for (i2 = patches.length - 1; i2 >= 0; i2--) {
@@ -2579,17 +2640,23 @@ function currentImpl(value) {
     return value;
   const state = value[DRAFT_STATE];
   let copy2;
+  let strict = true;
   if (state) {
     if (!state.modified_)
       return state.base_;
     state.finalized_ = true;
     copy2 = shallowCopy$1(value, state.scope_.immer_.useStrictShallowCopy_);
+    strict = state.scope_.immer_.shouldUseStrictIteration();
   } else {
     copy2 = shallowCopy$1(value, true);
   }
-  each(copy2, (key, childValue) => {
-    set$3(copy2, key, currentImpl(childValue));
-  });
+  each(
+    copy2,
+    (key, childValue) => {
+      set$3(copy2, key, currentImpl(childValue));
+    },
+    strict
+  );
   if (state) {
     state.finalized_ = false;
   }
@@ -2597,14 +2664,8 @@ function currentImpl(value) {
 }
 var immer = new Immer2();
 var produce = immer.produce;
-immer.produceWithPatches.bind(
-  immer
-);
-immer.setAutoFreeze.bind(immer);
-immer.setUseStrictShallowCopy.bind(immer);
-immer.applyPatches.bind(immer);
-var createDraft$1 = immer.createDraft.bind(immer);
-var finishDraft = immer.finishDraft.bind(immer);
+var createDraft$1 = /* @__PURE__ */ immer.createDraft.bind(immer);
+var finishDraft = /* @__PURE__ */ immer.finishDraft.bind(immer);
 var PathRef = {
   transform(ref, op) {
     var {
@@ -10988,7 +11049,7 @@ var TextString = (props) => {
     ref
   }, initialText);
 };
-var MemoizedText$1 = /* @__PURE__ */ memo$1(/* @__PURE__ */ forwardRef((props, ref) => {
+var MemoizedText$1 = /* @__PURE__ */ memo(/* @__PURE__ */ forwardRef((props, ref) => {
   return /* @__PURE__ */ React__default.createElement("span", {
     "data-slate-string": true,
     ref
@@ -15600,8 +15661,9 @@ const devtoolsImpl = (fn, devtoolsOptions = {}) => (set2, get2, api) => {
     const r2 = set2(state, replace);
     if (!isRecording)
       return r2;
-    const inferredActionType = findCallerName(new Error().stack);
-    const action = nameOrAction === void 0 ? { type: anonymousActionType || inferredActionType || "anonymous" } : typeof nameOrAction === "string" ? { type: nameOrAction } : nameOrAction;
+    const action = nameOrAction === void 0 ? {
+      type: anonymousActionType || findCallerName(new Error().stack) || "anonymous"
+    } : typeof nameOrAction === "string" ? { type: nameOrAction } : nameOrAction;
     if (store === void 0) {
       connection == null ? void 0 : connection.send(action, get2());
       return r2;
@@ -15889,12 +15951,12 @@ const persistImpl = (config, baseOptions) => (set2, get2, api) => {
   const savedSetState = api.setState;
   api.setState = (state, replace) => {
     savedSetState(state, replace);
-    void setItem();
+    return setItem();
   };
   const configResult = config(
     (...args) => {
       set2(...args);
-      void setItem();
+      return setItem();
     },
     get2,
     api
@@ -38245,7 +38307,7 @@ function FieldsBuilder({
   }, [setFieldPlugins]);
   React.useEffect(() => updateFieldPlugins(), []);
   useEventSubscription("plugin:add:field", () => updateFieldPlugins(), []);
-  return /* @__PURE__ */ React.createElement(FieldsGroup, { padding }, fields.map((field, index) => {
+  return /* @__PURE__ */ React.createElement(FieldsGroup, null, fields.map((field, index) => {
     return /* @__PURE__ */ React.createElement(
       InnerField,
       {
@@ -38306,6 +38368,7 @@ const InnerField = ({
     {
       name: field.name,
       key: field.name,
+      className: "w-full",
       isEqual: (a2, b) => isEqual(field, a2, b),
       type,
       parse: parse2 ? (value, name) => parse2(value, name, field) : void 0,
@@ -38354,13 +38417,12 @@ const InnerField = ({
   );
 };
 const FieldsGroup = ({
-  padding,
   children
 }) => {
   return /* @__PURE__ */ React.createElement(
     "div",
     {
-      className: `relative block w-full h-full whitespace-nowrap overflow-x-visible ${padding ? `pb-5` : ``}`
+      className: `relative flex flex-wrap w-full h-full whitespace-nowrap overflow-x-visible`
     },
     children
   );
@@ -39977,7 +40039,7 @@ const Select$1 = ({
       ref.current.focus();
     }
   }, [field == null ? void 0 : field.focusIntent, ref]);
-  return /* @__PURE__ */ React.createElement("div", { className: "relative group w-full h-full md:w-auto" }, /* @__PURE__ */ React.createElement(
+  return /* @__PURE__ */ React.createElement("div", { className: "relative group w-full h-fit md:w-auto" }, /* @__PURE__ */ React.createElement(
     "select",
     {
       id: input.name,
@@ -42917,7 +42979,10 @@ const formatCurrentDate = ({
   if (!dateFormat) {
     return format$1(displayDate, timeFormat);
   }
-  return `${format$1(displayDate, dateFormat)} ${format$1(displayDate, timeFormat)}`;
+  return `${format$1(displayDate, dateFormat)} ${format$1(
+    displayDate,
+    timeFormat
+  )}`;
 };
 function Calendar({
   className,
@@ -43319,7 +43384,8 @@ const DateTimePicker = React.forwardRef(
       }),
       [displayDate]
     );
-    const { options, localize: localize2, formatLong: formatLong2 } = locale;
+    const localeAny = locale;
+    const { options, localize: localize2, formatLong: formatLong2 } = localeAny || {};
     if (options && localize2 && formatLong2) {
       ({
         ...enUS,
@@ -46527,7 +46593,7 @@ const NavProvider = ({
   };
   return /* @__PURE__ */ React__default.createElement(NavContext.Provider, { value }, children);
 };
-const version$1 = "3.1.3";
+const version$1 = "3.3.0";
 const VersionInfo = () => {
   var _a2, _b, _c, _d, _e, _f;
   const cms = useCMS();
@@ -52341,7 +52407,7 @@ const nld = [
   "in",
   "is",
   "ja",
-  "je ",
+  "je",
   "kan",
   "kon",
   "kunnen",
@@ -63631,195 +63697,202 @@ var __publicField2 = (obj, key, value) => {
   __defNormalProp2(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
+const INDEXABLE_NODE_TYPES = ["text", "code_block", "html"];
 class StringBuilder {
   constructor(limit) {
-    __publicField2(this, "buffer");
-    __publicField2(this, "length", 0);
+    __publicField2(this, "buffer", []);
     __publicField2(this, "limit");
-    this.buffer = [];
+    __publicField2(this, "length", 0);
     this.limit = limit;
   }
   append(str) {
-    if (this.length + str.length > this.limit) {
+    if (this.length + str.length > this.limit)
       return true;
-    } else {
-      this.buffer.push(str);
-      this.length += str.length;
-      if (this.length > this.limit) {
-        return true;
-      }
-      return false;
-    }
+    this.buffer.push(str);
+    this.length += str.length;
+    return this.length > this.limit;
   }
   toString() {
     return this.buffer.join(" ");
   }
 }
-const extractText = (data, acc, indexableNodeTypes) => {
-  var _a2, _b;
-  if (data) {
-    if (indexableNodeTypes.indexOf(data.type) !== -1 && (data.text || data.value)) {
-      const tokens = tokenizeString(data.text || data.value);
-      for (const token of tokens) {
-        if (acc.append(token)) {
-          return;
-        }
-      }
+const tokenizeString = (str) => {
+  return str.split(/[\s\.,]+/).map((s2) => s2.toLowerCase()).filter((s2) => s2);
+};
+const extractText = (data, builder, nodeTypes) => {
+  var _a2;
+  if (!data)
+    return;
+  if (nodeTypes.includes(data.type ?? "") && (data.text || data.value)) {
+    const tokens = tokenizeString(data.text || data.value || "");
+    for (const token of tokens) {
+      if (builder.append(token))
+        return;
     }
-    (_b = (_a2 = data.children) == null ? void 0 : _a2.forEach) == null ? void 0 : _b.call(
-      _a2,
-      (child) => extractText(child, acc, indexableNodeTypes)
-    );
   }
+  (_a2 = data.children) == null ? void 0 : _a2.forEach((child) => extractText(child, builder, nodeTypes));
 };
-const relativePath = (path3, collection) => {
+const getRelativePath = (path3, collection) => {
   return path3.replace(/\\/g, "/").replace(collection.path, "").replace(/^\/|\/$/g, "");
 };
-const tokenizeString = (str) => {
-  return str.split(/[\s\.,]+/).map((s2) => s2.toLowerCase()).filter((s2) => s2);
-};
-const processTextFieldValue = (value, maxLen) => {
+const processTextField = (value, maxLength) => {
   const tokens = tokenizeString(value);
-  const builder = new StringBuilder(maxLen);
+  const builder = new StringBuilder(maxLength);
   for (const part of tokens) {
-    if (builder.append(part)) {
+    if (builder.append(part))
       break;
-    }
   }
   return builder.toString();
 };
+const processRichTextField = (value, maxLength) => {
+  const builder = new StringBuilder(maxLength);
+  extractText(value, builder, INDEXABLE_NODE_TYPES);
+  return builder.toString();
+};
+const processObjectField = (data, path3, collection, textIndexLength, field) => {
+  if (field.list) {
+    return data.map(
+      (obj) => processDocumentForIndexing(obj, path3, collection, textIndexLength, field)
+    );
+  }
+  return processDocumentForIndexing(
+    data,
+    path3,
+    collection,
+    textIndexLength,
+    field
+  );
+};
+const processStringField = (data, maxLength, isList) => {
+  if (isList) {
+    return data.map(
+      (value) => processTextField(value, maxLength)
+    );
+  }
+  return processTextField(data, maxLength);
+};
+const processRichTextFieldData = (data, maxLength, isList) => {
+  if (isList) {
+    return data.map(
+      (value) => processRichTextField(value, maxLength)
+    );
+  }
+  return processRichTextField(data, maxLength);
+};
 const processDocumentForIndexing = (data, path3, collection, textIndexLength, field) => {
   if (!field) {
-    const relPath = relativePath(path3, collection);
-    data["_id"] = `${collection.name}:${relPath}`;
-    data["_relativePath"] = relPath;
+    const relativePath = getRelativePath(path3, collection);
+    data["_id"] = `${collection.name}:${relativePath}`;
+    data["_relativePath"] = relativePath;
   }
-  for (const f2 of (field == null ? void 0 : field.fields) || collection.fields || []) {
+  const fields = (field == null ? void 0 : field.fields) || collection.fields || [];
+  for (const f2 of fields) {
     if (!f2.searchable) {
       delete data[f2.name];
       continue;
     }
-    const isList = f2.list;
-    if (data[f2.name]) {
-      if (f2.type === "object") {
-        if (isList) {
-          data[f2.name] = data[f2.name].map(
-            (obj) => processDocumentForIndexing(
-              obj,
-              path3,
-              collection,
-              textIndexLength,
-              f2
-            )
-          );
-        } else {
-          data[f2.name] = processDocumentForIndexing(
-            data[f2.name],
-            path3,
-            collection,
-            textIndexLength,
-            f2
-          );
-        }
-      } else if (f2.type === "string") {
-        const fieldTextIndexLength = f2.maxSearchIndexFieldLength || textIndexLength;
-        if (isList) {
-          data[f2.name] = data[f2.name].map(
-            (value) => processTextFieldValue(value, fieldTextIndexLength)
-          );
-        } else {
-          data[f2.name] = processTextFieldValue(
-            data[f2.name],
-            fieldTextIndexLength
-          );
-        }
-      } else if (f2.type === "rich-text") {
-        const fieldTextIndexLength = f2.maxSearchIndexFieldLength || textIndexLength;
-        if (isList) {
-          data[f2.name] = data[f2.name].map((value) => {
-            const acc = new StringBuilder(fieldTextIndexLength);
-            extractText(value, acc, ["text", "code_block", "html"]);
-            return acc.toString();
-          });
-        } else {
-          const acc = new StringBuilder(fieldTextIndexLength);
-          extractText(data[f2.name], acc, ["text", "code_block", "html"]);
-          data[f2.name] = acc.toString();
-        }
-      }
+    if (!data[f2.name])
+      continue;
+    const fieldMaxLength = f2.maxSearchIndexFieldLength || textIndexLength;
+    const isList = Boolean(f2.list);
+    switch (f2.type) {
+      case "object":
+        data[f2.name] = processObjectField(
+          data[f2.name],
+          path3,
+          collection,
+          textIndexLength,
+          f2
+        );
+        break;
+      case "string":
+        data[f2.name] = processStringField(
+          data[f2.name],
+          fieldMaxLength,
+          isList
+        );
+        break;
+      case "rich-text":
+        data[f2.name] = processRichTextFieldData(
+          data[f2.name],
+          fieldMaxLength,
+          isList
+        );
+        break;
     }
   }
   return data;
 };
-const memo = {};
+const stopwordCache = {};
 const lookupStopwords = (keys2, defaultStopWords = eng) => {
-  let stopwords = defaultStopWords;
-  if (keys2) {
-    if (memo[keys2.join(",")]) {
-      return memo[keys2.join(",")];
-    }
-    stopwords = [];
-    for (const key of keys2) {
-      stopwords.push(...sw[key]);
-    }
-    memo[keys2.join(",")] = stopwords;
+  if (!keys2) {
+    return defaultStopWords;
+  }
+  const cacheKey = keys2.join(",");
+  if (stopwordCache[cacheKey]) {
+    return stopwordCache[cacheKey];
   }
+  const stopwords = keys2.flatMap((key) => sw[key] || []);
+  stopwordCache[cacheKey] = stopwords;
   return stopwords;
 };
 const queryToSearchIndexQuery = (query, stopwordLanguages) => {
-  let q2;
   const parts = query.split(" ");
   const stopwords = lookupStopwords(stopwordLanguages);
   if (parts.length === 1) {
-    q2 = { AND: [parts[0]] };
-  } else {
-    q2 = {
-      AND: parts.filter(
-        (part) => part.toLowerCase() !== "and" && stopwords.indexOf(part.toLowerCase()) === -1
-      )
-    };
+    return { AND: [parts[0]] };
   }
-  return q2;
+  const filteredParts = parts.filter(
+    (part) => part.toLowerCase() !== "and" && !stopwords.includes(part.toLowerCase())
+  );
+  return { AND: filteredParts };
 };
 const optionsToSearchIndexOptions = (options) => {
-  const opt = {};
-  if (options == null ? void 0 : options.limit) {
-    opt["PAGE"] = {
+  if (!(options == null ? void 0 : options.limit))
+    return {};
+  return {
+    PAGE: {
       SIZE: options.limit,
-      NUMBER: (options == null ? void 0 : options.cursor) ? parseInt(options.cursor) : 0
-    };
-  }
-  return opt;
+      NUMBER: options.cursor ? parseInt(options.cursor) : 0
+    }
+  };
 };
 const parseSearchIndexResponse = (data, options) => {
-  const results = data["RESULT"];
-  const total = data["RESULT_LENGTH"];
-  if ((options == null ? void 0 : options.cursor) && (options == null ? void 0 : options.limit)) {
-    const prevCursor = options.cursor === "0" ? null : (parseInt(options.cursor) - 1).toString();
-    const nextCursor = total <= (parseInt(options.cursor) + 1) * options.limit ? null : (parseInt(options.cursor) + 1).toString();
+  const resultArray = (data == null ? void 0 : data.RESULT) ?? (data == null ? void 0 : data.results);
+  if (!data || !Array.isArray(resultArray)) {
     return {
-      results,
-      total,
-      prevCursor,
-      nextCursor
-    };
-  } else if (!(options == null ? void 0 : options.cursor) && (options == null ? void 0 : options.limit)) {
-    const prevCursor = null;
-    const nextCursor = total <= options.limit ? null : "1";
-    return {
-      results,
-      total,
-      prevCursor,
-      nextCursor
+      results: [],
+      total: 0,
+      prevCursor: null,
+      nextCursor: null,
+      fuzzyMatches: void 0
     };
-  } else {
+  }
+  const results = data.RESULT ?? data.results;
+  const total = data.RESULT_LENGTH ?? data.total ?? 0;
+  const fuzzyMatches = data.FUZZY_MATCHES ?? data.fuzzyMatches;
+  const nextCursor = data.NEXT_CURSOR ?? data.nextCursor;
+  const prevCursor = data.PREV_CURSOR ?? data.prevCursor;
+  if (nextCursor !== void 0 || prevCursor !== void 0) {
     return {
       results,
       total,
-      prevCursor: null,
-      nextCursor: null
+      prevCursor: prevCursor ?? null,
+      nextCursor: nextCursor ?? null,
+      fuzzyMatches
     };
   }
+  const currentPage = (options == null ? void 0 : options.cursor) ? parseInt(options.cursor) : 0;
+  const pageSize = options == null ? void 0 : options.limit;
+  const hasPreviousPage = currentPage > 0;
+  const hasNextPage = pageSize ? total > (currentPage + 1) * pageSize : false;
+  return {
+    results,
+    total,
+    prevCursor: hasPreviousPage ? (currentPage - 1).toString() : null,
+    nextCursor: hasNextPage ? (currentPage + 1).toString() : null,
+    fuzzyMatches
+  };
 };
 const CREATE_DOCUMENT_GQL = `#graphql
 mutation($collection: String!, $relativePath: String!, $params: DocumentMutation!) {
@@ -63875,7 +63948,7 @@ class TinaAdminApi {
   fetchCollections() {
     return this.schema.getCollections();
   }
-  async renameDocument({ collection, relativePath: relativePath2, newRelativePath }) {
+  async renameDocument({ collection, relativePath, newRelativePath }) {
     await this.api.request(
       `#graphql
               mutation RenameDocument($collection: String!, $relativePath: String! $newRelativePath: String!) {
@@ -63884,7 +63957,7 @@ class TinaAdminApi {
   }
               }
             `,
-      { variables: { collection, relativePath: relativePath2, newRelativePath } }
+      { variables: { collection, relativePath, newRelativePath } }
     );
     if (this.searchClient) {
       const { document: doc } = await this.fetchDocument(
@@ -63898,18 +63971,18 @@ class TinaAdminApi {
         this.maxSearchIndexFieldLength
       );
       await this.searchClient.put([processed]);
-      await this.searchClient.del([`${collection.name}:${relativePath2}`]);
+      await this.searchClient.del([`${collection.name}:${relativePath}`]);
     }
   }
   async deleteDocument({
     collection,
-    relativePath: relativePath2
+    relativePath
   }) {
     var _a2;
     await this.api.request(DELETE_DOCUMENT_GQL, {
-      variables: { collection, relativePath: relativePath2 }
+      variables: { collection, relativePath }
     });
-    await ((_a2 = this.searchClient) == null ? void 0 : _a2.del([`${collection}:${relativePath2}`]));
+    await ((_a2 = this.searchClient) == null ? void 0 : _a2.del([`${collection}:${relativePath}`]));
   }
   async fetchCollection(collectionName, includeDocuments, folder = "", after3, sortKey, order, filterArgs) {
     let filter2 = null;
@@ -64064,7 +64137,7 @@ class TinaAdminApi {
       }
     }
   }
-  async fetchDocument(collectionName, relativePath2, values = true) {
+  async fetchDocument(collectionName, relativePath, values = true) {
     let query;
     if (values) {
       query = `#graphql
@@ -64099,26 +64172,26 @@ class TinaAdminApi {
         }`;
     }
     const response = await this.api.request(query, {
-      variables: { collection: collectionName, relativePath: relativePath2 }
+      variables: { collection: collectionName, relativePath }
     });
     return response;
   }
-  async createDocument(collection, relativePath2, params) {
+  async createDocument(collection, relativePath, params) {
     const response = await this.api.request(CREATE_DOCUMENT_GQL, {
       variables: {
         collection: collection.name,
-        relativePath: relativePath2,
+        relativePath,
         params
       }
     });
     if (this.searchClient) {
       const { document: doc } = await this.fetchDocument(
         collection.name,
-        relativePath2
+        relativePath
       );
       const processed = processDocumentForIndexing(
         doc["_values"],
-        `${collection.path}/${relativePath2}`,
+        `${collection.path}/${relativePath}`,
         collection,
         this.maxSearchIndexFieldLength
       );
@@ -64126,22 +64199,22 @@ class TinaAdminApi {
     }
     return response;
   }
-  async updateDocument(collection, relativePath2, params) {
+  async updateDocument(collection, relativePath, params) {
     const response = await this.api.request(UPDATE_DOCUMENT_GQL, {
       variables: {
         collection: collection.name,
-        relativePath: relativePath2,
+        relativePath,
         params
       }
     });
     if (this.searchClient) {
       const { document: doc } = await this.fetchDocument(
         collection.name,
-        relativePath2
+        relativePath
       );
       const processed = processDocumentForIndexing(
         doc["_values"],
-        `${collection.path}/${relativePath2}`,
+        `${collection.path}/${relativePath}`,
         collection,
         this.maxSearchIndexFieldLength
       );
@@ -64264,7 +64337,7 @@ const CreateBranchModal = ({
       }
       const collection = tinaApi.schema.getCollectionByFullPath(path3);
       const params = tinaApi.schema.transformPayload(collection.name, values);
-      const relativePath2 = pathRelativeToCollection(collection.path, path3);
+      const relativePath = pathRelativeToCollection(collection.path, path3);
       const result = await tinaApi.executeEditorialWorkflow({
         branchName,
         baseBranch: tinaApi.branch,
@@ -64273,7 +64346,7 @@ const CreateBranchModal = ({
           query: graphql2,
           variables: {
             collection: collection.name,
-            relativePath: relativePath2,
+            relativePath,
             params
           }
         },
@@ -64305,7 +64378,7 @@ const CreateBranchModal = ({
         0
       );
       if (crudType === "create") {
-        const folderPath = relativePath2.includes("/") ? relativePath2.substring(0, relativePath2.lastIndexOf("/")) : "";
+        const folderPath = relativePath.includes("/") ? relativePath.substring(0, relativePath.lastIndexOf("/")) : "";
         window.location.hash = `#/collections/${collection.name}${folderPath ? `/${folderPath}` : ""}`;
       }
       close2();
@@ -64657,9 +64730,9 @@ const FormWrapper = ({
     "div",
     {
       "data-test": `form:${id2 == null ? void 0 : id2.replace(/\\/g, "/")}`,
-      className: "h-full overflow-y-auto max-h-full bg-gray-50"
+      className: "h-full overflow-y-auto max-h-full bg-gray-50 @container"
     },
-    /* @__PURE__ */ React.createElement("div", { className: "py-5 px-6" }, children)
+    /* @__PURE__ */ React.createElement("div", { className: "py-5 px-4" }, children)
   );
 };
 const Emoji = ({ className = "", ...props }) => /* @__PURE__ */ React.createElement(
@@ -64672,7 +64745,7 @@ const Emoji = ({ className = "", ...props }) => /* @__PURE__ */ React.createElem
 const CreateBranchModel = ({
   close: close2,
   safeSubmit,
-  relativePath: relativePath2,
+  relativePath,
   values,
   crudType
 }) => /* @__PURE__ */ React.createElement(
@@ -64680,7 +64753,7 @@ const CreateBranchModel = ({
   {
     close: close2,
     safeSubmit,
-    path: relativePath2,
+    path: relativePath,
     values,
     crudType
   }
@@ -119900,44 +119973,68 @@ class LocalClient extends Client {
 }
 class TinaCMSSearchClient {
   constructor(client, tinaSearchConfig) {
+    __publicField(this, "client");
+    __publicField(this, "fuzzyEnabled");
+    __publicField(this, "stopwordLanguages");
+    __publicField(this, "defaultFuzzyOptions");
     this.client = client;
-    this.tinaSearchConfig = tinaSearchConfig;
+    this.fuzzyEnabled = (tinaSearchConfig == null ? void 0 : tinaSearchConfig.fuzzyEnabled) ?? true;
+    this.stopwordLanguages = tinaSearchConfig == null ? void 0 : tinaSearchConfig.stopwordLanguages;
+    this.defaultFuzzyOptions = tinaSearchConfig == null ? void 0 : tinaSearchConfig.fuzzyOptions;
   }
-  async query(query, options) {
-    var _a2;
+  getSearchBaseUrl(useFuzzy) {
+    const version2 = useFuzzy ? "v2" : "";
+    const searchPath = version2 ? `${version2}/searchIndex` : "searchIndex";
+    return `${this.client.contentApiBase}/${searchPath}/${this.client.clientId}/${this.client.getBranch()}`;
+  }
+  buildSearchUrl(query, options, useFuzzy) {
+    const baseUrl = this.getSearchBaseUrl(useFuzzy);
+    if (useFuzzy) {
+      const params = new URLSearchParams();
+      params.set("query", query);
+      if (options == null ? void 0 : options.collection) {
+        params.set("collection", options.collection);
+      }
+      if (options == null ? void 0 : options.limit) {
+        params.set("limit", options.limit.toString());
+      }
+      if (options == null ? void 0 : options.cursor) {
+        params.set("cursor", options.cursor);
+      }
+      return `${baseUrl}?${params.toString()}`;
+    }
+    const queryWithCollection = (options == null ? void 0 : options.collection) ? `${query} AND _collection:${options.collection}` : query;
     const q2 = queryToSearchIndexQuery(
-      query,
-      (_a2 = this.tinaSearchConfig) == null ? void 0 : _a2.stopwordLanguages
+      queryWithCollection,
+      this.stopwordLanguages
     );
     const opt = optionsToSearchIndexOptions(options);
     const optionsParam = opt["PAGE"] ? `&options=${JSON.stringify(opt)}` : "";
-    const res = await this.client.authProvider.fetchWithToken(
-      `${this.client.contentApiBase}/searchIndex/${this.client.clientId}/${this.client.getBranch()}?q=${JSON.stringify(q2)}${optionsParam}`
-    );
+    return `${baseUrl}?q=${JSON.stringify(q2)}${optionsParam}`;
+  }
+  async query(query, options) {
+    const useFuzzy = (options == null ? void 0 : options.fuzzy) !== void 0 ? options.fuzzy : this.fuzzyEnabled;
+    const url = this.buildSearchUrl(query, options, useFuzzy);
+    const res = await this.client.authProvider.fetchWithToken(url);
     return parseSearchIndexResponse(await res.json(), options);
   }
   async del(ids) {
+    const baseUrl = this.getSearchBaseUrl(this.fuzzyEnabled);
     const res = await this.client.authProvider.fetchWithToken(
-      `${this.client.contentApiBase}/searchIndex/${this.client.clientId}/${this.client.getBranch()}?ids=${ids.join(",")}`,
-      {
-        method: "DELETE"
-      }
+      `${baseUrl}?ids=${ids.join(",")}`,
+      { method: "DELETE" }
     );
     if (res.status !== 200) {
       throw new Error("Failed to update search index");
     }
   }
   async put(docs) {
-    const res = await this.client.authProvider.fetchWithToken(
-      `${this.client.contentApiBase}/searchIndex/${this.client.clientId}/${this.client.getBranch()}`,
-      {
-        method: "POST",
-        body: JSON.stringify({ docs }),
-        headers: {
-          "Content-Type": "application/json"
-        }
-      }
-    );
+    const baseUrl = this.getSearchBaseUrl(this.fuzzyEnabled);
+    const res = await this.client.authProvider.fetchWithToken(baseUrl, {
+      method: "POST",
+      body: JSON.stringify({ docs }),
+      headers: { "Content-Type": "application/json" }
+    });
     if (res.status !== 200) {
       throw new Error("Failed to update search index");
     }
@@ -119945,29 +120042,62 @@ class TinaCMSSearchClient {
   supportsClientSideIndexing() {
     return true;
   }
+  getDefaultLimit() {
+    return 15;
+  }
 }
 class LocalSearchClient {
-  constructor(client) {
+  constructor(client, tinaSearchConfig) {
+    __publicField(this, "client");
+    __publicField(this, "fuzzyEnabled");
+    __publicField(this, "defaultFuzzyOptions");
     this.client = client;
+    this.fuzzyEnabled = (tinaSearchConfig == null ? void 0 : tinaSearchConfig.fuzzyEnabled) ?? true;
+    this.defaultFuzzyOptions = tinaSearchConfig == null ? void 0 : tinaSearchConfig.fuzzyOptions;
   }
-  async query(query, options) {
-    const q2 = queryToSearchIndexQuery(query);
+  getSearchBaseUrl(useFuzzy) {
+    return useFuzzy ? "http://localhost:4001/v2/searchIndex" : "http://localhost:4001/searchIndex";
+  }
+  buildSearchUrl(query, options, useFuzzy) {
+    const baseUrl = this.getSearchBaseUrl(!!useFuzzy);
+    if (useFuzzy) {
+      const params = new URLSearchParams();
+      params.set("query", query);
+      if (options == null ? void 0 : options.collection) {
+        params.set("collection", options.collection);
+      }
+      if (options == null ? void 0 : options.limit) {
+        params.set("limit", options.limit.toString());
+      }
+      if (options == null ? void 0 : options.cursor) {
+        params.set("cursor", options.cursor);
+      }
+      return `${baseUrl}?${params.toString()}`;
+    }
+    const queryWithCollection = (options == null ? void 0 : options.collection) ? `${query} AND _collection:${options.collection}` : query;
+    const q2 = queryToSearchIndexQuery(queryWithCollection);
     const opt = optionsToSearchIndexOptions(options);
     const optionsParam = opt["PAGE"] ? `&options=${JSON.stringify(opt)}` : "";
-    const res = await this.client.authProvider.fetchWithToken(
-      `http://localhost:4001/searchIndex?q=${JSON.stringify(q2)}${optionsParam}`
-    );
+    return `${baseUrl}?q=${JSON.stringify(q2)}${optionsParam}`;
+  }
+  async query(query, options) {
+    const useFuzzy = (options == null ? void 0 : options.fuzzy) !== void 0 ? options.fuzzy : this.fuzzyEnabled;
+    const url = this.buildSearchUrl(query, options, useFuzzy);
+    const res = await this.client.authProvider.fetchWithToken(url);
     return parseSearchIndexResponse(await res.json(), options);
   }
-  del(ids) {
-    return Promise.resolve(void 0);
+  del(_ids) {
+    return Promise.resolve();
   }
-  put(docs) {
-    return Promise.resolve(void 0);
+  put(_docs) {
+    return Promise.resolve();
   }
   supportsClientSideIndexing() {
     return false;
   }
+  getDefaultLimit() {
+    return 15;
+  }
 }
 function ModalBuilder(modalProps) {
   return /* @__PURE__ */ React__default.createElement(Modal, null, /* @__PURE__ */ React__default.createElement(ModalPopup, null, /* @__PURE__ */ React__default.createElement(ModalHeader, null, modalProps.title), /* @__PURE__ */ React__default.createElement(ModalBody, { padded: true }, modalProps.message && (typeof modalProps.message === "string" ? /* @__PURE__ */ React__default.createElement("p", null, modalProps.message) : modalProps.message), modalProps.error && /* @__PURE__ */ React__default.createElement(ErrorLabel, null, modalProps.error), modalProps.children), /* @__PURE__ */ React__default.createElement(ModalActions, null, modalProps.actions.map((action) => /* @__PURE__ */ React__default.createElement(AsyncButton, { key: action.name, ...action })))));
@@ -120262,19 +120392,22 @@ const TinaCloudProvider = (props) => {
     cms.api.tina.setBranch(currentBranch);
   }
   useEffect(() => {
-    var _a3, _b2, _c2, _d, _e, _f;
+    var _a3, _b2, _c2, _d, _e, _f, _g, _h;
     let searchClient;
     if (props.isLocalClient) {
-      searchClient = new LocalSearchClient(cms.api.tina);
+      searchClient = new LocalSearchClient(
+        cms.api.tina,
+        (_b2 = (_a3 = props.schema.config) == null ? void 0 : _a3.search) == null ? void 0 : _b2.tina
+      );
     } else {
-      const hasTinaSearch = Boolean((_b2 = (_a3 = props.schema.config) == null ? void 0 : _a3.search) == null ? void 0 : _b2.tina);
+      const hasTinaSearch = Boolean((_d = (_c2 = props.schema.config) == null ? void 0 : _c2.search) == null ? void 0 : _d.tina);
       if (hasTinaSearch) {
         searchClient = new TinaCMSSearchClient(
           cms.api.tina,
-          (_d = (_c2 = props.schema.config) == null ? void 0 : _c2.search) == null ? void 0 : _d.tina
+          (_f = (_e = props.schema.config) == null ? void 0 : _e.search) == null ? void 0 : _f.tina
         );
       } else {
-        searchClient = (_f = (_e = props.schema.config) == null ? void 0 : _e.search) == null ? void 0 : _f.searchClient;
+        searchClient = (_h = (_g = props.schema.config) == null ? void 0 : _g.search) == null ? void 0 : _h.searchClient;
       }
     }
     if (searchClient) {
@@ -120408,18 +120541,18 @@ class ContentCreatorPlugin {
     this.onChange = options.onChange;
     this.initialValues = options.initialValues;
   }
-  async onSubmit({ collection, template, relativePath: relativePath2 }, cms) {
+  async onSubmit({ collection, template, relativePath }, cms) {
     try {
       const selectedCollection = this.collections.find(
         (collectionItem) => collectionItem.slug === collection
       );
       const collectionFormat = selectedCollection.format;
       const extensionLength = -1 * (collectionFormat.length + 1);
-      let relativePathWithExt = relativePath2;
-      if (relativePath2.slice(extensionLength).toLocaleLowerCase() === `.${collectionFormat}`) {
-        relativePathWithExt = `${relativePath2.slice(0, -3)}.${collectionFormat}`;
+      let relativePathWithExt = relativePath;
+      if (relativePath.slice(extensionLength).toLocaleLowerCase() === `.${collectionFormat}`) {
+        relativePathWithExt = `${relativePath.slice(0, -3)}.${collectionFormat}`;
       } else {
-        relativePathWithExt = `${relativePath2}.${collectionFormat}`;
+        relativePathWithExt = `${relativePath}.${collectionFormat}`;
       }
       const payload = {
         relativePath: relativePathWithExt,
@@ -121320,6 +121453,10 @@ const CollectionListPage = () => {
       booleanEquals: null
     }));
   }, [collectionName]);
+  useEffect(() => {
+    setEndCursor("");
+    setPrevCursors([]);
+  }, [search]);
   const tableRowStyle = "hover:bg-gray-50/50 border-b-2 border-gray-50 transition-colors duration-300";
   const tableHeadingCellStyle = "px-3 py-3 text-left text-xs font-bold text-gray-700 tracking-wider";
   const tableHeadingStyle2 = "bg-gray-100 border-b-2 border-gray-200";
@@ -121579,6 +121716,8 @@ const CollectionListPage = () => {
         ))), /* @__PURE__ */ React__default.createElement("div", { className: "flex flex-1 flex-row gap-2 items-end w-full" }, searchEnabled ? /* @__PURE__ */ React__default.createElement(
           SearchInput,
           {
+            cms,
+            collectionName,
             loading: _loading,
             search,
             setSearch,
@@ -121911,46 +122050,67 @@ const SearchInput = ({
   setSearchInput
 }) => {
   const [searchLoaded, setSearchLoaded] = useState(false);
+  const inputRef = React__default.useRef(null);
   useEffect(() => {
-    if (loading) {
+    setSearchLoaded(!loading);
+  }, [loading]);
+  const handleKeyDown = (e3) => {
+    if (e3.key === "Enter") {
+      e3.preventDefault();
+      if (searchInput.trim()) {
+        setSearch(searchInput);
+        setSearchLoaded(false);
+      }
+    }
+  };
+  const handleSubmit = (e3) => {
+    e3.preventDefault();
+    if (searchInput.trim()) {
+      setSearch(searchInput);
       setSearchLoaded(false);
-    } else {
-      setSearchLoaded(true);
     }
-  }, [loading]);
-  return /* @__PURE__ */ React__default.createElement("form", { className: "flex flex-1 flex-col gap-2 items-start w-full" }, /* @__PURE__ */ React__default.createElement("div", { className: "h-4" }), /* @__PURE__ */ React__default.createElement("div", { className: "flex flex-col md:flex-row items-start md:items-center w-full md:w-auto gap-3" }, /* @__PURE__ */ React__default.createElement("div", { className: "flex-1 min-w-[200px] w-full md:w-auto relative" }, /* @__PURE__ */ React__default.createElement(BiSearch, { className: "absolute left-3 top-1/2 -translate-y-1/2 w-5 h-5 text-gray-400 pointer-events-none" }), /* @__PURE__ */ React__default.createElement(
-    "input",
+  };
+  return /* @__PURE__ */ React__default.createElement(
+    "form",
     {
-      type: "text",
-      name: "search",
-      placeholder: "Search...",
-      value: searchInput,
-      onChange: (e3) => {
-        setSearchInput(e3.target.value);
-      },
-      onKeyDown: (e3) => {
-        if (e3.key === "Enter") {
+      className: "flex flex-1 flex-col gap-2 items-start w-full",
+      onSubmit: handleSubmit
+    },
+    /* @__PURE__ */ React__default.createElement("div", { className: "h-4" }),
+    /* @__PURE__ */ React__default.createElement("div", { className: "flex items-center w-full md:w-auto gap-3" }, /* @__PURE__ */ React__default.createElement("div", { className: "flex-1 min-w-[200px] relative" }, /* @__PURE__ */ React__default.createElement(BiSearch, { className: "absolute left-3 top-1/2 -translate-y-1/2 w-5 h-5 text-gray-400 pointer-events-none z-10" }), /* @__PURE__ */ React__default.createElement(
+      "input",
+      {
+        ref: inputRef,
+        type: "text",
+        name: "search",
+        placeholder: "Search...",
+        value: searchInput,
+        onChange: (e3) => setSearchInput(e3.target.value),
+        onKeyDown: handleKeyDown,
+        className: "shadow appearance-none bg-white block pl-10 pr-10 py-2 truncate w-full text-base border border-gray-200 focus:outline-none focus:shadow-outline focus:ring-blue-500 focus:border-blue-500 sm:text-sm rounded placeholder:text-gray-300 text-gray-600 focus:text-gray-900",
+        autoComplete: "off"
+      }
+    ), search && searchLoaded && /* @__PURE__ */ React__default.createElement(
+      "button",
+      {
+        onClick: (e3) => {
           e3.preventDefault();
-          if (searchInput.trim()) {
-            setSearch(searchInput);
-            setSearchLoaded(false);
-          }
-        }
+          setSearch("");
+          setSearchInput("");
+        },
+        className: "absolute right-3 top-1/2 -translate-y-1/2 text-gray-400 hover:text-gray-600 transition-colors z-10"
       },
-      className: "shadow appearance-none bg-white block pl-10 pr-10 py-2 truncate w-full text-base border border-gray-200 focus:outline-none focus:shadow-outline focus:ring-blue-500 focus:border-blue-500 sm:text-sm rounded placeholder:text-gray-300 text-gray-600 focus:text-gray-900"
-    }
-  ), search && searchLoaded && /* @__PURE__ */ React__default.createElement(
-    "button",
-    {
-      onClick: (e3) => {
-        e3.preventDefault();
-        setSearch("");
-        setSearchInput("");
+      /* @__PURE__ */ React__default.createElement(BiX, { className: "w-5 h-5" })
+    )), /* @__PURE__ */ React__default.createElement(
+      Button$2,
+      {
+        variant: "primary",
+        type: "submit",
+        className: "focus:ring-0 focus:shadow-none"
       },
-      className: "absolute right-3 top-1/2 -translate-y-1/2 text-gray-400 hover:text-gray-600 transition-colors"
-    },
-    /* @__PURE__ */ React__default.createElement(BiX, { className: "w-5 h-5" })
-  ))));
+      "Search"
+    ))
+  );
 };
 const Breadcrumb = ({ folder, navigate, collectionName }) => {
   const folderArray = folder.name.split("/");
@@ -122218,17 +122378,16 @@ const useSearchCollection = (cms, collectionName, includeDocuments = true, folde
     const searchCollection = async () => {
       if (await api.isAuthenticated() && !folder.loading && !cancelled) {
         try {
-          const response = await cms.api.search.query(
-            `${search} AND _collection:${collectionName}`,
-            {
-              limit: 15,
-              cursor: after3
-            }
-          );
+          const response = await cms.api.search.query(search, {
+            limit: 15,
+            cursor: after3,
+            collection: collectionName
+          });
+          const results = (response == null ? void 0 : response.results) ?? [];
           const docs = await Promise.allSettled(
-            response.results.map((result) => {
-              const [collection2, relativePath2] = result._id.split(":");
-              return api.fetchDocument(collection2, relativePath2, false);
+            results.map((result) => {
+              const [collection2, relativePath] = result._id.split(":");
+              return api.fetchDocument(collection2, relativePath, false);
             })
           );
           const edges2 = docs.filter((p2) => {
@@ -122236,21 +122395,22 @@ const useSearchCollection = (cms, collectionName, includeDocuments = true, folde
             return p2.status === "fulfilled" && !!((_a2 = p2.value) == null ? void 0 : _a2.document);
           }).map((result) => ({ node: result.value.document }));
           const c2 = await api.fetchCollection(collectionName, false, "");
-          setCollection({
-            format: collection.format,
-            label: collection.label,
+          const collectionData = {
+            format: c2.format,
+            label: c2.label,
             name: collectionName,
-            templates: collection.templates,
+            templates: c2.templates,
             documents: {
               pageInfo: {
-                hasNextPage: !!response.nextCursor,
-                hasPreviousPage: !!response.prevCursor,
+                hasNextPage: !!(response == null ? void 0 : response.nextCursor),
+                hasPreviousPage: !!(response == null ? void 0 : response.prevCursor),
                 startCursor: "",
-                endCursor: response.nextCursor || ""
+                endCursor: (response == null ? void 0 : response.nextCursor) || ""
               },
               edges: edges2
             }
-          });
+          };
+          setCollection(collectionData);
         } catch (error22) {
           cms.alerts.error(
             `[${error22.name}] GetCollection failed: ${error22.message}`
@@ -122353,14 +122513,14 @@ const createDocument = async (cms, collection, template, mutationInfo, folder, v
     throw new Error("Filename must be a string");
   }
   const appendFolder = folder && !filename.startsWith("/") ? `/${folder}/` : "/";
-  const relativePath2 = `${appendFolder}${filename}.${collection.format}`;
+  const relativePath = `${appendFolder}${filename}.${collection.format}`;
   const params = api.schema.transformPayload(collection.name, {
     _collection: collection.name,
     ...template && { _template: template.name },
     ...leftover
   });
   if (await api.isAuthenticated()) {
-    await api.createDocument(collection, relativePath2, params);
+    await api.createDocument(collection, relativePath, params);
   } else {
     const authMessage = `CreateDocument failed: User is no longer authenticated; please login and try again.`;
     cms.alerts.error(authMessage);
@@ -122610,7 +122770,7 @@ const RenderForm$1 = ({
     ), /* @__PURE__ */ React__default.createElement(FormStatus, { pristine: formIsPristine }))
   ), activeForm && /* @__PURE__ */ React__default.createElement(FormBuilder, { form: activeForm, onPristineChange: setFormIsPristine })));
 };
-const useGetDocument = (cms, collectionName, relativePath2) => {
+const useGetDocument = (cms, collectionName, relativePath) => {
   const api = new TinaAdminApi(cms);
   const [document2, setDocument] = useState(void 0);
   const [loading, setLoading] = useState(true);
@@ -122622,7 +122782,7 @@ const useGetDocument = (cms, collectionName, relativePath2) => {
         try {
           const response = await api.fetchDocument(
             collectionName,
-            relativePath2
+            relativePath
           );
           if (!isCancelled) {
             setDocument(response.document);
@@ -122647,19 +122807,19 @@ const useGetDocument = (cms, collectionName, relativePath2) => {
     return () => {
       isCancelled = true;
     };
-  }, [cms, collectionName, relativePath2]);
+  }, [cms, collectionName, relativePath]);
   return { document: document2, loading, error: error2 };
 };
 const GetDocument = ({
   cms,
   collectionName,
-  relativePath: relativePath2,
+  relativePath,
   children
 }) => {
   const { document: document2, loading, error: error2 } = useGetDocument(
     cms,
     collectionName,
-    relativePath2
+    relativePath
   );
   if (error2) {
     return /* @__PURE__ */ React__default.createElement(FullscreenError, null);
@@ -122682,7 +122842,7 @@ const CollectionDuplicatePage = () => {
       includeDocuments: false
     },
     (collection) => {
-      const relativePath2 = `${filename.startsWith("~/") ? filename.substring(2) : filename}.${collection.format}`;
+      const relativePath = `${filename.startsWith("~/") ? filename.substring(2) : filename}.${collection.format}`;
       const mutationInfo = {
         includeCollection: true,
         includeTemplate: !!collection.templates
@@ -122692,7 +122852,7 @@ const CollectionDuplicatePage = () => {
         {
           cms,
           collectionName: collection.name,
-          relativePath: relativePath2
+          relativePath
         },
         (document2) => {
           var _a2;
@@ -122712,11 +122872,11 @@ const CollectionDuplicatePage = () => {
     }
   ));
 };
-const updateDocument = async (cms, relativePath2, collection, mutationInfo, values) => {
+const updateDocument = async (cms, relativePath, collection, mutationInfo, values) => {
   const api = new TinaAdminApi(cms);
   const params = api.schema.transformPayload(collection.name, values);
   if (await api.isAuthenticated()) {
-    await api.updateDocument(collection, relativePath2, params);
+    await api.updateDocument(collection, relativePath, params);
   } else {
     const authMessage = `UpdateDocument failed: User is no longer authenticated; please login and try again.`;
     cms.alerts.error(authMessage);
@@ -122738,7 +122898,7 @@ const CollectionUpdatePage = () => {
       includeDocuments: false
     },
     (collection) => {
-      const relativePath2 = `${resolvedFile}.${collection.format}`;
+      const relativePath = `${resolvedFile}.${collection.format}`;
       const mutationInfo = {
         includeCollection: true,
         includeTemplate: !!collection.templates
@@ -122748,7 +122908,7 @@ const CollectionUpdatePage = () => {
         {
           cms,
           collectionName: collection.name,
-          relativePath: relativePath2
+          relativePath
         },
         (document2) => /* @__PURE__ */ React__default.createElement(
           RenderForm,
@@ -122756,7 +122916,7 @@ const CollectionUpdatePage = () => {
             cms,
             document: document2,
             filename: resolvedFile,
-            relativePath: relativePath2,
+            relativePath,
             collection,
             mutationInfo
           }
@@ -122769,7 +122929,7 @@ const RenderForm = ({
   cms,
   document: document2,
   filename,
-  relativePath: relativePath2,
+  relativePath,
   collection,
   mutationInfo
 }) => {
@@ -122790,7 +122950,7 @@ const RenderForm = ({
   const form = useMemo(() => {
     return new Form({
       // id is the full document path
-      id: canonicalPath(`${schemaCollection.path}/${relativePath2}`),
+      id: canonicalPath(`${schemaCollection.path}/${relativePath}`),
       label: "form",
       fields: formInfo.fields,
       initialValues: document2._values,
@@ -122798,7 +122958,7 @@ const RenderForm = ({
         try {
           await updateDocument(
             cms,
-            relativePath2,
+            relativePath,
             collection,
             mutationInfo,
             values
@@ -122819,7 +122979,7 @@ const RenderForm = ({
         }
       }
     });
-  }, [cms, document2, relativePath2, collection, mutationInfo]);
+  }, [cms, document2, relativePath, collection, mutationInfo]);
   React__default.useEffect(() => {
     cms.dispatch({ type: "forms:add", value: form });
     cms.dispatch({ type: "forms:set-active-form-id", value: form.id });
@@ -122850,7 +123010,7 @@ const RenderForm = ({
       {
         defaultBranchName: (_a2 = cms.api.admin.api.schema.config.config.repoProvider) == null ? void 0 : _a2.defaultBranchName,
         historyUrl: (_b = cms.api.admin.api.schema.config.config.repoProvider) == null ? void 0 : _b.historyUrl,
-        contentRelativePath: relativePath2,
+        contentRelativePath: relativePath,
         tinaBranch: cms.api.admin.api.branch,
         isLocalMode: (_d = (_c = cms.api) == null ? void 0 : _c.tina) == null ? void 0 : _d.isLocalMode
       }