@strapi/content-manager 0.0.0-experimental.f6c00790e260ea5a9b6b86abac5fea02b05d569c → 0.0.0-experimental.f736daceb203b33d9ed36a1149e21f2814d1935c

package/dist/_chunks/{Field-DPAzUS1M.mjs → Input-aV8SSoTa.mjs}

@@ -1,25 +1,76 @@
 import { jsx, jsxs, Fragment } from "react/jsx-runtime";
 import * as React from "react";
 import { useState, useEffect, useCallback, memo } from "react";
-import { useStrapiApp, createContext, useField, useNotification, useForm, useAPIErrorHandler, useQueryParams, useFocusInputField, InputRenderer as InputRenderer$1 } from "@strapi/admin/strapi-admin";
-import { Box, SingleSelect, SingleSelectOption, Typography, Flex, BaseLink, Button, Popover, Field, Tooltip, IconButton, useComposedRefs, Portal, FocusTrap, Divider, VisuallyHidden, Grid as Grid$1, Accordion, TextButton, TextInput, IconButtonGroup, Menu, MenuItem } from "@strapi/design-system";
-import pipe$1 from "lodash/fp/pipe";
+import { useStrapiApp, createContext, useField, useForm, useNotification, useAPIErrorHandler, useQueryParams, useFocusInputField, InputRenderer as InputRenderer$1 } from "@strapi/admin/strapi-admin";
+import { Box, SingleSelect, SingleSelectOption, Typography, Flex, BaseLink, Button, Popover, Field, Tooltip, IconButton, useComposedRefs, Portal, FocusTrap, Divider, VisuallyHidden, Accordion, Menu, MenuItem, Grid as Grid$1, TextInput, IconButtonGroup, TextButton } from "@strapi/design-system";
+import { CodeBlock as CodeBlock$1, HeadingOne, HeadingTwo, HeadingThree, HeadingFour, HeadingFive, HeadingSix, Image as Image$1, NumberList, BulletList, Paragraph, Quotes, Link as Link$1, Drag, Collapse, Bold, Italic, Underline, StrikeThrough, Code, Expand, PlusCircle, Trash, More, EyeStriked, CheckCircle, WarningCircle, Loader, ArrowClockwise, Plus } from "@strapi/icons";
 import { useIntl } from "react-intl";
-import { m as DOCUMENT_META_FIELDS, g as getTranslation, c as useDoc, e as contentManagerApi, n as CLONE_PATH, d as buildValidParams, f as useDocumentRBAC, o as useDocLayout } from "./index-BHfS6_D5.mjs";
-import { generateNKeysBetween } from "fractional-indexing";
-import { u as useComponent, C as ComponentProvider, M as MemoizedRelationsField } from "./Relations-QP5yn9_z.mjs";
-import { Code, HeadingOne, HeadingTwo, HeadingThree, HeadingFour, HeadingFive, HeadingSix, Image as Image$1, NumberList, BulletList, Paragraph, Quotes, Link as Link$1, Drag, Collapse, Bold, Italic, Underline, StrikeThrough, Expand, PlusCircle, Plus, Trash, EyeStriked, CheckCircle, WarningCircle, Loader, ArrowClockwise, More } from "@strapi/icons";
+import { g as getTranslation, m as useDocLayout, c as useDoc, n as createDefaultForm, t as transformDocument, e as contentManagerApi, o as CLONE_PATH, d as buildValidParams, f as useDocumentRBAC, S as SINGLE_TYPES } from "./index-EH8ZtHd5.mjs";
 import { styled, css, keyframes } from "styled-components";
-import { C as ComponentIcon, a as COMPONENT_ICONS } from "./ComponentIcon-u4bIXTFY.mjs";
-import { getEmptyImage } from "react-dnd-html5-backend";
-import { a as DIRECTIONS, u as useDragAndDrop, I as ItemTypes } from "./useDragAndDrop-DdHgKsqq.mjs";
-import { g as getIn } from "./objects-mKMAmfec.mjs";
 import { Editor as Editor$1, Transforms, Node, Element, Range, Path, Point, createEditor } from "slate";
 import { withHistory } from "slate-history";
 import { useFocused, useSelected, ReactEditor, Editable, useSlate, Slate, withReact } from "slate-react";
-import { p as prefixFileUrlWithBackendUrl, u as usePrev, a as useDebounce } from "./useDebounce-DmuSJIF3.mjs";
+import * as Prism from "prismjs";
+import "prismjs/themes/prism-solarizedlight.css";
+import "prismjs/components/prism-asmatmel";
+import "prismjs/components/prism-bash";
+import "prismjs/components/prism-basic";
+import "prismjs/components/prism-c";
+import "prismjs/components/prism-clojure";
+import "prismjs/components/prism-cobol";
+import "prismjs/components/prism-cpp";
+import "prismjs/components/prism-csharp";
+import "prismjs/components/prism-dart";
+import "prismjs/components/prism-docker";
+import "prismjs/components/prism-elixir";
+import "prismjs/components/prism-erlang";
+import "prismjs/components/prism-fortran";
+import "prismjs/components/prism-fsharp";
+import "prismjs/components/prism-go";
+import "prismjs/components/prism-graphql";
+import "prismjs/components/prism-groovy";
+import "prismjs/components/prism-haskell";
+import "prismjs/components/prism-haxe";
+import "prismjs/components/prism-ini";
+import "prismjs/components/prism-java";
+import "prismjs/components/prism-javascript";
+import "prismjs/components/prism-jsx";
+import "prismjs/components/prism-json";
+import "prismjs/components/prism-julia";
+import "prismjs/components/prism-kotlin";
+import "prismjs/components/prism-latex";
+import "prismjs/components/prism-lua";
+import "prismjs/components/prism-markdown";
+import "prismjs/components/prism-matlab";
+import "prismjs/components/prism-makefile";
+import "prismjs/components/prism-objectivec";
+import "prismjs/components/prism-perl";
+import "prismjs/components/prism-php";
+import "prismjs/components/prism-powershell";
+import "prismjs/components/prism-python";
+import "prismjs/components/prism-r";
+import "prismjs/components/prism-ruby";
+import "prismjs/components/prism-rust";
+import "prismjs/components/prism-sas";
+import "prismjs/components/prism-scala";
+import "prismjs/components/prism-scheme";
+import "prismjs/components/prism-sql";
+import "prismjs/components/prism-stata";
+import "prismjs/components/prism-swift";
+import "prismjs/components/prism-typescript";
+import "prismjs/components/prism-tsx";
+import "prismjs/components/prism-vbnet";
+import "prismjs/components/prism-yaml";
+import { p as prefixFileUrlWithBackendUrl, u as usePrev } from "./usePrev-DH6iah0A.mjs";
+import { a as DIRECTIONS, u as useDragAndDrop, I as ItemTypes } from "./useDragAndDrop-DJ6jqvZN.mjs";
 import * as Toolbar from "@radix-ui/react-toolbar";
-import { useLocation, useMatch } from "react-router-dom";
+import { getEmptyImage } from "react-dnd-html5-backend";
+import { useMatch, useLocation } from "react-router-dom";
+import { g as getIn } from "./objects-D6yBsdmx.mjs";
+import { u as useComponent, C as ComponentProvider, M as MemoizedRelationsField } from "./Relations-B7_hbF0w.mjs";
+import pipe$1 from "lodash/fp/pipe";
+import { C as ComponentIcon, a as COMPONENT_ICONS } from "./ComponentIcon-u4bIXTFY.mjs";
+import { a as useDebounce } from "./relations-B8_Uu38Q.mjs";
 import CodeMirror from "codemirror5";
 import sanitizeHtml from "sanitize-html";
 import { getLanguage, highlight, highlightAuto } from "highlight.js";
@@ -35,93 +86,6 @@ import sub from "markdown-it-sub";
 import sup from "markdown-it-sup";
 import "highlight.js/styles/solarized-dark.css";
 import "codemirror5/addon/display/placeholder";
