@strapi/content-manager 0.0.0-experimental.a65a85fdea97faae8679d3ffc5f9d79af61abd26 → 0.0.0-experimental.abc

package/dist/_chunks/{Field-Dlh0uGnL.mjs → Field-tHCw4lGA.mjs}

@@ -1,23 +1,23 @@
 import { jsx, jsxs, Fragment } from "react/jsx-runtime";
 import * as React from "react";
-import { useState, useEffect, useCallback } 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 { Typography, Flex, Box, BaseLink, Button, useComposedRefs, Popover, Field, FieldLabel, FieldInput, Tooltip, SingleSelect, SingleSelectOption, IconButton, Portal, FocusTrap, InputWrapper, Divider, VisuallyHidden, FieldHint, FieldError, Grid as Grid$1, GridItem, TextButton, KeyboardNavigable, Accordion, AccordionToggle, AccordionContent as AccordionContent$1, BaseButton, TextInput, FieldAction, IconButtonGroup, Menu, MenuItem } from "@strapi/design-system";
+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 { useIntl } from "react-intl";
-import { l as DOCUMENT_META_FIELDS, g as getTranslation, b as useDoc, d as contentManagerApi, c as buildValidParams, e as useDocumentRBAC, m as useDocLayout } from "./index-DNVx8ssZ.mjs";
+import { m as DOCUMENT_META_FIELDS, g as getTranslation, c as useDoc, e as contentManagerApi, d as buildValidParams, f as useDocumentRBAC, n as useDocLayout } from "./index-C9TJPyni.mjs";
 import { generateNKeysBetween } from "fractional-indexing";
-import { u as useComponent, C as ComponentProvider, R as RelationsField } from "./Relations-CY7AtkDA.mjs";
+import { u as useComponent, C as ComponentProvider, M as MemoizedRelationsField } from "./Relations-CIYDdKU-.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 styled, { css, keyframes } from "styled-components";
-import { C as ComponentIcon } from "./ComponentIcon-BOFnK76n.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 } from "./urls-CbOsUOoW.mjs";
+import { p as prefixFileUrlWithBackendUrl, u as usePrev } from "./usePrev-DH6iah0A.mjs";
 import * as Toolbar from "@radix-ui/react-toolbar";
 import { useLocation } from "react-router-dom";
 import CodeMirror from "codemirror5";
@@ -160,6 +160,220 @@ const useLazyComponents = (componentUids = []) => {
   }, []);
   return { isLazyLoading: loading, lazyComponentStore, cleanup };
 };
+const codeLanguages = [
+  {
+    value: "asm",
+    label: "Assembly"
+  },
+  {
+    value: "bash",
+    label: "Bash"
+  },
+  {
+    value: "c",
+    label: "C"
+  },
+  {
+    value: "clojure",
+    label: "Clojure"
+  },
+  {
+    value: "cobol",
+    label: "COBOL"
+  },
+  {
+    value: "cpp",
+    label: "C++"
+  },
+  {
+    value: "csharp",
+    label: "C#"
+  },
+  {
+    value: "css",
+    label: "CSS"
+  },
+  {
+    value: "dart",
+    label: "Dart"
+  },
+  {
+    value: "dockerfile",
+    label: "Dockerfile"
+  },
+  {
+    value: "elixir",
+    label: "Elixir"
+  },
+  {
+    value: "erlang",
+    label: "Erlang"
+  },
+  {
+    value: "fortran",
+    label: "Fortran"
+  },
+  {
+    value: "fsharp",
+    label: "F#"
+  },
+  {
+    value: "go",
+    label: "Go"
+  },
+  {
+    value: "graphql",
+    label: "GraphQL"
+  },
+  {
+    value: "groovy",
+    label: "Groovy"
+  },
+  {
+    value: "haskell",
+    label: "Haskell"
+  },
+  {
+    value: "haxe",
+    label: "Haxe"
+  },
+  {
+    value: "html",
+    label: "HTML"
+  },
+  {
+    value: "ini",
+    label: "INI"
+  },
+  {
+    value: "java",
+    label: "Java"
+  },
+  {
+    value: "javascript",
+    label: "JavaScript"
+  },
+  {
+    value: "jsx",
+    label: "JavaScript (React)"
+  },
+  {
+    value: "json",
+    label: "JSON"
+  },
+  {
+    value: "julia",
+    label: "Julia"
+  },
+  {
+    value: "kotlin",
+    label: "Kotlin"
+  },
+  {
+    value: "latex",
+    label: "LaTeX"
+  },
+  {
+    value: "lua",
+    label: "Lua"
+  },
+  {
+    value: "markdown",
+    label: "Markdown"
+  },
+  {
+    value: "matlab",
+    label: "MATLAB"
+  },
+  {
+    value: "makefile",
+    label: "Makefile"
+  },
+  {
+    value: "objectivec",
+    label: "Objective-C"
+  },
+  {
+    value: "perl",
+    label: "Perl"
+  },
+  {
+    value: "php",
+    label: "PHP"
+  },
+  {
+    value: "plaintext",
+    label: "Plain text"
+  },
+  {
+    value: "powershell",
+    label: "PowerShell"
+  },
+  {
+    value: "python",
+    label: "Python"
+  },
+  {
+    value: "r",
+    label: "R"
+  },
+  {
+    value: "ruby",
+    label: "Ruby"
+  },
+  {
+    value: "rust",
+    label: "Rust"
+  },
+  {
+    value: "sas",
+    label: "SAS"
+  },
+  {
+    value: "scala",
+    label: "Scala"
+  },
+  {
+    value: "scheme",
+    label: "Scheme"
+  },
+  {
+    value: "shell",
+    label: "Shell"
+  },
+  {
+    value: "sql",
+    label: "SQL"
+  },
+  {
+    value: "stata",
+    label: "Stata"
+  },
+  {
+    value: "swift",
+    label: "Swift"
+  },
+  {
+    value: "typescript",
+    label: "TypeScript"
+  },
+  {
+    value: "tsx",
+    label: "TypeScript (React)"
+  },
+  {
+    value: "vbnet",
+    label: "VB.NET"
+  },
+  {
+    value: "xml",
+    label: "XML"
+  },
+  {
+    value: "yaml",
+    label: "YAML"
+  }
+];
 const baseHandleConvert = (editor, attributesToSet) => {
   const [_, lastNodePath] = Editor$1.last(editor, []);
   Transforms.unwrapNodes(editor, {
@@ -223,13 +437,14 @@ const pressEnterTwiceToExit = (editor) => {
     });
   }
 };
-const CodeBlock = styled.pre.attrs({ role: "code" })`
+const CodeBlock = styled.pre`
   border-radius: ${({ theme }) => theme.borderRadius};
   background-color: ${({ theme }) => theme.colors.neutral100};
   max-width: 100%;
   overflow: auto;
   padding: ${({ theme }) => `${theme.spaces[3]} ${theme.spaces[4]}`};
   flex-shrink: 1;