-const BLOCK_LIST_ATTRIBUTE_KEYS = ["__component", "__temp_key__"];
-const traverseData = (predicate, transform) => (schema, components = {}) => (data = {}) => {
-  const traverse = (datum, attributes) => {
-    return Object.entries(datum).reduce((acc, [key, value]) => {
-      const attribute = attributes[key];
-      if (BLOCK_LIST_ATTRIBUTE_KEYS.includes(key) || value === null || value === void 0) {
-        acc[key] = value;
-        return acc;
-      }
-      if (attribute.type === "component") {
-        if (attribute.repeatable) {
-          const componentValue = predicate(attribute, value) ? transform(value, attribute) : value;
-          acc[key] = componentValue.map(
-            (componentData) => traverse(componentData, components[attribute.component]?.attributes ?? {})
-          );
-        } else {
-          const componentValue = predicate(attribute, value) ? transform(value, attribute) : value;
-          acc[key] = traverse(componentValue, components[attribute.component]?.attributes ?? {});
-        }
-      } else if (attribute.type === "dynamiczone") {
-        const dynamicZoneValue = predicate(attribute, value) ? transform(value, attribute) : value;
-        acc[key] = dynamicZoneValue.map(
-          (componentData) => traverse(componentData, components[componentData.__component]?.attributes ?? {})
-        );
-      } else if (predicate(attribute, value)) {
-        acc[key] = transform(value, attribute);
-      } else {
-        acc[key] = value;
-      }
-      return acc;
-    }, {});
-  };
-  return traverse(data, schema.attributes);
-};
-const removeProhibitedFields = (prohibitedFields) => traverseData(
-  (attribute) => prohibitedFields.includes(attribute.type),
-  () => ""
-);
-const prepareRelations = traverseData(
-  (attribute) => attribute.type === "relation",
-  () => ({
-    connect: [],
-    disconnect: []
-  })
-);
-const prepareTempKeys = traverseData(
-  (attribute) => attribute.type === "component" && attribute.repeatable || attribute.type === "dynamiczone",
-  (data) => {
-    if (Array.isArray(data) && data.length > 0) {
-      const keys = generateNKeysBetween(void 0, void 0, data.length);
-      return data.map((datum, index) => ({
-        ...datum,
-        __temp_key__: keys[index]
-      }));
-    }
-    return data;
-  }
-);
-const removeFieldsThatDontExistOnSchema = (schema) => (data) => {
-  const schemaKeys = Object.keys(schema.attributes);
-  const dataKeys = Object.keys(data);
-  const keysToRemove = dataKeys.filter((key) => !schemaKeys.includes(key));
-  const revisedData = [...keysToRemove, ...DOCUMENT_META_FIELDS].reduce((acc, key) => {
-    delete acc[key];
-    return acc;
-  }, structuredClone(data));
-  return revisedData;
-};
-const removeNullValues = (data) => {
-  return Object.entries(data).reduce((acc, [key, value]) => {
-    if (value === null) {
-      return acc;
-    }
-    acc[key] = value;
-    return acc;
-  }, {});
-};
-const transformDocument = (schema, components = {}) => (document2) => {
-  const transformations = pipe$1(
-    removeFieldsThatDontExistOnSchema(schema),
-    removeProhibitedFields(["password"])(schema, components),
-    removeNullValues,
-    prepareRelations(schema, components),
-    prepareTempKeys(schema, components)
-  );
-  return transformations(document2);
-};
 const componentStore = /* @__PURE__ */ new Map();
 const useLazyComponents = (componentUids = []) => {
   const [lazyComponentStore, setLazyComponentStore] = useState(Object.fromEntries(componentStore));
@@ -163,7 +127,8 @@ const useLazyComponents = (componentUids = []) => {
 const codeLanguages = [
   {
     value: "asm",
-    label: "Assembly"
+    label: "Assembly",
+    decorate: "asmatmel"
   },
   {
     value: "bash",
@@ -199,7 +164,8 @@ const codeLanguages = [
   },
   {
     value: "dockerfile",
-    label: "Dockerfile"
+    label: "Dockerfile",
+    decorate: "docker"
   },
   {
     value: "elixir",
@@ -355,7 +321,8 @@ const codeLanguages = [
   },
   {
     value: "typescript",
-    label: "TypeScript"
+    label: "TypeScript",
+    decorate: "ts"
   },
   {
     value: "tsx",
@@ -371,7 +338,8 @@ const codeLanguages = [
   },
   {
     value: "yaml",
-    label: "YAML"
+    label: "YAML",
+    decorate: "yml"
   }
 ];
 const baseHandleConvert = (editor, attributesToSet) => {
@@ -437,6 +405,29 @@ const pressEnterTwiceToExit = (editor) => {
     });
   }
 };
+const decorateCode = ([node, path]) => {
+  const ranges = [];
+  if (!Element.isElement(node) || node.type !== "code") return ranges;
+  const text = Node.string(node);
+  const language = codeLanguages.find((lang) => lang.value === node.language);
+  const decorateKey = language?.decorate ?? language?.value;
+  const selectedLanguage = Prism.languages[decorateKey || "plaintext"];
+  const tokens = Prism.tokenize(text, selectedLanguage);
+  let start = 0;
+  for (const token of tokens) {
+    const length = token.length;
+    const end = start + length;
+    if (typeof token !== "string") {
+      ranges.push({
+        anchor: { path, offset: start },
+        focus: { path, offset: end },
+        className: `token ${token.type}`
+      });
+    }
+    start = end;
+  }
+  return ranges;
+};
 const CodeBlock = styled.pre`
   border-radius: ${({ theme }) => theme.borderRadius};
   background-color: ${({ theme }) => theme.colors.neutral100};
@@ -508,7 +499,7 @@ const CodeEditor = (props) => {
 const codeBlocks = {
   code: {
     renderElement: (props) => /* @__PURE__ */ jsx(CodeEditor, { ...props }),
-    icon: Code,
+    icon: CodeBlock$1,
     label: {
       id: "components.Blocks.blocks.code",
       defaultMessage: "Code block"
@@ -521,8 +512,7 @@ const codeBlocks = {
     handleEnterKey(editor) {
       pressEnterTwiceToExit(editor);
     },
-    snippets: ["```"],
-    dragHandleTopMargin: "10px"
+    snippets: ["```"]
   }
 };
 const H1 = styled(Typography).attrs({ tag: "h1" })`
@@ -697,8 +687,7 @@ const ImageDialog = () => {
   const [isOpen, setIsOpen] = React.useState(true);
   const { editor } = useBlocksEditorContext("ImageDialog");
   const components = useStrapiApp("ImageDialog", (state) => state.components);
-  if (!components || !isOpen)
-    return null;
+  if (!components || !isOpen) return null;
   const MediaLibraryDialog = components["media-library"];
   const insertImages = (images) => {
     Transforms.unwrapNodes(editor, {
@@ -707,14 +696,12 @@ const ImageDialog = () => {
     });
     const nodeEntryBeingReplaced = Editor$1.above(editor, {
       match(node) {
-        if (Editor$1.isEditor(node))
-          return false;
+        if (Editor$1.isEditor(node)) return false;
         const isInlineNode = ["text", "link"].includes(node.type);
         return !isInlineNode;
       }
     });
-    if (!nodeEntryBeingReplaced)
-      return;
+    if (!nodeEntryBeingReplaced) return;
     const [, pathToInsert] = nodeEntryBeingReplaced;
     Transforms.removeNodes(editor);
     const nodesToInsert = images.map((image) => {
@@ -892,8 +879,7 @@ const LinkContent = React.forwardRef(
       ReactEditor.focus(editor);
     };
     React.useEffect(() => {
-      if (popoverOpen)
-        linkInputRef.current?.focus();
+      if (popoverOpen) linkInputRef.current?.focus();
     }, [popoverOpen]);
     const inputNotDirty = !linkText || !linkUrl || link.url && link.url === linkUrl && elementText && elementText === linkText;
     return /* @__PURE__ */ jsxs(Popover.Root, { open: popoverOpen, children: [
@@ -963,11 +949,11 @@ const LinkContent = React.forwardRef(
           ),
           /* @__PURE__ */ jsxs(Flex, { gap: 2, children: [
             /* @__PURE__ */ jsx(Button, { variant: "tertiary", onClick: handleClose, children: formatMessage({
-              id: "components.Blocks.popover.cancel",
+              id: "global.cancel",
               defaultMessage: "Cancel"
             }) }),
             /* @__PURE__ */ jsx(Button, { disabled: Boolean(inputNotDirty) || isSaveDisabled, onClick: handleSave, children: formatMessage({
-              id: "components.Blocks.popover.save",
+              id: "global.save",
               defaultMessage: "Save"
             }) })
           ] })
@@ -1048,8 +1034,7 @@ const isText$1 = (node) => {
   return Node.isNode(node) && !Editor$1.isEditor(node) && node.type === "text";
 };
 const handleBackspaceKeyOnList = (editor, event) => {
-  if (!editor.selection)
-    return;
+  if (!editor.selection) return;
   const [currentListItem, currentListItemPath] = Editor$1.parent(editor, editor.selection.anchor);
   const [currentList, currentListPath] = Editor$1.parent(editor, currentListItemPath);
   const isListEmpty = currentList.children.length === 1 && isText$1(currentListItem.children[0]) && currentListItem.children[0].text === "";
@@ -1158,8 +1143,7 @@ const handleEnterKeyOnList = (editor) => {
 };
 const handleConvertToList = (editor, format) => {
   const convertedPath = baseHandleConvert(editor, { type: "list-item" });
-  if (!convertedPath)
-    return;
+  if (!convertedPath) return;
   Transforms.wrapNodes(editor, { type: "list", format, children: [] }, { at: convertedPath });
 };
 const handleTabOnList = (editor) => {
@@ -1171,8 +1155,7 @@ const handleTabOnList = (editor) => {
   }
   const [currentListItem, currentListItemPath] = currentListItemEntry;
   const [currentList] = Editor$1.parent(editor, currentListItemPath);
-  if (currentListItem === currentList.children[0])
-    return;
+  if (currentListItem === currentList.children[0]) return;
   const currentListItemIndex = currentList.children.findIndex((item) => item === currentListItem);
   const previousNode = currentList.children[currentListItemIndex - 1];
   if (previousNode.type === "list") {
@@ -1308,13 +1291,13 @@ const quoteBlocks = {
     handleEnterKey(editor) {
       pressEnterTwiceToExit(editor);
     },
-    snippets: [">"],
-    dragHandleTopMargin: "6px"
+    snippets: [">"]
   }
 };
 const ToolbarWrapper = styled(Flex)`
   &[aria-disabled='true'] {
     cursor: not-allowed;
+    background: ${({ theme }) => theme.colors.neutral150};
   }
 `;
 const Separator = styled(Toolbar.Separator)`
@@ -1325,7 +1308,7 @@ const Separator = styled(Toolbar.Separator)`
 const FlexButton = styled(Flex)`
   // Inherit the not-allowed cursor from ToolbarWrapper when disabled
   &[aria-disabled] {
-    cursor: inherit;
+    cursor: not-allowed;
   }
 
   &[aria-disabled='false'] {
@@ -1539,8 +1522,7 @@ const isListNode = (node) => {
 const ListButton = ({ block, format }) => {
   const { editor, disabled, blocks } = useBlocksEditorContext("ListButton");
   const isListActive = () => {
-    if (!editor.selection)
-      return false;
+    if (!editor.selection) return false;
     const currentListEntry = Editor$1.above(editor, {
       match: (node) => !Editor$1.isEditor(node) && node.type === "list",
       at: editor.selection.anchor
@@ -1614,8 +1596,7 @@ const LinkButton = ({ disabled }) => {
   const { editor } = useBlocksEditorContext("LinkButton");
   const isLinkActive = () => {
     const { selection } = editor;
-    if (!selection)
-      return false;
+    if (!selection) return false;
     const [match] = Array.from(
       Editor$1.nodes(editor, {
         at: Editor$1.unhangRange(editor, selection),
@@ -1679,7 +1660,7 @@ const BlocksToolbar = () => {
     return false;
   };
   const isButtonDisabled = checkButtonDisabled();
-  return /* @__PURE__ */ jsx(Toolbar.Root, { "aria-disabled": disabled, asChild: true, children: /* @__PURE__ */ jsxs(ToolbarWrapper, { gap: 2, padding: 2, children: [
+  return /* @__PURE__ */ jsx(Toolbar.Root, { "aria-disabled": disabled, asChild: true, children: /* @__PURE__ */ jsxs(ToolbarWrapper, { gap: 2, padding: 2, width: "100%", children: [
     /* @__PURE__ */ jsx(BlocksDropdown, {}),
     /* @__PURE__ */ jsx(Separator, {}),
     /* @__PURE__ */ jsx(Toolbar.ToggleGroup, { type: "multiple", asChild: true, children: /* @__PURE__ */ jsxs(Flex, { gap: 1, children: [
@@ -1753,30 +1734,32 @@ const DragIconButton = styled(IconButton)`
   display: flex;
   align-items: center;
   justify-content: center;
+  border: none;
   border-radius: ${({ theme }) => theme.borderRadius};
-  width: ${({ theme }) => theme.spaces[4]};
-  height: ${({ theme }) => theme.spaces[6]};
+  padding-left: ${({ theme }) => theme.spaces[0]};
+  padding-right: ${({ theme }) => theme.spaces[0]};
+  padding-top: ${({ theme }) => theme.spaces[1]};
+  padding-bottom: ${({ theme }) => theme.spaces[1]};
   visibility: hidden;
   cursor: grab;
   opacity: inherit;
   margin-top: ${(props) => props.$dragHandleTopMargin ?? 0};
 
   &:hover {
-    background: ${({ theme }) => theme.colors.neutral200};
+    background: ${({ theme }) => theme.colors.neutral100};
   }
   &:active {
     cursor: grabbing;
+    background: ${({ theme }) => theme.colors.neutral150};
   }
   &[aria-disabled='true'] {
-    cursor: not-allowed;
-    background: transparent;
+    visibility: hidden;
   }
   svg {
-    height: auto;
     min-width: ${({ theme }) => theme.spaces[3]};
 
     path {
-      fill: ${({ theme }) => theme.colors.neutral700};
+      fill: ${({ theme }) => theme.colors.neutral500};
     }
   }
 `;
@@ -1821,8 +1804,7 @@ const DragAndDropElement = ({
       displayedValue: children
     },
     onDropItem(currentIndex, newIndex) {
-      if (newIndex)
-        handleMoveBlock(newIndex, currentIndex);
+      if (newIndex) handleMoveBlock(newIndex, currentIndex);
     }
   });
   const composedBoxRefs = useComposedRefs(blockRef, dropRef);
@@ -1928,7 +1910,7 @@ const baseRenderLeaf = (props, modifiers2) => {
     }
     return currentChildren;
   }, props.children);
-  return /* @__PURE__ */ jsx("span", { ...props.attributes, children: wrappedChildren });
+  return /* @__PURE__ */ jsx("span", { ...props.attributes, className: props.leaf.className, children: wrappedChildren });
 };
 const baseRenderElement = ({
   props,
@@ -1966,8 +1948,7 @@ const BlocksContent = ({ placeholder, ariaLabelId }) => {
     [modifiers2]
   );
   const handleMoveBlocks = (editor2, event) => {
-    if (!editor2.selection)
-      return;
+    if (!editor2.selection) return;
     const start = Range.start(editor2.selection);
     const currentIndex = [start.path[0]];
     let newIndexPosition = 0;
@@ -2104,8 +2085,7 @@ const BlocksContent = ({ placeholder, ariaLabelId }) => {
     }
   };
   const handleScrollSelectionIntoView = () => {
-    if (!editor.selection)
-      return;
+    if (!editor.selection) return;
     const domRange = ReactEditor.toDOMRange(editor, editor.selection);
     const domRect = domRange.getBoundingClientRect();
     const blocksInput = blocksRef.current;
@@ -2132,7 +2112,7 @@ const BlocksContent = ({ placeholder, ariaLabelId }) => {
       background: "neutral0",
       color: "neutral800",
       lineHeight: 6,
-      paddingRight: 4,
+      paddingRight: 7,
       paddingTop: 6,
       paddingBottom: 3,
       children: [
@@ -2143,6 +2123,7 @@ const BlocksContent = ({ placeholder, ariaLabelId }) => {
             readOnly: disabled,
             placeholder,
             isExpandedMode,
+            decorate: decorateCode,
             renderElement,
             renderLeaf,
             onKeyDown: handleKeyDown,
@@ -2299,8 +2280,7 @@ const InlineCode = styled.code`
 `;
 const baseCheckIsActive = (editor, name2) => {
   const marks = Editor$1.marks(editor);
-  if (!marks)
-    return false;
+  if (!marks) return false;
   return Boolean(marks[name2]);
 };
 const baseHandleToggle = (editor, name2) => {
@@ -2466,6 +2446,7 @@ const ExpandIconButton = styled(IconButton)`
   position: absolute;
   bottom: 1.2rem;
   right: 1.2rem;
+  box-shadow: ${({ theme }) => theme.shadows.filterShadow};
 `;
 function useResetKey(value) {
   const slateUpdatesCount = React.useRef(0);
@@ -2597,26 +2578,6 @@ const BlocksInput = React.forwardRef(
   }
 );
 const MemoizedBlocksInput = React.memo(BlocksInput);
-const createDefaultForm = (contentType, components = {}) => {
-  const traverseSchema = (attributes) => {
-    return Object.entries(attributes).reduce((acc, [key, attribute]) => {
-      if ("default" in attribute) {
-        acc[key] = attribute.default;
-      } else if (attribute.type === "component" && attribute.required) {
-        const defaultComponentForm = traverseSchema(components[attribute.component].attributes);
-        if (attribute.repeatable) {
-          acc[key] = attribute.min ? [...Array(attribute.min).fill(defaultComponentForm)] : [];
-        } else {
-          acc[key] = defaultComponentForm;
-        }
-      } else if (attribute.type === "dynamiczone" && attribute.required) {
-        acc[key] = [];
-      }
-      return acc;
-    }, {});
-  };
-  return traverseSchema(contentType.attributes);
-};
 const Initializer = ({ disabled, name: name2, onClick }) => {
   const { formatMessage } = useIntl();
   const field = useField(name2);
@@ -2624,7 +2585,7 @@ const Initializer = ({ disabled, name: name2, onClick }) => {
     Box,
     {
       tag: "button",
-      background: "neutral100",
+      background: disabled ? "neutral150" : "neutral100",
       borderColor: field.error ? "danger600" : "neutral200",
       hasRadius: true,
       disabled,
@@ -2632,120 +2593,470 @@ const Initializer = ({ disabled, name: name2, onClick }) => {
       paddingTop: 9,
       paddingBottom: 9,
       type: "button",
+      style: { cursor: disabled ? "not-allowed" : "pointer" },
       children: /* @__PURE__ */ jsxs(Flex, { direction: "column", gap: 2, children: [
-        /* @__PURE__ */ jsx(Flex, { justifyContent: "center", children: /* @__PURE__ */ jsx(CircleIcon, {}) }),
-        /* @__PURE__ */ jsx(Flex, { justifyContent: "center", children: /* @__PURE__ */ jsx(Typography, { textColor: "primary600", variant: "pi", fontWeight: "bold", children: formatMessage({
-          id: getTranslation("components.empty-repeatable"),
-          defaultMessage: "No entry yet. Click on the button below to add one."
-        }) }) })
+        /* @__PURE__ */ jsx(Flex, { justifyContent: "center", color: disabled ? "neutral500" : "primary600", children: /* @__PURE__ */ jsx(PlusCircle, { width: "3.2rem", height: "3.2rem" }) }),
+        /* @__PURE__ */ jsx(Flex, { justifyContent: "center", children: /* @__PURE__ */ jsx(
+          Typography,
+          {
+            textColor: disabled ? "neutral600" : "primary600",
+            variant: "pi",
+            fontWeight: "bold",
+            children: formatMessage({
+              id: getTranslation("components.empty-repeatable"),
+              defaultMessage: "No entry yet. Click to add one."
+            })
+          }
+        ) })
       ] })
     }
   ) });
 };
-const CircleIcon = styled(PlusCircle)`
-  width: 2.4rem;
-  height: 2.4rem;
+const AddComponentButton = ({
+  hasError,
+  isDisabled,
+  isOpen,
+  children,
+  onClick
+}) => {
+  return /* @__PURE__ */ jsx(
+    StyledButton,
+    {
+      type: "button",
+      onClick,
+      disabled: isDisabled,
+      background: "neutral0",
+      style: { cursor: isDisabled ? "not-allowed" : "pointer" },
+      variant: "tertiary",
+      children: /* @__PURE__ */ jsxs(Flex, { tag: "span", gap: 2, children: [
+        /* @__PURE__ */ jsx(StyledAddIcon, { "aria-hidden": true, $isOpen: isOpen, $hasError: hasError && !isOpen }),
+        /* @__PURE__ */ jsx(
+          Typography,
+          {
+            variant: "pi",
+            fontWeight: "bold",
+            textColor: hasError && !isOpen ? "danger600" : "neutral600",
+            children
+          }
+        )
+      ] })
+    }
+  );
+};
+const StyledAddIcon = styled(PlusCircle)`
+  height: ${({ theme }) => theme.spaces[6]};
+  width: ${({ theme }) => theme.spaces[6]};
+  transform: ${({ $isOpen }) => $isOpen ? "rotate(45deg)" : "rotate(0deg)"};
+
   > circle {
-    fill: ${({ theme }) => theme.colors.primary200};
+    fill: ${({ theme, $hasError }) => $hasError ? theme.colors.danger200 : theme.colors.neutral150};
   }
   > path {
-    fill: ${({ theme }) => theme.colors.primary600};
+    fill: ${({ theme, $hasError }) => $hasError ? theme.colors.danger600 : theme.colors.neutral500};
   }
 `;
-const NonRepeatableComponent = ({
-  attribute,
-  name: name2,
-  children,
-  layout
+const StyledButton = styled(Button)`
+  padding-left: ${({ theme }) => theme.spaces[3]};
+  border-radius: 26px;
+  box-shadow: ${({ theme }) => theme.shadows.filterShadow};
+  height: 5rem;
+`;
+const ComponentCategory = ({
+  category,
+  components = [],
+  variant = "primary",
+  onAddComponent
 }) => {
-  const { value } = useField(name2);
-  const level = useComponent("NonRepeatableComponent", (state) => state.level);
-  const isNested = level > 0;
-  return /* @__PURE__ */ jsx(ComponentProvider, { id: value?.id, uid: attribute.component, level: level + 1, type: "component", children: /* @__PURE__ */ jsx(
+  const { formatMessage } = useIntl();
+  return /* @__PURE__ */ jsxs(Accordion.Item, { value: category, children: [
+    /* @__PURE__ */ jsx(Accordion.Header, { variant, children: /* @__PURE__ */ jsx(Accordion.Trigger, { children: formatMessage({ id: category, defaultMessage: category }) }) }),
+    /* @__PURE__ */ jsx(ResponsiveAccordionContent, { children: /* @__PURE__ */ jsx(Grid, { paddingTop: 4, paddingBottom: 4, paddingLeft: 3, paddingRight: 3, children: components.map(({ uid, displayName, icon }) => /* @__PURE__ */ jsx(
+      ComponentBox,
+      {
+        tag: "button",
+        type: "button",
+        background: "neutral100",
+        justifyContent: "center",
+        onClick: onAddComponent(uid),
+        hasRadius: true,
+        height: "8.4rem",
+        shrink: 0,
+        borderColor: "neutral200",
+        children: /* @__PURE__ */ jsxs(Flex, { direction: "column", gap: 1, alignItems: "center", justifyContent: "center", children: [
+          /* @__PURE__ */ jsx(ComponentIcon, { color: "currentColor", background: "primary200", icon }),
+          /* @__PURE__ */ jsx(Typography, { variant: "pi", fontWeight: "bold", children: displayName })
+        ] })
+      },
+      uid
+    )) }) })
+  ] });
+};
+const ResponsiveAccordionContent = styled(Accordion.Content)`
+  container-type: inline-size;
+`;
+const Grid = styled(Box)`
+  display: grid;
+  grid-template-columns: repeat(auto-fill, 100%);
+  grid-gap: ${({ theme }) => theme.spaces[1]};
+
+  @container (min-width: ${() => RESPONSIVE_CONTAINER_BREAKPOINTS.sm}) {
+    grid-template-columns: repeat(auto-fill, 14rem);
+  }
+`;
+const ComponentBox = styled(Flex)`
+  color: ${({ theme }) => theme.colors.neutral600};
+  cursor: pointer;
+
+  @media (prefers-reduced-motion: no-preference) {
+    transition: color 120ms ${(props) => props.theme.motion.easings.easeOutQuad};
+  }
+
+  &:focus,
+  &:hover {
+    border: 1px solid ${({ theme }) => theme.colors.primary200};
+    background: ${({ theme }) => theme.colors.primary100};
+    color: ${({ theme }) => theme.colors.primary600};
+  }
+`;
+const ComponentPicker = ({
+  dynamicComponentsByCategory = {},
+  isOpen,
+  onClickAddComponent
+}) => {
+  const { formatMessage } = useIntl();
+  const handleAddComponentToDz = (componentUid) => () => {
+    onClickAddComponent(componentUid);
+  };
+  if (!isOpen) {
+    return null;
+  }
+  return /* @__PURE__ */ jsxs(
     Box,
     {
-      background: "neutral100",
-      paddingLeft: 6,
-      paddingRight: 6,
       paddingTop: 6,
       paddingBottom: 6,
-      hasRadius: isNested,
-      borderColor: isNested ? "neutral200" : void 0,
-      children: /* @__PURE__ */ jsx(Flex, { direction: "column", alignItems: "stretch", gap: 6, children: layout.map((row, index) => {
-        return /* @__PURE__ */ jsx(Grid$1.Root, { gap: 4, children: row.map(({ size, ...field }) => {
-          const completeFieldName = `${name2}.${field.name}`;
-          return /* @__PURE__ */ jsx(
-            Grid$1.Item,
-            {
-              col: size,
-              s: 12,
-              xs: 12,
-              direction: "column",
-              alignItems: "stretch",
-              children: children({ ...field, name: completeFieldName })
-            },
-            completeFieldName
-          );
-        }) }, index);
-      }) })
+      paddingLeft: 5,
+      paddingRight: 5,
+      background: "neutral0",
+      shadow: "tableShadow",
+      borderColor: "neutral150",
+      hasRadius: true,
+      children: [
+        /* @__PURE__ */ jsx(Flex, { justifyContent: "center", children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", textColor: "neutral600", children: formatMessage({
+          id: getTranslation("components.DynamicZone.ComponentPicker-label"),
+          defaultMessage: "Pick one component"
+        }) }) }),
+        /* @__PURE__ */ jsx(Box, { paddingTop: 2, children: /* @__PURE__ */ jsx(Accordion.Root, { defaultValue: Object.keys(dynamicComponentsByCategory)[0], children: Object.entries(dynamicComponentsByCategory).map(([category, components], index) => /* @__PURE__ */ jsx(
+          ComponentCategory,
+          {
+            category,
+            components,
+            onAddComponent: handleAddComponentToDz,
+            variant: index % 2 === 1 ? "primary" : "secondary"
+          },
+          category
+        )) }) })
+      ]
     }
-  ) });
+  );
 };
-const RepeatableComponent = ({
-  attribute,
+const DynamicComponent = ({
+  componentUid,
   disabled,
+  index,
   name: name2,
-  mainField,
-  children,
-  layout
+  onRemoveComponentClick,
+  onMoveComponent,
+  onGrabItem,
+  onDropItem,
+  onCancel,
+  dynamicComponentsByCategory = {},
+  onAddComponent,
+  children
 }) => {
-  const { toggleNotification } = useNotification();
   const { formatMessage } = useIntl();
-  const { search: searchString } = useLocation();
-  const search = React.useMemo(() => new URLSearchParams(searchString), [searchString]);
-  const { components } = useDoc();
-  const { value = [], error } = useField(name2);
-  const addFieldRow = useForm("RepeatableComponent", (state) => state.addFieldRow);
-  const moveFieldRow = useForm("RepeatableComponent", (state) => state.moveFieldRow);
-  const removeFieldRow = useForm("RepeatableComponent", (state) => state.removeFieldRow);
-  const { max = Infinity } = attribute;
-  const [collapseToOpen, setCollapseToOpen] = React.useState("");
-  const [liveText, setLiveText] = React.useState("");
-  const componentTmpKeyWithFocussedField = React.useMemo(() => {
-    if (search.has("field")) {
-      const fieldParam = search.get("field");
-      if (!fieldParam) {
-        return void 0;
-      }
-      const [, path] = fieldParam.split(`${name2}.`);
-      if (getIn(value, path, void 0) !== void 0) {
-        const [subpath] = path.split(".");
-        return getIn(value, subpath, void 0)?.__temp_key__;
-      }
-    }
-    return void 0;
-  }, [search, name2, value]);
-  const prevValue = usePrev(value);
+  const formValues = useForm("DynamicComponent", (state) => state.values);
+  const {
+    edit: { components }
+  } = useDocLayout();
+  const title = React.useMemo(() => {
+    const { mainField } = components[componentUid]?.settings ?? { mainField: "id" };
+    const mainFieldValue = getIn(formValues, `${name2}.${index}.${mainField}`);
+    const displayedValue = mainField === "id" || !mainFieldValue ? "" : String(mainFieldValue).trim();
+    const mainValue = displayedValue.length > 0 ? `- ${displayedValue}` : displayedValue;
+    return mainValue;
+  }, [componentUid, components, formValues, name2, index]);
+  const { icon, displayName } = React.useMemo(() => {
+    const [category] = componentUid.split(".");
+    const { icon: icon2, displayName: displayName2 } = (dynamicComponentsByCategory[category] ?? []).find(
+      (component) => component.uid === componentUid
+    ) ?? { icon: null, displayName: null };
+    return { icon: icon2, displayName: displayName2 };
+  }, [componentUid, dynamicComponentsByCategory]);
+  const [{ handlerId, isDragging, handleKeyDown }, boxRef, dropRef, dragRef, dragPreviewRef] = useDragAndDrop(!disabled, {
+    type: `${ItemTypes.DYNAMIC_ZONE}_${name2}`,
+    index,
+    item: {
+      index,
+      displayedValue: `${displayName} ${title}`,
+      icon
+    },
+    onMoveItem: onMoveComponent,
+    onDropItem,
+    onGrabItem,
+    onCancel
+  });
   React.useEffect(() => {
-    if (prevValue && prevValue.length < value.length) {
-      setCollapseToOpen(value[value.length - 1].__temp_key__);
-    }
-  }, [value, prevValue]);
+    dragPreviewRef(getEmptyImage(), { captureDraggingState: false });
+  }, [dragPreviewRef, index]);
+  const accordionValue = React.useId();
+  const { value = [], rawError } = useField(`${name2}.${index}`);
+  const [collapseToOpen, setCollapseToOpen] = React.useState("");
   React.useEffect(() => {
-    if (typeof componentTmpKeyWithFocussedField === "string") {
-      setCollapseToOpen(componentTmpKeyWithFocussedField);
+    if (rawError && value) {
+      setCollapseToOpen(accordionValue);
     }
-  }, [componentTmpKeyWithFocussedField]);
-  const toggleCollapses = () => {
-    setCollapseToOpen("");
+  }, [rawError, value, accordionValue]);
+  const composedBoxRefs = useComposedRefs(boxRef, dropRef);
+  const accordionActions = disabled ? null : /* @__PURE__ */ jsxs(Fragment, { children: [
+    /* @__PURE__ */ jsx(
+      IconButton,
+      {
+        variant: "ghost",
+        label: formatMessage(
+          {
+            id: getTranslation("components.DynamicZone.delete-label"),
+            defaultMessage: "Delete {name}"
+          },
+          { name: title }
+        ),
+        onClick: onRemoveComponentClick,
+        children: /* @__PURE__ */ jsx(Trash, {})
+      }
+    ),
+    /* @__PURE__ */ jsx(
+      IconButton,
+      {
+        variant: "ghost",
+        onClick: (e) => e.stopPropagation(),
+        "data-handler-id": handlerId,
+        ref: dragRef,
+        label: formatMessage({
+          id: getTranslation("components.DragHandle-label"),
+          defaultMessage: "Drag"
+        }),
+        onKeyDown: handleKeyDown,
+        children: /* @__PURE__ */ jsx(Drag, {})
+      }
+    ),
+    /* @__PURE__ */ jsxs(Menu.Root, { children: [
+      /* @__PURE__ */ jsx(Menu.Trigger, { size: "S", endIcon: null, paddingLeft: 0, paddingRight: 0, children: /* @__PURE__ */ jsx(
+        IconButton,
+        {
+          variant: "ghost",
+          label: formatMessage({
+            id: getTranslation("components.DynamicZone.more-actions"),
+            defaultMessage: "More actions"
+          }),
+          tag: "span",
+          children: /* @__PURE__ */ jsx(More, { "aria-hidden": true, focusable: false })
+        }
+      ) }),
+      /* @__PURE__ */ jsxs(Menu.Content, { children: [
+        /* @__PURE__ */ jsxs(Menu.SubRoot, { children: [
+          /* @__PURE__ */ jsx(Menu.SubTrigger, { children: formatMessage({
+            id: getTranslation("components.DynamicZone.add-item-above"),
+            defaultMessage: "Add component above"
+          }) }),
+          /* @__PURE__ */ jsx(Menu.SubContent, { children: Object.entries(dynamicComponentsByCategory).map(([category, components2]) => /* @__PURE__ */ jsxs(React.Fragment, { children: [
+            /* @__PURE__ */ jsx(Menu.Label, { children: category }),
+            components2.map(({ displayName: displayName2, uid }) => /* @__PURE__ */ jsx(MenuItem, { onSelect: () => onAddComponent(uid, index), children: displayName2 }, componentUid))
+          ] }, category)) })
+        ] }),
+        /* @__PURE__ */ jsxs(Menu.SubRoot, { children: [
+          /* @__PURE__ */ jsx(Menu.SubTrigger, { children: formatMessage({
+            id: getTranslation("components.DynamicZone.add-item-below"),
+            defaultMessage: "Add component below"
+          }) }),
+          /* @__PURE__ */ jsx(Menu.SubContent, { children: Object.entries(dynamicComponentsByCategory).map(([category, components2]) => /* @__PURE__ */ jsxs(React.Fragment, { children: [
+            /* @__PURE__ */ jsx(Menu.Label, { children: category }),
+            components2.map(({ displayName: displayName2, uid }) => /* @__PURE__ */ jsx(MenuItem, { onSelect: () => onAddComponent(uid, index + 1), children: displayName2 }, componentUid))
+          ] }, category)) })
+        ] })
+      ] })
+    ] })
+  ] });
+  const accordionTitle = title ? `${displayName} ${title}` : displayName;
+  return /* @__PURE__ */ jsxs(ComponentContainer, { tag: "li", width: "100%", children: [
+    /* @__PURE__ */ jsx(Flex, { justifyContent: "center", children: /* @__PURE__ */ jsx(Rectangle, { background: "neutral200" }) }),
+    /* @__PURE__ */ jsx(StyledBox, { ref: composedBoxRefs, hasRadius: true, children: isDragging ? /* @__PURE__ */ jsx(Preview$1, {}) : /* @__PURE__ */ jsx(Accordion.Root, { value: collapseToOpen, onValueChange: setCollapseToOpen, children: /* @__PURE__ */ jsxs(Accordion.Item, { value: accordionValue, children: [
+      /* @__PURE__ */ jsxs(Accordion.Header, { children: [
+        /* @__PURE__ */ jsx(
+          Accordion.Trigger,
+          {
+            icon: icon && COMPONENT_ICONS[icon] ? COMPONENT_ICONS[icon] : COMPONENT_ICONS.dashboard,
+            children: accordionTitle
+          }
+        ),
+        /* @__PURE__ */ jsx(Accordion.Actions, { children: accordionActions })
+      ] }),
+      /* @__PURE__ */ jsx(Accordion.Content, { children: /* @__PURE__ */ jsx(AccordionContentRadius, { background: "neutral0", children: /* @__PURE__ */ jsx(Box, { paddingLeft: 6, paddingRight: 6, paddingTop: 6, paddingBottom: 6, children: /* @__PURE__ */ jsx(Grid$1.Root, { gap: 4, children: components[componentUid]?.layout?.map((row, rowInd) => /* @__PURE__ */ jsx(
+        Grid$1.Item,
+        {
+          col: 12,
+          s: 12,
+          xs: 12,
+          direction: "column",
+          alignItems: "stretch",
+          children: /* @__PURE__ */ jsx(ResponsiveGridRoot, { gap: 4, children: row.map(({ size, ...field }) => {
+            const fieldName = `${name2}.${index}.${field.name}`;
+            const fieldWithTranslatedLabel = {
+              ...field,
+              label: formatMessage({
+                id: `content-manager.components.${componentUid}.${field.name}`,
+                defaultMessage: field.label
+              })
+            };
+            return /* @__PURE__ */ jsx(
+              ResponsiveGridItem,
+              {
+                col: size,
+                s: 12,
+                xs: 12,
+                direction: "column",
+                alignItems: "stretch",
+                children: children ? children({ ...fieldWithTranslatedLabel, name: fieldName }) : /* @__PURE__ */ jsx(MemoizedInputRenderer, { ...fieldWithTranslatedLabel, name: fieldName })
+              },
+              fieldName
+            );
+          }) })
+        },
+        rowInd
+      )) }) }) }) })
+    ] }) }) })
+  ] });
+};
+const StyledBox = styled(Box)`
+  > div:first-child {
+    box-shadow: ${({ theme }) => theme.shadows.tableShadow};
+  }
+`;
+const AccordionContentRadius = styled(Box)`
+  border-radius: 0 0 ${({ theme }) => theme.spaces[1]} ${({ theme }) => theme.spaces[1]};
+`;
+const Rectangle = styled(Box)`
+  width: ${({ theme }) => theme.spaces[2]};
+  height: ${({ theme }) => theme.spaces[4]};
+`;
+const Preview$1 = styled.span`
+  display: block;
+  background-color: ${({ theme }) => theme.colors.primary100};
+  outline: 1px dashed ${({ theme }) => theme.colors.primary500};
+  outline-offset: -1px;
+  padding: ${({ theme }) => theme.spaces[6]};
+`;
+const ComponentContainer = styled(Box)`
+  list-style: none;
+  padding: 0;
+  margin: 0;
+`;
+const DynamicZoneLabel = ({
+  hint,
+  label,
+  labelAction,
+  name: name2,
+  numberOfComponents = 0,
+  required
+}) => {
+  return /* @__PURE__ */ jsx(Flex, { justifyContent: "center", children: /* @__PURE__ */ jsx(
+    Box,
+    {
+      paddingTop: 3,
+      paddingBottom: 3,
+      paddingRight: 4,
+      paddingLeft: 4,
+      borderRadius: "26px",
+      background: "neutral0",
+      shadow: "filterShadow",
+      color: "neutral500",
+      children: /* @__PURE__ */ jsxs(Flex, { direction: "column", justifyContent: "center", children: [
+        /* @__PURE__ */ jsxs(Flex, { maxWidth: "35.6rem", children: [
+          /* @__PURE__ */ jsxs(Typography, { variant: "pi", textColor: "neutral600", fontWeight: "bold", ellipsis: true, children: [
+            label || name2,
+            " "
+          ] }),
+          /* @__PURE__ */ jsxs(Typography, { variant: "pi", textColor: "neutral600", fontWeight: "bold", children: [
+            "(",
+            numberOfComponents,
+            ")"
+          ] }),
+          required && /* @__PURE__ */ jsx(Typography, { textColor: "danger600", children: "*" }),
+          labelAction && /* @__PURE__ */ jsx(Box, { paddingLeft: 1, children: labelAction })
+        ] }),
+        hint && /* @__PURE__ */ jsx(Box, { paddingTop: 1, maxWidth: "35.6rem", children: /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral600", ellipsis: true, children: hint }) })
+      ] })
+    }
+  ) });
+};
+const [DynamicZoneProvider, useDynamicZone] = createContext(
+  "DynamicZone",
+  {
+    isInDynamicZone: false
+  }
+);
+const DynamicZone = ({
+  attribute,
+  disabled: disabledProp,
+  hint,
+  label,
+  labelAction,
+  name: name2,
+  required = false,
+  children
+}) => {
+  const { max = Infinity, min = -Infinity } = attribute ?? {};
+  const [addComponentIsOpen, setAddComponentIsOpen] = React.useState(false);
+  const [liveText, setLiveText] = React.useState("");
+  const { components, isLoading } = useDoc();
+  const disabled = disabledProp || isLoading;
+  const { addFieldRow, removeFieldRow, moveFieldRow } = useForm(
+    "DynamicZone",
+    ({ addFieldRow: addFieldRow2, removeFieldRow: removeFieldRow2, moveFieldRow: moveFieldRow2 }) => ({
+      addFieldRow: addFieldRow2,
+      removeFieldRow: removeFieldRow2,
+      moveFieldRow: moveFieldRow2
+    })
+  );
+  const { value = [], error } = useField(name2);
+  const dynamicComponentsByCategory = React.useMemo(() => {
+    return attribute.components.reduce((acc, componentUid) => {
+      const { category, info } = components[componentUid] ?? { info: {} };
+      const component = { uid: componentUid, displayName: info.displayName, icon: info.icon };
+      if (!acc[category]) {
+        acc[category] = [];
+      }
+      acc[category] = [...acc[category], component];
+      return acc;
+    }, {});
+  }, [attribute.components, components]);
+  const { formatMessage } = useIntl();
+  const { toggleNotification } = useNotification();
+  const dynamicDisplayedComponentsLength = value.length;
+  const handleAddComponent = (uid, position) => {
+    setAddComponentIsOpen(false);
+    const schema = components[uid];
+    const form = createDefaultForm(schema, components);
+    const transformations = pipe$1(transformDocument(schema, components), (data2) => ({
+      ...data2,
+      __component: uid
+    }));
+    const data = transformations(form);
+    addFieldRow(name2, data, position);
   };
-  const handleClick = () => {
-    if (value.length < max) {
-      const schema = components[attribute.component];
-      const form = createDefaultForm(schema, components);
-      const data = transformDocument(schema, components)(form);
-      addFieldRow(name2, data);
-    } else if (value.length >= max) {
+  const handleClickOpenPicker = () => {
+    if (dynamicDisplayedComponentsLength < max) {
+      setAddComponentIsOpen((prev) => !prev);
+    } else {
       toggleNotification({
         type: "info",
         message: formatMessage({
@@ -2754,7 +3065,7 @@ const RepeatableComponent = ({
       });
     }
   };
-  const handleMoveComponentField = (newIndex, currentIndex) => {
+  const handleMoveComponent = (newIndex, currentIndex) => {
     setLiveText(
       formatMessage(
         {
@@ -2769,9 +3080,6 @@ const RepeatableComponent = ({
     );
     moveFieldRow(name2, currentIndex, newIndex);
   };
-  const handleValueChange = (key) => {
-    setCollapseToOpen(key);
-  };
   const getItemPos = (index) => `${index + 1} of ${value.length}`;
   const handleCancel = (index) => {
     setLiveText(
@@ -2796,446 +3104,127 @@ const RepeatableComponent = ({
         {
           item: `${name2}.${index}`,
           position: getItemPos(index)
-        }
-      )
-    );
-  };
-  const handleDropItem = (index) => {
-    setLiveText(
-      formatMessage(
-        {
-          id: getTranslation("dnd.drop-item"),
-          defaultMessage: `{item}, dropped. Final position in list: {position}.`
-        },
-        {
-          item: `${name2}.${index}`,
-          position: getItemPos(index)
-        }
-      )
-    );
-  };
-  const ariaDescriptionId = React.useId();
-  const level = useComponent("RepeatableComponent", (state) => state.level);
-  if (value.length === 0) {
-    return /* @__PURE__ */ jsx(Initializer, { disabled, name: name2, onClick: handleClick });
-  }
-  return /* @__PURE__ */ jsxs(Box, { hasRadius: true, children: [
-    /* @__PURE__ */ jsx(VisuallyHidden, { id: ariaDescriptionId, children: formatMessage({
-      id: getTranslation("dnd.instructions"),
-      defaultMessage: `Press spacebar to grab and re-order`
-    }) }),
-    /* @__PURE__ */ jsx(VisuallyHidden, { "aria-live": "assertive", children: liveText }),
-    /* @__PURE__ */ jsxs(
-      AccordionRoot,
-      {
-        $error: error,
-        value: collapseToOpen,
-        onValueChange: handleValueChange,
-        "aria-describedby": ariaDescriptionId,
-        children: [
-          value.map(({ __temp_key__: key, id }, index) => {
-            const nameWithIndex = `${name2}.${index}`;
-            return /* @__PURE__ */ jsx(
-              ComponentProvider,
-              {
-                id,
-                uid: attribute.component,
-                level: level + 1,
-                type: "repeatable",
-                children: /* @__PURE__ */ jsx(
-                  Component,
-                  {
-                    disabled,
-                    name: nameWithIndex,
-                    attribute,
-                    index,
-                    mainField,
-                    onMoveItem: handleMoveComponentField,
-                    onDeleteComponent: () => {
-                      removeFieldRow(name2, index);
-                      toggleCollapses();
-                    },
-                    toggleCollapses,
-                    onCancel: handleCancel,
-                    onDropItem: handleDropItem,
-                    onGrabItem: handleGrabItem,
-                    __temp_key__: key,
-                    children: layout.map((row, index2) => {
-                      return /* @__PURE__ */ jsx(Grid$1.Root, { gap: 4, children: row.map(({ size, ...field }) => {
-                        const completeFieldName = `${nameWithIndex}.${field.name}`;
-                        return /* @__PURE__ */ jsx(
-                          Grid$1.Item,
-                          {
-                            col: size,
-                            s: 12,
-                            xs: 12,
-                            direction: "column",
-                            alignItems: "stretch",
-                            children: children({ ...field, name: completeFieldName })
-                          },
-                          completeFieldName
-                        );
-                      }) }, index2);
-                    })
-                  }
-                )
-              },
-              key
-            );
-          }),
-          /* @__PURE__ */ jsx(TextButtonCustom, { disabled, onClick: handleClick, startIcon: /* @__PURE__ */ jsx(Plus, {}), children: formatMessage({
-            id: getTranslation("containers.EditView.add.new-entry"),
-            defaultMessage: "Add an entry"
-          }) })
-        ]
-      }
-    )
-  ] });
-};
-const AccordionRoot = styled(Accordion.Root)`
-  border: 1px solid
-    ${({ theme, $error }) => $error ? theme.colors.danger600 : theme.colors.neutral200};
-`;
-const TextButtonCustom = styled(TextButton)`
-  width: 100%;
-  display: flex;
-  justify-content: center;
-  border-top: 1px solid ${({ theme }) => theme.colors.neutral200};
-  padding-inline: ${(props) => props.theme.spaces[6]};
-  padding-block: ${(props) => props.theme.spaces[3]};
-
-  &:not([disabled]) {
-    cursor: pointer;
-
-    &:hover {
-      background-color: ${(props) => props.theme.colors.primary100};
-    }
-  }
-
-  span {
-    font-weight: 600;
-    font-size: 1.4rem;
-    line-height: 2.4rem;
-  }
-
-  @media (prefers-reduced-motion: no-preference) {
-    transition: background-color 120ms ${(props) => props.theme.motion.easings.easeOutQuad};
-  }
-`;
-const Component = ({
-  disabled,
-  index,
-  name: name2,
-  mainField = {
-    name: "id",
-    type: "integer"
-  },
-  children,
-  onDeleteComponent,
-  toggleCollapses,
-  __temp_key__,
-  ...dragProps
-}) => {
-  const { formatMessage } = useIntl();
-  const displayValue = useForm("RepeatableComponent", (state) => {
-    return getIn(state.values, [...name2.split("."), mainField.name]);
-  });
-  const accordionRef = React.useRef(null);
-  const componentKey = name2.split(".").slice(0, -1).join(".");
-  const [{ handlerId, isDragging, handleKeyDown }, boxRef, dropRef, dragRef, dragPreviewRef] = useDragAndDrop(!disabled, {
-    type: `${ItemTypes.COMPONENT}_${componentKey}`,
-    index,
-    item: {
-      index,
-      displayedValue: displayValue
-    },
-    onStart() {
-      toggleCollapses();
-    },
-    ...dragProps
-  });
-  React.useEffect(() => {
-    dragPreviewRef(getEmptyImage(), { captureDraggingState: false });
-  }, [dragPreviewRef, index]);
-  const composedAccordionRefs = useComposedRefs(accordionRef, dragRef);
-  const composedBoxRefs = useComposedRefs(
-    boxRef,
-    dropRef
-  );
-  return /* @__PURE__ */ jsx(Fragment, { children: isDragging ? /* @__PURE__ */ jsx(Preview$1, {}) : /* @__PURE__ */ jsxs(Accordion.Item, { ref: composedBoxRefs, value: __temp_key__, children: [
-    /* @__PURE__ */ jsxs(Accordion.Header, { children: [
-      /* @__PURE__ */ jsx(Accordion.Trigger, { children: displayValue }),
-      /* @__PURE__ */ jsxs(Accordion.Actions, { children: [
-        /* @__PURE__ */ jsx(
-          IconButton,
-          {
-            variant: "ghost",
-            onClick: onDeleteComponent,
-            label: formatMessage({
-              id: getTranslation("containers.Edit.delete"),
-              defaultMessage: "Delete"
-            }),
-            children: /* @__PURE__ */ jsx(Trash, {})
-          }
-        ),
-        /* @__PURE__ */ jsx(
-          IconButton,
-          {
-            ref: composedAccordionRefs,
-            variant: "ghost",
-            onClick: (e) => e.stopPropagation(),
-            "data-handler-id": handlerId,
-            label: formatMessage({
-              id: getTranslation("components.DragHandle-label"),
-              defaultMessage: "Drag"
-            }),
-            onKeyDown: handleKeyDown,
-            children: /* @__PURE__ */ jsx(Drag, {})
-          }
-        )
-      ] })
-    ] }),
-    /* @__PURE__ */ jsx(Accordion.Content, { children: /* @__PURE__ */ jsx(
-      Flex,
-      {
-        direction: "column",
-        alignItems: "stretch",
-        background: "neutral100",
-        padding: 6,
-        gap: 6,
-        children
-      }
-    ) })
-  ] }) });
-};
-const Preview$1 = () => {
-  return /* @__PURE__ */ jsx(StyledSpan, { tag: "span", padding: 6, background: "primary100" });
-};
-const StyledSpan = styled(Box)`
-  display: block;
-  outline: 1px dashed ${({ theme }) => theme.colors.primary500};
-  outline-offset: -1px;
-`;
-const ComponentInput = ({
-  label,
-  required,
-  name: name2,
-  attribute,
-  disabled,
-  labelAction,
-  ...props
-}) => {
-  const { formatMessage } = useIntl();
-  const field = useField(name2);
-  const showResetComponent = !attribute.repeatable && field.value && !disabled;
-  const { components } = useDoc();
-  const handleInitialisationClick = () => {
-    const schema = components[attribute.component];
-    const form = createDefaultForm(schema, components);
-    const data = transformDocument(schema, components)(form);
-    field.onChange(name2, data);
+        }
+      )
+    );
   };
-  return /* @__PURE__ */ jsxs(Field.Root, { error: field.error, required, children: [
-    /* @__PURE__ */ jsxs(Flex, { justifyContent: "space-between", children: [
-      /* @__PURE__ */ jsxs(Field.Label, { action: labelAction, children: [
-        label,
-        attribute.repeatable && /* @__PURE__ */ jsxs(Fragment, { children: [
-          " (",
-          Array.isArray(field.value) ? field.value.length : 0,
-          ")"
-        ] })
-      ] }),
-      showResetComponent && /* @__PURE__ */ jsx(
-        IconButton,
+  const handleDropItem = (index) => {
+    setLiveText(
+      formatMessage(
         {
-          label: formatMessage({
-            id: getTranslation("components.reset-entry"),
-            defaultMessage: "Reset Entry"
-          }),
-          variant: "ghost",
-          onClick: () => {
-            field.onChange(name2, null);
-          },
-          children: /* @__PURE__ */ jsx(Trash, {})
+          id: getTranslation("dnd.drop-item"),
+          defaultMessage: `{item}, dropped. Final position in list: {position}.`
+        },
+        {
+          item: `${name2}.${index}`,
+          position: getItemPos(index)
         }
       )
-    ] }),
-    !attribute.repeatable && !field.value && /* @__PURE__ */ jsx(Initializer, { disabled, name: name2, onClick: handleInitialisationClick }),
-    !attribute.repeatable && field.value ? /* @__PURE__ */ jsx(NonRepeatableComponent, { attribute, name: name2, disabled, ...props, children: props.children }) : null,
-    attribute.repeatable && /* @__PURE__ */ jsx(RepeatableComponent, { attribute, name: name2, disabled, ...props, children: props.children }),
-    /* @__PURE__ */ jsx(Field.Error, {})
-  ] });
-};
-const MemoizedComponentInput = React.memo(ComponentInput);
-const AddComponentButton = ({
-  hasError,
-  isDisabled,
-  isOpen,
-  children,
-  onClick
-}) => {
-  return /* @__PURE__ */ jsx(
-    StyledButton,
-    {
-      type: "button",
-      onClick,
-      disabled: isDisabled,
-      background: "neutral0",
-      style: { cursor: isDisabled ? "not-allowed" : "pointer" },
-      variant: "tertiary",
-      children: /* @__PURE__ */ jsxs(Flex, { tag: "span", gap: 2, children: [
-        /* @__PURE__ */ jsx(StyledAddIcon, { "aria-hidden": true, $isOpen: isOpen, $hasError: hasError && !isOpen }),
-        /* @__PURE__ */ jsx(
-          AddComponentTitle,
-          {
-            variant: "pi",
-            fontWeight: "bold",
-            textColor: hasError && !isOpen ? "danger600" : "neutral500",
-            children
-          }
-        )
-      ] })
-    }
-  );
-};
-const StyledAddIcon = styled(PlusCircle)`
-  height: ${({ theme }) => theme.spaces[6]};
-  width: ${({ theme }) => theme.spaces[6]};
-  transform: ${({ $isOpen }) => $isOpen ? "rotate(45deg)" : "rotate(0deg)"};
-
-  > circle {
-    fill: ${({ theme, $hasError }) => $hasError ? theme.colors.danger200 : theme.colors.neutral150};
-  }
-  > path {
-    fill: ${({ theme, $hasError }) => $hasError ? theme.colors.danger600 : theme.colors.neutral600};
-  }
-`;
-const AddComponentTitle = styled(Typography)``;
-const StyledButton = styled(Button)`
-  border-radius: 26px;
-  border-color: ${({ theme }) => theme.colors.neutral150};
-  box-shadow: ${({ theme }) => theme.shadows.filterShadow};
-  height: 5rem;
-
-  &:hover {
-    ${AddComponentTitle} {
-      color: ${({ theme }) => theme.colors.primary600};
-    }
-
-    ${StyledAddIcon} {
-      > circle {
-        fill: ${({ theme }) => theme.colors.primary600};
-      }
-      > path {
-        fill: ${({ theme }) => theme.colors.primary600};
-      }
+    );
+  };
+  const handleRemoveComponent = (name22, currentIndex) => () => {
+    removeFieldRow(name22, currentIndex);
+  };
+  const hasError = error !== void 0;
+  const renderButtonLabel = () => {
+    if (addComponentIsOpen) {
+      return formatMessage({ id: "app.utils.close-label", defaultMessage: "Close" });
     }
-  }
-  &:active {
-    ${AddComponentTitle} {
-      color: ${({ theme }) => theme.colors.primary600};
+    if (hasError && dynamicDisplayedComponentsLength > max) {
+      return formatMessage(
+        {
+          id: getTranslation(`components.DynamicZone.extra-components`),
+          defaultMessage: "There {number, plural, =0 {are # extra components} one {is # extra component} other {are # extra components}}"
+        },
+        {
+          number: dynamicDisplayedComponentsLength - max
+        }
+      );
     }
-    ${StyledAddIcon} {
-      > circle {
-        fill: ${({ theme }) => theme.colors.primary600};
-      }
-      > path {
-        fill: ${({ theme }) => theme.colors.neutral100};
-      }
+    if (hasError && dynamicDisplayedComponentsLength < min) {
+      return formatMessage(
+        {
+          id: getTranslation(`components.DynamicZone.missing-components`),
+          defaultMessage: "There {number, plural, =0 {are # missing components} one {is # missing component} other {are # missing components}}"
+        },
+        { number: min - dynamicDisplayedComponentsLength }
+      );
     }
-  }
-`;
-const ComponentCategory = ({
-  category,
-  components = [],
-  variant = "primary",
-  onAddComponent
-}) => {
-  const { formatMessage } = useIntl();
-  return /* @__PURE__ */ jsxs(Accordion.Item, { value: category, children: [
-    /* @__PURE__ */ jsx(Accordion.Header, { variant, children: /* @__PURE__ */ jsx(Accordion.Trigger, { children: formatMessage({ id: category, defaultMessage: category }) }) }),
-    /* @__PURE__ */ jsx(Accordion.Content, { children: /* @__PURE__ */ jsx(Grid, { paddingTop: 4, paddingBottom: 4, paddingLeft: 3, paddingRight: 3, children: components.map(({ uid, displayName, icon }) => /* @__PURE__ */ jsx(
-      ComponentBox,
+    return formatMessage(
       {
-        tag: "button",
-        type: "button",
-        background: "neutral100",
-        justifyContent: "center",
-        onClick: onAddComponent(uid),
-        hasRadius: true,
-        height: "8.4rem",
-        shrink: 0,
-        borderColor: "neutral200",
-        children: /* @__PURE__ */ jsxs(Flex, { direction: "column", gap: 1, alignItems: "center", justifyContent: "center", children: [
-          /* @__PURE__ */ jsx(ComponentIcon, { color: "currentColor", background: "primary200", icon }),
-          /* @__PURE__ */ jsx(Typography, { variant: "pi", fontWeight: "bold", children: displayName })
-        ] })
+        id: getTranslation("components.DynamicZone.add-component"),
+        defaultMessage: "Add a component to {componentName}"
       },
-      uid
-    )) }) })
-  ] });
-};
-const Grid = styled(Box)`
-  display: grid;
-  grid-template-columns: repeat(auto-fit, 14rem);
-  grid-gap: ${({ theme }) => theme.spaces[1]};
-`;
-const ComponentBox = styled(Flex)`
-  color: ${({ theme }) => theme.colors.neutral600};
-  cursor: pointer;
-
-  @media (prefers-reduced-motion: no-preference) {
-    transition: color 120ms ${(props) => props.theme.motion.easings.easeOutQuad};
-  }
-
-  &:focus,
-  &:hover {
-    border: 1px solid ${({ theme }) => theme.colors.primary200};
-    background: ${({ theme }) => theme.colors.primary100};
-    color: ${({ theme }) => theme.colors.primary600};
-  }
-`;
-const ComponentPicker = ({
-  dynamicComponentsByCategory = {},
-  isOpen,
-  onClickAddComponent
-}) => {
-  const { formatMessage } = useIntl();
-  const handleAddComponentToDz = (componentUid) => () => {
-    onClickAddComponent(componentUid);
+      { componentName: label || name2 }
+    );
   };
-  if (!isOpen) {
-    return null;
-  }
-  return /* @__PURE__ */ jsxs(
-    Box,
-    {
-      paddingTop: 6,
-      paddingBottom: 6,
-      paddingLeft: 5,
-      paddingRight: 5,
-      background: "neutral0",
-      shadow: "tableShadow",
-      borderColor: "neutral150",
-      hasRadius: true,
-      children: [
-        /* @__PURE__ */ jsx(Flex, { justifyContent: "center", children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", textColor: "neutral600", children: formatMessage({
-          id: getTranslation("components.DynamicZone.ComponentPicker-label"),
-          defaultMessage: "Pick one component"
-        }) }) }),
-        /* @__PURE__ */ jsx(Box, { paddingTop: 2, children: /* @__PURE__ */ jsx(Accordion.Root, { defaultValue: Object.keys(dynamicComponentsByCategory)[0], children: Object.entries(dynamicComponentsByCategory).map(([category, components], index) => /* @__PURE__ */ jsx(
-          ComponentCategory,
-          {
-            category,
-            components,
-            onAddComponent: handleAddComponentToDz,
-            variant: index % 2 === 1 ? "primary" : "secondary"
-          },
-          category
-        )) }) })
-      ]
-    }
-  );
+  const level = useComponent("DynamicZone", (state) => state.level);
+  const ariaDescriptionId = React.useId();
+  return /* @__PURE__ */ jsx(DynamicZoneProvider, { isInDynamicZone: true, children: /* @__PURE__ */ jsxs(Flex, { direction: "column", alignItems: "stretch", gap: 6, children: [
+    dynamicDisplayedComponentsLength > 0 && /* @__PURE__ */ jsxs(Box, { children: [
+      /* @__PURE__ */ jsx(
+        DynamicZoneLabel,
+        {
+          hint,
+          label,
+          labelAction,
+          name: name2,
+          numberOfComponents: dynamicDisplayedComponentsLength,
+          required
+        }
+      ),
+      /* @__PURE__ */ jsx(VisuallyHidden, { id: ariaDescriptionId, children: formatMessage({
+        id: getTranslation("dnd.instructions"),
+        defaultMessage: `Press spacebar to grab and re-order`
+      }) }),
+      /* @__PURE__ */ jsx(VisuallyHidden, { "aria-live": "assertive", children: liveText }),
+      /* @__PURE__ */ jsx("ol", { "aria-describedby": ariaDescriptionId, children: value.map((field, index) => /* @__PURE__ */ jsx(
+        ComponentProvider,
+        {
+          level: level + 1,
+          uid: field.__component,
+          id: field.id,
+          type: "dynamiczone",
+          children: /* @__PURE__ */ jsx(
+            DynamicComponent,
+            {
+              disabled,
+              name: name2,
+              index,
+              componentUid: field.__component,
+              onMoveComponent: handleMoveComponent,
+              onRemoveComponentClick: handleRemoveComponent(name2, index),
+              onCancel: handleCancel,
+              onDropItem: handleDropItem,
+              onGrabItem: handleGrabItem,
+              onAddComponent: handleAddComponent,
+              dynamicComponentsByCategory,
+              children
+            }
+          )
+        },
+        field.__temp_key__
+      )) })
+    ] }),
+    /* @__PURE__ */ jsx(Flex, { justifyContent: "center", children: /* @__PURE__ */ jsx(
+      AddComponentButton,
+      {
+        hasError,
+        isDisabled: disabled,
+        isOpen: addComponentIsOpen,
+        onClick: handleClickOpenPicker,
+        children: renderButtonLabel()
+      }
+    ) }),
+    /* @__PURE__ */ jsx(
+      ComponentPicker,
+      {
+        dynamicComponentsByCategory,
+        isOpen: addComponentIsOpen,
+        onClickAddComponent: handleAddComponent
+      }
+    )
+  ] }) });
 };
 const NotAllowedInput = ({ hint, label, required, name: name2 }) => {
   const { formatMessage } = useIntl();
@@ -3715,8 +3704,7 @@ const Wrapper = styled.div`
 `;
 var listRE = /^(\s*)(>[> ]*|[*+-] \[[x ]\]\s|[*+-]\s|(\d+)([.)]))(\s*)/, emptyListRE = /^(\s*)(>[> ]*|[*+-] \[[x ]\]|[*+-]|(\d+)[.)])(\s*)$/, unorderedListRE = /[*+-]\s/;
 function newlineAndIndentContinueMarkdownList(cm) {
-  if (cm.getOption("disableInput"))
-    return CodeMirror.Pass;
+  if (cm.getOption("disableInput")) return CodeMirror.Pass;
   var ranges = cm.listSelections(), replacements = [];
   for (var i = 0; i < ranges.length; i++) {
     var pos = ranges[i].head;
@@ -3750,8 +3738,7 @@ function newlineAndIndentContinueMarkdownList(cm) {
       var numbered = !(unorderedListRE.test(match[2]) || match[2].indexOf(">") >= 0);
       var bullet = numbered ? parseInt(match[3], 10) + 1 + match[4] : match[2].replace("x", " ");
       replacements[i] = "\n" + indent + bullet + after;
-      if (numbered)
-        incrementRemainingMarkdownListNumbers(cm, pos);
+      if (numbered) incrementRemainingMarkdownListNumbers(cm, pos);
     }
   }
   cm.replaceSelections(replacements);
@@ -3769,10 +3756,8 @@ function incrementRemainingMarkdownListNumbers(cm, pos) {
       var newNumber = parseInt(startItem[3], 10) + lookAhead - skipCount;
       var nextNumber = parseInt(nextItem[3], 10), itemNumber = nextNumber;
       if (startIndent === nextIndent && !isNaN(nextNumber)) {
-        if (newNumber === nextNumber)
-          itemNumber = nextNumber + 1;
-        if (newNumber > nextNumber)
-          itemNumber = newNumber + 1;
+        if (newNumber === nextNumber) itemNumber = nextNumber + 1;
+        if (newNumber > nextNumber) itemNumber = newNumber + 1;
         cm.replaceRange(
           nextLine.replace(listRE, nextIndent + itemNumber + nextItem[4] + nextItem[5]),
           {
@@ -3785,10 +3770,8 @@ function incrementRemainingMarkdownListNumbers(cm, pos) {
           }
         );
       } else {
-        if (startIndent.length > nextIndent.length)
-          return;
-        if (startIndent.length < nextIndent.length && lookAhead === 1)
-          return;
+        if (startIndent.length > nextIndent.length) return;
+        if (startIndent.length < nextIndent.length && lookAhead === 1) return;
         skipCount += 1;
       }
     }
@@ -4925,15 +4908,19 @@ const Wysiwyg = React.forwardRef(
 );
 const MemoizedWysiwyg = React.memo(Wysiwyg);
 const InputRenderer = ({ visible, hint: providedHint, ...props }) => {
-  const { id } = useDoc();
+  const { id, document: document2, collectionType } = useDoc();
   const isFormDisabled = useForm("InputRenderer", (state) => state.disabled);
   const isInDynamicZone = useDynamicZone("isInDynamicZone", (state) => state.isInDynamicZone);
   const canCreateFields = useDocumentRBAC("InputRenderer", (rbac) => rbac.canCreateFields);
   const canReadFields = useDocumentRBAC("InputRenderer", (rbac) => rbac.canReadFields);
   const canUpdateFields = useDocumentRBAC("InputRenderer", (rbac) => rbac.canUpdateFields);
   const canUserAction = useDocumentRBAC("InputRenderer", (rbac) => rbac.canUserAction);
-  const editableFields = id ? canUpdateFields : canCreateFields;
-  const readableFields = id ? canReadFields : canCreateFields;
+  let idToCheck = id;
+  if (collectionType === SINGLE_TYPES) {
+    idToCheck = document2?.documentId;
+  }
+  const editableFields = idToCheck ? canUpdateFields : canCreateFields;
+  const readableFields = idToCheck ? canReadFields : canCreateFields;
   const canUserReadField = canUserAction(props.name, readableFields, props.type);
   const canUserEditField = canUserAction(props.name, editableFields, props.type);
   const fields = useStrapiApp("InputRenderer", (app) => app.fields);
@@ -4944,6 +4931,7 @@ const InputRenderer = ({ visible, hint: providedHint, ...props }) => {
   const {
     edit: { components }
   } = useDocLayout();
+  const field = useField(props.name);
   if (!visible) {
     return null;
   }
@@ -4954,566 +4942,645 @@ const InputRenderer = ({ visible, hint: providedHint, ...props }) => {
   if (attributeHasCustomFieldProperty(props.attribute)) {
     const CustomInput = lazyComponentStore[props.attribute.customField];
     if (CustomInput) {
-      return /* @__PURE__ */ jsx(CustomInput, { ...props, hint, disabled: fieldIsDisabled });
+      return /* @__PURE__ */ jsx(CustomInput, { ...props, ...field, hint, disabled: fieldIsDisabled });
+    }
+    return /* @__PURE__ */ jsx(
+      InputRenderer$1,
+      {
+        ...props,
+        hint,
+        type: props.attribute.customField,
+        disabled: fieldIsDisabled
+      }
+    );
+  }
+  const addedInputTypes = Object.keys(fields);
+  if (!attributeHasCustomFieldProperty(props.attribute) && addedInputTypes.includes(props.type)) {
+    const CustomInput = fields[props.type];
+    return /* @__PURE__ */ jsx(CustomInput, { ...props, hint, disabled: fieldIsDisabled });
+  }
+  switch (props.type) {
+    case "blocks":
+      return /* @__PURE__ */ jsx(MemoizedBlocksInput, { ...props, hint, type: props.type, disabled: fieldIsDisabled });
+    case "component":
+      return /* @__PURE__ */ jsx(
+        MemoizedComponentInput,
+        {
+          ...props,
+          hint,
+          layout: components[props.attribute.component].layout,
+          disabled: fieldIsDisabled,
+          children: (inputProps) => /* @__PURE__ */ jsx(InputRenderer, { ...inputProps })
+        }
+      );
+    case "dynamiczone":
+      return /* @__PURE__ */ jsx(DynamicZone, { ...props, hint, disabled: fieldIsDisabled });
+    case "relation":
+      return /* @__PURE__ */ jsx(MemoizedRelationsField, { ...props, hint, disabled: fieldIsDisabled });
+    case "richtext":
+      return /* @__PURE__ */ jsx(MemoizedWysiwyg, { ...props, hint, type: props.type, disabled: fieldIsDisabled });
+    case "uid":
+      return /* @__PURE__ */ jsx(MemoizedUIDInput, { ...props, hint, type: props.type, disabled: fieldIsDisabled });
+    case "enumeration":
+      return /* @__PURE__ */ jsx(
+        InputRenderer$1,
+        {
+          ...props,
+          hint,
+          options: props.attribute.enum.map((value) => ({ value })),
+          type: props.customField ? "custom-field" : props.type,
+          disabled: fieldIsDisabled
+        }
+      );
+    default:
+      const { unique: _unique, mainField: _mainField, ...restProps } = props;
+      return /* @__PURE__ */ jsx(
+        InputRenderer$1,
+        {
+          ...restProps,
+          hint,
+          type: props.customField ? "custom-field" : props.type,
+          disabled: fieldIsDisabled
+        }
+      );
+  }
+};
+const attributeHasCustomFieldProperty = (attribute) => "customField" in attribute && typeof attribute.customField === "string";
+const useFieldHint = (hint = void 0, attribute) => {
+  const { formatMessage } = useIntl();
+  const { maximum, minimum } = getMinMax(attribute);
+  if (!maximum && !minimum) {
+    return hint;
+  }
+  const units = !["biginteger", "integer", "number", "dynamiczone", "component"].includes(
+    attribute.type
+  ) ? formatMessage(
+    {
+      id: "content-manager.form.Input.hint.character.unit",
+      defaultMessage: "{maxValue, plural, one { character} other { characters}}"
+    },
+    {
+      maxValue: Math.max(minimum || 0, maximum || 0)
+    }
+  ) : null;
+  const hasMinAndMax = typeof minimum === "number" && typeof maximum === "number";
+  return formatMessage(
+    {
+      id: "content-manager.form.Input.hint.text",
+      defaultMessage: "{min, select, undefined {} other {min. {min}}}{divider}{max, select, undefined {} other {max. {max}}}{unit}{br}{description}"
+    },
+    {
+      min: minimum,
+      max: maximum,
+      description: hint,
+      unit: units,
+      divider: hasMinAndMax ? formatMessage({
+        id: "content-manager.form.Input.hint.minMaxDivider",
+        defaultMessage: " / "
+      }) : null,
+      br: /* @__PURE__ */ jsx("br", {})
+    }
+  );
+};
+const getMinMax = (attribute) => {
+  if ("min" in attribute || "max" in attribute) {
+    return {
+      maximum: !Number.isNaN(Number(attribute.max)) ? Number(attribute.max) : void 0,
+      minimum: !Number.isNaN(Number(attribute.min)) ? Number(attribute.min) : void 0
+    };
+  } else if ("maxLength" in attribute || "minLength" in attribute) {
+    return { maximum: attribute.maxLength, minimum: attribute.minLength };
+  } else {
+    return { maximum: void 0, minimum: void 0 };
+  }
+};
+const MemoizedInputRenderer = memo(InputRenderer);
+const RESPONSIVE_CONTAINER_BREAKPOINTS = {
+  sm: "27.5rem"
+  // 440px
+};
+const ResponsiveGridRoot = styled(Grid$1.Root)`
+  container-type: inline-size;
+`;
+const ResponsiveGridItem = styled(Grid$1.Item)`
+  grid-column: span 12;
+
+  @container (min-width: ${RESPONSIVE_CONTAINER_BREAKPOINTS.sm}) {
+    ${({ col }) => col && `grid-column: span ${col};`}
+  }
+`;
+const FormLayout = ({ layout }) => {
+  const { formatMessage } = useIntl();
+  const { model } = useDoc();
+  return /* @__PURE__ */ jsx(Flex, { direction: "column", alignItems: "stretch", gap: 6, children: layout.map((panel, index) => {
+    if (panel.some((row) => row.some((field) => field.type === "dynamiczone"))) {
+      const [row] = panel;
+      const [field] = row;
+      const fieldWithTranslatedLabel = {
+        ...field,
+        label: formatMessage({
+          id: `content-manager.content-types.${model}.${field.name}`,
+          defaultMessage: field.label
+        })
+      };
+      return /* @__PURE__ */ jsx(Grid$1.Root, { gap: 4, children: /* @__PURE__ */ jsx(Grid$1.Item, { col: 12, s: 12, xs: 12, direction: "column", alignItems: "stretch", children: /* @__PURE__ */ jsx(MemoizedInputRenderer, { ...fieldWithTranslatedLabel }) }) }, field.name);
+    }
+    return /* @__PURE__ */ jsx(
+      Box,
+      {
+        hasRadius: true,
+        background: "neutral0",
+        shadow: "tableShadow",
+        paddingLeft: 6,
+        paddingRight: 6,
+        paddingTop: 6,
+        paddingBottom: 6,
+        borderColor: "neutral150",
+        children: /* @__PURE__ */ jsx(Flex, { direction: "column", alignItems: "stretch", gap: 6, children: panel.map((row, gridRowIndex) => /* @__PURE__ */ jsx(ResponsiveGridRoot, { gap: 4, children: row.map(({ size, ...field }) => {
+          const fieldWithTranslatedLabel = {
+            ...field,
+            label: formatMessage({
+              id: `content-manager.content-types.${model}.${field.name}`,
+              defaultMessage: field.label
+            })
+          };
+          return /* @__PURE__ */ jsx(
+            ResponsiveGridItem,
+            {
+              col: size,
+              s: 12,
+              xs: 12,
+              direction: "column",
+              alignItems: "stretch",
+              children: /* @__PURE__ */ jsx(MemoizedInputRenderer, { ...fieldWithTranslatedLabel })
+            },
+            field.name
+          );
+        }) }, gridRowIndex)) })
+      },
+      index
+    );
+  }) });
+};
+const NonRepeatableComponent = ({
+  attribute,
+  name: name2,
+  children,
+  layout
+}) => {
+  const { formatMessage } = useIntl();
+  const { value } = useField(name2);
+  const level = useComponent("NonRepeatableComponent", (state) => state.level);
+  const isNested = level > 0;
+  return /* @__PURE__ */ jsx(ComponentProvider, { id: value?.id, uid: attribute.component, level: level + 1, type: "component", children: /* @__PURE__ */ jsx(
+    Box,
+    {
+      background: "neutral100",
+      paddingLeft: 6,
+      paddingRight: 6,
+      paddingTop: 6,
+      paddingBottom: 6,
+      hasRadius: isNested,
+      borderColor: isNested ? "neutral200" : void 0,
+      children: /* @__PURE__ */ jsx(Flex, { direction: "column", alignItems: "stretch", gap: 6, children: layout.map((row, index) => {
+        return /* @__PURE__ */ jsx(ResponsiveGridRoot, { gap: 4, children: row.map(({ size, ...field }) => {
+          const completeFieldName = `${name2}.${field.name}`;
+          const translatedLabel = formatMessage({
+            id: `content-manager.components.${attribute.component}.${field.name}`,
+            defaultMessage: field.label
+          });
+          return /* @__PURE__ */ jsx(
+            ResponsiveGridItem,
+            {
+              col: size,
+              s: 12,
+              xs: 12,
+              direction: "column",
+              alignItems: "stretch",
+              children: children({ ...field, label: translatedLabel, name: completeFieldName })
+            },
+            completeFieldName
+          );
+        }) }, index);
+      }) })
+    }
+  ) });
+};
+const RepeatableComponent = ({
+  attribute,
+  disabled,
+  name: name2,
+  mainField,
+  children,
+  layout
+}) => {
+  const { toggleNotification } = useNotification();
+  const { formatMessage } = useIntl();
+  const { search: searchString } = useLocation();
+  const search = React.useMemo(() => new URLSearchParams(searchString), [searchString]);
+  const { components } = useDoc();
+  const {
+    value = [],
+    error,
+    rawError
+  } = useField(name2);
+  const addFieldRow = useForm("RepeatableComponent", (state) => state.addFieldRow);
+  const moveFieldRow = useForm("RepeatableComponent", (state) => state.moveFieldRow);
+  const removeFieldRow = useForm("RepeatableComponent", (state) => state.removeFieldRow);
+  const { max = Infinity } = attribute;
+  const [collapseToOpen, setCollapseToOpen] = React.useState("");
+  const [liveText, setLiveText] = React.useState("");
+  React.useEffect(() => {
+    const hasNestedErrors = rawError && Array.isArray(rawError) && rawError.length > 0;
+    const hasNestedValue = value && Array.isArray(value) && value.length > 0;
+    if (hasNestedErrors && hasNestedValue) {
+      const errorOpenItems = rawError.map((_, idx) => {
+        return value[idx] ? value[idx].__temp_key__ : null;
+      }).filter((value2) => !!value2);
+      if (errorOpenItems && errorOpenItems.length > 0) {
+        setCollapseToOpen((collapseToOpen2) => {
+          if (!errorOpenItems.includes(collapseToOpen2)) {
+            return errorOpenItems[0];
+          }
+          return collapseToOpen2;
+        });
+      }
+    }
+  }, [rawError, value]);
+  const componentTmpKeyWithFocussedField = React.useMemo(() => {
+    if (search.has("field")) {
+      const fieldParam = search.get("field");
+      if (!fieldParam) {
+        return void 0;
+      }
+      const [, path] = fieldParam.split(`${name2}.`);
+      if (getIn(value, path, void 0) !== void 0) {
+        const [subpath] = path.split(".");
+        return getIn(value, subpath, void 0)?.__temp_key__;
+      }
+    }
+    return void 0;
+  }, [search, name2, value]);
+  const prevValue = usePrev(value);
+  React.useEffect(() => {
+    if (prevValue && prevValue.length < value.length) {
+      setCollapseToOpen(value[value.length - 1].__temp_key__);
+    }
+  }, [value, prevValue]);
+  React.useEffect(() => {
+    if (typeof componentTmpKeyWithFocussedField === "string") {
+      setCollapseToOpen(componentTmpKeyWithFocussedField);
     }
-    return /* @__PURE__ */ jsx(
-      InputRenderer$1,
-      {
-        ...props,
-        hint,
-        type: props.attribute.customField,
-        disabled: fieldIsDisabled
-      }
+  }, [componentTmpKeyWithFocussedField]);
+  const toggleCollapses = () => {
+    setCollapseToOpen("");
+  };
+  const handleClick = () => {
+    if (value.length < max) {
+      const schema = components[attribute.component];
+      const form = createDefaultForm(schema, components);
+      const data = transformDocument(schema, components)(form);
+      addFieldRow(name2, data);
+    } else if (value.length >= max) {
+      toggleNotification({
+        type: "info",
+        message: formatMessage({
+          id: getTranslation("components.notification.info.maximum-requirement")
+        })
+      });
+    }
+  };
+  const handleMoveComponentField = (newIndex, currentIndex) => {
+    setLiveText(
+      formatMessage(
+        {
+          id: getTranslation("dnd.reorder"),
+          defaultMessage: "{item}, moved. New position in list: {position}."
+        },
+        {
+          item: `${name2}.${currentIndex}`,
+          position: getItemPos(newIndex)
+        }
+      )
     );
-  }
-  const addedInputTypes = Object.keys(fields);
-  if (!attributeHasCustomFieldProperty(props.attribute) && addedInputTypes.includes(props.type)) {
-    const CustomInput = fields[props.type];
-    return /* @__PURE__ */ jsx(CustomInput, { ...props, hint, disabled: fieldIsDisabled });
-  }
-  switch (props.type) {
-    case "blocks":
-      return /* @__PURE__ */ jsx(MemoizedBlocksInput, { ...props, hint, type: props.type, disabled: fieldIsDisabled });
-    case "component":
-      return /* @__PURE__ */ jsx(
-        MemoizedComponentInput,
+    moveFieldRow(name2, currentIndex, newIndex);
+  };
+  const handleValueChange = (key) => {
+    setCollapseToOpen(key);
+  };
+  const getItemPos = (index) => `${index + 1} of ${value.length}`;
+  const handleCancel = (index) => {
+    setLiveText(
+      formatMessage(
         {
-          ...props,
-          hint,
-          layout: components[props.attribute.component].layout,
-          disabled: fieldIsDisabled,
-          children: (inputProps) => /* @__PURE__ */ jsx(InputRenderer, { ...inputProps })
+          id: getTranslation("dnd.cancel-item"),
+          defaultMessage: "{item}, dropped. Re-order cancelled."
+        },
+        {
+          item: `${name2}.${index}`
         }
-      );
-    case "dynamiczone":
-      return /* @__PURE__ */ jsx(DynamicZone, { ...props, hint, disabled: fieldIsDisabled });
-    case "relation":
-      return /* @__PURE__ */ jsx(MemoizedRelationsField, { ...props, hint, disabled: fieldIsDisabled });
-    case "richtext":
-      return /* @__PURE__ */ jsx(MemoizedWysiwyg, { ...props, hint, type: props.type, disabled: fieldIsDisabled });
-    case "uid":
-      return /* @__PURE__ */ jsx(MemoizedUIDInput, { ...props, hint, type: props.type, disabled: fieldIsDisabled });
-    case "enumeration":
-      return /* @__PURE__ */ jsx(
-        InputRenderer$1,
+      )
+    );
+  };
+  const handleGrabItem = (index) => {
+    setLiveText(
+      formatMessage(
         {
-          ...props,
-          hint,
-          options: props.attribute.enum.map((value) => ({ value })),
-          type: props.customField ? "custom-field" : props.type,
-          disabled: fieldIsDisabled
+          id: getTranslation("dnd.grab-item"),
+          defaultMessage: `{item}, grabbed. Current position in list: {position}. Press up and down arrow to change position, Spacebar to drop, Escape to cancel.`
+        },
+        {
+          item: `${name2}.${index}`,
+          position: getItemPos(index)
         }
-      );
-    default:
-      const { unique: _unique, mainField: _mainField, ...restProps } = props;
-      return /* @__PURE__ */ jsx(
-        InputRenderer$1,
+      )
+    );
+  };
+  const handleDropItem = (index) => {
+    setLiveText(
+      formatMessage(
         {
-          ...restProps,
-          hint,
-          type: props.customField ? "custom-field" : props.type,
-          disabled: fieldIsDisabled
+          id: getTranslation("dnd.drop-item"),
+          defaultMessage: `{item}, dropped. Final position in list: {position}.`
+        },
+        {
+          item: `${name2}.${index}`,
+          position: getItemPos(index)
         }
-      );
-  }
-};
-const attributeHasCustomFieldProperty = (attribute) => "customField" in attribute && typeof attribute.customField === "string";
-const useFieldHint = (hint = void 0, attribute) => {
-  const { formatMessage } = useIntl();
-  const { maximum, minimum } = getMinMax(attribute);
-  if (!maximum && !minimum) {
-    return hint;
+      )
+    );
+  };
+  const ariaDescriptionId = React.useId();
+  const level = useComponent("RepeatableComponent", (state) => state.level);
+  if (value.length === 0) {
+    return /* @__PURE__ */ jsx(Initializer, { disabled, name: name2, onClick: handleClick });
   }
-  const units = !["biginteger", "integer", "number", "dynamiczone", "component"].includes(
-    attribute.type
-  ) ? formatMessage(
-    {
-      id: "content-manager.form.Input.hint.character.unit",
-      defaultMessage: "{maxValue, plural, one { character} other { characters}}"
-    },
-    {
-      maxValue: Math.max(minimum || 0, maximum || 0)
-    }
-  ) : null;
-  const hasMinAndMax = typeof minimum === "number" && typeof maximum === "number";
-  return formatMessage(
-    {
-      id: "content-manager.form.Input.hint.text",
-      defaultMessage: "{min, select, undefined {} other {min. {min}}}{divider}{max, select, undefined {} other {max. {max}}}{unit}{br}{description}"
-    },
-    {
-      min: minimum,
-      max: maximum,
-      description: hint,
-      unit: units,
-      divider: hasMinAndMax ? formatMessage({
-        id: "content-manager.form.Input.hint.minMaxDivider",
-        defaultMessage: " / "
-      }) : null,
-      br: /* @__PURE__ */ jsx("br", {})
-    }
-  );
+  return /* @__PURE__ */ jsxs(Box, { hasRadius: true, children: [
+    /* @__PURE__ */ jsx(VisuallyHidden, { id: ariaDescriptionId, children: formatMessage({
+      id: getTranslation("dnd.instructions"),
+      defaultMessage: `Press spacebar to grab and re-order`
+    }) }),
+    /* @__PURE__ */ jsx(VisuallyHidden, { "aria-live": "assertive", children: liveText }),
+    /* @__PURE__ */ jsxs(
+      AccordionRoot,
+      {
+        $error: error,
+        value: collapseToOpen,
+        onValueChange: handleValueChange,
+        "aria-describedby": ariaDescriptionId,
+        children: [
+          value.map(({ __temp_key__: key, id }, index) => {
+            const nameWithIndex = `${name2}.${index}`;
+            return /* @__PURE__ */ jsx(
+              ComponentProvider,
+              {
+                id,
+                uid: attribute.component,
+                level: level + 1,
+                type: "repeatable",
+                children: /* @__PURE__ */ jsx(
+                  Component,
+                  {
+                    disabled,
+                    name: nameWithIndex,
+                    attribute,
+                    index,
+                    mainField,
+                    onMoveItem: handleMoveComponentField,
+                    onDeleteComponent: () => {
+                      removeFieldRow(name2, index);
+                      toggleCollapses();
+                    },
+                    toggleCollapses,
+                    onCancel: handleCancel,
+                    onDropItem: handleDropItem,
+                    onGrabItem: handleGrabItem,
+                    __temp_key__: key,
+                    children: layout.map((row, index2) => {
+                      return /* @__PURE__ */ jsx(ResponsiveGridRoot, { gap: 4, children: row.map(({ size, ...field }) => {
+                        const completeFieldName = `${nameWithIndex}.${field.name}`;
+                        const translatedLabel = formatMessage({
+                          id: `content-manager.components.${attribute.component}.${field.name}`,
+                          defaultMessage: field.label
+                        });
+                        return /* @__PURE__ */ jsx(
+                          ResponsiveGridItem,
+                          {
+                            col: size,
+                            s: 12,
+                            xs: 12,
+                            direction: "column",
+                            alignItems: "stretch",
+                            children: children({
+                              ...field,
+                              label: translatedLabel,
+                              name: completeFieldName
+                            })
+                          },
+                          completeFieldName
+                        );
+                      }) }, index2);
+                    })
+                  }
+                )
+              },
+              key
+            );
+          }),
+          /* @__PURE__ */ jsx(TextButtonCustom, { disabled, onClick: handleClick, startIcon: /* @__PURE__ */ jsx(Plus, {}), children: formatMessage({
+            id: getTranslation("containers.EditView.add.new-entry"),
+            defaultMessage: "Add an entry"
+          }) })
+        ]
+      }
+    )
+  ] });
 };
-const getMinMax = (attribute) => {
-  if ("min" in attribute || "max" in attribute) {
-    return {
-      maximum: !Number.isNaN(Number(attribute.max)) ? Number(attribute.max) : void 0,
-      minimum: !Number.isNaN(Number(attribute.min)) ? Number(attribute.min) : void 0
-    };
-  } else if ("maxLength" in attribute || "minLength" in attribute) {
-    return { maximum: attribute.maxLength, minimum: attribute.minLength };
-  } else {
-    return { maximum: void 0, minimum: void 0 };
+const AccordionRoot = styled(Accordion.Root)`
+  border: 1px solid
+    ${({ theme, $error }) => $error ? theme.colors.danger600 : theme.colors.neutral200};
+`;
+const TextButtonCustom = styled(TextButton)`
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  border-top: 1px solid ${({ theme }) => theme.colors.neutral200};
+  padding-inline: ${(props) => props.theme.spaces[6]};
+  padding-block: ${(props) => props.theme.spaces[3]};
+
+  &:not([disabled]) {
+    cursor: pointer;
+
+    &:hover {
+      background-color: ${(props) => props.theme.colors.primary100};
+    }
   }
-};
-const MemoizedInputRenderer = memo(InputRenderer);
-const DynamicComponent = ({
-  componentUid,
+
+  span {
+    font-weight: 600;
+    font-size: 1.4rem;
+    line-height: 2.4rem;
+  }
+
+  @media (prefers-reduced-motion: no-preference) {
+    transition: background-color 120ms ${(props) => props.theme.motion.easings.easeOutQuad};
+  }
+`;
+const Component = ({
   disabled,
   index,
   name: name2,
-  onRemoveComponentClick,
-  onMoveComponent,
-  onGrabItem,
-  onDropItem,
-  onCancel,
-  dynamicComponentsByCategory = {},
-  onAddComponent
+  mainField = {
+    name: "id",
+    type: "integer"
+  },
+  children,
+  onDeleteComponent,
+  toggleCollapses,
+  __temp_key__,
+  ...dragProps
 }) => {
   const { formatMessage } = useIntl();
-  const formValues = useForm("DynamicComponent", (state) => state.values);
-  const {
-    edit: { components }
-  } = useDocLayout();
-  const title = React.useMemo(() => {
-    const { mainField } = components[componentUid]?.settings ?? { mainField: "id" };
-    const mainFieldValue = getIn(formValues, `${name2}.${index}.${mainField}`);
-    const displayedValue = mainField === "id" || !mainFieldValue ? "" : String(mainFieldValue).trim();
-    const mainValue = displayedValue.length > 0 ? `- ${displayedValue}` : displayedValue;
-    return mainValue;
-  }, [componentUid, components, formValues, name2, index]);
-  const { icon, displayName } = React.useMemo(() => {
-    const [category] = componentUid.split(".");
-    const { icon: icon2, displayName: displayName2 } = (dynamicComponentsByCategory[category] ?? []).find(
-      (component) => component.uid === componentUid
-    ) ?? { icon: null, displayName: null };
-    return { icon: icon2, displayName: displayName2 };
-  }, [componentUid, dynamicComponentsByCategory]);
+  const displayValue = useForm("RepeatableComponent", (state) => {
+    return getIn(state.values, [...name2.split("."), mainField.name]);
+  });
+  const accordionRef = React.useRef(null);
+  const componentKey = name2.split(".").slice(0, -1).join(".");
   const [{ handlerId, isDragging, handleKeyDown }, boxRef, dropRef, dragRef, dragPreviewRef] = useDragAndDrop(!disabled, {
-    type: `${ItemTypes.DYNAMIC_ZONE}_${name2}`,
+    type: `${ItemTypes.COMPONENT}_${componentKey}`,
     index,
     item: {
       index,
-      displayedValue: `${displayName} ${title}`,
-      icon
+      displayedValue: displayValue
     },
-    onMoveItem: onMoveComponent,
-    onDropItem,
-    onGrabItem,
-    onCancel
+    onStart() {
+      toggleCollapses();
+    },
+    ...dragProps
   });
   React.useEffect(() => {
     dragPreviewRef(getEmptyImage(), { captureDraggingState: false });
   }, [dragPreviewRef, index]);
-  const composedBoxRefs = useComposedRefs(boxRef, dropRef);
-  const accordionActions = disabled ? null : /* @__PURE__ */ jsxs(Fragment, { children: [
-    /* @__PURE__ */ jsx(
-      IconButton,
-      {
-        variant: "ghost",
-        label: formatMessage(
-          {
-            id: getTranslation("components.DynamicZone.delete-label"),
-            defaultMessage: "Delete {name}"
-          },
-          { name: title }
-        ),
-        onClick: onRemoveComponentClick,
-        children: /* @__PURE__ */ jsx(Trash, {})
-      }
-    ),
-    /* @__PURE__ */ jsx(
-      IconButton,
-      {
-        variant: "ghost",
-        onClick: (e) => e.stopPropagation(),
-        "data-handler-id": handlerId,
-        ref: dragRef,
-        label: formatMessage({
-          id: getTranslation("components.DragHandle-label"),
-          defaultMessage: "Drag"
-        }),
-        onKeyDown: handleKeyDown,
-        children: /* @__PURE__ */ jsx(Drag, {})
-      }
-    ),
-    /* @__PURE__ */ jsxs(Menu.Root, { children: [
-      /* @__PURE__ */ jsxs(Menu.Trigger, { size: "S", endIcon: null, paddingLeft: 2, paddingRight: 2, children: [
-        /* @__PURE__ */ jsx(More, { "aria-hidden": true, focusable: false }),
-        /* @__PURE__ */ jsx(VisuallyHidden, { tag: "span", children: formatMessage({
-          id: getTranslation("components.DynamicZone.more-actions"),
-          defaultMessage: "More actions"
-        }) })
-      ] }),
-      /* @__PURE__ */ jsxs(Menu.Content, { children: [
-        /* @__PURE__ */ jsxs(Menu.SubRoot, { children: [
-          /* @__PURE__ */ jsx(Menu.SubTrigger, { children: formatMessage({
-            id: getTranslation("components.DynamicZone.add-item-above"),
-            defaultMessage: "Add component above"
-          }) }),
-          /* @__PURE__ */ jsx(Menu.SubContent, { children: Object.entries(dynamicComponentsByCategory).map(([category, components2]) => /* @__PURE__ */ jsxs(React.Fragment, { children: [
-            /* @__PURE__ */ jsx(Menu.Label, { children: category }),
-            components2.map(({ displayName: displayName2, uid }) => /* @__PURE__ */ jsx(MenuItem, { onSelect: () => onAddComponent(uid, index), children: displayName2 }, componentUid))
-          ] }, category)) })
-        ] }),
-        /* @__PURE__ */ jsxs(Menu.SubRoot, { children: [
-          /* @__PURE__ */ jsx(Menu.SubTrigger, { children: formatMessage({
-            id: getTranslation("components.DynamicZone.add-item-below"),
-            defaultMessage: "Add component below"
-          }) }),
-          /* @__PURE__ */ jsx(Menu.SubContent, { children: Object.entries(dynamicComponentsByCategory).map(([category, components2]) => /* @__PURE__ */ jsxs(React.Fragment, { children: [
-            /* @__PURE__ */ jsx(Menu.Label, { children: category }),
-            components2.map(({ displayName: displayName2, uid }) => /* @__PURE__ */ jsx(MenuItem, { onSelect: () => onAddComponent(uid, index + 1), children: displayName2 }, componentUid))
-          ] }, category)) })
-        ] })
-      ] })
-    ] })
-  ] });
-  const accordionTitle = title ? `${displayName} ${title}` : displayName;
-  const accordionValue = React.useId();
-  return /* @__PURE__ */ jsxs(ComponentContainer, { tag: "li", width: "100%", children: [
-    /* @__PURE__ */ jsx(Flex, { justifyContent: "center", children: /* @__PURE__ */ jsx(Rectangle, { background: "neutral200" }) }),
-    /* @__PURE__ */ jsx(StyledBox, { ref: composedBoxRefs, hasRadius: true, children: isDragging ? /* @__PURE__ */ jsx(Preview, {}) : /* @__PURE__ */ jsx(Accordion.Root, { children: /* @__PURE__ */ jsxs(Accordion.Item, { value: accordionValue, children: [
-      /* @__PURE__ */ jsxs(Accordion.Header, { children: [
+  const composedAccordionRefs = useComposedRefs(accordionRef, dragRef);
+  const composedBoxRefs = useComposedRefs(
+    boxRef,
+    dropRef
+  );
+  return /* @__PURE__ */ jsx(Fragment, { children: isDragging ? /* @__PURE__ */ jsx(Preview, {}) : /* @__PURE__ */ jsxs(Accordion.Item, { ref: composedBoxRefs, value: __temp_key__, children: [
+    /* @__PURE__ */ jsxs(Accordion.Header, { children: [
+      /* @__PURE__ */ jsx(Accordion.Trigger, { children: displayValue }),
+      /* @__PURE__ */ jsxs(Accordion.Actions, { children: [
         /* @__PURE__ */ jsx(
-          Accordion.Trigger,
+          IconButton,
           {
-            icon: icon && COMPONENT_ICONS[icon] ? COMPONENT_ICONS[icon] : COMPONENT_ICONS.dashboard,
-            children: accordionTitle
+            variant: "ghost",
+            onClick: onDeleteComponent,
+            label: formatMessage({
+              id: getTranslation("containers.Edit.delete"),
+              defaultMessage: "Delete"
+            }),
+            children: /* @__PURE__ */ jsx(Trash, {})
           }
         ),
-        /* @__PURE__ */ jsx(Accordion.Actions, { children: accordionActions })
-      ] }),
-      /* @__PURE__ */ jsx(Accordion.Content, { children: /* @__PURE__ */ jsx(AccordionContentRadius, { background: "neutral0", children: /* @__PURE__ */ jsx(Box, { paddingLeft: 6, paddingRight: 6, paddingTop: 6, paddingBottom: 6, children: components[componentUid]?.layout?.map((row, rowInd) => /* @__PURE__ */ jsx(Grid$1.Root, { gap: 4, children: row.map(({ size, ...field }) => {
-        const fieldName = `${name2}.${index}.${field.name}`;
-        return /* @__PURE__ */ jsx(
-          Grid$1.Item,
+        /* @__PURE__ */ jsx(
+          IconButton,
           {
-            col: size,
-            s: 12,
-            xs: 12,
-            direction: "column",
-            alignItems: "stretch",
-            children: /* @__PURE__ */ jsx(MemoizedInputRenderer, { ...field, name: fieldName })
-          },
-          fieldName
-        );
-      }) }, rowInd)) }) }) })
-    ] }) }) })
-  ] });
-};
-const StyledBox = styled(Box)`
-  > div:first-child {
-    box-shadow: ${({ theme }) => theme.shadows.tableShadow};
-  }
-`;
-const AccordionContentRadius = styled(Box)`
-  border-radius: 0 0 ${({ theme }) => theme.spaces[1]} ${({ theme }) => theme.spaces[1]};
-`;
-const Rectangle = styled(Box)`
-  width: ${({ theme }) => theme.spaces[2]};
-  height: ${({ theme }) => theme.spaces[4]};
-`;
-const Preview = styled.span`
-  display: block;
-  background-color: ${({ theme }) => theme.colors.primary100};
-  outline: 1px dashed ${({ theme }) => theme.colors.primary500};
-  outline-offset: -1px;
-  padding: ${({ theme }) => theme.spaces[6]};
-`;
-const ComponentContainer = styled(Box)`
-  list-style: none;
-  padding: 0;
-  margin: 0;
-`;
-const DynamicZoneLabel = ({
-  hint,
-  label,
-  labelAction,
-  name: name2,
-  numberOfComponents = 0,
-  required
-}) => {
-  return /* @__PURE__ */ jsx(Flex, { justifyContent: "center", children: /* @__PURE__ */ jsx(
-    Box,
-    {
-      paddingTop: 3,
-      paddingBottom: 3,
-      paddingRight: 4,
-      paddingLeft: 4,
-      borderRadius: "26px",
-      background: "neutral0",
-      shadow: "filterShadow",
-      color: "neutral500",
-      children: /* @__PURE__ */ jsxs(Flex, { direction: "column", justifyContent: "center", children: [
-        /* @__PURE__ */ jsxs(Flex, { maxWidth: "35.6rem", children: [
-          /* @__PURE__ */ jsxs(Typography, { variant: "pi", textColor: "neutral600", fontWeight: "bold", ellipsis: true, children: [
-            label || name2,
-            " "
-          ] }),
-          /* @__PURE__ */ jsxs(Typography, { variant: "pi", textColor: "neutral600", fontWeight: "bold", children: [
-            "(",
-            numberOfComponents,
-            ")"
-          ] }),
-          required && /* @__PURE__ */ jsx(Typography, { textColor: "danger600", children: "*" }),
-          labelAction && /* @__PURE__ */ jsx(Box, { paddingLeft: 1, children: labelAction })
-        ] }),
-        hint && /* @__PURE__ */ jsx(Box, { paddingTop: 1, maxWidth: "35.6rem", children: /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral600", ellipsis: true, children: hint }) })
+            ref: composedAccordionRefs,
+            variant: "ghost",
+            onClick: (e) => e.stopPropagation(),
+            "data-handler-id": handlerId,
+            label: formatMessage({
+              id: getTranslation("components.DragHandle-label"),
+              defaultMessage: "Drag"
+            }),
+            onKeyDown: handleKeyDown,
+            children: /* @__PURE__ */ jsx(Drag, {})
+          }
+        )
       ] })
-    }
-  ) });
-};
-const [DynamicZoneProvider, useDynamicZone] = createContext(
-  "DynamicZone",
-  {
-    isInDynamicZone: false
-  }
-);
-const DynamicZone = ({
-  attribute,
-  disabled: disabledProp,
-  hint,
+    ] }),
+    /* @__PURE__ */ jsx(Accordion.Content, { children: /* @__PURE__ */ jsx(
+      Flex,
+      {
+        direction: "column",
+        alignItems: "stretch",
+        background: "neutral100",
+        padding: 6,
+        gap: 6,
+        children
+      }
+    ) })
+  ] }) });
+};
+const Preview = () => {
+  return /* @__PURE__ */ jsx(StyledSpan, { tag: "span", padding: 6, background: "primary100" });
+};
+const StyledSpan = styled(Box)`
+  display: block;
+  outline: 1px dashed ${({ theme }) => theme.colors.primary500};
+  outline-offset: -1px;
+`;
+const ComponentInput = ({
   label,
-  labelAction,
+  required,
   name: name2,
-  required = false
+  attribute,
+  disabled,
+  labelAction,
+  ...props
 }) => {
-  const { max = Infinity, min = -Infinity } = attribute ?? {};
-  const [addComponentIsOpen, setAddComponentIsOpen] = React.useState(false);
-  const [liveText, setLiveText] = React.useState("");
-  const { components, isLoading } = useDoc();
-  const disabled = disabledProp || isLoading;
-  const { addFieldRow, removeFieldRow, moveFieldRow } = useForm(
-    "DynamicZone",
-    ({ addFieldRow: addFieldRow2, removeFieldRow: removeFieldRow2, moveFieldRow: moveFieldRow2 }) => ({
-      addFieldRow: addFieldRow2,
-      removeFieldRow: removeFieldRow2,
-      moveFieldRow: moveFieldRow2
-    })
-  );
-  const { value = [], error } = useField(name2);
-  const dynamicComponentsByCategory = React.useMemo(() => {
-    return attribute.components.reduce((acc, componentUid) => {
-      const { category, info } = components[componentUid] ?? { info: {} };
-      const component = { uid: componentUid, displayName: info.displayName, icon: info.icon };
-      if (!acc[category]) {
-        acc[category] = [];
-      }
-      acc[category] = [...acc[category], component];
-      return acc;
-    }, {});
-  }, [attribute.components, components]);
   const { formatMessage } = useIntl();
-  const { toggleNotification } = useNotification();
-  const dynamicDisplayedComponentsLength = value.length;
-  const handleAddComponent = (uid, position) => {
-    setAddComponentIsOpen(false);
-    const schema = components[uid];
+  const field = useField(name2);
+  const showResetComponent = !attribute.repeatable && field.value && !disabled;
+  const { components } = useDoc();
+  const handleInitialisationClick = () => {
+    const schema = components[attribute.component];
     const form = createDefaultForm(schema, components);
-    const transformations = pipe$1(transformDocument(schema, components), (data2) => ({
-      ...data2,
-      __component: uid
-    }));
-    const data = transformations(form);
-    addFieldRow(name2, data, position);
-  };
-  const handleClickOpenPicker = () => {
-    if (dynamicDisplayedComponentsLength < max) {
-      setAddComponentIsOpen((prev) => !prev);
-    } else {
-      toggleNotification({
-        type: "info",
-        message: formatMessage({
-          id: getTranslation("components.notification.info.maximum-requirement")
-        })
-      });
-    }
-  };
-  const handleMoveComponent = (newIndex, currentIndex) => {
-    setLiveText(
-      formatMessage(
-        {
-          id: getTranslation("dnd.reorder"),
-          defaultMessage: "{item}, moved. New position in list: {position}."
-        },
-        {
-          item: `${name2}.${currentIndex}`,
-          position: getItemPos(newIndex)
-        }
-      )
-    );
-    moveFieldRow(name2, currentIndex, newIndex);
-  };
-  const getItemPos = (index) => `${index + 1} of ${value.length}`;
-  const handleCancel = (index) => {
-    setLiveText(
-      formatMessage(
-        {
-          id: getTranslation("dnd.cancel-item"),
-          defaultMessage: "{item}, dropped. Re-order cancelled."
-        },
-        {
-          item: `${name2}.${index}`
-        }
-      )
-    );
-  };
-  const handleGrabItem = (index) => {
-    setLiveText(
-      formatMessage(
-        {
-          id: getTranslation("dnd.grab-item"),
-          defaultMessage: `{item}, grabbed. Current position in list: {position}. Press up and down arrow to change position, Spacebar to drop, Escape to cancel.`
-        },
-        {
-          item: `${name2}.${index}`,
-          position: getItemPos(index)
-        }
-      )
-    );
+    const data = transformDocument(schema, components)(form);
+    field.onChange(name2, data);
   };
-  const handleDropItem = (index) => {
-    setLiveText(
-      formatMessage(
-        {
-          id: getTranslation("dnd.drop-item"),
-          defaultMessage: `{item}, dropped. Final position in list: {position}.`
-        },
+  return /* @__PURE__ */ jsxs(Field.Root, { error: field.error, required, children: [
+    /* @__PURE__ */ jsxs(Flex, { justifyContent: "space-between", children: [
+      /* @__PURE__ */ jsxs(Field.Label, { action: labelAction, children: [
+        label,
+        attribute.repeatable && /* @__PURE__ */ jsxs(Fragment, { children: [
+          " (",
+          Array.isArray(field.value) ? field.value.length : 0,
+          ")"
+        ] })
+      ] }),
+      showResetComponent && /* @__PURE__ */ jsx(
+        IconButton,
         {
-          item: `${name2}.${index}`,
-          position: getItemPos(index)
+          label: formatMessage({
+            id: getTranslation("components.reset-entry"),
+            defaultMessage: "Reset Entry"
+          }),
+          variant: "ghost",
+          onClick: () => {
+            field.onChange(name2, null);
+          },
+          children: /* @__PURE__ */ jsx(Trash, {})
         }
       )
-    );
-  };
-  const handleRemoveComponent = (name22, currentIndex) => () => {
-    removeFieldRow(name22, currentIndex);
-  };
-  const hasError = error !== void 0;
-  const renderButtonLabel = () => {
-    if (addComponentIsOpen) {
-      return formatMessage({ id: "app.utils.close-label", defaultMessage: "Close" });
-    }
-    if (hasError && dynamicDisplayedComponentsLength > max) {
-      return formatMessage(
-        {
-          id: getTranslation(`components.DynamicZone.extra-components`),
-          defaultMessage: "There {number, plural, =0 {are # extra components} one {is # extra component} other {are # extra components}}"
-        },
-        {
-          number: dynamicDisplayedComponentsLength - max
-        }
-      );
-    }
-    if (hasError && dynamicDisplayedComponentsLength < min) {
-      return formatMessage(
-        {
-          id: getTranslation(`components.DynamicZone.missing-components`),
-          defaultMessage: "There {number, plural, =0 {are # missing components} one {is # missing component} other {are # missing components}}"
-        },
-        { number: min - dynamicDisplayedComponentsLength }
-      );
-    }
-    return formatMessage(
-      {
-        id: getTranslation("components.DynamicZone.add-component"),
-        defaultMessage: "Add a component to {componentName}"
-      },
-      { componentName: label || name2 }
-    );
-  };
-  const level = useComponent("DynamicZone", (state) => state.level);
-  const ariaDescriptionId = React.useId();
-  return /* @__PURE__ */ jsx(DynamicZoneProvider, { isInDynamicZone: true, children: /* @__PURE__ */ jsxs(Flex, { direction: "column", alignItems: "stretch", gap: 6, children: [
-    dynamicDisplayedComponentsLength > 0 && /* @__PURE__ */ jsxs(Box, { children: [
-      /* @__PURE__ */ jsx(
-        DynamicZoneLabel,
-        {
-          hint,
-          label,
-          labelAction,
-          name: name2,
-          numberOfComponents: dynamicDisplayedComponentsLength,
-          required
-        }
-      ),
-      /* @__PURE__ */ jsx(VisuallyHidden, { id: ariaDescriptionId, children: formatMessage({
-        id: getTranslation("dnd.instructions"),
-        defaultMessage: `Press spacebar to grab and re-order`
-      }) }),
-      /* @__PURE__ */ jsx(VisuallyHidden, { "aria-live": "assertive", children: liveText }),
-      /* @__PURE__ */ jsx("ol", { "aria-describedby": ariaDescriptionId, children: value.map((field, index) => /* @__PURE__ */ jsx(
-        ComponentProvider,
-        {
-          level: level + 1,
-          uid: field.__component,
-          id: field.id,
-          type: "dynamiczone",
-          children: /* @__PURE__ */ jsx(
-            DynamicComponent,
-            {
-              disabled,
-              name: name2,
-              index,
-              componentUid: field.__component,
-              onMoveComponent: handleMoveComponent,
-              onRemoveComponentClick: handleRemoveComponent(name2, index),
-              onCancel: handleCancel,
-              onDropItem: handleDropItem,
-              onGrabItem: handleGrabItem,
-              onAddComponent: handleAddComponent,
-              dynamicComponentsByCategory
-            }
-          )
-        },
-        field.__temp_key__
-      )) })
     ] }),
-    /* @__PURE__ */ jsx(Flex, { justifyContent: "center", children: /* @__PURE__ */ jsx(
-      AddComponentButton,
-      {
-        hasError,
-        isDisabled: disabled,
-        isOpen: addComponentIsOpen,
-        onClick: handleClickOpenPicker,
-        children: renderButtonLabel()
-      }
-    ) }),
-    /* @__PURE__ */ jsx(
-      ComponentPicker,
-      {
-        dynamicComponentsByCategory,
-        isOpen: addComponentIsOpen,
-        onClickAddComponent: handleAddComponent
-      }
-    )
-  ] }) });
+    !attribute.repeatable && !field.value && /* @__PURE__ */ jsx(Initializer, { disabled, name: name2, onClick: handleInitialisationClick }),
+    !attribute.repeatable && field.value ? /* @__PURE__ */ jsx(NonRepeatableComponent, { attribute, name: name2, disabled, ...props, children: props.children }) : null,
+    attribute.repeatable && /* @__PURE__ */ jsx(RepeatableComponent, { attribute, name: name2, disabled, ...props, children: props.children }),
+    /* @__PURE__ */ jsx(Field.Error, {})
+  ] });
 };
+const MemoizedComponentInput = React.memo(ComponentInput);
 export {
   DynamicZone as D,
-  MemoizedInputRenderer as M,
+  FormLayout as F,
+  MemoizedUIDInput as M,
   NotAllowedInput as N,
   useDynamicZone as a,
   useFieldHint as b,
-  createDefaultForm as c,
-  MemoizedUIDInput as d,
-  MemoizedWysiwyg as e,
-  MemoizedComponentInput as f,
-  MemoizedBlocksInput as g,
-  prepareTempKeys as p,
-  removeFieldsThatDontExistOnSchema as r,
-  transformDocument as t,
+  MemoizedWysiwyg as c,
+  MemoizedComponentInput as d,
+  MemoizedBlocksInput as e,
   useLazyComponents as u
 };
-//# sourceMappingURL=Field-DPAzUS1M.mjs.map
+//# sourceMappingURL=Input-aV8SSoTa.mjs.map