+
   & > code {
     font-family: 'SF Mono', SFMono-Regular, ui-monospace, 'DejaVu Sans Mono', Menlo, Consolas,
       monospace;
@@ -238,9 +453,61 @@ const CodeBlock = styled.pre.attrs({ role: "code" })`
     max-width: 100%;
   }
 `;
+const CodeEditor = (props) => {
+  const { editor } = useBlocksEditorContext("ImageDialog");
+  const editorIsFocused = useFocused();
+  const imageIsSelected = useSelected();
+  const { formatMessage } = useIntl();
+  const [isSelectOpen, setIsSelectOpen] = React.useState(false);
+  const shouldDisplayLanguageSelect = editorIsFocused && imageIsSelected || isSelectOpen;
+  return /* @__PURE__ */ jsxs(Box, { position: "relative", width: "100%", children: [
+    /* @__PURE__ */ jsx(CodeBlock, { ...props.attributes, children: /* @__PURE__ */ jsx("code", { children: props.children }) }),
+    shouldDisplayLanguageSelect && /* @__PURE__ */ jsx(
+      Box,
+      {
+        position: "absolute",
+        background: "neutral0",
+        borderColor: "neutral150",
+        borderStyle: "solid",
+        borderWidth: "0.5px",
+        shadow: "tableShadow",
+        top: "100%",
+        marginTop: 1,
+        right: 0,
+        padding: 1,
+        hasRadius: true,
+        children: /* @__PURE__ */ jsx(
+          SingleSelect,
+          {
+            onChange: (open) => {
+              Transforms.setNodes(
+                editor,
+                { language: open.toString() },
+                { match: (node) => !Editor$1.isEditor(node) && node.type === "code" }
+              );
+            },
+            value: props.element.type === "code" && props.element.language || "plaintext",
+            onOpenChange: (open) => {
+              setIsSelectOpen(open);
+              if (!open) {
+                ReactEditor.focus(editor);
+              }
+            },
+            onCloseAutoFocus: (e) => e.preventDefault(),
+            "aria-label": formatMessage({
+              id: "components.Blocks.blocks.code.languageLabel",
+              defaultMessage: "Select a language"
+            }),
+            children: codeLanguages.map(({ value, label }) => /* @__PURE__ */ jsx(SingleSelectOption, { value, children: label }, value))
+          }
+        )
+      }
+    )
+  ] });
+};
 const codeBlocks = {
   code: {
-    renderElement: (props) => /* @__PURE__ */ jsx(CodeBlock, { ...props.attributes, children: /* @__PURE__ */ jsx("code", { children: props.children }) }),
+    renderElement: (props) => /* @__PURE__ */ jsx(CodeEditor, { ...props }),
     icon: Code,
     label: {
       id: "components.Blocks.blocks.code",
@@ -249,7 +516,7 @@ const codeBlocks = {
     matchNode: (node) => node.type === "code",
     isInBlocksSelector: true,
     handleConvert(editor) {
-      baseHandleConvert(editor, { type: "code" });
+      baseHandleConvert(editor, { type: "code", language: "plaintext" });
     },
     handleEnterKey(editor) {
       pressEnterTwiceToExit(editor);
@@ -258,27 +525,27 @@ const codeBlocks = {
     dragHandleTopMargin: "10px"
   }
 };
-const H1 = styled(Typography).attrs({ as: "h1" })`
+const H1 = styled(Typography).attrs({ tag: "h1" })`
   font-size: 4.2rem;
   line-height: ${({ theme }) => theme.lineHeights[1]};
 `;
-const H2 = styled(Typography).attrs({ as: "h2" })`
+const H2 = styled(Typography).attrs({ tag: "h2" })`
   font-size: 3.5rem;
   line-height: ${({ theme }) => theme.lineHeights[1]};
 `;
-const H3 = styled(Typography).attrs({ as: "h3" })`
+const H3 = styled(Typography).attrs({ tag: "h3" })`
   font-size: 2.9rem;
   line-height: ${({ theme }) => theme.lineHeights[1]};
 `;
-const H4 = styled(Typography).attrs({ as: "h4" })`
+const H4 = styled(Typography).attrs({ tag: "h4" })`
   font-size: 2.4rem;
   line-height: ${({ theme }) => theme.lineHeights[1]};
 `;
-const H5 = styled(Typography).attrs({ as: "h5" })`
+const H5 = styled(Typography).attrs({ tag: "h5" })`
   font-size: 2rem;
   line-height: ${({ theme }) => theme.lineHeights[1]};
 `;
-const H6 = styled(Typography).attrs({ as: "h6" })`
+const H6 = styled(Typography).attrs({ tag: "h6" })`
   font-size: 1.6rem;
   line-height: ${({ theme }) => theme.lineHeights[1]};
 `;
@@ -367,7 +634,7 @@ const headingBlocks = {
 const ImageWrapper = styled(Flex)`
   transition-property: box-shadow;
   transition-duration: 0.2s;
-  ${(props) => props.isFocused && css`
+  ${(props) => props.$isFocused && css`
       box-shadow: ${props.theme.colors.primary600} 0px 0px 0px 3px;
     `}
 
@@ -419,7 +686,7 @@ const Image = ({ attributes, children, element }) => {
         background: "neutral100",
         contentEditable: false,
         justifyContent: "center",
-        isFocused: editorIsFocused && imageIsSelected,
+        $isFocused: editorIsFocused && imageIsSelected,
         hasRadius: true,
         children: /* @__PURE__ */ jsx("img", { src: url, alt: alternativeText, width, height })
       }
@@ -579,7 +846,7 @@ const StyledBaseLink = styled(BaseLink)`
   text-decoration: none;
 `;
 const RemoveButton = styled(Button)`
-  visibility: ${(props) => props.visible ? "visible" : "hidden"};
+  visibility: ${(props) => props.$visible ? "visible" : "hidden"};
 `;
 const LinkContent = React.forwardRef(
   ({ link, children, attributes }, forwardedRef) => {
@@ -589,18 +856,12 @@ const LinkContent = React.forwardRef(
     const [popoverOpen, setPopoverOpen] = React.useState(
       editor.lastInsertedLinkPath ? Path.equals(path, editor.lastInsertedLinkPath) : false
     );
-    const linkRef = React.useRef(null);
     const elementText = link.children.map((child) => child.text).join("");
     const [linkText, setLinkText] = React.useState(elementText);
     const [linkUrl, setLinkUrl] = React.useState(link.url);
     const linkInputRef = React.useRef(null);
-    const [showRemoveButton, setShowRemoveButton] = React.useState(false);
+    const isLastInsertedLink = editor.lastInsertedLinkPath ? !Path.equals(path, editor.lastInsertedLinkPath) : true;
     const [isSaveDisabled, setIsSaveDisabled] = React.useState(false);
-    const handleOpenEditPopover = (e) => {
-      e.preventDefault();
-      setPopoverOpen(true);
-      setShowRemoveButton(true);
-    };
     const onLinkChange = (e) => {
       setIsSaveDisabled(false);
       setLinkUrl(e.target.value);
@@ -621,40 +882,40 @@ const LinkContent = React.forwardRef(
       editLink(editor, { url: linkUrl, text: linkText });
       setPopoverOpen(false);
       editor.lastInsertedLinkPath = null;
+      ReactEditor.focus(editor);
     };
-    const handleDismiss = () => {
-      setPopoverOpen(false);
+    const handleClose = () => {
       if (link.url === "") {
         removeLink(editor);
       }
+      setPopoverOpen(false);
       ReactEditor.focus(editor);
     };
-    const inputNotDirty = !linkText || !linkUrl || link.url && link.url === linkUrl && elementText && elementText === linkText;
-    const composedRefs = useComposedRefs(linkRef, forwardedRef);
     React.useEffect(() => {
       if (popoverOpen)
         linkInputRef.current?.focus();
     }, [popoverOpen]);
-    return /* @__PURE__ */ jsxs(Fragment, { children: [
-      /* @__PURE__ */ jsx(
+    const inputNotDirty = !linkText || !linkUrl || link.url && link.url === linkUrl && elementText && elementText === linkText;
+    return /* @__PURE__ */ jsxs(Popover.Root, { open: popoverOpen, children: [
+      /* @__PURE__ */ jsx(Popover.Trigger, { children: /* @__PURE__ */ jsx(
         StyledBaseLink,
         {
           ...attributes,
-          ref: composedRefs,
+          ref: forwardedRef,
           href: link.url,
-          onClick: handleOpenEditPopover,
+          onClick: () => setPopoverOpen(true),
           color: "primary600",
           children
         }
-      ),
-      popoverOpen && /* @__PURE__ */ jsx(Popover, { source: linkRef, onDismiss: handleDismiss, padding: 4, contentEditable: false, children: /* @__PURE__ */ jsxs(Flex, { as: "form", onSubmit: handleSave, direction: "column", gap: 4, children: [
-        /* @__PURE__ */ jsx(Field, { width: "368px", children: /* @__PURE__ */ jsxs(Flex, { direction: "column", gap: 1, alignItems: "stretch", children: [
-          /* @__PURE__ */ jsx(FieldLabel, { children: formatMessage({
+      ) }),
+      /* @__PURE__ */ jsx(Popover.Content, { onPointerDownOutside: handleClose, children: /* @__PURE__ */ jsxs(Flex, { padding: 4, direction: "column", gap: 4, children: [
+        /* @__PURE__ */ jsx(Field.Root, { width: "368px", children: /* @__PURE__ */ jsxs(Flex, { direction: "column", gap: 1, alignItems: "stretch", children: [
+          /* @__PURE__ */ jsx(Field.Label, { children: formatMessage({
             id: "components.Blocks.popover.text",
             defaultMessage: "Text"
           }) }),
           /* @__PURE__ */ jsx(
-            FieldInput,
+            Field.Input,
             {
               name: "text",
               placeholder: formatMessage({
@@ -668,13 +929,13 @@ const LinkContent = React.forwardRef(
             }
           )
         ] }) }),
-        /* @__PURE__ */ jsx(Field, { width: "368px", children: /* @__PURE__ */ jsxs(Flex, { direction: "column", gap: 1, alignItems: "stretch", children: [
-          /* @__PURE__ */ jsx(FieldLabel, { children: formatMessage({
+        /* @__PURE__ */ jsx(Field.Root, { width: "368px", children: /* @__PURE__ */ jsxs(Flex, { direction: "column", gap: 1, alignItems: "stretch", children: [
+          /* @__PURE__ */ jsx(Field.Label, { children: formatMessage({
             id: "components.Blocks.popover.link",
             defaultMessage: "Link"
           }) }),
           /* @__PURE__ */ jsx(
-            FieldInput,
+            Field.Input,
             {
               ref: linkInputRef,
               name: "url",
@@ -693,7 +954,7 @@ const LinkContent = React.forwardRef(
             {
               variant: "danger-light",
               onClick: () => removeLink(editor),
-              visible: showRemoveButton,
+              $visible: isLastInsertedLink,
               children: formatMessage({
                 id: "components.Blocks.popover.remove",
                 defaultMessage: "Remove"
@@ -701,11 +962,11 @@ const LinkContent = React.forwardRef(
             }
           ),
           /* @__PURE__ */ jsxs(Flex, { gap: 2, children: [
-            /* @__PURE__ */ jsx(Button, { variant: "tertiary", onClick: handleDismiss, children: formatMessage({
+            /* @__PURE__ */ jsx(Button, { variant: "tertiary", onClick: handleClose, children: formatMessage({
               id: "components.Blocks.popover.cancel",
               defaultMessage: "Cancel"
             }) }),
-            /* @__PURE__ */ jsx(Button, { type: "submit", disabled: Boolean(inputNotDirty) || isSaveDisabled, children: formatMessage({
+            /* @__PURE__ */ jsx(Button, { disabled: Boolean(inputNotDirty) || isSaveDisabled, onClick: handleSave, children: formatMessage({
               id: "components.Blocks.popover.save",
               defaultMessage: "Save"
             }) })
@@ -748,11 +1009,11 @@ const listStyle = css`
   }
 `;
 const Orderedlist = styled.ol`
-  list-style-type: ${(props) => props.listStyleType};
+  list-style-type: ${(props) => props.$listStyleType};
   ${listStyle}
 `;
 const Unorderedlist = styled.ul`
-  list-style-type: ${(props) => props.listStyleType};
+  list-style-type: ${(props) => props.$listStyleType};
   ${listStyle}
 `;
 const orderedStyles = ["decimal", "lower-alpha", "upper-roman"];
@@ -765,9 +1026,9 @@ const List = ({ attributes, children, element }) => {
   const nextIndex = (element.indentLevel || 0) % listStyles.length;
   const listStyleType = listStyles[nextIndex];
   if (element.format === "ordered") {
-    return /* @__PURE__ */ jsx(Orderedlist, { listStyleType, ...attributes, children });
+    return /* @__PURE__ */ jsx(Orderedlist, { $listStyleType: listStyleType, ...attributes, children });
   }
-  return /* @__PURE__ */ jsx(Unorderedlist, { listStyleType, ...attributes, children });
+  return /* @__PURE__ */ jsx(Unorderedlist, { $listStyleType: listStyleType, ...attributes, children });
 };
 const replaceListWithEmptyBlock = (editor, currentListPath) => {
   Transforms.removeNodes(editor, { at: currentListPath });
@@ -964,7 +1225,7 @@ const listBlocks = {
     snippets: ["-", "*", "+"]
   },
   "list-item": {
-    renderElement: (props) => /* @__PURE__ */ jsx(Typography, { as: "li", ...props.attributes, children: props.children }),
+    renderElement: (props) => /* @__PURE__ */ jsx(Typography, { tag: "li", ...props.attributes, children: props.children }),
     // No handleConvert, list items are created when converting to the parent list
     matchNode: (node) => node.type === "list-item",
     isInBlocksSelector: false,
@@ -973,7 +1234,7 @@ const listBlocks = {
 };
 const paragraphBlocks = {
   paragraph: {
-    renderElement: (props) => /* @__PURE__ */ jsx(Typography, { as: "p", variant: "omega", ...props.attributes, children: props.children }),
+    renderElement: (props) => /* @__PURE__ */ jsx(Typography, { tag: "p", variant: "omega", ...props.attributes, children: props.children }),
     icon: Paragraph,
     label: {
       id: "components.Blocks.blocks.text",
@@ -1139,7 +1400,7 @@ const ToolbarButton = ({
       children: /* @__PURE__ */ jsx(
         FlexButton,
         {
-          as: "button",
+          tag: "button",
           background: isActive ? "primary100" : "",
           alignItems: "center",
           justifyContent: "center",
@@ -1291,6 +1552,26 @@ const ListButton = ({ block, format }) => {
     }
     return false;
   };
+  const isListDisabled = () => {
+    if (disabled) {
+      return true;
+    }
+    if (!editor.selection) {
+      return false;
+    }
+    const anchorNodeEntry = Editor$1.above(editor, {
+      at: editor.selection.anchor,
+      match: (node) => !Editor$1.isEditor(node) && node.type !== "text"
+    });
+    const focusNodeEntry = Editor$1.above(editor, {
+      at: editor.selection.focus,
+      match: (node) => !Editor$1.isEditor(node) && node.type !== "text"
+    });
+    if (!anchorNodeEntry || !focusNodeEntry) {
+      return false;
+    }
+    return anchorNodeEntry[0] !== focusNodeEntry[0];
+  };
   const toggleList = (format2) => {
     let currentListEntry;
     if (editor.selection) {
@@ -1324,7 +1605,7 @@ const ListButton = ({ block, format }) => {
       name: format,
       label: block.label,
       isActive: isListActive(),
-      disabled,
+      disabled: isListDisabled(),
       handleClick: () => toggleList(format)
     }
   );
@@ -1460,7 +1741,7 @@ const DragItem = styled(Flex)`
 
   // Set the visibility of drag button
   [role='button'] {
-    visibility: ${(props) => props.dragVisibility};
+    visibility: ${(props) => props.$dragVisibility};
     opacity: inherit;
   }
   &[aria-disabled='true'] {
@@ -1477,7 +1758,7 @@ const DragIconButton = styled(IconButton)`
   visibility: hidden;
   cursor: grab;
   opacity: inherit;
-  margin-top: ${(props) => props.dragHandleTopMargin ?? 0};
+  margin-top: ${(props) => props.$dragHandleTopMargin ?? 0};
 
   &:hover {
     background: ${({ theme }) => theme.colors.neutral200};
@@ -1491,7 +1772,7 @@ const DragIconButton = styled(IconButton)`
   }
   svg {
     height: auto;
-    width: ${({ theme }) => theme.spaces[3]};
+    min-width: ${({ theme }) => theme.spaces[3]};
 
     path {
       fill: ${({ theme }) => theme.colors.neutral700};
@@ -1552,7 +1833,7 @@ const DragAndDropElement = ({
   React.useEffect(() => {
     setDragVisibility("hidden");
   }, [editor.selection]);
-  return /* @__PURE__ */ jsxs(Wrapper$1, { ref: (ref) => composedBoxRefs(ref), isOverDropTarget, children: [
+  return /* @__PURE__ */ jsxs(Wrapper$1, { ref: composedBoxRefs, isOverDropTarget, children: [
     isOverDropTarget && /* @__PURE__ */ jsx(
       DropPlaceholder,
       {
@@ -1590,15 +1871,16 @@ const DragAndDropElement = ({
         onSelect: () => setDragVisibility("visible"),
         onMouseLeave: () => setDragVisibility("hidden"),
         "aria-disabled": disabled,
-        dragVisibility,
+        $dragVisibility: dragVisibility,
         children: [
           /* @__PURE__ */ jsx(
             DragIconButton,
             {
-              forwardedAs: "div",
+              tag: "div",
               role: "button",
               tabIndex: 0,
-              "aria-label": formatMessage({
+              withTooltip: false,
+              label: formatMessage({
                 id: getTranslation("components.DragHandle-label"),
                 defaultMessage: "Drag"
               }),
@@ -1606,8 +1888,8 @@ const DragAndDropElement = ({
               "aria-disabled": disabled,
               disabled,
               draggable: true,
-              dragHandleTopMargin,
-              children: /* @__PURE__ */ jsx(Drag, { color: "neutral600" })
+              $dragHandleTopMargin: dragHandleTopMargin,
+              children: /* @__PURE__ */ jsx(Drag, { color: "primary500" })
             }
           ),
           children
@@ -1618,17 +1900,18 @@ const DragAndDropElement = ({
 };
 const CloneDragItem = ({ children, dragHandleTopMargin }) => {
   const { formatMessage } = useIntl();
-  return /* @__PURE__ */ jsxs(DragItem, { gap: 2, paddingLeft: 2, alignItems: "start", dragVisibility: "visible", children: [
+  return /* @__PURE__ */ jsxs(DragItem, { gap: 2, paddingLeft: 2, alignItems: "start", $dragVisibility: "visible", children: [
     /* @__PURE__ */ jsx(
       DragIconButton,
       {
-        forwardedAs: "div",
+        tag: "div",
         role: "button",
-        "aria-label": formatMessage({
+        withTooltip: false,
+        label: formatMessage({
           id: getTranslation("components.DragHandle-label"),
           defaultMessage: "Drag"
         }),
-        dragHandleTopMargin,
+        $dragHandleTopMargin: dragHandleTopMargin,
         children: /* @__PURE__ */ jsx(Drag, { color: "neutral600" })
       }
     ),
@@ -1930,7 +2213,7 @@ const EditorLayout$1 = ({
               /* @__PURE__ */ jsx(
                 CollapseIconButton,
                 {
-                  "aria-label": formatMessage({
+                  label: formatMessage({
                     id: getTranslation("components.Blocks.collapse"),
                     defaultMessage: "Collapse"
                   }),
@@ -1950,8 +2233,8 @@ const EditorLayout$1 = ({
       direction: "column",
       alignItems: "flex-start",
       height: "512px",
-      disabled,
-      hasError: Boolean(error),
+      $disabled: disabled,
+      $hasError: Boolean(error),
       style: { overflow: "hidden" },
       "aria-describedby": ariaDescriptionId,
       position: "relative",
@@ -1959,6 +2242,29 @@ const EditorLayout$1 = ({
     }
   );
 };
+const InputWrapper = styled(Flex)`
+  border: 1px solid
+    ${({ theme, $hasError }) => $hasError ? theme.colors.danger600 : theme.colors.neutral200};
+  border-radius: ${({ theme }) => theme.borderRadius};
+  background: ${({ theme }) => theme.colors.neutral0};
+
+  ${({ theme, $hasError = false }) => css`
+    outline: none;
+    box-shadow: 0;
+    transition-property: border-color, box-shadow, fill;
+    transition-duration: 0.2s;
+
+    &:focus-within {
+      border: 1px solid ${$hasError ? theme.colors.danger600 : theme.colors.primary600};
+      box-shadow: ${$hasError ? theme.colors.danger600 : theme.colors.primary600} 0px 0px 0px 2px;
+    }
+  `}
+
+  ${({ theme, $disabled }) => $disabled ? css`
+          color: ${theme.colors.neutral600};
+          background: ${theme.colors.neutral150};
+        ` : void 0}
+`;
 const stylesToInherit = css`
   font-size: inherit;
   color: inherit;
@@ -1971,10 +2277,14 @@ const ItalicText = styled(Typography)`
   font-style: italic;
   ${stylesToInherit}
 `;
-const UnderlineText = styled(Typography).attrs({ textDecoration: "underline" })`
+const UnderlineText = styled(Typography).attrs({
+  textDecoration: "underline"
+})`
   ${stylesToInherit}
 `;
-const StrikeThroughText = styled(Typography).attrs({ textDecoration: "line-through" })`
+const StrikeThroughText = styled(Typography).attrs({
+  textDecoration: "line-through"
+})`
   ${stylesToInherit}
 `;
 const InlineCode = styled.code`
@@ -2242,7 +2552,7 @@ const BlocksEditor = React.forwardRef(
                     !isExpandedMode && /* @__PURE__ */ jsx(
                       ExpandIconButton,
                       {
-                        "aria-label": formatMessage({
+                        label: formatMessage({
                           id: getTranslation("components.Blocks.expand"),
                           defaultMessage: "Expand"
                         }),
@@ -2265,8 +2575,8 @@ const BlocksInput = React.forwardRef(
   ({ label, name: name2, required = false, hint, labelAction, ...editorProps }, forwardedRef) => {
     const id = React.useId();
     const field = useField(name2);
-    return /* @__PURE__ */ jsx(Field, { id, name: name2, hint, error: field.error, required, children: /* @__PURE__ */ jsxs(Flex, { direction: "column", alignItems: "stretch", gap: 1, children: [
-      /* @__PURE__ */ jsx(FieldLabel, { action: labelAction, children: label }),
+    return /* @__PURE__ */ jsx(Field.Root, { id, name: name2, hint, error: field.error, required, children: /* @__PURE__ */ jsxs(Flex, { direction: "column", alignItems: "stretch", gap: 1, children: [
+      /* @__PURE__ */ jsx(Field.Label, { action: labelAction, children: label }),
       /* @__PURE__ */ jsx(
         BlocksEditor,
         {
@@ -2279,11 +2589,12 @@ const BlocksInput = React.forwardRef(
           ...editorProps
         }
       ),
-      /* @__PURE__ */ jsx(FieldHint, {}),
-      /* @__PURE__ */ jsx(FieldError, {})
+      /* @__PURE__ */ jsx(Field.Hint, {}),
+      /* @__PURE__ */ jsx(Field.Error, {})
     ] }) });
   }
 );
+const MemoizedBlocksInput = React.memo(BlocksInput);
 const createDefaultForm = (contentType, components = {}) => {
   const traverseSchema = (attributes) => {
     return Object.entries(attributes).reduce((acc, [key, attribute]) => {
@@ -2307,30 +2618,27 @@ const createDefaultForm = (contentType, components = {}) => {
 const Initializer = ({ disabled, name: name2, onClick }) => {
   const { formatMessage } = useIntl();
   const field = useField(name2);
-  return /* @__PURE__ */ jsxs(Fragment, { children: [
-    /* @__PURE__ */ jsx(
-      Box,
-      {
-        as: "button",
-        background: "neutral100",
-        borderColor: field.error ? "danger600" : "neutral200",
-        hasRadius: true,
-        disabled,
-        onClick,
-        paddingTop: 9,
-        paddingBottom: 9,
-        type: "button",
-        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."
-          }) }) })
-        ] })
-      }
-    ),
-    field.error && /* @__PURE__ */ jsx(Typography, { textColor: "danger600", variant: "pi", children: field.error })
-  ] });
+  return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx(
+    Box,
+    {
+      tag: "button",
+      background: "neutral100",
+      borderColor: field.error ? "danger600" : "neutral200",
+      hasRadius: true,
+      disabled,
+      onClick,
+      paddingTop: 9,
+      paddingBottom: 9,
+      type: "button",
+      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."
+        }) }) })
+      ] })
+    }
+  ) });
 };
 const CircleIcon = styled(PlusCircle)`
   width: 2.4rem;
@@ -2362,9 +2670,20 @@ const NonRepeatableComponent = ({
       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, { gap: 4, children: row.map(({ size, ...field }) => {
+        return /* @__PURE__ */ jsx(Grid$1.Root, { gap: 4, children: row.map(({ size, ...field }) => {
           const completeFieldName = `${name2}.${field.name}`;
-          return /* @__PURE__ */ jsx(GridItem, { col: size, s: 12, xs: 12, children: children({ ...field, name: completeFieldName }) }, completeFieldName);
+          return /* @__PURE__ */ jsx(
+            Grid$1.Item,
+            {
+              col: size,
+              s: 12,
+              xs: 12,
+              direction: "column",
+              alignItems: "stretch",
+              children: children({ ...field, name: completeFieldName })
+            },
+            completeFieldName
+          );
         }) }, index);
       }) })
     }
@@ -2388,7 +2707,7 @@ const RepeatableComponent = ({
   const moveFieldRow = useForm("RepeatableComponent", (state) => state.moveFieldRow);
   const removeFieldRow = useForm("RepeatableComponent", (state) => state.removeFieldRow);
   const { max = Infinity } = attribute;
-  const [collapseToOpen, setCollapseToOpen] = React.useState(null);
+  const [collapseToOpen, setCollapseToOpen] = React.useState("");
   const [liveText, setLiveText] = React.useState("");
   const componentTmpKeyWithFocussedField = React.useMemo(() => {
     if (search.has("field")) {
@@ -2404,13 +2723,19 @@ const RepeatableComponent = ({
     }
     return void 0;
   }, [search, name2, value]);
+  const prevValue = usePrev(value);
   React.useEffect(() => {
-    if (typeof componentTmpKeyWithFocussedField === "number") {
+    if (prevValue && prevValue.length < value.length) {
+      setCollapseToOpen(value[value.length - 1].__temp_key__);
+    }
+  }, [value, prevValue]);
+  React.useEffect(() => {
+    if (typeof componentTmpKeyWithFocussedField === "string") {
       setCollapseToOpen(componentTmpKeyWithFocussedField);
     }
   }, [componentTmpKeyWithFocussedField]);
   const toggleCollapses = () => {
-    setCollapseToOpen(null);
+    setCollapseToOpen("");
   };
   const handleClick = () => {
     if (value.length < max) {
@@ -2442,12 +2767,8 @@ const RepeatableComponent = ({
     );
     moveFieldRow(name2, currentIndex, newIndex);
   };
-  const handleToggle = (key) => () => {
-    if (collapseToOpen === key) {
-      setCollapseToOpen(null);
-    } else {
-      setCollapseToOpen(key);
-    }
+  const handleValueChange = (key) => {
+    setCollapseToOpen(key);
   };
   const getItemPos = (index) => `${index + 1} of ${value.length}`;
   const handleCancel = (index) => {
@@ -2502,158 +2823,115 @@ const RepeatableComponent = ({
       defaultMessage: `Press spacebar to grab and re-order`
     }) }),
     /* @__PURE__ */ jsx(VisuallyHidden, { "aria-live": "assertive", children: liveText }),
-    /* @__PURE__ */ jsxs(AccordionGroup, { error, children: [
-      /* @__PURE__ */ jsx(AccordionContent, { "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,
+    /* @__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,
               {
-                disabled,
-                name: nameWithIndex,
-                attribute,
-                index,
-                isOpen: collapseToOpen === key,
-                mainField,
-                onMoveItem: handleMoveComponentField,
-                onClickToggle: handleToggle(key),
-                onDeleteComponent: () => {
-                  removeFieldRow(name2, index);
-                  toggleCollapses();
-                },
-                toggleCollapses,
-                onCancel: handleCancel,
-                onDropItem: handleDropItem,
-                onGrabItem: handleGrabItem,
-                children: layout.map((row, index2) => {
-                  return /* @__PURE__ */ jsx(Grid$1, { gap: 4, children: row.map(({ size, ...field }) => {
-                    const completeFieldName = `${nameWithIndex}.${field.name}`;
-                    return /* @__PURE__ */ jsx(GridItem, { col: size, s: 12, xs: 12, children: children({ ...field, name: completeFieldName }) }, completeFieldName);
-                  }) }, index2);
-                })
-              }
-            )
-          },
-          key
-        );
-      }) }),
-      /* @__PURE__ */ jsx(AccordionFooter, { children: /* @__PURE__ */ jsx(Flex, { justifyContent: "center", height: "48px", background: "neutral0", children: /* @__PURE__ */ jsx(TextButtonCustom, { disabled, onClick: handleClick, startIcon: /* @__PURE__ */ jsx(Plus, {}), children: formatMessage({
-        id: getTranslation("containers.EditView.add.new-entry"),
-        defaultMessage: "Add an entry"
-      }) }) }) })
-    ] })
+                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)`
-  height: 100%;
   width: 100%;
-  border-radius: 0 0 4px 4px;
   display: flex;
   justify-content: center;
-  span {
-    font-weight: 600;
-    font-size: 14px;
-  }
-`;
-const AccordionFooter = styled(Box)`
-  overflow: hidden;
-  border-bottom: 1px solid ${({ theme }) => theme.colors.neutral200};
-  border-right: 1px solid ${({ theme }) => theme.colors.neutral200};
-  border-left: 1px solid ${({ theme }) => theme.colors.neutral200};
-  border-radius: 0 0 ${({ theme }) => theme.borderRadius} ${({ theme }) => theme.borderRadius};
-`;
-const AccordionContent = styled(Box)`
-  border-bottom: none;
-
-  /* add the borders and make sure the top is transparent to avoid jumping with the hover effect  */
-  & > div > div {
-    border: 1px solid ${({ theme }) => theme.colors.neutral200};
-    border-top-color: transparent;
-  }
-
-  /* the top accordion _does_ need a border though */
-  & > div:first-child > div {
-    border-top: 1px solid ${({ theme }) => theme.colors.neutral200};
-  }
-
-  /* Reset all the border-radius' */
-  & > div > div,
-  & > div > div > div {
-    border-radius: unset;
-  }
+  border-top: 1px solid ${({ theme }) => theme.colors.neutral200};
+  padding-inline: ${(props) => props.theme.spaces[6]};
+  padding-block: ${(props) => props.theme.spaces[3]};
 
-  /* Give the border radius back to the first accordion */
-  & > div:first-child > div,
-  & > div:first-child > div > div {
-    border-radius: ${({ theme }) => theme.borderRadius} ${({ theme }) => theme.borderRadius} 0 0;
-  }
+  &:not([disabled]) {
+    cursor: pointer;
 
-  & > div > div[data-strapi-expanded='true'] {
-    border: 1px solid ${({ theme }) => theme.colors.primary600};
+    &:hover {
+      background-color: ${(props) => props.theme.colors.primary100};
+    }
   }
-`;
-const AccordionGroup = ({ children, error }) => {
-  return /* @__PURE__ */ jsxs(KeyboardNavigable, { attributeName: "data-strapi-accordion-toggle", children: [
-    children,
-    error && /* @__PURE__ */ jsx(Box, { paddingTop: 1, children: /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "danger600", children: error }) })
-  ] });
-};
-const CustomIconButton$1 = styled(IconButton)`
-  background-color: transparent;
 
-  svg {
-    path {
-      fill: ${({ theme, expanded }) => expanded ? theme.colors.primary600 : theme.colors.neutral600};
-    }
+  span {
+    font-weight: 600;
+    font-size: 1.4rem;
+    line-height: 2.4rem;
   }
 
-  &:hover {
-    svg {
-      path {
-        fill: ${({ theme }) => theme.colors.primary600};
-      }
-    }
-  }
-`;
-const ActionsFlex$1 = styled(Flex)`
-  & .drag-handle {
-    background: unset;
-
-    svg {
-      path {
-        fill: ${({ theme, expanded }) => expanded ? theme.colors.primary600 : void 0};
-      }
-    }
-
-    &:hover {
-      svg {
-        path {
-          /* keeps the hover style of the accordion */
-          fill: ${({ theme }) => theme.colors.primary600};
-        }
-      }
-    }
+  @media (prefers-reduced-motion: no-preference) {
+    transition: background-color 120ms ${(props) => props.theme.motion.easings.easeOutQuad};
   }
 `;
 const Component = ({
   disabled,
   index,
-  isOpen,
   name: name2,
   mainField = {
     name: "id",
     type: "integer"
   },
   children,
-  onClickToggle,
   onDeleteComponent,
   toggleCollapses,
+  __temp_key__,
   ...dragProps
 }) => {
   const { formatMessage } = useIntl();
@@ -2678,50 +2956,44 @@ const Component = ({
     dragPreviewRef(getEmptyImage(), { captureDraggingState: false });
   }, [dragPreviewRef, index]);
   const composedAccordionRefs = useComposedRefs(accordionRef, dragRef);
-  const composedBoxRefs = useComposedRefs(boxRef, dropRef);
-  return /* @__PURE__ */ jsx(Box, { ref: (ref) => composedBoxRefs(ref), children: isDragging ? /* @__PURE__ */ jsx(Preview$1, {}) : /* @__PURE__ */ jsxs(Accordion, { expanded: isOpen, onToggle: onClickToggle, id: name2, size: "S", children: [
-    /* @__PURE__ */ jsx(
-      AccordionToggle,
-      {
-        action: disabled ? null : /* @__PURE__ */ jsxs(ActionsFlex$1, { gap: 0, expanded: isOpen, children: [
-          /* @__PURE__ */ jsx(
-            CustomIconButton$1,
-            {
-              expanded: isOpen,
-              borderWidth: 0,
-              onClick: onDeleteComponent,
-              label: formatMessage({
-                id: getTranslation("containers.Edit.delete"),
-                defaultMessage: "Delete"
-              }),
-              icon: /* @__PURE__ */ jsx(Trash, {})
-            }
-          ),
-          /* @__PURE__ */ jsx(
-            IconButton,
-            {
-              className: "drag-handle",
-              ref: composedAccordionRefs,
-              forwardedAs: "div",
-              role: "button",
-              borderWidth: 0,
-              tabIndex: 0,
-              onClick: (e) => e.stopPropagation(),
-              "data-handler-id": handlerId,
-              label: formatMessage({
-                id: getTranslation("components.DragHandle-label"),
-                defaultMessage: "Drag"
-              }),
-              onKeyDown: handleKeyDown,
-              children: /* @__PURE__ */ jsx(Drag, {})
-            }
-          )
-        ] }),
-        title: displayValue,
-        togglePosition: "left"
-      }
-    ),
-    /* @__PURE__ */ jsx(AccordionContent$1, { children: /* @__PURE__ */ jsx(
+  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",
@@ -2735,7 +3007,7 @@ const Component = ({
   ] }) });
 };
 const Preview$1 = () => {
-  return /* @__PURE__ */ jsx(StyledSpan, { as: "span", padding: 6, background: "primary100" });
+  return /* @__PURE__ */ jsx(StyledSpan, { tag: "span", padding: 6, background: "primary100" });
 };
 const StyledSpan = styled(Box)`
   display: block;
@@ -2761,29 +3033,15 @@ const ComponentInput = ({
     const data = transformDocument(schema, components)(form);
     field.onChange(name2, data);
   };
-  return /* @__PURE__ */ jsxs(Box, { children: [
+  return /* @__PURE__ */ jsxs(Field.Root, { error: field.error, required, children: [
     /* @__PURE__ */ jsxs(Flex, { justifyContent: "space-between", children: [
-      /* @__PURE__ */ jsxs(Flex, { paddingBottom: 1, children: [
-        /* @__PURE__ */ jsxs(
-          Typography,
-          {
-            textColor: "neutral800",
-            htmlFor: name2,
-            variant: "pi",
-            fontWeight: "bold",
-            as: "label",
-            children: [
-              label,
-              attribute.repeatable && /* @__PURE__ */ jsxs(Fragment, { children: [
-                " (",
-                Array.isArray(field.value) ? field.value.length : 0,
-                ")"
-              ] }),
-              required && /* @__PURE__ */ jsx(Typography, { textColor: "danger600", children: "*" })
-            ]
-          }
-        ),
-        labelAction && /* @__PURE__ */ jsx(Box, { paddingLeft: 1, children: labelAction })
+      /* @__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,
@@ -2792,21 +3050,21 @@ const ComponentInput = ({
             id: getTranslation("components.reset-entry"),
             defaultMessage: "Reset Entry"
           }),
-          icon: /* @__PURE__ */ jsx(Trash, {}),
-          borderWidth: 0,
+          variant: "ghost",
           onClick: () => {
             field.onChange(name2, null);
-          }
+          },
+          children: /* @__PURE__ */ jsx(Trash, {})
         }
       )
     ] }),
-    /* @__PURE__ */ jsxs(Flex, { direction: "column", alignItems: "stretch", gap: 1, children: [
-      !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 })
-    ] })
+    !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,
@@ -2821,15 +3079,12 @@ const AddComponentButton = ({
       onClick,
       disabled: isDisabled,
       background: "neutral0",
-      paddingTop: 3,
-      paddingBottom: 3,
-      paddingLeft: 4,
-      paddingRight: 4,
       style: { cursor: isDisabled ? "not-allowed" : "pointer" },
-      children: /* @__PURE__ */ jsxs(Flex, { as: "span", gap: 2, children: [
+      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,
+          AddComponentTitle,
           {
             variant: "pi",
             fontWeight: "bold",
@@ -2853,13 +3108,15 @@ const StyledAddIcon = styled(PlusCircle)`
     fill: ${({ theme, $hasError }) => $hasError ? theme.colors.danger600 : theme.colors.neutral600};
   }
 `;
-const StyledButton = styled(BaseButton)`
+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 {
-    ${Typography} {
+    ${AddComponentTitle} {
       color: ${({ theme }) => theme.colors.primary600};
     }
 
@@ -2868,12 +3125,12 @@ const StyledButton = styled(BaseButton)`
         fill: ${({ theme }) => theme.colors.primary600};
       }
       > path {
-        fill: ${({ theme }) => theme.colors.neutral100};
+        fill: ${({ theme }) => theme.colors.primary600};
       }
     }
   }
   &:active {
-    ${Typography} {
+    ${AddComponentTitle} {
       color: ${({ theme }) => theme.colors.primary600};
     }
     ${StyledAddIcon} {
@@ -2890,27 +3147,15 @@ const ComponentCategory = ({
   category,
   components = [],
   variant = "primary",
-  isOpen,
-  onAddComponent,
-  onToggle
+  onAddComponent
 }) => {
   const { formatMessage } = useIntl();
-  const handleToggle = () => {
-    onToggle(category);
-  };
-  return /* @__PURE__ */ jsxs(Accordion, { expanded: isOpen, onToggle: handleToggle, size: "S", children: [
-    /* @__PURE__ */ jsx(
-      AccordionToggle,
-      {
-        variant,
-        title: formatMessage({ id: category, defaultMessage: category }),
-        togglePosition: "left"
-      }
-    ),
-    /* @__PURE__ */ jsx(AccordionContent$1, { children: /* @__PURE__ */ jsx(Box, { paddingTop: 4, paddingBottom: 4, paddingLeft: 3, paddingRight: 3, children: /* @__PURE__ */ jsx(Grid, { children: components.map(({ uid, displayName, icon }) => /* @__PURE__ */ jsx(
+  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,
       {
-        as: "button",
+        tag: "button",
         type: "button",
         background: "neutral100",
         justifyContent: "center",
@@ -2920,34 +3165,32 @@ const ComponentCategory = ({
         shrink: 0,
         borderColor: "neutral200",
         children: /* @__PURE__ */ jsxs(Flex, { direction: "column", gap: 1, alignItems: "center", justifyContent: "center", children: [
-          /* @__PURE__ */ jsx(ComponentIcon, { icon }),
-          /* @__PURE__ */ jsx(Typography, { variant: "pi", fontWeight: "bold", textColor: "neutral600", children: displayName })
+          /* @__PURE__ */ jsx(ComponentIcon, { color: "currentColor", background: "primary200", icon }),
+          /* @__PURE__ */ jsx(Typography, { variant: "pi", fontWeight: "bold", children: displayName })
         ] })
       },
       uid
-    )) }) }) })
+    )) }) })
   ] });
 };
-const Grid = styled.div`
+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};
-
-    ${Typography} {
-      color: ${({ theme }) => theme.colors.primary600};
-    }
-
-    /* > Flex > ComponentIcon */
-    > div > div:first-child {
-      background: ${({ theme }) => theme.colors.primary200};
-      color: ${({ theme }) => theme.colors.primary600};
-    }
+    color: ${({ theme }) => theme.colors.primary600};
   }
 `;
 const ComponentPicker = ({
@@ -2956,19 +3199,8 @@ const ComponentPicker = ({
   onClickAddComponent
 }) => {
   const { formatMessage } = useIntl();
-  const [categoryToOpen, setCategoryToOpen] = React.useState("");
-  React.useEffect(() => {
-    const categoryKeys = Object.keys(dynamicComponentsByCategory);
-    if (isOpen && categoryKeys.length > 0) {
-      setCategoryToOpen(categoryKeys[0]);
-    }
-  }, [isOpen, dynamicComponentsByCategory]);
   const handleAddComponentToDz = (componentUid) => () => {
     onClickAddComponent(componentUid);
-    setCategoryToOpen("");
-  };
-  const handleClickToggle = (categoryName) => {
-    setCategoryToOpen((currentCat) => currentCat === categoryName ? "" : categoryName);
   };
   if (!isOpen) {
     return null;
@@ -2989,14 +3221,12 @@ const ComponentPicker = ({
           id: getTranslation("components.DynamicZone.ComponentPicker-label"),
           defaultMessage: "Pick one component"
         }) }) }),
-        /* @__PURE__ */ jsx(Box, { paddingTop: 2, children: /* @__PURE__ */ jsx(KeyboardNavigable, { attributeName: "data-strapi-accordion-toggle", children: Object.entries(dynamicComponentsByCategory).map(([category, components], index) => /* @__PURE__ */ jsx(
+        /* @__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,
-            isOpen: category === categoryToOpen,
-            onToggle: handleClickToggle,
             variant: index % 2 === 1 ? "primary" : "secondary"
           },
           category
@@ -3011,27 +3241,21 @@ const NotAllowedInput = ({ hint, label, required, name: name2 }) => {
     id: "components.NotAllowedInput.text",
     defaultMessage: "No permissions to see this field"
   });
-  return /* @__PURE__ */ jsx(
-    TextInput,
-    {
-      disabled: true,
-      label,
-      id: name2,
-      hint,
-      name: name2,
-      placeholder,
-      required,
-      startAction: /* @__PURE__ */ jsx(StyledIcon, {}),
-      type: "text",
-      value: ""
-    }
-  );
+  return /* @__PURE__ */ jsxs(Field.Root, { id: name2, hint, name: name2, required, children: [
+    /* @__PURE__ */ jsx(Field.Label, { children: label }),
+    /* @__PURE__ */ jsx(
+      TextInput,
+      {
+        disabled: true,
+        placeholder,
+        startAction: /* @__PURE__ */ jsx(EyeStriked, { fill: "neutral600" }),
+        type: "text",
+        value: ""
+      }
+    ),
+    /* @__PURE__ */ jsx(Field.Hint, {})
+  ] });
 };
-const StyledIcon = styled(EyeStriked)`
-  & > path {
-    fill: ${({ theme }) => theme.colors.neutral600};
-  }
-`;
 function useDebounce(value, delay) {
   const [debouncedValue, setDebouncedValue] = useState(value);
   useEffect(() => {
@@ -3084,188 +3308,193 @@ const uidApi = contentManagerApi.injectEndpoints({
 });
 const { useGenerateUIDMutation, useGetDefaultUIDQuery, useGetAvailabilityQuery } = uidApi;
 const UID_REGEX = /^[A-Za-z0-9-_.~]*$/;
-const UIDInput = React.forwardRef((props, ref) => {
-  const { model, id } = useDoc();
-  const allFormValues = useForm("InputUID", (form) => form.values);
-  const [availability, setAvailability] = React.useState();
-  const [showRegenerate, setShowRegenerate] = React.useState(false);
-  const field = useField(props.name);
-  const debouncedValue = useDebounce(field.value, 300);
-  const { toggleNotification } = useNotification();
-  const { _unstableFormatAPIError: formatAPIError } = useAPIErrorHandler();
-  const { formatMessage } = useIntl();
-  const [{ query }] = useQueryParams();
-  const params = React.useMemo(() => buildValidParams(query), [query]);
-  const {
-    data: defaultGeneratedUID,
-    isLoading: isGeneratingDefaultUID,
-    error: apiError
-  } = useGetDefaultUIDQuery(
-    {
-      contentTypeUID: model,
-      field: props.name,
-      data: {
-        id: id ?? "",
-        ...allFormValues
-      },
-      params
-    },
-    {
-      skip: field.value || !props.required
-    }
-  );
-  React.useEffect(() => {
-    if (apiError) {
-      toggleNotification({
-        type: "warning",
-        message: formatAPIError(apiError)
-      });
-    }
-  }, [apiError, formatAPIError, toggleNotification]);
-  React.useEffect(() => {
-    if (defaultGeneratedUID && field.value === void 0) {
-      field.onChange(props.name, defaultGeneratedUID);
-    }
-  }, [defaultGeneratedUID, field, props.name]);
-  const [generateUID, { isLoading: isGeneratingUID }] = useGenerateUIDMutation();
-  const handleRegenerateClick = async () => {
-    try {
-      const res = await generateUID({
+const UIDInput = React.forwardRef(
+  ({ hint, label, labelAction, name: name2, required, ...props }, ref) => {
+    const { model, id } = useDoc();
+    const allFormValues = useForm("InputUID", (form) => form.values);
+    const [availability, setAvailability] = React.useState();
+    const [showRegenerate, setShowRegenerate] = React.useState(false);
+    const field = useField(name2);
+    const debouncedValue = useDebounce(field.value, 300);
+    const { toggleNotification } = useNotification();
+    const { _unstableFormatAPIError: formatAPIError } = useAPIErrorHandler();
+    const { formatMessage } = useIntl();
+    const [{ query }] = useQueryParams();
+    const params = React.useMemo(() => buildValidParams(query), [query]);
+    const {
+      data: defaultGeneratedUID,
+      isLoading: isGeneratingDefaultUID,
+      error: apiError
+    } = useGetDefaultUIDQuery(
+      {
         contentTypeUID: model,
-        field: props.name,
-        data: { id: id ?? "", ...allFormValues },
+        field: name2,
+        data: {
+          id: id ?? "",
+          ...allFormValues
+        },
         params
-      });
-      if ("data" in res) {
-        field.onChange(props.name, res.data);
-      } else {
+      },
+      {
+        skip: field.value || !required
+      }
+    );
+    React.useEffect(() => {
+      if (apiError) {
         toggleNotification({
-          type: "danger",
-          message: formatAPIError(res.error)
+          type: "warning",
+          message: formatAPIError(apiError)
         });
       }
-    } catch (err) {
-      toggleNotification({
-        type: "danger",
-        message: formatMessage({
-          id: "notification.error",
-          defaultMessage: "An error occurred."
-        })
-      });
-    }
-  };
-  const {
-    data: availabilityData,
-    isLoading: isCheckingAvailability,
-    error: availabilityError
-  } = useGetAvailabilityQuery(
-    {
-      contentTypeUID: model,
-      field: props.name,
-      value: debouncedValue ? debouncedValue.trim() : "",
-      params
-    },
-    {
-      skip: !Boolean(
-        debouncedValue !== field.initialValue && debouncedValue && UID_REGEX.test(debouncedValue.trim())
-      )
-    }
-  );
-  React.useEffect(() => {
-    if (availabilityError) {
-      toggleNotification({
-        type: "warning",
-        message: formatAPIError(availabilityError)
-      });
-    }
-  }, [availabilityError, formatAPIError, toggleNotification]);
-  React.useEffect(() => {
-    setAvailability(availabilityData);
-    let timer;
-    if (availabilityData?.isAvailable) {
-      timer = window.setTimeout(() => {
-        setAvailability(void 0);
-      }, 4e3);
-    }
-    return () => {
-      if (timer) {
-        clearTimeout(timer);
+    }, [apiError, formatAPIError, toggleNotification]);
+    React.useEffect(() => {
+      if (defaultGeneratedUID && field.value === void 0) {
+        field.onChange(name2, defaultGeneratedUID);
+      }
+    }, [defaultGeneratedUID, field, name2]);
+    const [generateUID, { isLoading: isGeneratingUID }] = useGenerateUIDMutation();
+    const handleRegenerateClick = async () => {
+      try {
+        const res = await generateUID({
+          contentTypeUID: model,
+          field: name2,
+          data: { id: id ?? "", ...allFormValues },
+          params
+        });
+        if ("data" in res) {
+          field.onChange(name2, res.data);
+        } else {
+          toggleNotification({
+            type: "danger",
+            message: formatAPIError(res.error)
+          });
+        }
+      } catch (err) {
+        toggleNotification({
+          type: "danger",
+          message: formatMessage({
+            id: "notification.error",
+            defaultMessage: "An error occurred."
+          })
+        });
       }
     };
-  }, [availabilityData]);
-  const isLoading = isGeneratingDefaultUID || isGeneratingUID || isCheckingAvailability;
-  const fieldRef = useFocusInputField(props.name);
-  const composedRefs = useComposedRefs(ref, fieldRef);
-  return (
-    // @ts-expect-error – label _could_ be a ReactNode since it's a child, this should be fixed in the DS.
-    /* @__PURE__ */ jsx(
-      TextInput,
+    const {
+      data: availabilityData,
+      isLoading: isCheckingAvailability,
+      error: availabilityError
+    } = useGetAvailabilityQuery(
       {
-        ref: composedRefs,
-        disabled: props.disabled,
-        error: field.error,
-        endAction: /* @__PURE__ */ jsxs(Flex, { position: "relative", gap: 1, children: [
-          availability && !showRegenerate && /* @__PURE__ */ jsxs(
-            TextValidation,
-            {
-              alignItems: "center",
-              gap: 1,
-              justifyContent: "flex-end",
-              available: !!availability?.isAvailable,
-              "data-not-here-outer": true,
-              position: "absolute",
-              pointerEvents: "none",
-              right: 6,
-              width: "100px",
-              children: [
-                availability?.isAvailable ? /* @__PURE__ */ jsx(CheckCircle, {}) : /* @__PURE__ */ jsx(WarningCircle, {}),
-                /* @__PURE__ */ jsx(
-                  Typography,
-                  {
-                    textColor: availability.isAvailable ? "success600" : "danger600",
-                    variant: "pi",
-                    children: formatMessage(
-                      availability.isAvailable ? {
-                        id: "content-manager.components.uid.available",
-                        defaultMessage: "Available"
-                      } : {
-                        id: "content-manager.components.uid.unavailable",
-                        defaultMessage: "Unavailable"
-                      }
-                    )
-                  }
-                )
-              ]
-            }
-          ),
-          !props.disabled && /* @__PURE__ */ jsxs(Fragment, { children: [
-            showRegenerate && /* @__PURE__ */ jsx(TextValidation, { alignItems: "center", justifyContent: "flex-end", gap: 1, children: /* @__PURE__ */ jsx(Typography, { textColor: "primary600", variant: "pi", children: formatMessage({
-              id: "content-manager.components.uid.regenerate",
-              defaultMessage: "Regenerate"
-            }) }) }),
-            /* @__PURE__ */ jsx(
-              FieldActionWrapper,
+        contentTypeUID: model,
+        field: name2,
+        value: debouncedValue ? debouncedValue.trim() : "",
+        params
+      },
+      {
+        skip: !Boolean(
+          debouncedValue !== field.initialValue && debouncedValue && UID_REGEX.test(debouncedValue.trim())
+        )
+      }
+    );
+    React.useEffect(() => {
+      if (availabilityError) {
+        toggleNotification({
+          type: "warning",
+          message: formatAPIError(availabilityError)
+        });
+      }
+    }, [availabilityError, formatAPIError, toggleNotification]);
+    React.useEffect(() => {
+      setAvailability(availabilityData);
+      let timer;
+      if (availabilityData?.isAvailable) {
+        timer = window.setTimeout(() => {
+          setAvailability(void 0);
+        }, 4e3);
+      }
+      return () => {
+        if (timer) {
+          clearTimeout(timer);
+        }
+      };
+    }, [availabilityData]);
+    const isLoading = isGeneratingDefaultUID || isGeneratingUID || isCheckingAvailability;
+    const fieldRef = useFocusInputField(name2);
+    const composedRefs = useComposedRefs(ref, fieldRef);
+    return /* @__PURE__ */ jsxs(Field.Root, { hint, name: name2, error: field.error, required, children: [
+      /* @__PURE__ */ jsx(Field.Label, { action: labelAction, children: label }),
+      /* @__PURE__ */ jsx(
+        TextInput,
+        {
+          ref: composedRefs,
+          disabled: props.disabled,
+          endAction: /* @__PURE__ */ jsxs(Flex, { position: "relative", gap: 1, children: [
+            availability && !showRegenerate && /* @__PURE__ */ jsxs(
+              TextValidation,
               {
-                onClick: handleRegenerateClick,
-                label: formatMessage({
-                  id: "content-manager.components.uid.regenerate",
-                  defaultMessage: "Regenerate"
-                }),
-                onMouseEnter: () => setShowRegenerate(true),
-                onMouseLeave: () => setShowRegenerate(false),
-                children: isLoading ? /* @__PURE__ */ jsx(LoadingWrapper, { "data-testid": "loading-wrapper", children: /* @__PURE__ */ jsx(Loader, {}) }) : /* @__PURE__ */ jsx(ArrowClockwise, {})
+                alignItems: "center",
+                gap: 1,
+                justifyContent: "flex-end",
+                $available: !!availability?.isAvailable,
+                "data-not-here-outer": true,
+                position: "absolute",
+                pointerEvents: "none",
+                right: 6,
+                width: "100px",
+                children: [
+                  availability?.isAvailable ? /* @__PURE__ */ jsx(CheckCircle, {}) : /* @__PURE__ */ jsx(WarningCircle, {}),
+                  /* @__PURE__ */ jsx(
+                    Typography,
+                    {
+                      textColor: availability.isAvailable ? "success600" : "danger600",
+                      variant: "pi",
+                      children: formatMessage(
+                        availability.isAvailable ? {
+                          id: "content-manager.components.uid.available",
+                          defaultMessage: "Available"
+                        } : {
+                          id: "content-manager.components.uid.unavailable",
+                          defaultMessage: "Unavailable"
+                        }
+                      )
+                    }
+                  )
+                ]
               }
-            )
-          ] })
-        ] }),
-        onChange: field.onChange,
-        value: field.value ?? "",
-        ...props
-      }
-    )
-  );
-});
-const FieldActionWrapper = styled(FieldAction)`
+            ),
+            !props.disabled && /* @__PURE__ */ jsxs(Fragment, { children: [
+              showRegenerate && /* @__PURE__ */ jsx(TextValidation, { alignItems: "center", justifyContent: "flex-end", gap: 1, children: /* @__PURE__ */ jsx(Typography, { textColor: "primary600", variant: "pi", children: formatMessage({
+                id: "content-manager.components.uid.regenerate",
+                defaultMessage: "Regenerate"
+              }) }) }),
+              /* @__PURE__ */ jsx(
+                FieldActionWrapper,
+                {
+                  onClick: handleRegenerateClick,
+                  label: formatMessage({
+                    id: "content-manager.components.uid.regenerate",
+                    defaultMessage: "Regenerate"
+                  }),
+                  onMouseEnter: () => setShowRegenerate(true),
+                  onMouseLeave: () => setShowRegenerate(false),
+                  children: isLoading ? /* @__PURE__ */ jsx(LoadingWrapper, { "data-testid": "loading-wrapper", children: /* @__PURE__ */ jsx(Loader, {}) }) : /* @__PURE__ */ jsx(ArrowClockwise, {})
+                }
+              )
+            ] })
+          ] }),
+          onChange: field.onChange,
+          value: field.value ?? "",
+          ...props
+        }
+      ),
+      /* @__PURE__ */ jsx(Field.Error, {}),
+      /* @__PURE__ */ jsx(Field.Hint, {})
+    ] });
+  }
+);
+const FieldActionWrapper = styled(Field.Action)`
+  width: 1.6rem;
+
   svg {
     height: 1.6rem;
     width: 1.6rem;
@@ -3286,7 +3515,7 @@ const TextValidation = styled(Flex)`
     width: 1.2rem;
 
     path {
-      fill: ${({ theme, available }) => available ? theme.colors.success600 : theme.colors.danger600};
+      fill: ${({ theme, $available }) => $available ? theme.colors.success600 : theme.colors.danger600};
     }
   }
 `;
@@ -3301,6 +3530,7 @@ const rotation = keyframes`
 const LoadingWrapper = styled(Flex)`
   animation: ${rotation} 2s infinite linear;
 `;
+const MemoizedUIDInput = React.memo(UIDInput);
 const md = new Markdown({
   html: true,
   // Enable HTML tags in source
@@ -3635,7 +3865,7 @@ const Editor = React.forwardRef(
       [editorRef]
     );
     return /* @__PURE__ */ jsxs(EditorAndPreviewWrapper, { children: [
-      /* @__PURE__ */ jsx(EditorStylesContainer, { isExpandMode, disabled: disabled || isPreviewMode, children: /* @__PURE__ */ jsx("textarea", { ref: textareaRef }) }),
+      /* @__PURE__ */ jsx(EditorStylesContainer, { $isExpandMode: isExpandMode, $disabled: disabled || isPreviewMode, children: /* @__PURE__ */ jsx("textarea", { ref: textareaRef }) }),
       isPreviewMode && /* @__PURE__ */ jsx(PreviewWysiwyg, { data: value })
     ] });
   }
@@ -3645,7 +3875,7 @@ const EditorAndPreviewWrapper = styled.div`
   height: calc(100% - 48px);
 `;
 const EditorStylesContainer = styled.div`
-  cursor: ${({ disabled }) => disabled ? "not-allowed !important" : "auto"};
+  cursor: ${({ $disabled }) => $disabled ? "not-allowed !important" : "auto"};
   height: 100%;
   /* BASICS */
   .CodeMirror-placeholder {
@@ -3655,7 +3885,7 @@ const EditorStylesContainer = styled.div`
   .CodeMirror {
     /* Set height, width, borders, and global font properties here */
     font-size: 1.4rem;
-    height: ${({ isExpandMode }) => isExpandMode ? "100%" : "410px"}; //  512px(total height) - 48px (header) - 52px(footer) - 2px border
+    height: ${({ $isExpandMode }) => $isExpandMode ? "100%" : "410px"}; //  512px(total height) - 48px (header) - 52px(footer) - 2px border
     color: ${({ theme }) => theme.colors.neutral800};
     direction: ltr;
     font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell,
@@ -4033,7 +4263,7 @@ const EditorLayout = ({
                     justifyContent: "flex-end",
                     shrink: 0,
                     width: "100%",
-                    children: /* @__PURE__ */ jsxs(ExpandButton$1, { onClick: onCollapse, children: [
+                    children: /* @__PURE__ */ jsxs(ExpandButton$1, { onClick: onCollapse, variant: "tertiary", size: "M", children: [
                       /* @__PURE__ */ jsx(Typography, { children: formatMessage({
                         id: "components.Wysiwyg.collapse",
                         defaultMessage: "Collapse"
@@ -4051,12 +4281,14 @@ const EditorLayout = ({
     ) }) });
   }
   return /* @__PURE__ */ jsx(
-    Box,
+    Flex,
     {
       borderColor: error ? "danger600" : "neutral200",
       borderStyle: "solid",
       borderWidth: "1px",
       hasRadius: true,
+      direction: "column",
+      alignItems: "stretch",
       children
     }
   );
@@ -4067,11 +4299,19 @@ const ExpandWrapper = styled(Flex)`
 const BoxWithBorder = styled(Box)`
   border-right: 1px solid ${({ theme }) => theme.colors.neutral200};
 `;
-const ExpandButton$1 = styled(BaseButton)`
+const ExpandButton$1 = styled(Button)`
   background-color: transparent;
   border: none;
   align-items: center;
 
+  & > span {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    width: 100%;
+    font-weight: ${({ theme }) => theme.fontWeights.regular};
+  }
+
   svg {
     margin-left: ${({ theme }) => `${theme.spaces[2]}`};
 
@@ -4340,8 +4580,6 @@ const quoteAndCodeHandler = (editor, markdownType) => {
 };
 const CustomIconButton = styled(IconButton)`
   padding: ${({ theme }) => theme.spaces[2]};
-  /* Trick to prevent the outline from overflowing because of the general outline-offset */
-  outline-offset: -2px !important;
 
   svg {
     width: 1.8rem;
@@ -4369,11 +4607,19 @@ const MoreButton = styled(IconButton)`
 const IconButtonGroupMargin = styled(IconButtonGroup)`
   margin-right: ${({ theme }) => `${theme.spaces[2]}`};
 `;
-const ExpandButton = styled(BaseButton)`
+const ExpandButton = styled(Button)`
   background-color: transparent;
   border: none;
   align-items: center;
 
+  & > span {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    width: 100%;
+    font-weight: ${({ theme }) => theme.fontWeights.regular};
+  }
+
   svg {
     margin-left: ${({ theme }) => `${theme.spaces[2]}`};
     path {
@@ -4385,8 +4631,8 @@ const ExpandButton = styled(BaseButton)`
 `;
 const WysiwygFooter = ({ onToggleExpand }) => {
   const { formatMessage } = useIntl();
-  return /* @__PURE__ */ jsx(Box, { padding: 2, background: "neutral100", borderRadius: `0 0 0.4rem 0.4rem`, children: /* @__PURE__ */ jsx(Flex, { justifyContent: "flex-end", alignItems: "flex-end", children: /* @__PURE__ */ jsxs(ExpandButton, { id: "expand", onClick: onToggleExpand, children: [
-    /* @__PURE__ */ jsx(Typography, { children: formatMessage({
+  return /* @__PURE__ */ jsx(Box, { padding: 2, background: "neutral100", borderRadius: `0 0 0.4rem 0.4rem`, children: /* @__PURE__ */ jsx(Flex, { justifyContent: "flex-end", alignItems: "flex-end", children: /* @__PURE__ */ jsxs(ExpandButton, { id: "expand", onClick: onToggleExpand, variant: "tertiary", size: "M", children: [
+    /* @__PURE__ */ jsx(Typography, { textColor: "neutral800", children: formatMessage({
       id: "components.WysiwygBottomControls.fullscreen",
       defaultMessage: "Expand"
     }) }),
@@ -4408,7 +4654,7 @@ const WysiwygNav = ({
     id: "components.Wysiwyg.selectOptions.title",
     defaultMessage: "Add a title"
   });
-  const buttonMoreRef = React.useRef(null);
+  React.useRef(null);
   const handleTogglePopover = () => {
     setVisiblePopover((prev) => !prev);
   };
@@ -4421,21 +4667,30 @@ const WysiwygNav = ({
         justifyContent: "space-between",
         borderRadius: `0.4rem 0.4rem 0 0`,
         children: [
-          /* @__PURE__ */ jsxs(StyledFlex, { children: [
-            /* @__PURE__ */ jsxs(SingleSelect, { disabled: true, placeholder: selectPlaceholder, size: "S", label: selectPlaceholder, children: [
-              /* @__PURE__ */ jsx(SingleSelectOption, { value: "h1", children: "h1" }),
-              /* @__PURE__ */ jsx(SingleSelectOption, { value: "h2", children: "h2" }),
-              /* @__PURE__ */ jsx(SingleSelectOption, { value: "h3", children: "h3" }),
-              /* @__PURE__ */ jsx(SingleSelectOption, { value: "h4", children: "h4" }),
-              /* @__PURE__ */ jsx(SingleSelectOption, { value: "h5", children: "h5" }),
-              /* @__PURE__ */ jsx(SingleSelectOption, { value: "h6", children: "h6" })
-            ] }),
+          /* @__PURE__ */ jsxs(Flex, { children: [
+            /* @__PURE__ */ jsx(Field.Root, { children: /* @__PURE__ */ jsxs(
+              SingleSelect,
+              {
+                disabled: true,
+                placeholder: selectPlaceholder,
+                "aria-label": selectPlaceholder,
+                size: "S",
+                children: [
+                  /* @__PURE__ */ jsx(SingleSelectOption, { value: "h1", children: "h1" }),
+                  /* @__PURE__ */ jsx(SingleSelectOption, { value: "h2", children: "h2" }),
+                  /* @__PURE__ */ jsx(SingleSelectOption, { value: "h3", children: "h3" }),
+                  /* @__PURE__ */ jsx(SingleSelectOption, { value: "h4", children: "h4" }),
+                  /* @__PURE__ */ jsx(SingleSelectOption, { value: "h5", children: "h5" }),
+                  /* @__PURE__ */ jsx(SingleSelectOption, { value: "h6", children: "h6" })
+                ]
+              }
+            ) }),
             /* @__PURE__ */ jsxs(MainButtons, { children: [
-              /* @__PURE__ */ jsx(CustomIconButton, { disabled: true, label: "Bold", name: "Bold", icon: /* @__PURE__ */ jsx(Bold, {}) }),
-              /* @__PURE__ */ jsx(CustomIconButton, { disabled: true, label: "Italic", name: "Italic", icon: /* @__PURE__ */ jsx(Italic, {}) }),
-              /* @__PURE__ */ jsx(CustomIconButton, { disabled: true, label: "Underline", name: "Underline", icon: /* @__PURE__ */ jsx(Underline, {}) })
+              /* @__PURE__ */ jsx(CustomIconButton, { disabled: true, label: "Bold", name: "Bold", children: /* @__PURE__ */ jsx(Bold, {}) }),
+              /* @__PURE__ */ jsx(CustomIconButton, { disabled: true, label: "Italic", name: "Italic", children: /* @__PURE__ */ jsx(Italic, {}) }),
+              /* @__PURE__ */ jsx(CustomIconButton, { disabled: true, label: "Underline", name: "Underline", children: /* @__PURE__ */ jsx(Underline, {}) })
             ] }),
-            /* @__PURE__ */ jsx(MoreButton, { disabled: true, label: "More", icon: /* @__PURE__ */ jsx(More, {}) })
+            /* @__PURE__ */ jsx(MoreButton, { disabled: true, label: "More", children: /* @__PURE__ */ jsx(More, {}) })
           ] }),
           !isExpandMode && /* @__PURE__ */ jsx(Button, { onClick: onTogglePreviewMode, variant: "tertiary", children: formatMessage({
             id: "components.Wysiwyg.ToggleMode.markdown-mode",
@@ -4453,14 +4708,14 @@ const WysiwygNav = ({
       justifyContent: "space-between",
       borderRadius: `0.4rem 0.4rem 0 0`,
       children: [
-        /* @__PURE__ */ jsxs(StyledFlex, { children: [
-          /* @__PURE__ */ jsxs(
+        /* @__PURE__ */ jsxs(Flex, { children: [
+          /* @__PURE__ */ jsx(Field.Root, { children: /* @__PURE__ */ jsxs(
             SingleSelect,
             {
               placeholder: selectPlaceholder,
-              label: selectPlaceholder,
-              size: "S",
+              "aria-label": selectPlaceholder,
               onChange: (value) => onActionClick(value, editorRef),
+              size: "S",
               children: [
                 /* @__PURE__ */ jsx(SingleSelectOption, { value: "h1", children: "h1" }),
                 /* @__PURE__ */ jsx(SingleSelectOption, { value: "h2", children: "h2" }),
@@ -4470,7 +4725,7 @@ const WysiwygNav = ({
                 /* @__PURE__ */ jsx(SingleSelectOption, { value: "h6", children: "h6" })
               ]
             }
-          ),
+          ) }),
           /* @__PURE__ */ jsxs(MainButtons, { children: [
             /* @__PURE__ */ jsx(
               CustomIconButton,
@@ -4478,7 +4733,7 @@ const WysiwygNav = ({
                 onClick: () => onActionClick("Bold", editorRef),
                 label: "Bold",
                 name: "Bold",
-                icon: /* @__PURE__ */ jsx(Bold, {})
+                children: /* @__PURE__ */ jsx(Bold, {})
               }
             ),
             /* @__PURE__ */ jsx(
@@ -4487,7 +4742,7 @@ const WysiwygNav = ({
                 onClick: () => onActionClick("Italic", editorRef),
                 label: "Italic",
                 name: "Italic",
-                icon: /* @__PURE__ */ jsx(Italic, {})
+                children: /* @__PURE__ */ jsx(Italic, {})
               }
             ),
             /* @__PURE__ */ jsx(
@@ -4496,91 +4751,85 @@ const WysiwygNav = ({
                 onClick: () => onActionClick("Underline", editorRef),
                 label: "Underline",
                 name: "Underline",
-                icon: /* @__PURE__ */ jsx(Underline, {})
+                children: /* @__PURE__ */ jsx(Underline, {})
               }
             )
           ] }),
-          /* @__PURE__ */ jsx(
-            MoreButton,
-            {
-              ref: buttonMoreRef,
-              onClick: handleTogglePopover,
-              label: "More",
-              icon: /* @__PURE__ */ jsx(More, {})
-            }
-          ),
-          visiblePopover && /* @__PURE__ */ jsx(Popover, { onDismiss: handleTogglePopover, centered: true, source: buttonMoreRef, spacing: 4, children: /* @__PURE__ */ jsxs(Flex, { children: [
-            /* @__PURE__ */ jsxs(IconButtonGroupMargin, { children: [
-              /* @__PURE__ */ jsx(
-                CustomIconButton,
-                {
-                  onClick: () => onActionClick("Strikethrough", editorRef, handleTogglePopover),
-                  label: "Strikethrough",
-                  name: "Strikethrough",
-                  icon: /* @__PURE__ */ jsx(StrikeThrough, {})
-                }
-              ),
-              /* @__PURE__ */ jsx(
-                CustomIconButton,
-                {
-                  onClick: () => onActionClick("BulletList", editorRef, handleTogglePopover),
-                  label: "BulletList",
-                  name: "BulletList",
-                  icon: /* @__PURE__ */ jsx(BulletList, {})
-                }
-              ),
-              /* @__PURE__ */ jsx(
-                CustomIconButton,
-                {
-                  onClick: () => onActionClick("NumberList", editorRef, handleTogglePopover),
-                  label: "NumberList",
-                  name: "NumberList",
-                  icon: /* @__PURE__ */ jsx(NumberList, {})
-                }
-              )
-            ] }),
-            /* @__PURE__ */ jsxs(IconButtonGroup, { children: [
-              /* @__PURE__ */ jsx(
-                CustomIconButton,
-                {
-                  onClick: () => onActionClick("Code", editorRef, handleTogglePopover),
-                  label: "Code",
-                  name: "Code",
-                  icon: /* @__PURE__ */ jsx(Code, {})
-                }
-              ),
-              /* @__PURE__ */ jsx(
-                CustomIconButton,
-                {
-                  onClick: () => {
-                    handleTogglePopover();
-                    onToggleMediaLib();
-                  },
-                  label: "Image",
-                  name: "Image",
-                  icon: /* @__PURE__ */ jsx(Image$1, {})
-                }
-              ),
-              /* @__PURE__ */ jsx(
-                CustomLinkIconButton,
-                {
-                  onClick: () => onActionClick("Link", editorRef, handleTogglePopover),
-                  label: "Link",
-                  name: "Link",
-                  icon: /* @__PURE__ */ jsx(Link$1, {})
-                }
-              ),
-              /* @__PURE__ */ jsx(
-                CustomIconButton,
-                {
-                  onClick: () => onActionClick("Quote", editorRef, handleTogglePopover),
-                  label: "Quote",
-                  name: "Quote",
-                  icon: /* @__PURE__ */ jsx(Quotes, {})
-                }
-              )
-            ] })
-          ] }) })
+          /* @__PURE__ */ jsxs(Popover.Root, { children: [
+            /* @__PURE__ */ jsx(Popover.Trigger, { children: /* @__PURE__ */ jsx(MoreButton, { label: "More", children: /* @__PURE__ */ jsx(More, {}) }) }),
+            /* @__PURE__ */ jsx(Popover.Content, { sideOffset: 12, children: /* @__PURE__ */ jsxs(Flex, { padding: 2, children: [
+              /* @__PURE__ */ jsxs(IconButtonGroupMargin, { children: [
+                /* @__PURE__ */ jsx(
+                  CustomIconButton,
+                  {
+                    onClick: () => onActionClick("Strikethrough", editorRef, handleTogglePopover),
+                    label: "Strikethrough",
+                    name: "Strikethrough",
+                    children: /* @__PURE__ */ jsx(StrikeThrough, {})
+                  }
+                ),
+                /* @__PURE__ */ jsx(
+                  CustomIconButton,
+                  {
+                    onClick: () => onActionClick("BulletList", editorRef, handleTogglePopover),
+                    label: "BulletList",
+                    name: "BulletList",
+                    children: /* @__PURE__ */ jsx(BulletList, {})
+                  }
+                ),
+                /* @__PURE__ */ jsx(
+                  CustomIconButton,
+                  {
+                    onClick: () => onActionClick("NumberList", editorRef, handleTogglePopover),
+                    label: "NumberList",
+                    name: "NumberList",
+                    children: /* @__PURE__ */ jsx(NumberList, {})
+                  }
+                )
+              ] }),
+              /* @__PURE__ */ jsxs(IconButtonGroup, { children: [
+                /* @__PURE__ */ jsx(
+                  CustomIconButton,
+                  {
+                    onClick: () => onActionClick("Code", editorRef, handleTogglePopover),
+                    label: "Code",
+                    name: "Code",
+                    children: /* @__PURE__ */ jsx(Code, {})
+                  }
+                ),
+                /* @__PURE__ */ jsx(
+                  CustomIconButton,
+                  {
+                    onClick: () => {
+                      handleTogglePopover();
+                      onToggleMediaLib();
+                    },
+                    label: "Image",
+                    name: "Image",
+                    children: /* @__PURE__ */ jsx(Image$1, {})
+                  }
+                ),
+                /* @__PURE__ */ jsx(
+                  CustomLinkIconButton,
+                  {
+                    onClick: () => onActionClick("Link", editorRef, handleTogglePopover),
+                    label: "Link",
+                    name: "Link",
+                    children: /* @__PURE__ */ jsx(Link$1, {})
+                  }
+                ),
+                /* @__PURE__ */ jsx(
+                  CustomIconButton,
+                  {
+                    onClick: () => onActionClick("Quote", editorRef, handleTogglePopover),
+                    label: "Quote",
+                    name: "Quote",
+                    children: /* @__PURE__ */ jsx(Quotes, {})
+                  }
+                )
+              ] })
+            ] }) })
+          ] })
         ] }),
         onTogglePreviewMode && /* @__PURE__ */ jsx(Button, { onClick: onTogglePreviewMode, variant: "tertiary", children: formatMessage({
           id: "components.Wysiwyg.ToggleMode.preview-mode",
@@ -4590,19 +4839,6 @@ const WysiwygNav = ({
     }
   );
 };
-const StyledFlex = styled(Flex)`
-  /* Hide the label, every input needs a label. */
-  label {
-    border: 0;
-    clip: rect(0 0 0 0);
-    height: 1px;
-    margin: -1px;
-    overflow: hidden;
-    padding: 0;
-    position: absolute;
-    width: 1px;
-  }
-`;
 const Wysiwyg = React.forwardRef(
   ({ hint, disabled, label, name: name2, placeholder, required, labelAction }, forwardedRef) => {
     const field = useField(name2);
@@ -4667,9 +4903,9 @@ const Wysiwyg = React.forwardRef(
       insertFile(editorRef, formattedFiles);
       setMediaLibVisible(false);
     };
-    return /* @__PURE__ */ jsxs(Field, { name: name2, hint, error: field.error, required, children: [
+    return /* @__PURE__ */ jsxs(Field.Root, { name: name2, hint, error: field.error, required, children: [
       /* @__PURE__ */ jsxs(Flex, { direction: "column", alignItems: "stretch", gap: 1, children: [
-        /* @__PURE__ */ jsx(FieldLabel, { action: labelAction, children: label }),
+        /* @__PURE__ */ jsx(Field.Label, { action: labelAction, children: label }),
         /* @__PURE__ */ jsxs(
           EditorLayout,
           {
@@ -4710,14 +4946,15 @@ const Wysiwyg = React.forwardRef(
             ]
           }
         ),
-        /* @__PURE__ */ jsx(FieldHint, {}),
-        /* @__PURE__ */ jsx(FieldError, {})
+        /* @__PURE__ */ jsx(Field.Hint, {}),
+        /* @__PURE__ */ jsx(Field.Error, {})
       ] }),
       mediaLibVisible && // @ts-expect-error – TODO: fix this way of injecting because it's not really typeable without a registry.
       /* @__PURE__ */ jsx(MediaLibraryDialog, { onClose: handleToggleMediaLib, onSelectAssets: handleSelectAssets })
     ] });
   }
 );
+const MemoizedWysiwyg = React.memo(Wysiwyg);
 const InputRenderer = ({ visible, hint: providedHint, ...props }) => {
   const { id } = useDoc();
   const isFormDisabled = useForm("InputRenderer", (state) => state.disabled);
@@ -4767,10 +5004,10 @@ const InputRenderer = ({ visible, hint: providedHint, ...props }) => {
   }
   switch (props.type) {
     case "blocks":
-      return /* @__PURE__ */ jsx(BlocksInput, { ...props, hint, type: props.type, disabled: fieldIsDisabled });
+      return /* @__PURE__ */ jsx(MemoizedBlocksInput, { ...props, hint, type: props.type, disabled: fieldIsDisabled });
     case "component":
       return /* @__PURE__ */ jsx(
-        ComponentInput,
+        MemoizedComponentInput,
         {
           ...props,
           hint,
@@ -4782,11 +5019,11 @@ const InputRenderer = ({ visible, hint: providedHint, ...props }) => {
     case "dynamiczone":
       return /* @__PURE__ */ jsx(DynamicZone, { ...props, hint, disabled: fieldIsDisabled });
     case "relation":
-      return /* @__PURE__ */ jsx(RelationsField, { ...props, hint, disabled: fieldIsDisabled });
+      return /* @__PURE__ */ jsx(MemoizedRelationsField, { ...props, hint, disabled: fieldIsDisabled });
     case "richtext":
-      return /* @__PURE__ */ jsx(Wysiwyg, { ...props, hint, type: props.type, disabled: fieldIsDisabled });
+      return /* @__PURE__ */ jsx(MemoizedWysiwyg, { ...props, hint, type: props.type, disabled: fieldIsDisabled });
     case "uid":
-      return /* @__PURE__ */ jsx(UIDInput, { ...props, hint, type: props.type, disabled: fieldIsDisabled });
+      return /* @__PURE__ */ jsx(MemoizedUIDInput, { ...props, hint, type: props.type, disabled: fieldIsDisabled });
     case "enumeration":
       return /* @__PURE__ */ jsx(
         InputRenderer$1,
@@ -4818,7 +5055,9 @@ const useFieldHint = (hint = void 0, attribute) => {
   if (!maximum && !minimum) {
     return hint;
   }
-  const units = !["biginteger", "integer", "number"].includes(attribute.type) ? formatMessage(
+  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}}"
@@ -4858,6 +5097,7 @@ const getMinMax = (attribute) => {
     return { maximum: void 0, minimum: void 0 };
   }
 };
+const MemoizedInputRenderer = memo(InputRenderer);
 const DynamicComponent = ({
   componentUid,
   disabled,
@@ -4871,7 +5111,6 @@ const DynamicComponent = ({
   dynamicComponentsByCategory = {},
   onAddComponent
 }) => {
-  const [isOpen, setIsOpen] = React.useState(true);
   const { formatMessage } = useIntl();
   const formValues = useForm("DynamicComponent", (state) => state.values);
   const {
@@ -4880,7 +5119,7 @@ const DynamicComponent = ({
   const title = React.useMemo(() => {
     const { mainField } = components[componentUid]?.settings ?? { mainField: "id" };
     const mainFieldValue = getIn(formValues, `${name2}.${index}.${mainField}`);
-    const displayedValue = mainField === "id" ? "" : String(mainFieldValue).trim();
+    const displayedValue = mainField === "id" || !mainFieldValue ? "" : String(mainFieldValue).trim();
     const mainValue = displayedValue.length > 0 ? `- ${displayedValue}` : displayedValue;
     return mainValue;
   }, [componentUid, components, formValues, name2, index]);
@@ -4891,9 +5130,6 @@ const DynamicComponent = ({
     ) ?? { icon: null, displayName: null };
     return { icon: icon2, displayName: displayName2 };
   }, [componentUid, dynamicComponentsByCategory]);
-  const handleToggle = () => {
-    setIsOpen((s) => !s);
-  };
   const [{ handlerId, isDragging, handleKeyDown }, boxRef, dropRef, dragRef, dragPreviewRef] = useDragAndDrop(!disabled, {
     type: `${ItemTypes.DYNAMIC_ZONE}_${name2}`,
     index,
@@ -4911,11 +5147,11 @@ const DynamicComponent = ({
     dragPreviewRef(getEmptyImage(), { captureDraggingState: false });
   }, [dragPreviewRef, index]);
   const composedBoxRefs = useComposedRefs(boxRef, dropRef);
-  const accordionActions = disabled ? null : /* @__PURE__ */ jsxs(ActionsFlex, { gap: 0, children: [
+  const accordionActions = disabled ? null : /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsx(
-      IconButtonCustom,
+      IconButton,
       {
-        borderWidth: 0,
+        variant: "ghost",
         label: formatMessage(
           {
             id: getTranslation("components.DynamicZone.delete-label"),
@@ -4930,10 +5166,7 @@ const DynamicComponent = ({
     /* @__PURE__ */ jsx(
       IconButton,
       {
-        forwardedAs: "div",
-        role: "button",
-        borderWidth: 0,
-        tabIndex: 0,
+        variant: "ghost",
         onClick: (e) => e.stopPropagation(),
         "data-handler-id": handlerId,
         ref: dragRef,
@@ -4948,7 +5181,7 @@ const DynamicComponent = ({
     /* @__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, { as: "span", children: formatMessage({
+        /* @__PURE__ */ jsx(VisuallyHidden, { tag: "span", children: formatMessage({
           id: getTranslation("components.DynamicZone.more-actions"),
           defaultMessage: "More actions"
         }) })
@@ -4977,42 +5210,39 @@ const DynamicComponent = ({
       ] })
     ] })
   ] });
-  return /* @__PURE__ */ jsxs(ComponentContainer, { as: "li", width: "100%", children: [
+  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__ */ jsxs(Accordion, { expanded: isOpen, onToggle: handleToggle, size: "S", children: [
-      /* @__PURE__ */ jsx(
-        AccordionToggle,
-        {
-          startIcon: /* @__PURE__ */ jsx(ComponentIcon, { icon, showBackground: false, size: "S" }),
-          action: accordionActions,
-          title: `${displayName} ${title}`,
-          togglePosition: "left"
-        }
-      ),
-      /* @__PURE__ */ jsx(AccordionContent$1, { 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, { gap: 4, children: row.map(({ size, ...field }) => {
+    /* @__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: [
+        /* @__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: 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(GridItem, { col: size, s: 12, xs: 12, children: /* @__PURE__ */ jsx(InputRenderer, { ...field, name: fieldName }) }, fieldName);
+        return /* @__PURE__ */ jsx(
+          Grid$1.Item,
+          {
+            col: size,
+            s: 12,
+            xs: 12,
+            direction: "column",
+            alignItems: "stretch",
+            children: /* @__PURE__ */ jsx(MemoizedInputRenderer, { ...field, name: fieldName })
+          },
+          fieldName
+        );
       }) }, rowInd)) }) }) })
-    ] }) })
+    ] }) }) })
   ] });
 };
-const ActionsFlex = styled(Flex)`
-  /* 
-    we need to remove the background from the button but we can't 
-    wrap the element in styled because it breaks the forwardedAs which
-    we need for drag handler to work on firefox
-  */
-  div[role='button'] {
-    background: transparent;
-  }
-`;
-const IconButtonCustom = styled(IconButton)`
-  background-color: transparent;
-
-  svg path {
-    fill: ${({ theme, expanded }) => expanded ? theme.colors.primary600 : theme.colors.neutral600};
-  }
-`;
 const StyledBox = styled(Box)`
   > div:first-child {
     box-shadow: ${({ theme }) => theme.shadows.tableShadow};
@@ -5083,7 +5313,7 @@ const [DynamicZoneProvider, useDynamicZone] = createContext(
 );
 const DynamicZone = ({
   attribute,
-  disabled,
+  disabled: disabledProp,
   hint,
   label,
   labelAction,
@@ -5093,7 +5323,8 @@ const DynamicZone = ({
   const { max = Infinity, min = -Infinity } = attribute ?? {};
   const [addComponentIsOpen, setAddComponentIsOpen] = React.useState(false);
   const [liveText, setLiveText] = React.useState("");
-  const { components } = useDoc();
+  const { components, isLoading } = useDoc();
+  const disabled = disabledProp || isLoading;
   const { addFieldRow, removeFieldRow, moveFieldRow } = useForm(
     "DynamicZone",
     ({ addFieldRow: addFieldRow2, removeFieldRow: removeFieldRow2, moveFieldRow: moveFieldRow2 }) => ({
@@ -5200,7 +5431,7 @@ const DynamicZone = ({
   const handleRemoveComponent = (name22, currentIndex) => () => {
     removeFieldRow(name22, currentIndex);
   };
-  const hasError = error !== void 0 || dynamicDisplayedComponentsLength < min || dynamicDisplayedComponentsLength > max;
+  const hasError = error !== void 0;
   const renderButtonLabel = () => {
     if (addComponentIsOpen) {
       return formatMessage({ id: "app.utils.close-label", defaultMessage: "Close" });
@@ -5301,19 +5532,19 @@ const DynamicZone = ({
   ] }) });
 };
 export {
-  BlocksInput as B,
-  ComponentInput as C,
   DynamicZone as D,
-  InputRenderer as I,
+  MemoizedInputRenderer as M,
   NotAllowedInput as N,
-  UIDInput as U,
-  Wysiwyg as W,
   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,
   useLazyComponents as u
 };
-//# sourceMappingURL=Field-Dlh0uGnL.mjs.map
+//# sourceMappingURL=Field-tHCw4lGA.mjs.map