@marigold/components 6.11.0 → 7.1.0

package/dist/index.js

@@ -35,50 +35,48 @@ __export(src_exports, {
   ActionMenu: () => ActionMenu,
   Aside: () => Aside,
   Aspect: () => Aspect,
-  Autocomplete: () => Autocomplete,
+  Autocomplete: () => _Autocomplete,
   Badge: () => Badge,
   Body: () => Body,
   Breakout: () => Breakout,
   Button: () => _Button,
-  Calendar: () => Calendar,
-  CalendarCell: () => CalendarCell,
-  CalendarGrid: () => CalendarGrid,
+  Calendar: () => _Calendar,
   Card: () => Card,
   Center: () => Center,
   Checkbox: () => _Checkbox,
   CheckboxGroup: () => _CheckboxGroup,
   CloseButton: () => CloseButton2,
   Columns: () => Columns,
-  ComboBox: () => ComboBox,
+  ComboBox: () => _ComboBox,
   Container: () => Container,
-  DateField: () => DateField,
-  DatePicker: () => DatePicker,
+  DateField: () => _DateField,
+  DatePicker: () => _DatePicker,
   Dialog: () => _Dialog,
   Divider: () => _Divider,
   FieldBase: () => FieldBase,
   FieldGroup: () => FieldGroup,
   FieldGroupContext: () => FieldGroupContext,
   Footer: () => Footer,
+  Form: () => import_react_aria_components20.Form,
   Header: () => _Header,
   Headline: () => _Headline,
   Image: () => Image,
   Inline: () => Inline,
-  Input: () => Input,
+  Input: () => _Input,
   Inset: () => Inset,
   Label: () => _Label,
   Link: () => _Link,
   List: () => List,
   MarigoldProvider: () => MarigoldProvider,
-  Menu: () => Menu,
+  Menu: () => _Menu,
   Message: () => Message,
   Modal: () => _Modal,
   NumberField: () => _NumberField,
-  Overlay: () => Overlay,
-  Popover: () => Popover,
+  Popover: () => _Popover,
   Radio: () => _Radio,
   RadioGroup: () => _RadioGroup,
   SearchField: () => _SearchField,
-  Select: () => Select,
+  Select: () => _Select,
   Slider: () => _Slider,
   Split: () => Split,
   Stack: () => Stack,
@@ -89,18 +87,17 @@ __export(src_exports, {
   Text: () => Text2,
   TextArea: () => _TextArea,
   TextField: () => _TextField,
-  ThemeProvider: () => import_system55.ThemeProvider,
+  ThemeProvider: () => import_system52.ThemeProvider,
   Tiles: () => Tiles,
   Tooltip: () => _Tooltip,
-  Tray: () => Tray,
-  TrayWrapper: () => TrayWrapper,
   Underlay: () => Underlay,
   VisuallyHidden: () => import_visually_hidden.VisuallyHidden,
   XLoader: () => XLoader,
+  _Calendar: () => _Calendar,
   useAsyncList: () => import_data.useAsyncList,
   useFieldGroupContext: () => useFieldGroupContext,
   useListData: () => import_data.useListData,
-  useTheme: () => import_system55.useTheme
+  useTheme: () => import_system52.useTheme
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -116,7 +113,7 @@ var import_tree = require("@react-stately/tree");
 // src/Accordion/AccordionItem.tsx
 var import_react3 = require("react");
 var import_focus = require("@react-aria/focus");
-var import_utils4 = require("@react-aria/utils");
+var import_utils2 = require("@react-aria/utils");
 var import_system3 = require("@marigold/system");
 
 // src/Chevron/ChevronUp.tsx
@@ -139,13 +136,11 @@ var ChevronDown = (0, import_react2.forwardRef)(
 var import_button = require("@react-aria/button");
 var import_selection = require("@react-aria/selection");
 var import_utils = require("@react-aria/utils");
-var import_utils2 = require("@react-aria/utils");
-var import_utils3 = require("@react-aria/utils");
 function isNonContiguousSelectionModifier(e) {
-  return (0, import_utils2.isAppleDevice)() ? e.altKey : e.ctrlKey;
+  return (0, import_utils.isAppleDevice)() ? e.altKey : e.ctrlKey;
 }
 function isCtrlKeyPressed(e) {
-  if ((0, import_utils3.isMac)()) {
+  if ((0, import_utils.isMac)()) {
     return e.metaKey;
   }
   return e.ctrlKey;
@@ -162,9 +157,7 @@ function useAccordionItem(props, state, ref) {
     key,
     ref
   });
-  const isDefaultExpanded = state.expandedKeys.has(
-    item.key.toString().replace(".$", "")
-  );
+  const isDefaultExpanded = state.expandedKeys.has(item.key);
   let onSelect = (e) => {
     if (e.pointerType === "keyboard" && isNonContiguousSelectionModifier(e)) {
       if (isDefaultExpanded) {
@@ -242,16 +235,17 @@ var AccordionItem = ({
   ...props
 }) => {
   const ref = (0, import_react3.useRef)(null);
-  const defaultExpanded = state.expandedKeys.has(
-    item.key.toString().replace(".$", "")
-  );
+  const defaultExpanded = Array.from(state.expandedKeys).some((key) => {
+    return key.toString() === item.key.toString().replace(".$", "");
+  });
   const expanded = state.selectionManager.isSelected(item.key);
   (0, import_react3.useEffect)(() => {
     if (defaultExpanded) {
       if (state.selectionManager.selectionMode === "multiple") {
-        state.expandedKeys.forEach((key) => {
-          state.selectionManager.select(key);
-        });
+        state.selectionManager.setSelectedKeys([
+          ...state.selectionManager.selectedKeys,
+          item.key
+        ]);
       } else {
         state.expandedKeys.clear();
         state.selectionManager.toggleSelection(item.key);
@@ -279,7 +273,7 @@ var AccordionItem = ({
           "inline-flex items-center justify-center gap-[0.5ch]",
           classNames2.button
         ),
-        ...(0, import_utils4.mergeProps)(buttonProps, stateProps, props),
+        ...(0, import_utils2.mergeProps)(buttonProps, stateProps, props),
         ref,
         "aria-label": item.textValue,
         children: [
@@ -288,14 +282,14 @@ var AccordionItem = ({
         ]
       }
     ) }),
-    expanded || defaultExpanded ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
       "div",
       {
-        ...(0, import_utils4.mergeProps)(regionProps, focusProps, stateProps),
-        className: classNames2.item,
+        ...(0, import_utils2.mergeProps)(regionProps, focusProps, stateProps),
+        className: expanded || defaultExpanded ? classNames2.item : (0, import_system3.cn)(classNames2.item, "hidden"),
         children: item.props.children
       }
-    ) : null
+    )
   ] });
 };
 
@@ -305,26 +299,25 @@ var Accordion = ({ children, ...props }) => {
   const ownProps = {
     ...props,
     // we have to do this because JSX childs are not supported
-    children: import_react4.Children.toArray(children).map((child) => {
-      if (!(0, import_react4.isValidElement)(child)) {
-        return child;
-      }
-      return (0, import_react4.cloneElement)(child, {
-        hasChildItems: false,
-        ...child.props
-      });
-    })
+    children: []
   };
+  import_react4.Children.forEach(children, (child) => {
+    var _a;
+    if ((0, import_react4.isValidElement)(child) && typeof ((_a = child.props) == null ? void 0 : _a.children) !== "string") {
+      const clone = (0, import_react4.cloneElement)(child, {
+        hasChildItems: false
+      });
+      ownProps.children.push(clone);
+      return;
+    }
+    ownProps.children.push(child);
+  });
   const ref = (0, import_react4.useRef)(null);
   const state = (0, import_tree.useTreeState)({
     selectionMode: "single",
     ...ownProps
   });
-  const { accordionProps } = (0, import_accordion.useAccordion)(
-    { ...ownProps, children },
-    state,
-    ref
-  );
+  const { accordionProps } = (0, import_accordion.useAccordion)({ ...ownProps }, state, ref);
   delete accordionProps.onKeyDownCapture;
   return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { ...accordionProps, ref, children: [...state.collection].map((item) => /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
     AccordionItem,
@@ -403,27 +396,24 @@ var Aspect = ({
 };
 
 // src/Autocomplete/Autocomplete.tsx
-var import_react16 = require("react");
-var import_autocomplete = require("@react-aria/autocomplete");
-var import_i18n = require("@react-aria/i18n");
-var import_collections2 = require("@react-stately/collections");
-var import_combobox = require("@react-stately/combobox");
+var import_react14 = require("react");
+var import_react15 = __toESM(require("react"));
+var import_react_aria_components11 = require("react-aria-components");
 
 // src/FieldBase/FieldBase.tsx
+var import_react7 = require("react");
 var import_system8 = require("@marigold/system");
 
 // src/HelpText/HelpText.tsx
+var import_react_aria_components = require("react-aria-components");
 var import_system6 = require("@marigold/system");
 var import_jsx_runtime7 = require("react/jsx-runtime");
 var HelpText = ({
   variant,
   size,
-  disabled,
   description,
-  descriptionProps,
   error,
   errorMessage,
-  errorMessageProps,
   ...props
 }) => {
   const hasErrorMessage = errorMessage && error;
@@ -432,30 +422,36 @@ var HelpText = ({
     variant,
     size
   });
-  return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
-    "div",
-    {
-      ...props,
-      ...hasErrorMessage ? errorMessageProps : descriptionProps,
-      className: (0, import_system6.cn)("flex items-center gap-1", classNames2.container),
-      children: hasErrorMessage ? /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(import_jsx_runtime7.Fragment, { children: [
-        /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
-          import_system6.SVG,
-          {
-            className: (0, import_system6.cn)("h-4 w-4", classNames2.icon),
-            viewBox: "0 0 24 24",
-            role: "presentation",
-            children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("path", { d: "M2.25 20.3097H21.75L12 3.46875L2.25 20.3097ZM12.8864 17.2606H11.1136V15.4879H12.8864V17.2606ZM12.8864 13.7151H11.1136V10.1697H12.8864V13.7151Z" })
-          }
-        ),
-        errorMessage
-      ] }) : /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_jsx_runtime7.Fragment, { children: description })
-    }
-  );
+  if (!description && !errorMessage) {
+    return null;
+  }
+  return /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)("div", { className: (0, import_system6.cn)(classNames2.container), children: [
+    /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(
+      import_react_aria_components.FieldError,
+      {
+        ...props,
+        className: "grid grid-flow-col items-center justify-start gap-1",
+        children: [
+          /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
+            "svg",
+            {
+              className: (0, import_system6.cn)("h-4 w-4", classNames2.icon),
+              viewBox: "0 0 24 24",
+              role: "presentation",
+              fill: "currentColor",
+              children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("path", { d: "M2.25 20.3097H21.75L12 3.46875L2.25 20.3097ZM12.8864 17.2606H11.1136V15.4879H12.8864V17.2606ZM12.8864 13.7151H11.1136V10.1697H12.8864V13.7151Z" })
+            }
+          ),
+          errorMessage
+        ]
+      }
+    ),
+    !hasErrorMessage && /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_react_aria_components.Text, { slot: "description", children: description })
+  ] });
 };
 
 // src/Label/Label.tsx
-var import_react_aria_components = require("react-aria-components");
+var import_react_aria_components2 = require("react-aria-components");
 var import_system7 = require("@marigold/system");
 
 // src/FieldBase/FieldGroup.tsx
@@ -473,7 +469,7 @@ var _Label = ({ size, variant, children, ...props }) => {
   const classNames2 = (0, import_system7.useClassNames)({ component: "Label", size, variant });
   const { labelWidth } = useFieldGroupContext();
   return /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(
-    import_react_aria_components.Label,
+    import_react_aria_components2.Label,
     {
       ...props,
       className: (0, import_system7.cn)(classNames2.container, "flex w-[var(--labelWidth)]"),
@@ -497,67 +493,66 @@ var _Label = ({ size, variant, children, ...props }) => {
 
 // src/FieldBase/FieldBase.tsx
 var import_jsx_runtime10 = require("react/jsx-runtime");
-var FieldBase = ({
-  children,
-  variant,
-  size,
-  width = "full",
-  disabled,
-  label,
-  labelProps,
-  description,
-  descriptionProps,
-  error,
-  errorMessage,
-  errorMessageProps,
-  stateProps,
-  ...props
-}) => {
-  const hasHelpText = !!description || errorMessage && error;
+var fixedForwardRef = import_react7.forwardRef;
+var _FieldBase = (props, ref) => {
+  const {
+    as: Component = "div",
+    children,
+    label,
+    size,
+    variant,
+    width = "full",
+    description,
+    errorMessage,
+    className,
+    stateProps,
+    ...rest
+  } = props;
   const classNames2 = (0, import_system8.useClassNames)({
     component: "Field",
     variant,
     size
   });
   return /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)(
-    "div",
+    Component,
     {
-      ...props,
-      ...stateProps,
-      className: (0, import_system8.cn)("group/field", import_system8.width[width], classNames2),
+      ref,
+      className: (0, import_system8.cn)("group/field", import_system8.width[width], classNames2, className),
+      "data-required": props.isRequired ? true : void 0,
+      "data-error": props.isInvalid ? true : void 0,
+      ...rest,
       children: [
-        label ? /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(_Label, { variant, size, ...labelProps, children: label }) : /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("span", { "aria-hidden": "true" }),
+        label ? /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(_Label, { variant, size, children: label }) : /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("span", { "aria-hidden": "true" }),
         children,
-        hasHelpText && /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
           HelpText,
           {
             variant,
             size,
-            disabled,
             description,
-            descriptionProps,
-            error,
             errorMessage,
-            errorMessageProps
+            error: props.isInvalid
           }
         )
       ]
     }
   );
 };
+var FieldBase = fixedForwardRef(_FieldBase);
 
 // src/Input/Input.tsx
-var import_react7 = require("react");
+var import_react8 = require("react");
+var import_react_aria_components3 = require("react-aria-components");
 var import_system9 = require("@marigold/system");
 var import_jsx_runtime11 = require("react/jsx-runtime");
-var Input = (0, import_react7.forwardRef)(
-  ({ type = "text", icon, action, variant, size, ...props }, ref) => {
+var _Input = (0, import_react8.forwardRef)(
+  ({ type, icon, action, variant, size, className, ...props }, ref) => {
     const classNames2 = (0, import_system9.useClassNames)({
       component: "Input",
       variant,
       size
     });
-    const inputIcon = icon ? (0, import_react7.cloneElement)(icon, {
+    const inputIcon = icon ? (0, import_react8.cloneElement)(icon, {
       className: (0, import_system9.cn)(
         "pointer-events-none absolute",
         classNames2.icon,
@@ -565,7 +560,7 @@ var Input = (0, import_react7.forwardRef)(
       ),
       ...icon.props
     }) : null;
-    const inputAction = action && !props.readOnly ? (0, import_react7.cloneElement)(action, {
+    const inputAction = action && !props.readOnly ? (0, import_react8.cloneElement)(action, {
       className: (0, import_system9.cn)(
         "absolute",
         classNames2.action,
@@ -582,7 +577,7 @@ var Input = (0, import_react7.forwardRef)(
         children: [
           inputIcon,
           /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
-            "input",
+            import_react_aria_components3.Input,
             {
               ...props,
               className: (0, import_system9.cn)(
@@ -590,7 +585,8 @@ var Input = (0, import_react7.forwardRef)(
                 "disabled:cursor-not-allowed",
                 "[&[type=file]]:border-none [&[type=file]]:p-0",
                 "[&[type=color]]:ml-0 [&[type=color]]:border-none [&[type=color]]:bg-transparent [&[type=color]]:p-0",
-                classNames2.input
+                classNames2.input,
+                className
               ),
               ref,
               type
@@ -603,96 +599,68 @@ var Input = (0, import_react7.forwardRef)(
   }
 );
 
-// src/ListBox/_ListBox.tsx
+// src/ListBox/ListBox.tsx
 var import_react10 = require("react");
-var import_listbox3 = require("@react-aria/listbox");
-var import_utils6 = require("@react-aria/utils");
+var import_react_aria_components6 = require("react-aria-components");
 var import_system11 = require("@marigold/system");
 
 // src/ListBox/Context.ts
-var import_react8 = require("react");
-var ListBoxContext = (0, import_react8.createContext)({});
-var useListBoxContext = () => (0, import_react8.useContext)(ListBoxContext);
-
-// src/ListBox/_ListBoxOption.tsx
 var import_react9 = require("react");
-var import_listbox = require("@react-aria/listbox");
-var import_utils5 = require("@react-aria/utils");
-var import_system10 = require("@marigold/system");
+var ListBoxContext = (0, import_react9.createContext)({});
+var useListBoxContext = () => (0, import_react9.useContext)(ListBoxContext);
+
+// src/ListBox/ListBoxOption.tsx
+var import_react_aria_components4 = require("react-aria-components");
 var import_jsx_runtime12 = require("react/jsx-runtime");
-var ListBoxOption = ({ item, state }) => {
-  const ref = (0, import_react9.useRef)(null);
-  const { optionProps, isSelected, isDisabled, isFocused } = (0, import_listbox.useOption)(
-    {
-      key: item.key
-    },
-    state,
-    ref
-  );
-  const { onPointerUp, ...props } = optionProps;
+var _ListBoxItem = (props) => {
   const { classNames: classNames2 } = useListBoxContext();
-  const stateProps = (0, import_system10.useStateProps)({
-    selected: isSelected,
-    disabled: isDisabled,
-    focusVisible: isFocused
-  });
-  return /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
-    "li",
-    {
-      ref,
-      className: classNames2.option,
-      ...(0, import_utils5.mergeProps)(props, { onPointerDown: onPointerUp }, { ...stateProps }),
-      children: item.props.children
-    }
-  );
+  return /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(import_react_aria_components4.ListBoxItem, { ...props, className: classNames2.option });
 };
 
-// src/ListBox/_ListBoxSection.tsx
-var import_listbox2 = require("@react-aria/listbox");
+// src/ListBox/ListBoxSection.tsx
+var import_react_aria_components5 = require("react-aria-components");
+var import_system10 = require("@marigold/system");
 var import_jsx_runtime13 = require("react/jsx-runtime");
-var ListBoxSection = ({ section, state }) => {
+var _Section = (props) => {
   const { classNames: classNames2 } = useListBoxContext();
-  const { itemProps, headingProps, groupProps } = (0, import_listbox2.useListBoxSection)({
-    heading: section.rendered,
-    "aria-label": section["aria-label"]
-  });
-  return /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)("li", { className: classNames2.section, ...itemProps, children: [
-    section.rendered && /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("div", { className: classNames2.sectionTitle, ...headingProps, children: section.rendered }),
-    /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("ul", { className: classNames2.list, ...groupProps, children: [...section.props.children].map((node) => /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(ListBoxOption, { item: node, state }, node.key)) })
-  ] });
+  return /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
+    import_react_aria_components5.Section,
+    {
+      ...props,
+      className: (0, import_system10.cn)(classNames2.section, classNames2.sectionTitle)
+    }
+  );
 };
 
-// src/ListBox/_ListBox.tsx
+// src/ListBox/ListBox.tsx
 var import_jsx_runtime14 = require("react/jsx-runtime");
-var ListBox = (0, import_react10.forwardRef)(
-  ({ state, variant, size, ...props }, ref) => {
-    const innerRef = (0, import_utils6.useObjectRef)(ref);
-    const { listBoxProps } = (0, import_listbox3.useListBox)(props, state, innerRef);
+var _ListBox = (0, import_react10.forwardRef)(
+  ({ variant, size, ...props }, ref) => {
     const classNames2 = (0, import_system11.useClassNames)({ component: "ListBox", variant, size });
     return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(ListBoxContext.Provider, { value: { classNames: classNames2 }, children: /* @__PURE__ */ (0, import_jsx_runtime14.jsx)("div", { className: classNames2.container, children: /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
-      "ul",
+      import_react_aria_components6.ListBox,
       {
+        ...props,
         className: (0, import_system11.cn)(
           "overflow-y-auto sm:max-h-[75vh] lg:max-h-[45vh]",
           classNames2.list
         ),
-        ref: innerRef,
-        ...listBoxProps,
-        children: [...state.collection].map(
-          (item) => item.type === "section" ? /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(ListBoxSection, { section: item, state }, item.key) : /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(ListBoxOption, { item, state }, item.key)
-        )
+        ref,
+        children: props.children
       }
     ) }) });
   }
 );
+_ListBox.Item = _ListBoxItem;
+_ListBox.Section = _Section;
 
-// src/Overlay/Modal.tsx
+// src/Overlay/Popover.tsx
 var import_react11 = require("react");
-var import_react_aria_components3 = require("react-aria-components");
+var import_react_aria_components8 = require("react-aria-components");
 var import_system13 = require("@marigold/system");
 
 // src/Overlay/Underlay.tsx
-var import_react_aria_components2 = require("react-aria-components");
+var import_react_aria_components7 = require("react-aria-components");
 var import_system12 = require("@marigold/system");
 var import_jsx_runtime15 = require("react/jsx-runtime");
 var Underlay = ({
@@ -711,7 +679,7 @@ var Underlay = ({
     ...rest
   };
   return /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
-    import_react_aria_components2.ModalOverlay,
+    import_react_aria_components7.ModalOverlay,
     {
       className: ({ isEntering, isExiting }) => (0, import_system12.cn)(
         "fixed inset-0 z-10 flex min-h-full items-center justify-center overflow-y-auto backdrop-blur ",
@@ -720,227 +688,108 @@ var Underlay = ({
         classNames2
       ),
       ...props,
+      "data-testid": "underlay-id",
       children: props.children
     }
   );
 };
 
-// src/Overlay/Modal.tsx
+// src/Overlay/Popover.tsx
 var import_jsx_runtime16 = require("react/jsx-runtime");
-var _Modal = (0, import_react11.forwardRef)(({ open, dismissable, keyboardDismissable, ...rest }, ref) => {
-  const theme = (0, import_system13.useTheme)();
-  const props = {
-    isOpen: open,
-    isDismissable: dismissable,
-    isKeyboardDismissDisabled: keyboardDismissable,
-    ...rest
-  };
-  return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
-    Underlay,
-    {
-      dismissable,
-      keyboardDismissable,
-      open,
-      variant: "modal",
-      children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(import_react_aria_components3.Modal, { ref, "data-theme": theme.name, ...props, children: props.children })
-    }
-  );
-});
-
-// src/Overlay/Overlay.tsx
-var import_react12 = require("react");
-var import_overlays = require("@react-aria/overlays");
-var import_system14 = require("@marigold/system");
-var import_jsx_runtime17 = require("react/jsx-runtime");
-var Overlay = ({ children, container, open }) => {
-  const nodeRef = (0, import_react12.useRef)(null);
-  const theme = (0, import_system14.useTheme)();
-  let mountOverlay = open;
-  if (!mountOverlay) {
-    return null;
-  }
-  return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(import_overlays.Overlay, { portalContainer: container, children: /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
-    "div",
-    {
-      ref: nodeRef,
-      "data-testid": "overlay",
-      "data-theme": theme.name,
-      className: "opacity-100",
-      children
-    }
-  ) });
-};
-
-// src/Overlay/_Popover.tsx
-var import_react13 = require("react");
-var import_focus2 = require("@react-aria/focus");
-var import_overlays2 = require("@react-aria/overlays");
-var import_system15 = require("@marigold/system");
-var import_jsx_runtime18 = require("react/jsx-runtime");
-var Popover = (0, import_react13.forwardRef)(
-  (props, ref) => {
-    const fallbackRef = (0, import_react13.useRef)(null);
-    const popoverRef = ref || fallbackRef;
-    let { children, state, ...otherProps } = props;
-    return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(Overlay, { open: state.isOpen, ...otherProps, children: /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(PopoverWrapper, { ref: popoverRef, ...props, children }) });
-  }
-);
-var PopoverWrapper = (0, import_react13.forwardRef)(
-  ({
-    children,
-    isNonModal,
-    state,
-    keyboardDismissDisabled,
-    ...props
-  }, ref) => {
-    const { popoverProps, underlayProps, placement } = (0, import_overlays2.usePopover)(
-      {
-        ...props,
-        isNonModal,
-        isKeyboardDismissDisabled: keyboardDismissDisabled,
-        popoverRef: ref,
-        placement: "bottom left"
-      },
-      state
-    );
-    const classNames2 = (0, import_system15.useClassNames)({
+var _Popover = (0, import_react11.forwardRef)(
+  ({ keyboardDismissDisabled, placement, open, children, ...rest }, ref) => {
+    const props = {
+      isKeyboardDismissDisabled: keyboardDismissDisabled,
+      isOpen: open,
+      placement,
+      ...rest
+    };
+    const classNames2 = (0, import_system13.useClassNames)({
       component: "Popover",
-      variant: placement
+      variant: placement,
+      // Make Popover as wide as trigger element
+      className: "w-[--trigger-width]"
     });
-    return /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)(import_focus2.FocusScope, { restoreFocus: true, children: [
-      !isNonModal && /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(Underlay, { ...underlayProps }),
-      /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)(
-        "div",
+    const isSmallScreen = (0, import_system13.useSmallScreen)();
+    const theme = (0, import_system13.useTheme)();
+    return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(import_jsx_runtime16.Fragment, { children: isSmallScreen ? /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)(import_jsx_runtime16.Fragment, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(Underlay, { open, variant: "modal" }),
+      /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+        import_react_aria_components8.Popover,
         {
-          ...popoverProps,
-          className: classNames2,
-          style: {
-            ...popoverProps.style,
-            minWidth: props.triggerRef.current ? props.triggerRef.current.offsetWidth : void 0
-          },
           ref,
-          role: "presentation",
-          children: [
-            !isNonModal && /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(import_overlays2.DismissButton, { onDismiss: state.close }),
-            children,
-            /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(import_overlays2.DismissButton, { onDismiss: state.close })
-          ]
+          ...props,
+          className: (0, import_system13.cn)(
+            "!left-0 bottom-0 !mt-auto flex !max-h-fit w-full flex-col"
+          ),
+          "data-theme": theme.name,
+          children
         }
       )
-    ] });
+    ] }) : /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+      import_react_aria_components8.Popover,
+      {
+        ref,
+        ...props,
+        className: classNames2,
+        offset: 0,
+        "data-theme": theme.name,
+        children
+      }
+    ) });
   }
 );
 
-// src/Overlay/Tray.tsx
-var import_react14 = require("react");
-var import_focus3 = require("@react-aria/focus");
-var import_overlays3 = require("@react-aria/overlays");
-var import_utils7 = require("@react-aria/utils");
-
-// src/Overlay/_Underlay.tsx
-var import_system16 = require("@marigold/system");
-var import_jsx_runtime19 = require("react/jsx-runtime");
-var Underlay2 = ({ size, variant, ...props }) => {
-  const classNames2 = (0, import_system16.useClassNames)({ component: "Underlay", size, variant });
-  return /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("div", { className: (0, import_system16.cn)("fixed inset-0 z-40", classNames2), ...props });
-};
+// src/Autocomplete/ClearButton.tsx
+var import_react13 = __toESM(require("react"));
+var import_react_aria_components10 = require("react-aria-components");
+var import_system15 = require("@marigold/system");
 
-// src/Overlay/Tray.tsx
-var import_jsx_runtime20 = require("react/jsx-runtime");
-var Tray = (0, import_react14.forwardRef)(
-  ({ state, children, ...props }, ref) => {
-    const trayRef = (0, import_utils7.useObjectRef)(ref);
-    return /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Overlay, { open: state.isOpen, children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(TrayWrapper, { state, ...props, ref: trayRef, children }) });
-  }
-);
-var TrayWrapper = (0, import_react14.forwardRef)(
-  ({ children, state, ...props }, ref) => {
-    let { modalProps, underlayProps } = (0, import_overlays3.useModalOverlay)(
+// src/Button/Button.tsx
+var import_react12 = require("react");
+var import_react_aria_components9 = require("react-aria-components");
+var import_system14 = require("@marigold/system");
+var import_jsx_runtime17 = require("react/jsx-runtime");
+var _Button = (0, import_react12.forwardRef)(
+  ({ children, variant, size, className, disabled, fullWidth, ...props }, ref) => {
+    const classNames2 = (0, import_system14.useClassNames)({
+      component: "Button",
+      variant,
+      size,
+      className
+    });
+    return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
+      import_react_aria_components9.Button,
       {
         ...props,
-        isDismissable: true
-      },
-      state,
-      ref
-    );
-    return /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(import_focus3.FocusScope, { contain: true, restoreFocus: true, autoFocus: true, children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Underlay2, { ...underlayProps, variant: "modal", children: /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(
-      "div",
-      {
-        ...modalProps,
         ref,
-        className: "absolute bottom-0 w-full",
-        "data-testid": "tray",
-        children: [
-          /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(import_overlays3.DismissButton, { onDismiss: state.close }),
-          children,
-          /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(import_overlays3.DismissButton, { onDismiss: state.close })
-        ]
+        className: (0, import_system14.cn)(
+          "inline-flex items-center justify-center gap-[0.5ch]",
+          classNames2,
+          fullWidth ? "w-full" : void 0
+        ),
+        isDisabled: disabled,
+        children
       }
-    ) }) });
+    );
   }
 );
 
 // src/Autocomplete/ClearButton.tsx
-var import_react15 = require("react");
-var import_button2 = require("@react-aria/button");
-var import_focus4 = require("@react-aria/focus");
-var import_interactions = require("@react-aria/interactions");
-var import_utils8 = require("@react-aria/utils");
-var import_system17 = require("@marigold/system");
-var import_jsx_runtime21 = require("react/jsx-runtime");
-var ClearButton = ({
-  preventFocus,
-  disabled,
-  onClick,
-  onPress,
-  onPressStart,
-  onPressEnd,
-  onPressChange,
-  onPressUp,
-  excludeFromTabOrder,
-  preventFocusOnPress,
-  className,
-  ...props
-}) => {
-  const buttonRef = (0, import_react15.useRef)(null);
-  const { hoverProps, isHovered } = (0, import_interactions.useHover)({ isDisabled: disabled });
-  const { isFocusVisible, focusProps } = (0, import_focus4.useFocusRing)({
-    autoFocus: props.autoFocus
-  });
-  const { buttonProps, isPressed } = (0, import_button2.useButton)(
-    {
-      ...props,
-      onClick,
-      onPress,
-      onPressStart,
-      onPressEnd,
-      onPressChange,
-      onPressUp,
-      excludeFromTabOrder,
-      preventFocusOnPress,
-      isDisabled: disabled
-    },
-    buttonRef
-  );
-  if (preventFocus) {
-    delete buttonProps.tabIndex;
-  }
-  const stateProps = (0, import_system17.useStateProps)({
-    active: isPressed,
-    focusVisible: isFocusVisible,
-    hover: isHovered
-  });
-  return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
-    "button",
+var import_jsx_runtime18 = require("react/jsx-runtime");
+var AutocompleteClearButton = ({ className }) => {
+  let state = import_react13.default.useContext(import_react_aria_components10.ComboBoxStateContext);
+  return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
+    _Button,
     {
-      ...(0, import_utils8.mergeProps)(buttonProps, focusProps, hoverProps, props),
-      ...stateProps,
-      ref: buttonRef,
-      className: (0, import_system17.cn)(
+      "aria-label": "Clear",
+      onPress: () => state == null ? void 0 : state.setInputValue(""),
+      variant: "icon",
+      className: (0, import_system15.cn)(
         "cursor-pointer appearance-none border-none p-0 pr-1",
         className
       ),
-      children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
         "svg",
         {
           xmlns: "http://www.w3.org/2000/svg",
@@ -948,7 +797,7 @@ var ClearButton = ({
           fill: "currentColor",
           width: 20,
           height: 20,
-          children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("path", { d: "M6.28 5.22a.75.75 0 00-1.06 1.06L8.94 10l-3.72 3.72a.75.75 0 101.06 1.06L10 11.06l3.72 3.72a.75.75 0 101.06-1.06L11.06 10l3.72-3.72a.75.75 0 00-1.06-1.06L10 8.94 6.28 5.22z" })
+          children: /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("path", { d: "M6.28 5.22a.75.75 0 00-1.06 1.06L8.94 10l-3.72 3.72a.75.75 0 101.06 1.06L10 11.06l3.72 3.72a.75.75 0 101.06-1.06L11.06 10l3.72-3.72a.75.75 0 00-1.06-1.06L10 8.94 6.28 5.22z" })
         }
       )
     }
@@ -956,248 +805,125 @@ var ClearButton = ({
 };
 
 // src/Autocomplete/Autocomplete.tsx
-var import_jsx_runtime22 = require("react/jsx-runtime");
-var SearchIcon = (props) => /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
-  "svg",
-  {
-    xmlns: "http://www.w3.org/2000/svg",
-    viewBox: "0 0 24 24",
-    fill: "currentColor",
-    width: 24,
-    height: 24,
-    ...props,
-    children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("path", { d: "M16.1865 14.5142H15.3057L14.9936 14.2131C16.0862 12.9421 16.744 11.292 16.744 9.497C16.744 5.49443 13.4996 2.25 9.497 2.25C5.49443 2.25 2.25 5.49443 2.25 9.497C2.25 13.4996 5.49443 16.744 9.497 16.744C11.292 16.744 12.9421 16.0862 14.2131 14.9936L14.5142 15.3057V16.1865L20.0888 21.75L21.75 20.0888L16.1865 14.5142ZM9.49701 14.5142C6.72085 14.5142 4.47986 12.2732 4.47986 9.49701C4.47986 6.72085 6.72085 4.47986 9.49701 4.47986C12.2732 4.47986 14.5142 6.72085 14.5142 9.49701C14.5142 12.2732 12.2732 14.5142 9.49701 14.5142Z" })
-  }
-);
-var Autocomplete = ({
-  disabled,
-  required,
-  readOnly,
-  error,
-  onChange,
-  value,
-  defaultValue,
-  variant,
-  size,
-  width,
-  ...rest
-}) => {
-  const { contains } = (0, import_i18n.useFilter)({ sensitivity: "base" });
-  const props = {
-    ...rest,
-    onInputChange: onChange,
-    inputValue: value,
-    defaultInputValue: defaultValue,
-    isDisabled: disabled,
-    isRequired: required,
-    isReadOnly: readOnly,
-    validationState: error ? "invalid" : "valid"
-  };
-  const state = (0, import_combobox.useComboBoxState)({
-    ...props,
-    defaultFilter: contains,
-    allowsCustomValue: true,
-    onSelectionChange: (key) => {
-      var _a;
-      return key !== null && ((_a = props.onSubmit) == null ? void 0 : _a.call(props, key, null));
-    },
-    selectedKey: void 0,
-    defaultSelectedKey: void 0
-  });
-  const inputRef = (0, import_react16.useRef)(null);
-  const listBoxRef = (0, import_react16.useRef)(null);
-  const popoverRef = (0, import_react16.useRef)(null);
-  const { inputProps, listBoxProps, labelProps, clearButtonProps } = (0, import_autocomplete.useSearchAutocomplete)(
+var import_jsx_runtime19 = require("react/jsx-runtime");
+var SearchInput = ({ onSubmit, ref }) => {
+  const state = import_react15.default.useContext(import_react_aria_components11.ComboBoxStateContext);
+  return /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
+    _Input,
     {
-      ...props,
-      onSubmit: (value2, key) => {
-        var _a;
-        return (_a = props.onSubmit) == null ? void 0 : _a.call(props, key, value2);
-      },
-      popoverRef,
-      listBoxRef,
-      inputRef
-    },
-    state
-  );
-  const { isDisabled, ...restClearButtonProps } = clearButtonProps;
-  return /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)(import_jsx_runtime22.Fragment, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
-      FieldBase,
-      {
-        label: props.label,
-        labelProps,
-        description: props.description,
-        error,
-        errorMessage: props.errorMessage,
-        disabled,
-        width,
-        children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
-          Input,
-          {
-            ...inputProps,
-            ref: inputRef,
-            icon: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(SearchIcon, {}),
-            action: state.inputValue !== "" ? /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
-              ClearButton,
-              {
-                preventFocus: true,
-                disabled: isDisabled,
-                ...restClearButtonProps
-              }
-            ) : null
+      ref,
+      icon: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(SearchIcon, {}),
+      action: (state == null ? void 0 : state.inputValue) !== "" ? /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(AutocompleteClearButton, {}) : void 0,
+      onKeyDown: (e) => {
+        if (e.key === "Enter" || e.key === "Escape") {
+          e.preventDefault();
+        }
+        if (e.key === "Enter") {
+          if (state.selectionManager.focusedKey === null) {
+            onSubmit == null ? void 0 : onSubmit(null, state.inputValue);
           }
-        )
-      }
-    ),
-    /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
-      Popover,
-      {
-        state,
-        ref: popoverRef,
-        triggerRef: inputRef,
-        scrollRef: listBoxRef,
-        isNonModal: true,
-        children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(ListBox, { ref: listBoxRef, state, ...listBoxProps })
+        }
       }
-    )
-  ] });
+    }
+  );
 };
-Autocomplete.Item = import_collections2.Item;
-
-// src/ComboBox/ComboBox.tsx
-var import_react18 = __toESM(require("react"));
-var import_combobox2 = require("@react-aria/combobox");
-var import_i18n2 = require("@react-aria/i18n");
-var import_collections3 = require("@react-stately/collections");
-var import_combobox3 = require("@react-stately/combobox");
-
-// src/Button/Button.tsx
-var import_react17 = require("react");
-var import_react_aria_components4 = require("react-aria-components");
-var import_system18 = require("@marigold/system");
-var import_jsx_runtime23 = require("react/jsx-runtime");
-var _Button = (0, import_react17.forwardRef)(
-  ({ children, variant, size, className, disabled, fullWidth, ...props }, ref) => {
-    const classNames2 = (0, import_system18.useClassNames)({
-      component: "Button",
-      variant,
-      size,
-      className
-    });
-    return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
-      import_react_aria_components4.Button,
-      {
-        ...props,
-        ref,
-        className: (0, import_system18.cn)(
-          "inline-flex items-center justify-center gap-[0.5ch]",
-          classNames2,
-          fullWidth ? "w-full" : void 0
-        ),
-        isDisabled: disabled,
-        children
-      }
-    );
+var SearchIcon = (props) => /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
+  "svg",
+  {
+    xmlns: "http://www.w3.org/2000/svg",
+    viewBox: "0 0 24 24",
+    fill: "currentColor",
+    width: 24,
+    height: 24,
+    ...props,
+    children: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("path", { d: "M16.1865 14.5142H15.3057L14.9936 14.2131C16.0862 12.9421 16.744 11.292 16.744 9.497C16.744 5.49443 13.4996 2.25 9.497 2.25C5.49443 2.25 2.25 5.49443 2.25 9.497C2.25 13.4996 5.49443 16.744 9.497 16.744C11.292 16.744 12.9421 16.0862 14.2131 14.9936L14.5142 15.3057V16.1865L20.0888 21.75L21.75 20.0888L16.1865 14.5142ZM9.49701 14.5142C6.72085 14.5142 4.47986 12.2732 4.47986 9.49701C4.47986 6.72085 6.72085 4.47986 9.49701 4.47986C12.2732 4.47986 14.5142 6.72085 14.5142 9.49701C14.5142 12.2732 12.2732 14.5142 9.49701 14.5142Z" })
+  }
+);
+var _Autocomplete = (0, import_react14.forwardRef)(
+  ({
+    children,
+    defaultValue,
+    value,
+    onChange,
+    onSubmit,
+    disabled,
+    error,
+    readOnly,
+    required,
+    ...rest
+  }, ref) => {
+    const props = {
+      onSelectionChange: (key) => key !== null && (onSubmit == null ? void 0 : onSubmit(key, null)),
+      defaultInputValue: defaultValue,
+      inputValue: value,
+      onInputChange: onChange,
+      allowsCustomValue: true,
+      isDisabled: disabled,
+      isInvalid: error,
+      isReadOnly: readOnly,
+      isRequired: required,
+      ...rest
+    };
+    return /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(import_jsx_runtime19.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)(FieldBase, { as: import_react_aria_components11.ComboBox, ...props, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(SearchInput, { onSubmit, ref }),
+      /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(_Popover, { children: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(_ListBox, { children }) })
+    ] }) });
   }
 );
+_Autocomplete.Item = _ListBox.Item;
 
 // src/ComboBox/ComboBox.tsx
-var import_jsx_runtime24 = require("react/jsx-runtime");
-var ComboBox = ({
-  error,
-  width,
-  disabled,
-  required,
-  readOnly,
-  defaultValue,
-  value,
-  onChange,
-  variant,
-  size,
-  ...rest
-}) => {
-  const props = {
-    isDisabled: disabled,
-    isRequired: required,
-    isReadOnly: readOnly,
-    defaultInputValue: defaultValue,
-    inputValue: value,
-    onInputChange: onChange,
+var import_react16 = require("react");
+var import_react_aria_components12 = require("react-aria-components");
+var import_jsx_runtime20 = require("react/jsx-runtime");
+var _ComboBox = (0, import_react16.forwardRef)(
+  ({
+    variant,
+    size,
+    required,
+    disabled,
+    readOnly,
+    error,
+    defaultValue,
+    value,
+    onChange,
+    children,
     ...rest
-  };
-  const { contains } = (0, import_i18n2.useFilter)({ sensitivity: "base" });
-  const state = (0, import_combobox3.useComboBoxState)({ ...props, defaultFilter: contains });
-  const buttonRef = import_react18.default.useRef(null);
-  const inputRef = import_react18.default.useRef(null);
-  const listBoxRef = import_react18.default.useRef(null);
-  const popoverRef = import_react18.default.useRef(null);
-  const {
-    buttonProps: triggerProps,
-    inputProps,
-    listBoxProps,
-    labelProps
-  } = (0, import_combobox2.useComboBox)(
-    { ...props, inputRef, buttonRef, listBoxRef, popoverRef },
-    state
-  );
-  const errorMessageProps = { "aria-invalid": error };
-  const { label, description, errorMessage } = props;
-  return /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(import_jsx_runtime24.Fragment, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
-      FieldBase,
-      {
-        label,
-        labelProps,
-        description,
-        error,
-        errorMessage,
-        errorMessageProps,
-        width,
-        children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
-          Input,
-          {
-            ...inputProps,
-            ref: inputRef,
-            action: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
-              _Button,
-              {
-                className: "absolute right-2 h-4 w-4 border-none bg-transparent p-0",
-                ref: buttonRef,
-                ...triggerProps,
-                children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(ChevronDown, { className: "h-4 w-4" })
-              }
-            )
-          }
-        )
-      }
-    ),
-    /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
-      Popover,
-      {
-        state,
-        ref: popoverRef,
-        triggerRef: inputRef,
-        scrollRef: listBoxRef,
-        isNonModal: true,
-        children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(ListBox, { ref: listBoxRef, state, ...listBoxProps })
-      }
-    )
-  ] });
-};
-ComboBox.Item = import_collections3.Item;
+  }, ref) => {
+    const props = {
+      isDisabled: disabled,
+      isReadOnly: readOnly,
+      isRequired: required,
+      isInvalid: error,
+      defaultInputValue: defaultValue,
+      inputValue: value,
+      onInputChange: onChange,
+      ...rest
+    };
+    return /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(FieldBase, { as: import_react_aria_components12.ComboBox, ref, ...props, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+        _Input,
+        {
+          action: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(_Button, { className: "absolute right-2 h-4 w-4 border-none bg-transparent p-0", children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(ChevronDown, { className: "h-4 w-4" }) })
+        }
+      ),
+      /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(_Popover, { children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(_ListBox, { children }) })
+    ] });
+  }
+);
+_ComboBox.Item = _ListBox.Item;
 
 // src/Badge/Badge.tsx
-var import_system19 = require("@marigold/system");
-var import_jsx_runtime25 = require("react/jsx-runtime");
+var import_system16 = require("@marigold/system");
+var import_jsx_runtime21 = require("react/jsx-runtime");
 var Badge = ({ variant, size, children, ...props }) => {
-  const classNames2 = (0, import_system19.useClassNames)({ component: "Badge", variant, size });
-  return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { ...props, className: classNames2, children });
+  const classNames2 = (0, import_system16.useClassNames)({ component: "Badge", variant, size });
+  return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("div", { ...props, className: classNames2, children });
 };
 
 // src/Breakout/Breakout.tsx
-var import_system20 = require("@marigold/system");
-var import_jsx_runtime26 = require("react/jsx-runtime");
+var import_system17 = require("@marigold/system");
+var import_jsx_runtime22 = require("react/jsx-runtime");
 var Breakout = ({
   height,
   children,
@@ -1207,17 +933,17 @@ var Breakout = ({
   ...props
 }) => {
   var _a, _b, _c, _d;
-  return /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
     "div",
     {
-      className: (0, import_system20.cn)(
+      className: (0, import_system17.cn)(
         "col-start-[1_!important] col-end-[-1_!important] w-full",
-        alignX && ((_b = (_a = import_system20.alignment) == null ? void 0 : _a.horizontal) == null ? void 0 : _b.alignmentX[alignX]),
-        alignY && ((_d = (_c = import_system20.alignment) == null ? void 0 : _c.horizontal) == null ? void 0 : _d.alignmentY[alignY]),
+        alignX && ((_b = (_a = import_system17.alignment) == null ? void 0 : _a.horizontal) == null ? void 0 : _b.alignmentX[alignX]),
+        alignY && ((_d = (_c = import_system17.alignment) == null ? void 0 : _c.horizontal) == null ? void 0 : _d.alignmentY[alignY]),
         alignX || alignY ? "flex" : "block",
         "h-[--height]"
       ),
-      style: (0, import_system20.createVar)({ height }),
+      style: (0, import_system17.createVar)({ height }),
       ...props,
       children
     }
@@ -1225,16 +951,16 @@ var Breakout = ({
 };
 
 // src/Body/Body.tsx
-var import_system21 = require("@marigold/system");
-var import_jsx_runtime27 = require("react/jsx-runtime");
+var import_system18 = require("@marigold/system");
+var import_jsx_runtime23 = require("react/jsx-runtime");
 var Body = ({ children, variant, size, ...props }) => {
-  const classNames2 = (0, import_system21.useClassNames)({ component: "Body", variant, size });
-  return /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("section", { ...props, className: classNames2, children });
+  const classNames2 = (0, import_system18.useClassNames)({ component: "Body", variant, size });
+  return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("section", { ...props, className: classNames2, children });
 };
 
 // src/Card/Card.tsx
-var import_system22 = require("@marigold/system");
-var import_jsx_runtime28 = require("react/jsx-runtime");
+var import_system19 = require("@marigold/system");
+var import_jsx_runtime24 = require("react/jsx-runtime");
 var Card = ({
   children,
   variant,
@@ -1249,22 +975,22 @@ var Card = ({
   pr,
   ...props
 }) => {
-  const classNames2 = (0, import_system22.useClassNames)({ component: "Card", variant, size });
-  return /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
+  const classNames2 = (0, import_system19.useClassNames)({ component: "Card", variant, size });
+  return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
     "div",
     {
       ...props,
-      className: (0, import_system22.cn)(
+      className: (0, import_system19.cn)(
         "flex flex-col",
         classNames2,
-        import_system22.gapSpace[space],
-        import_system22.paddingSpace !== void 0 && import_system22.paddingSpace[p],
-        import_system22.paddingSpaceX !== void 0 && import_system22.paddingSpaceX[px],
-        import_system22.paddingSpaceY !== void 0 && import_system22.paddingSpaceY[py],
-        import_system22.paddingRight !== void 0 && import_system22.paddingRight[pr],
-        import_system22.paddingLeft !== void 0 && import_system22.paddingLeft[pl],
-        import_system22.paddingBottom !== void 0 && import_system22.paddingBottom[pb],
-        import_system22.paddingTop !== void 0 && import_system22.paddingTop[pt]
+        import_system19.gapSpace[space],
+        import_system19.paddingSpace !== void 0 && import_system19.paddingSpace[p],
+        import_system19.paddingSpaceX !== void 0 && import_system19.paddingSpaceX[px],
+        import_system19.paddingSpaceY !== void 0 && import_system19.paddingSpaceY[py],
+        import_system19.paddingRight !== void 0 && import_system19.paddingRight[pr],
+        import_system19.paddingLeft !== void 0 && import_system19.paddingLeft[pl],
+        import_system19.paddingBottom !== void 0 && import_system19.paddingBottom[pb],
+        import_system19.paddingTop !== void 0 && import_system19.paddingTop[pt]
       ),
       children
     }
@@ -1272,35 +998,35 @@ var Card = ({
 };
 
 // src/Center/Center.tsx
-var import_system23 = require("@marigold/system");
-var import_jsx_runtime29 = require("react/jsx-runtime");
+var import_system20 = require("@marigold/system");
+var import_jsx_runtime25 = require("react/jsx-runtime");
 var Center = ({
   maxWidth = "100%",
   space = 0,
   children,
   ...props
 }) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
     "div",
     {
       ...props,
-      className: (0, import_system23.cn)(
+      className: (0, import_system20.cn)(
         "me-[auto] ms-[auto] box-content flex flex-col items-center justify-center",
-        import_system23.gapSpace[space],
+        import_system20.gapSpace[space],
         "max-w-[--maxWidth]"
       ),
-      style: (0, import_system23.createVar)({ maxWidth }),
+      style: (0, import_system20.createVar)({ maxWidth }),
       children
     }
   );
 };
 
 // src/Checkbox/Checkbox.tsx
-var import_react19 = require("react");
-var import_react_aria_components5 = require("react-aria-components");
-var import_system24 = require("@marigold/system");
-var import_jsx_runtime30 = require("react/jsx-runtime");
-var CheckMark = () => /* @__PURE__ */ (0, import_jsx_runtime30.jsx)("svg", { viewBox: "0 0 12 10", children: /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(
+var import_react17 = require("react");
+var import_react_aria_components13 = require("react-aria-components");
+var import_system21 = require("@marigold/system");
+var import_jsx_runtime26 = require("react/jsx-runtime");
+var CheckMark = () => /* @__PURE__ */ (0, import_jsx_runtime26.jsx)("svg", { viewBox: "0 0 12 10", children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
   "path",
   {
     fill: "currentColor",
@@ -1308,7 +1034,7 @@ var CheckMark = () => /* @__PURE__ */ (0, import_jsx_runtime30.jsx)("svg", { vie
     d: "M11.915 1.548 10.367 0 4.045 6.315 1.557 3.827 0 5.373l4.045 4.046 7.87-7.871Z"
   }
 ) });
-var IndeterminateMark = () => /* @__PURE__ */ (0, import_jsx_runtime30.jsx)("svg", { width: "12", height: "3", viewBox: "0 0 12 3", children: /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(
+var IndeterminateMark = () => /* @__PURE__ */ (0, import_jsx_runtime26.jsx)("svg", { width: "12", height: "3", viewBox: "0 0 12 3", children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
   "path",
   {
     fill: "currentColor",
@@ -1317,11 +1043,11 @@ var IndeterminateMark = () => /* @__PURE__ */ (0, import_jsx_runtime30.jsx)("svg
   }
 ) });
 var Icon = ({ className, checked, indeterminate, ...props }) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
     "div",
     {
       "aria-hidden": "true",
-      className: (0, import_system24.cn)(
+      className: (0, import_system21.cn)(
         "flex shrink-0 grow-0 basis-4 items-center justify-center",
         "h-4 w-4 p-px",
         "bg-white",
@@ -1329,11 +1055,11 @@ var Icon = ({ className, checked, indeterminate, ...props }) => {
         className
       ),
       ...props,
-      children: indeterminate ? /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(IndeterminateMark, {}) : checked ? /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(CheckMark, {}) : null
+      children: indeterminate ? /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(IndeterminateMark, {}) : checked ? /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(CheckMark, {}) : null
     }
   );
 };
-var _Checkbox = (0, import_react19.forwardRef)(
+var _Checkbox = (0, import_react17.forwardRef)(
   ({
     className,
     indeterminate,
@@ -1358,19 +1084,19 @@ var _Checkbox = (0, import_react19.forwardRef)(
       defaultSelected: defaultChecked,
       ...rest
     };
-    const classNames2 = (0, import_system24.useClassNames)({ component: "Checkbox", variant, size });
-    return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(
-      import_react_aria_components5.Checkbox,
+    const classNames2 = (0, import_system21.useClassNames)({ component: "Checkbox", variant, size });
+    return /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
+      import_react_aria_components13.Checkbox,
       {
         ref,
-        className: (0, import_system24.cn)(
+        className: (0, import_system21.cn)(
           "group/checkbox flex items-center gap-[0.5rem]",
           "cursor-pointer data-[disabled]:cursor-not-allowed",
           classNames2.container
         ),
         ...props,
-        children: ({ isSelected, isIndeterminate }) => /* @__PURE__ */ (0, import_jsx_runtime30.jsxs)(import_jsx_runtime30.Fragment, { children: [
-          /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(
+        children: ({ isSelected, isIndeterminate }) => /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)(import_jsx_runtime26.Fragment, { children: [
+          /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
             Icon,
             {
               checked: isSelected,
@@ -1378,7 +1104,7 @@ var _Checkbox = (0, import_react19.forwardRef)(
               className: classNames2.checkbox
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime30.jsx)("div", { className: classNames2.label, children })
+          /* @__PURE__ */ (0, import_jsx_runtime26.jsx)("div", { className: classNames2.label, children })
         ] })
       }
     );
@@ -1386,110 +1112,9 @@ var _Checkbox = (0, import_react19.forwardRef)(
 );
 
 // src/Checkbox/CheckboxGroup.tsx
-var import_react_aria_components7 = require("react-aria-components");
-var import_system27 = require("@marigold/system");
-
-// src/FieldBase/_FieldBase.tsx
-var import_react20 = require("react");
-var import_system26 = require("@marigold/system");
-
-// src/HelpText/_HelpText.tsx
-var import_react_aria_components6 = require("react-aria-components");
-var import_system25 = require("@marigold/system");
-var import_jsx_runtime31 = require("react/jsx-runtime");
-var HelpText2 = ({
-  variant,
-  size,
-  description,
-  error,
-  errorMessage,
-  ...props
-}) => {
-  const hasErrorMessage = errorMessage && error;
-  const classNames2 = (0, import_system25.useClassNames)({
-    component: "HelpText",
-    variant,
-    size
-  });
-  if (!description && !errorMessage) {
-    return null;
-  }
-  return /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)("div", { className: (0, import_system25.cn)(classNames2.container), children: [
-    /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)(
-      import_react_aria_components6.FieldError,
-      {
-        ...props,
-        className: "grid grid-flow-col items-center justify-start gap-1",
-        children: [
-          /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
-            "svg",
-            {
-              className: (0, import_system25.cn)("h-4 w-4", classNames2.icon),
-              viewBox: "0 0 24 24",
-              role: "presentation",
-              fill: "currentColor",
-              children: /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("path", { d: "M2.25 20.3097H21.75L12 3.46875L2.25 20.3097ZM12.8864 17.2606H11.1136V15.4879H12.8864V17.2606ZM12.8864 13.7151H11.1136V10.1697H12.8864V13.7151Z" })
-            }
-          ),
-          errorMessage
-        ]
-      }
-    ),
-    !hasErrorMessage && /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(import_react_aria_components6.Text, { slot: "description", children: description })
-  ] });
-};
-
-// src/FieldBase/_FieldBase.tsx
-var import_jsx_runtime32 = require("react/jsx-runtime");
-var fixedForwardRef = import_react20.forwardRef;
-var _FieldBase = (props, ref) => {
-  const {
-    as: Component = "div",
-    children,
-    label,
-    size,
-    variant,
-    width = "full",
-    description,
-    errorMessage,
-    className,
-    stateProps,
-    ...rest
-  } = props;
-  const classNames2 = (0, import_system26.useClassNames)({
-    component: "Field",
-    variant,
-    size
-  });
-  return /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(
-    Component,
-    {
-      ref,
-      className: (0, import_system26.cn)("group/field", import_system26.width[width], classNames2, className),
-      "data-required": props.isRequired ? true : void 0,
-      "data-error": props.isInvalid ? true : void 0,
-      ...rest,
-      children: [
-        label ? /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(_Label, { variant, size, children: label }) : /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("span", { "aria-hidden": "true" }),
-        children,
-        /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
-          HelpText2,
-          {
-            variant,
-            size,
-            description,
-            errorMessage,
-            error: props.isInvalid
-          }
-        )
-      ]
-    }
-  );
-};
-var FieldBase2 = fixedForwardRef(_FieldBase);
-
-// src/Checkbox/CheckboxGroup.tsx
-var import_jsx_runtime33 = require("react/jsx-runtime");
+var import_react_aria_components14 = require("react-aria-components");
+var import_system22 = require("@marigold/system");
+var import_jsx_runtime27 = require("react/jsx-runtime");
 var _CheckboxGroup = ({
   children,
   variant,
@@ -1500,7 +1125,7 @@ var _CheckboxGroup = ({
   error,
   ...rest
 }) => {
-  const classNames2 = (0, import_system27.useClassNames)({
+  const classNames2 = (0, import_system22.useClassNames)({
     component: "Checkbox",
     variant,
     size,
@@ -1514,13 +1139,13 @@ var _CheckboxGroup = ({
     isInvalid: error,
     ...rest
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(FieldBase2, { as: import_react_aria_components7.CheckboxGroup, ...props, children });
+  return /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(FieldBase, { as: import_react_aria_components14.CheckboxGroup, ...props, children });
 };
 
 // src/Columns/Columns.tsx
-var import_react21 = require("react");
-var import_system28 = require("@marigold/system");
-var import_jsx_runtime34 = require("react/jsx-runtime");
+var import_react18 = require("react");
+var import_system23 = require("@marigold/system");
+var import_jsx_runtime28 = require("react/jsx-runtime");
 var Columns = ({
   space = 0,
   columns,
@@ -1529,30 +1154,30 @@ var Columns = ({
   children,
   ...props
 }) => {
-  if (import_react21.Children.count(children) !== columns.length) {
+  if (import_react18.Children.count(children) !== columns.length) {
     throw new Error(
-      `Columns: expected ${columns.length} children, got ${import_react21.Children.count(
+      `Columns: expected ${columns.length} children, got ${import_react18.Children.count(
         children
       )}`
     );
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
     "div",
     {
-      className: (0, import_system28.cn)(
+      className: (0, import_system23.cn)(
         "flex flex-wrap items-stretch",
         stretch && "h-full",
-        import_system28.gapSpace[space]
+        import_system23.gapSpace[space]
       ),
       ...props,
-      children: import_react21.Children.map(children, (child, idx) => /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
+      children: import_react18.Children.map(children, (child, idx) => /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
         "div",
         {
-          className: (0, import_system28.cn)(
+          className: (0, import_system23.cn)(
             "grow-[--columnSize] basis-[calc((var(--collapseAt)_-_100%)_*_999)]"
           ),
-          style: (0, import_system28.createVar)({ collapseAt, columnSize: columns[idx] }),
-          children: (0, import_react21.isValidElement)(child) ? (0, import_react21.cloneElement)(child) : child
+          style: (0, import_system23.createVar)({ collapseAt, columnSize: columns[idx] }),
+          children: child
         }
       ))
     }
@@ -1560,8 +1185,8 @@ var Columns = ({
 };
 
 // src/Container/Container.tsx
-var import_system29 = require("@marigold/system");
-var import_jsx_runtime35 = require("react/jsx-runtime");
+var import_system24 = require("@marigold/system");
+var import_jsx_runtime29 = require("react/jsx-runtime");
 var content = {
   small: "20ch",
   medium: "45ch",
@@ -1581,31 +1206,31 @@ var Container = ({
   ...props
 }) => {
   const maxWidth = contentType === "content" ? content[size] : header[size];
-  return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(
     "div",
     {
       ...props,
-      className: (0, import_system29.cn)(
+      className: (0, import_system24.cn)(
         "grid",
-        import_system29.placeItems[alignItems],
-        import_system29.gridColsAlign[align],
-        import_system29.gridColumn[align]
+        import_system24.placeItems[alignItems],
+        import_system24.gridColsAlign[align],
+        import_system24.gridColumn[align]
       ),
-      style: (0, import_system29.createVar)({ maxWidth }),
+      style: (0, import_system24.createVar)({ maxWidth }),
       children
     }
   );
 };
 
 // src/Dialog/Dialog.tsx
-var import_react23 = require("react");
-var import_react_aria_components10 = require("react-aria-components");
-var import_system31 = require("@marigold/system");
+var import_react21 = require("react");
+var import_react_aria_components18 = require("react-aria-components");
+var import_system27 = require("@marigold/system");
 
 // src/Headline/Headline.tsx
-var import_react_aria_components8 = require("react-aria-components");
-var import_system30 = require("@marigold/system");
-var import_jsx_runtime36 = require("react/jsx-runtime");
+var import_react_aria_components15 = require("react-aria-components");
+var import_system25 = require("@marigold/system");
+var import_jsx_runtime30 = require("react/jsx-runtime");
 var _Headline = ({
   variant,
   size,
@@ -1615,20 +1240,20 @@ var _Headline = ({
   level = 1,
   ...props
 }) => {
-  const theme = (0, import_system30.useTheme)();
-  const classNames2 = (0, import_system30.useClassNames)({
+  const theme = (0, import_system25.useTheme)();
+  const classNames2 = (0, import_system25.useClassNames)({
     component: "Headline",
     variant,
     size: size != null ? size : `level-${level}`
   });
-  return /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
-    import_react_aria_components8.Heading,
+  return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(
+    import_react_aria_components15.Heading,
     {
       level: Number(level),
       ...props,
-      className: (0, import_system30.cn)(classNames2, "text-[--color]", import_system30.textAlign[align]),
-      style: (0, import_system30.createVar)({
-        color: color && theme.colors && (0, import_system30.get)(
+      className: (0, import_system25.cn)(classNames2, "text-[--color]", import_system25.textAlign[align]),
+      style: (0, import_system25.createVar)({
+        color: color && theme.colors && (0, import_system25.get)(
           theme.colors,
           color.replace("-", "."),
           color
@@ -1641,9 +1266,36 @@ var _Headline = ({
 };
 
 // src/Dialog/DialogTrigger.tsx
-var import_react22 = require("react");
-var import_react_aria_components9 = require("react-aria-components");
-var import_jsx_runtime37 = require("react/jsx-runtime");
+var import_react20 = require("react");
+var import_react_aria_components17 = require("react-aria-components");
+
+// src/Overlay/Modal.tsx
+var import_react19 = require("react");
+var import_react_aria_components16 = require("react-aria-components");
+var import_system26 = require("@marigold/system");
+var import_jsx_runtime31 = require("react/jsx-runtime");
+var _Modal = (0, import_react19.forwardRef)(({ open, dismissable, keyboardDismissable, ...rest }, ref) => {
+  const theme = (0, import_system26.useTheme)();
+  const props = {
+    isOpen: open,
+    isDismissable: dismissable,
+    isKeyboardDismissDisabled: keyboardDismissable,
+    ...rest
+  };
+  return /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
+    Underlay,
+    {
+      dismissable,
+      keyboardDismissable,
+      open,
+      variant: "modal",
+      children: /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(import_react_aria_components16.Modal, { ref, "data-theme": theme.name, ...props, children: props.children })
+    }
+  );
+});
+
+// src/Dialog/DialogTrigger.tsx
+var import_jsx_runtime32 = require("react/jsx-runtime");
 var _DialogTrigger = ({
   open,
   dismissable,
@@ -1655,15 +1307,15 @@ var _DialogTrigger = ({
     isOpen: open,
     ...rest
   };
-  const children = import_react22.Children.toArray(props.children);
+  const children = import_react20.Children.toArray(props.children);
   const [dialogTrigger, dialog] = children;
   const hasDialogTrigger = dialogTrigger.type !== _Dialog;
   const currentDialog = children.length < 2 ? !hasDialogTrigger && dialogTrigger : dialog;
   if (isNonModal)
-    return /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(import_react_aria_components9.DialogTrigger, { ...props, children: props.children });
-  return /* @__PURE__ */ (0, import_jsx_runtime37.jsxs)(import_react_aria_components9.DialogTrigger, { ...props, children: [
+    return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(import_react_aria_components17.DialogTrigger, { ...props, children: props.children });
+  return /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(import_react_aria_components17.DialogTrigger, { ...props, children: [
     hasDialogTrigger && dialogTrigger,
-    /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
       _Modal,
       {
         dismissable,
@@ -1675,18 +1327,18 @@ var _DialogTrigger = ({
 };
 
 // src/Dialog/Dialog.tsx
-var import_jsx_runtime38 = require("react/jsx-runtime");
+var import_jsx_runtime33 = require("react/jsx-runtime");
 var CloseButton = ({ className }) => {
-  const { close } = (0, import_react23.useContext)(import_react_aria_components10.OverlayTriggerStateContext);
-  return /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("div", { className: "flex justify-end", children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
+  const { close } = (0, import_react21.useContext)(import_react_aria_components18.OverlayTriggerStateContext);
+  return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)("div", { className: "flex justify-end", children: /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
     "button",
     {
-      className: (0, import_system31.cn)(
+      className: (0, import_system27.cn)(
         "h-4 w-4 cursor-pointer border-none p-0 leading-normal outline-0",
         className
       ),
       onClick: close,
-      children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("svg", { viewBox: "0 0 20 20", fill: "currentColor", children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime33.jsx)("svg", { viewBox: "0 0 20 20", fill: "currentColor", children: /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
         "path",
         {
           fillRule: "evenodd",
@@ -1697,7 +1349,7 @@ var CloseButton = ({ className }) => {
     }
   ) });
 };
-var DialogHeadline = ({ children }) => /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(_Headline, { slot: "title", children });
+var DialogHeadline = ({ children }) => /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(_Headline, { slot: "title", children });
 var _Dialog = ({
   variant,
   size,
@@ -1705,8 +1357,8 @@ var _Dialog = ({
   isNonModal,
   ...props
 }) => {
-  const classNames2 = (0, import_system31.useClassNames)({ component: "Dialog", variant, size });
-  let state = (0, import_react23.useContext)(import_react_aria_components10.OverlayTriggerStateContext);
+  const classNames2 = (0, import_system27.useClassNames)({ component: "Dialog", variant, size });
+  let state = (0, import_react21.useContext)(import_react_aria_components18.OverlayTriggerStateContext);
   let children = props.children;
   if (typeof children === "function") {
     children = children({
@@ -1714,13 +1366,13 @@ var _Dialog = ({
       })
     });
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
-    import_react_aria_components10.Dialog,
+  return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
+    import_react_aria_components18.Dialog,
     {
       ...props,
-      className: (0, import_system31.cn)("relative outline-none", classNames2.container),
-      children: /* @__PURE__ */ (0, import_jsx_runtime38.jsxs)(import_jsx_runtime38.Fragment, { children: [
-        closeButton && /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(CloseButton, { className: classNames2.closeButton }),
+      className: (0, import_system27.cn)("relative outline-none", classNames2.container),
+      children: /* @__PURE__ */ (0, import_jsx_runtime33.jsxs)(import_jsx_runtime33.Fragment, { children: [
+        closeButton && /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(CloseButton, { className: classNames2.closeButton }),
         children
       ] })
     }
@@ -1730,38 +1382,41 @@ _Dialog.Trigger = _DialogTrigger;
 _Dialog.Headline = DialogHeadline;
 
 // src/Divider/Divider.tsx
-var import_react_aria_components11 = require("react-aria-components");
-var import_system32 = require("@marigold/system");
-var import_jsx_runtime39 = require("react/jsx-runtime");
+var import_react_aria_components19 = require("react-aria-components");
+var import_system28 = require("@marigold/system");
+var import_jsx_runtime34 = require("react/jsx-runtime");
 var _Divider = ({ variant, ...props }) => {
-  const classNames2 = (0, import_system32.useClassNames)({ component: "Divider", variant });
-  return /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(import_react_aria_components11.Separator, { className: classNames2, ...props });
+  const classNames2 = (0, import_system28.useClassNames)({ component: "Divider", variant });
+  return /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(import_react_aria_components19.Separator, { className: classNames2, ...props });
 };
 
 // src/Footer/Footer.tsx
-var import_system33 = require("@marigold/system");
-var import_jsx_runtime40 = require("react/jsx-runtime");
+var import_system29 = require("@marigold/system");
+var import_jsx_runtime35 = require("react/jsx-runtime");
 var Footer = ({ children, variant, size, ...props }) => {
-  const classNames2 = (0, import_system33.useClassNames)({ component: "Footer", variant, size });
-  return /* @__PURE__ */ (0, import_jsx_runtime40.jsx)("footer", { ...props, className: classNames2, children });
+  const classNames2 = (0, import_system29.useClassNames)({ component: "Footer", variant, size });
+  return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("footer", { ...props, className: classNames2, children });
 };
 
+// src/Form/Form.tsx
+var import_react_aria_components20 = require("react-aria-components");
+
 // src/Header/Header.tsx
-var import_react_aria_components12 = require("react-aria-components");
-var import_system34 = require("@marigold/system");
-var import_jsx_runtime41 = require("react/jsx-runtime");
+var import_react_aria_components21 = require("react-aria-components");
+var import_system30 = require("@marigold/system");
+var import_jsx_runtime36 = require("react/jsx-runtime");
 var _Header = ({ variant, size, ...props }) => {
-  const classNames2 = (0, import_system34.useClassNames)({
+  const classNames2 = (0, import_system30.useClassNames)({
     component: "Header",
     variant,
     size
   });
-  return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(import_react_aria_components12.Header, { className: classNames2, ...props, children: props.children });
+  return /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(import_react_aria_components21.Header, { className: classNames2, ...props, children: props.children });
 };
 
 // src/Image/Image.tsx
-var import_system35 = require("@marigold/system");
-var import_jsx_runtime42 = require("react/jsx-runtime");
+var import_system31 = require("@marigold/system");
+var import_jsx_runtime37 = require("react/jsx-runtime");
 var Image = ({
   variant,
   size,
@@ -1769,25 +1424,25 @@ var Image = ({
   position = "none",
   ...props
 }) => {
-  const classNames2 = (0, import_system35.useClassNames)({ component: "Image", variant, size });
-  return /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
+  const classNames2 = (0, import_system31.useClassNames)({ component: "Image", variant, size });
+  return /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
     "img",
     {
       ...props,
       alt: props.alt,
-      className: (0, import_system35.cn)(
+      className: (0, import_system31.cn)(
         fit !== "none" && "h-full w-full",
         classNames2,
-        import_system35.objectFit[fit],
-        import_system35.objectPosition[position]
+        import_system31.objectFit[fit],
+        import_system31.objectPosition[position]
       )
     }
   );
 };
 
 // src/Inline/Inline.tsx
-var import_system36 = require("@marigold/system");
-var import_jsx_runtime43 = require("react/jsx-runtime");
+var import_system32 = require("@marigold/system");
+var import_jsx_runtime38 = require("react/jsx-runtime");
 var Inline = ({
   space = 0,
   orientation,
@@ -1797,15 +1452,15 @@ var Inline = ({
   ...props
 }) => {
   var _a2, _b2, _c, _d;
-  return /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
     "div",
     {
       ...props,
-      className: (0, import_system36.cn)(
+      className: (0, import_system32.cn)(
         "flex flex-wrap",
-        import_system36.gapSpace[space],
-        alignX && ((_b2 = (_a2 = import_system36.alignment) == null ? void 0 : _a2.horizontal) == null ? void 0 : _b2.alignmentX[alignX]),
-        alignY && ((_d = (_c = import_system36.alignment) == null ? void 0 : _c.horizontal) == null ? void 0 : _d.alignmentY[alignY])
+        import_system32.gapSpace[space],
+        alignX && ((_b2 = (_a2 = import_system32.alignment) == null ? void 0 : _a2.horizontal) == null ? void 0 : _b2.alignmentX[alignX]),
+        alignY && ((_d = (_c = import_system32.alignment) == null ? void 0 : _c.horizontal) == null ? void 0 : _d.alignmentY[alignY])
       ),
       children
     }
@@ -1813,301 +1468,268 @@ var Inline = ({
 };
 
 // src/DateField/DateField.tsx
-var import_date = require("@internationalized/date");
-var import_react25 = require("react");
-var import_datepicker2 = require("@react-aria/datepicker");
-var import_focus6 = require("@react-aria/focus");
-var import_i18n3 = require("@react-aria/i18n");
-var import_interactions2 = require("@react-aria/interactions");
-var import_utils10 = require("@react-aria/utils");
-var import_datepicker3 = require("@react-stately/datepicker");
-var import_system38 = require("@marigold/system");
+var import_react22 = require("react");
+var import_react_aria_components24 = require("react-aria-components");
+
+// src/DateField/DateInput.tsx
+var import_react_aria_components23 = require("react-aria-components");
+var import_system34 = require("@marigold/system");
 
 // src/DateField/DateSegment.tsx
-var import_react24 = require("react");
-var import_datepicker = require("@react-aria/datepicker");
-var import_focus5 = require("@react-aria/focus");
-var import_utils9 = require("@react-aria/utils");
-var import_system37 = require("@marigold/system");
-var import_jsx_runtime44 = require("react/jsx-runtime");
-var DateSegment = ({
-  className,
-  segment,
-  state,
-  isPrevPlaceholder
-}) => {
-  const ref = (0, import_react24.useRef)(null);
-  const { segmentProps } = (0, import_datepicker.useDateSegment)(segment, state, ref);
-  const { focusProps, isFocused } = (0, import_focus5.useFocusRing)({
-    within: true,
-    isTextInput: true
-  });
-  const stateProps = (0, import_system37.useStateProps)({
-    disabled: state.isDisabled,
-    focusVisible: isFocused
-  });
-  const { isPlaceholder, placeholder, text, type, maxValue } = segment;
-  return /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(
-    "div",
+var import_react_aria_components22 = require("react-aria-components");
+var import_system33 = require("@marigold/system");
+var import_jsx_runtime39 = require("react/jsx-runtime");
+var _DateSegment = ({ segment, ...props }) => {
+  return /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+    import_react_aria_components22.DateSegment,
     {
-      ...(0, import_utils9.mergeProps)(segmentProps, stateProps, focusProps),
-      ref,
-      className: (0, import_system37.cn)(
-        "group/segment",
-        "text-center leading-none outline-0",
-        type !== "literal" && "p-0.5",
-        className
-      ),
+      ...props,
+      segment,
       style: {
-        ...segmentProps.style,
-        minWidth: maxValue != null ? String(maxValue).length + "ch" : void 0
+        minWidth: segment.maxValue != null ? `${String(segment.maxValue).length}ch` : void 0
       },
-      children: [
-        /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(
+      children: ({ text, placeholder, isPlaceholder }) => /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(import_jsx_runtime39.Fragment, { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
           "span",
           {
             "aria-hidden": "true",
-            className: (0, import_system37.cn)(
+            className: (0, import_system33.cn)(
               isPlaceholder ? "visible block" : "invisible hidden",
               "pointer-events-none w-full text-center"
             ),
             children: isPlaceholder && (placeholder == null ? void 0 : placeholder.toUpperCase())
           }
         ),
-        /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("span", { children: isPlaceholder ? "" : type === "month" || type === "day" ? Number(text) < 10 ? "0" + text : text : text })
-      ]
+        /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("span", { children: isPlaceholder ? "" : (segment.type === "month" || segment.type === "day") && Number(segment.text) < 10 ? "0" + segment.text : text })
+      ] })
     }
   );
 };
 
+// src/DateField/DateInput.tsx
+var import_jsx_runtime40 = require("react/jsx-runtime");
+var _DateInput = ({ variant, size, action, ...props }) => {
+  const classNames2 = (0, import_system34.useClassNames)({ component: "DateField", variant, size });
+  return /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(import_react_aria_components23.Group, { className: classNames2.field, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(import_react_aria_components23.DateInput, { className: "flex flex-1 items-center", ...props, children: (segment) => /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(_DateSegment, { className: classNames2.segment, segment }) }),
+    action ? action : /* @__PURE__ */ (0, import_jsx_runtime40.jsx)("div", { className: "flex items-center justify-center", children: /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(
+      "svg",
+      {
+        "data-testid": "action",
+        className: classNames2.action,
+        viewBox: "0 0 24 24",
+        width: 24,
+        height: 24,
+        children: /* @__PURE__ */ (0, import_jsx_runtime40.jsx)("path", { d: "M20.0906 19.2V6.6C20.0906 5.61 19.2806 4.8 18.2906 4.8H17.3906V3H15.5906V4.8H8.39062V3H6.59062V4.8H5.69063C4.69163 4.8 3.89962 5.61 3.89962 6.6L3.89062 19.2C3.89062 20.19 4.69163 21 5.69063 21H18.2906C19.2806 21 20.0906 20.19 20.0906 19.2ZM9.29062 11.1001H7.49061V12.9001H9.29062V11.1001ZM5.69062 8.40009H18.2906V6.60008H5.69062V8.40009ZM18.2906 10.2V19.2H5.69062V10.2H18.2906ZM14.6906 12.9001H16.4906V11.1001H14.6906V12.9001ZM12.8906 12.9001H11.0906V11.1001H12.8906V12.9001Z" })
+      }
+    ) })
+  ] });
+};
+
 // src/DateField/DateField.tsx
-var import_jsx_runtime45 = require("react/jsx-runtime");
-var DateField = ({
-  disabled,
-  readOnly,
-  required,
-  error,
-  errorMessage,
-  errorMessageProps,
-  variant,
-  size,
-  action,
-  isPressed,
-  triggerRef,
-  width,
-  ...res
-}) => {
-  const { locale } = (0, import_i18n3.useLocale)();
-  const props = {
-    isDisabled: disabled,
-    isReadOnly: readOnly,
-    isRequired: required,
-    ...res
-  };
-  const { label, description } = props;
-  const state = (0, import_datepicker3.useDateFieldState)({
-    ...props,
-    locale,
-    createCalendar: import_date.createCalendar
-  });
-  const ref = (0, import_react25.useRef)(null);
-  const { fieldProps, labelProps, descriptionProps } = (0, import_datepicker2.useDateField)(
-    props,
-    state,
-    ref
-  );
-  const classNames2 = (0, import_system38.useClassNames)({ component: "DateField", variant, size });
-  const { focusProps, isFocused } = (0, import_focus6.useFocusRing)({
-    within: true,
-    isTextInput: true,
-    autoFocus: props.autoFocus
-  });
-  const { hoverProps, isHovered } = (0, import_interactions2.useHover)({ isDisabled: disabled });
-  const stateProps = (0, import_system38.useStateProps)({
-    hover: isHovered,
-    error,
-    readOnly,
+var import_jsx_runtime41 = require("react/jsx-runtime");
+var _DateField = (0, import_react22.forwardRef)(
+  ({
+    variant,
+    size,
+    action,
     disabled,
     required,
-    focus: isFocused || isPressed
-  });
-  return /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(
-    FieldBase,
-    {
-      error,
-      errorMessage,
-      errorMessageProps,
-      label,
-      labelProps,
-      description,
-      descriptionProps,
-      disabled,
-      stateProps,
-      variant,
-      size,
-      width,
-      children: /* @__PURE__ */ (0, import_jsx_runtime45.jsxs)(
-        "div",
-        {
-          ...(0, import_utils10.mergeProps)(fieldProps, focusProps, stateProps, hoverProps),
-          className: (0, import_system38.cn)(
-            "relative flex flex-row flex-nowrap",
-            "cursor-text aria-disabled:cursor-not-allowed",
-            classNames2.field
-          ),
-          "data-testid": "date-field",
-          ref: triggerRef,
-          children: [
-            /* @__PURE__ */ (0, import_jsx_runtime45.jsx)("div", { ref, className: "flex basis-full items-center", children: state.segments.map((segment, i) => {
-              var _a;
-              return /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(
-                DateSegment,
-                {
-                  className: classNames2.segment,
-                  isPrevPlaceholder: (_a = state.segments[i - 1]) == null ? void 0 : _a.isPlaceholder,
-                  segment,
-                  state
-                },
-                i
-              );
-            }) }),
-            action ? action : /* @__PURE__ */ (0, import_jsx_runtime45.jsx)("div", { className: "flex items-center justify-center", children: /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(
-              "svg",
-              {
-                "data-testid": "action",
-                className: (0, import_system38.cn)(classNames2.action),
-                viewBox: "0 0 24 24",
-                width: 24,
-                height: 24,
-                children: /* @__PURE__ */ (0, import_jsx_runtime45.jsx)("path", { d: "M20.0906 19.2V6.6C20.0906 5.61 19.2806 4.8 18.2906 4.8H17.3906V3H15.5906V4.8H8.39062V3H6.59062V4.8H5.69063C4.69163 4.8 3.89962 5.61 3.89962 6.6L3.89062 19.2C3.89062 20.19 4.69163 21 5.69063 21H18.2906C19.2806 21 20.0906 20.19 20.0906 19.2ZM9.29062 11.1001H7.49061V12.9001H9.29062V11.1001ZM5.69062 8.40009H18.2906V6.60008H5.69062V8.40009ZM18.2906 10.2V19.2H5.69062V10.2H18.2906ZM14.6906 12.9001H16.4906V11.1001H14.6906V12.9001ZM12.8906 12.9001H11.0906V11.1001H12.8906V12.9001Z" })
-              }
-            ) })
-          ]
-        }
-      )
-    }
-  );
-};
+    error,
+    readOnly,
+    ...rest
+  }, ref) => {
+    const props = {
+      isDisabled: disabled,
+      isReadOnly: readOnly,
+      isInvalid: error,
+      isRequired: required,
+      ...rest
+    };
+    return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+      FieldBase,
+      {
+        as: import_react_aria_components24.DateField,
+        variant,
+        size,
+        ref,
+        ...props,
+        children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(_DateInput, { action })
+      }
+    );
+  }
+);
 
 // src/Calendar/Calendar.tsx
-var import_date3 = require("@internationalized/date");
-var import_react29 = require("react");
-var import_calendar3 = require("@react-aria/calendar");
-var import_i18n7 = require("@react-aria/i18n");
-var import_calendar4 = require("@react-stately/calendar");
-var import_icons = require("@marigold/icons");
-var import_system40 = require("@marigold/system");
-
-// src/Calendar/CalendarGrid.tsx
-var import_date2 = require("@internationalized/date");
 var import_react27 = require("react");
-var import_calendar2 = require("@react-aria/calendar");
-var import_i18n4 = require("@react-aria/i18n");
-var import_i18n5 = require("@react-aria/i18n");
-
-// src/Calendar/CalendarCell.tsx
-var import_react26 = require("react");
-var import_calendar = require("@react-aria/calendar");
-var import_interactions3 = require("@react-aria/interactions");
-var import_utils11 = require("@react-aria/utils");
+var import_react_aria_components31 = require("react-aria-components");
 var import_system39 = require("@marigold/system");
-var import_jsx_runtime46 = require("react/jsx-runtime");
-var CalendarCell = (props) => {
-  const ref = (0, import_react26.useRef)(null);
-  const { state } = props;
-  let { cellProps, buttonProps, formattedDate, isOutsideVisibleRange } = (0, import_calendar.useCalendarCell)(props, state, ref);
-  const classNames2 = (0, import_system39.useClassNames)({
-    component: "Calendar"
-  });
-  const isDisabled = cellProps["aria-disabled"];
-  const { hoverProps, isHovered } = (0, import_interactions3.useHover)({
-    isDisabled: isDisabled || cellProps["aria-selected"]
-  });
-  const stateProps = (0, import_system39.useStateProps)({
-    disabled: isDisabled,
-    hover: isHovered,
-    selected: cellProps["aria-selected"]
-  });
-  return /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("td", { className: "group/cell", ...cellProps, children: /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(
-    "div",
-    {
-      className: (0, import_system39.cn)(
-        "flex h-[30px] w-[30px] cursor-pointer items-center justify-center rounded-full p-[5.3px] text-sm font-normal aria-disabled:cursor-default",
-        classNames2.calendarCell
-      ),
-      hidden: isOutsideVisibleRange,
-      ref,
-      ...(0, import_utils11.mergeProps)(buttonProps, stateProps, hoverProps),
-      children: formattedDate
-    }
-  ) });
-};
 
 // src/Calendar/CalendarGrid.tsx
-var import_jsx_runtime47 = require("react/jsx-runtime");
-var CalendarGrid = ({ state, ...props }) => {
-  const { locale } = (0, import_i18n4.useLocale)();
-  const { gridProps, headerProps } = (0, import_calendar2.useCalendarGrid)(props, state);
-  const numberOfWeeksInMonth = (0, import_date2.getWeeksInMonth)(
-    state.visibleRange.start,
-    locale
-  );
-  const dayFormatter = (0, import_i18n5.useDateFormatter)({
+var import_react_aria_components26 = require("react-aria-components");
+var import_system36 = require("@marigold/system");
+
+// src/Calendar/CalendarGridHeader.tsx
+var import_date = require("@internationalized/date");
+var import_react23 = require("react");
+var import_react_aria_components25 = require("react-aria-components");
+var import_calendar = require("@react-aria/calendar");
+var import_i18n = require("@react-aria/i18n");
+var import_system35 = require("@marigold/system");
+var import_jsx_runtime42 = require("react/jsx-runtime");
+function CalendarGridHeader(props) {
+  const state = (0, import_react23.useContext)(import_react_aria_components25.CalendarStateContext);
+  const { headerProps } = (0, import_calendar.useCalendarGrid)(props, state);
+  const { locale } = (0, import_i18n.useLocale)();
+  const dayFormatter = (0, import_i18n.useDateFormatter)({
     weekday: "short",
     timeZone: state.timeZone
   });
-  const weekDays = (0, import_react27.useMemo)(() => {
-    const weekStart = (0, import_date2.startOfWeek)((0, import_date2.today)(state.timeZone), locale);
+  const weekDays = (0, import_react23.useMemo)(() => {
+    const weekStart = (0, import_date.startOfWeek)((0, import_date.today)(state.timeZone), locale);
     return [...new Array(7).keys()].map((index) => {
       const date = weekStart.add({ days: index });
       const dateDay = date.toDate(state.timeZone);
       return dayFormatter.format(dateDay);
     });
   }, [locale, state.timeZone, dayFormatter]);
-  return /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(
-    "table",
+  const classNames2 = (0, import_system35.useClassNames)({ component: "Calendar" });
+  return /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("thead", { ...headerProps, children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("tr", { children: weekDays.map((day, index) => /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("th", { className: classNames2.calendarHeader, children: day.substring(0, 2) }, index)) }) });
+}
+
+// src/Calendar/CalendarGrid.tsx
+var import_jsx_runtime43 = require("react/jsx-runtime");
+var _CalendarGrid = () => {
+  const classNames2 = (0, import_system36.useClassNames)({ component: "Calendar" });
+  return /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(import_react_aria_components26.CalendarGrid, { className: classNames2.calendarGrid, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(CalendarGridHeader, {}),
+    /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(import_react_aria_components26.CalendarGridBody, { children: (date) => /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(
+      import_react_aria_components26.CalendarCell,
+      {
+        date,
+        className: (0, import_system36.cn)(
+          "flex h-[30px] w-[30px] cursor-pointer items-center justify-center rounded-full p-[5.3px] text-sm font-normal aria-disabled:cursor-default",
+          classNames2.calendarCell
+        )
+      }
+    ) })
+  ] });
+};
+
+// src/Calendar/CalendarListBox.tsx
+var import_react24 = require("react");
+var import_react_aria_components27 = require("react-aria-components");
+var import_icons = require("@marigold/icons");
+var import_system37 = require("@marigold/system");
+
+// src/Calendar/useFormattedMonths.tsx
+var import_i18n2 = require("@react-aria/i18n");
+function useFormattedMonths(timeZone, focusedDate) {
+  let months = [];
+  let formatter = (0, import_i18n2.useDateFormatter)({
+    month: "long",
+    timeZone
+  });
+  let numMonths = focusedDate.calendar.getMonthsInYear(focusedDate);
+  for (let i = 1; i <= numMonths; i++) {
+    let date = focusedDate.set({ month: i });
+    months.push(formatter.format(date.toDate(timeZone)));
+  }
+  return months;
+}
+
+// src/Calendar/CalendarListBox.tsx
+var import_jsx_runtime44 = require("react/jsx-runtime");
+function CalendarListBox({
+  type,
+  isDisabled,
+  setSelectedDropdown
+}) {
+  const state = (0, import_react24.useContext)(import_react_aria_components27.CalendarStateContext);
+  const months = useFormattedMonths(state.timeZone, state.focusedDate);
+  const buttonStyles = "flex items-center justify-between gap-1 overflow-hidden";
+  const { select: selectClassNames } = (0, import_system37.useClassNames)({ component: "Select" });
+  return /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(
+    "button",
     {
-      className: "w-full border-spacing-[6px]",
-      ...gridProps,
-      cellPadding: "8",
+      disabled: isDisabled,
+      onClick: () => setSelectedDropdown(type),
+      className: (0, import_system37.cn)(buttonStyles, selectClassNames),
+      "data-testid": type,
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("thead", { ...headerProps, children: /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("tr", { children: weekDays.map((day, index) => /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("th", { style: { fontWeight: "bolder" }, children: day.substring(0, 2) }, index)) }) }),
-        /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("tbody", { children: [...new Array(numberOfWeeksInMonth).keys()].map((weekIndex) => /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("tr", { children: state.getDatesInWeek(weekIndex).map(
-          (date, i) => date ? /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
-            CalendarCell,
-            {
-              date,
-              state
-            },
-            i
-          ) : /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("td", {}, i)
-        ) }, weekIndex)) })
+        type === "month" ? months[state.focusedDate.month - 1].substring(0, 3) : state.focusedDate.year,
+        /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(import_icons.ChevronDown, {})
       ]
     }
   );
-};
+}
 
-// src/Calendar/MonthDropdown.tsx
-var import_jsx_runtime48 = require("react/jsx-runtime");
-var MonthDropdown = ({
-  state,
-  setSelectedDropdown,
-  months
-}) => {
+// src/Calendar/MonthControls.tsx
+var import_react_aria_components28 = require("react-aria-components");
+var import_icons2 = require("@marigold/icons");
+var import_system38 = require("@marigold/system");
+var import_jsx_runtime45 = require("react/jsx-runtime");
+function MonthControls() {
+  const classNames2 = (0, import_system38.useClassNames)({ component: "Calendar" });
+  const buttonClassNames = (0, import_system38.useClassNames)({ component: "Button" });
+  return /* @__PURE__ */ (0, import_jsx_runtime45.jsxs)(
+    "div",
+    {
+      className: (0, import_system38.cn)(
+        "flex w-full flex-nowrap justify-end gap-[10px] [&_button:disabled]:cursor-not-allowed [&_button]:px-2 [&_button]:py-1",
+        classNames2.calendarControllers
+      ),
+      children: [
+        /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(
+          import_react_aria_components28.Button,
+          {
+            className: (0, import_system38.cn)(
+              "inline-flex items-center justify-center gap-[0.5ch]",
+              buttonClassNames
+            ),
+            slot: "previous",
+            children: /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(import_icons2.ChevronLeft, {})
+          }
+        ),
+        /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(
+          import_react_aria_components28.Button,
+          {
+            className: (0, import_system38.cn)(
+              "inline-flex items-center justify-center gap-[0.5ch]",
+              buttonClassNames
+            ),
+            slot: "next",
+            children: /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(import_icons2.ChevronRight, {})
+          }
+        )
+      ]
+    }
+  );
+}
+var MonthControls_default = MonthControls;
+
+// src/Calendar/MonthListBox.tsx
+var import_react25 = require("react");
+var import_react_aria_components29 = require("react-aria-components");
+var import_jsx_runtime46 = require("react/jsx-runtime");
+var MonthListBox = ({ setSelectedDropdown }) => {
+  const state = (0, import_react25.useContext)(import_react_aria_components29.CalendarStateContext);
+  const months = useFormattedMonths(state.timeZone, state.focusedDate);
   let onChange = (index) => {
     let value = Number(index) + 1;
     let date = state.focusedDate.set({ month: value });
     state.setFocusedDate(date);
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(
     "ul",
     {
       "data-testid": "monthOptions",
       className: "grid h-full max-h-[300px] min-w-[300px] grid-cols-3 gap-y-10 overflow-y-scroll p-2",
       children: months.map((month, index) => {
-        return /* @__PURE__ */ (0, import_jsx_runtime48.jsx)("li", { className: "flex justify-center", children: /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(
+        return /* @__PURE__ */ (0, import_jsx_runtime46.jsx)("li", { className: "flex justify-center", children: /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(
           _Button,
           {
+            slot: "previous",
             variant: index === state.focusedDate.month - 1 ? "secondary" : "text",
             size: "small",
             onPress: () => {
@@ -2122,15 +1744,17 @@ var MonthDropdown = ({
     }
   );
 };
-var MonthDropdown_default = MonthDropdown;
+var MonthListBox_default = MonthListBox;
 
-// src/Calendar/YearDropdown.tsx
-var import_react28 = require("react");
-var import_i18n6 = require("@react-aria/i18n");
-var import_jsx_runtime49 = require("react/jsx-runtime");
-var YearDropdown = ({ state, setSelectedDropdown }) => {
+// src/Calendar/YearListBox.tsx
+var import_react26 = require("react");
+var import_react_aria_components30 = require("react-aria-components");
+var import_i18n3 = require("@react-aria/i18n");
+var import_jsx_runtime47 = require("react/jsx-runtime");
+var YearListBox = ({ setSelectedDropdown }) => {
+  const state = (0, import_react26.useContext)(import_react_aria_components30.CalendarStateContext);
   const years = [];
-  let formatter = (0, import_i18n6.useDateFormatter)({
+  let formatter = (0, import_i18n3.useDateFormatter)({
     year: "numeric",
     timeZone: state.timeZone
   });
@@ -2141,8 +1765,8 @@ var YearDropdown = ({ state, setSelectedDropdown }) => {
       formatted: formatter.format(date.toDate(state.timeZone))
     });
   }
-  const activeButtonRef = (0, import_react28.useRef)(null);
-  (0, import_react28.useEffect)(() => {
+  const activeButtonRef = (0, import_react26.useRef)(null);
+  (0, import_react26.useEffect)(() => {
     if (activeButtonRef.current) {
       const activeButton = activeButtonRef.current;
       activeButton == null ? void 0 : activeButton.scrollIntoView({
@@ -2156,21 +1780,22 @@ var YearDropdown = ({ state, setSelectedDropdown }) => {
     let date = years[index].value;
     state.setFocusedDate(date);
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
     "ul",
     {
       "data-testid": "yearOptions",
       className: "grid h-full max-h-[300px] min-w-[300px] grid-cols-3 gap-y-10 overflow-y-scroll p-2",
       children: years.map((year, index) => {
         const isActive = +year.formatted === state.focusedDate.year;
-        return /* @__PURE__ */ (0, import_jsx_runtime49.jsx)("li", { className: "flex justify-center", children: /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
+        return /* @__PURE__ */ (0, import_jsx_runtime47.jsx)("li", { className: "flex justify-center", children: /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
           "div",
           {
             ref: isActive ? activeButtonRef : null,
             style: { height: "100%", width: "100%" },
-            children: /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
+            children: /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
               _Button,
               {
+                slot: "previous",
                 disabled: state.isDisabled,
                 variant: isActive ? "secondary" : "text",
                 size: "small",
@@ -2189,269 +1814,168 @@ var YearDropdown = ({ state, setSelectedDropdown }) => {
     }
   );
 };
-var YearDropdown_default = YearDropdown;
+var YearListBox_default = YearListBox;
 
 // src/Calendar/Calendar.tsx
-var import_jsx_runtime50 = require("react/jsx-runtime");
-var buttonStyles = "flex items-center justify-between gap-1 overflow-hidden";
-var Calendar = ({
+var import_jsx_runtime48 = require("react/jsx-runtime");
+var _Calendar = ({
   disabled,
   readOnly,
   size,
   variant,
   ...rest
 }) => {
-  const { locale } = (0, import_i18n7.useLocale)();
   const props = {
     isDisabled: disabled,
     isReadOnly: readOnly,
     ...rest
   };
-  const state = (0, import_calendar4.useCalendarState)({
-    ...props,
-    locale,
-    createCalendar: import_date3.createCalendar
-  });
-  const ref = (0, import_react29.useRef)(null);
-  const { calendarProps, prevButtonProps, nextButtonProps } = (0, import_calendar3.useCalendar)(
-    props,
-    state
-  );
-  const {
-    isDisabled: prevIsDisabled,
-    onFocusChange: prevFocusChange,
-    ...prevPropsRest
-  } = prevButtonProps;
-  const {
-    isDisabled: nextIsDisabled,
-    onFocusChange: nextFocusChange,
-    ...nextPropsRest
-  } = nextButtonProps;
-  const calendarState = (0, import_system40.useStateProps)({
-    disabled: state.isDisabled,
-    focusVisible: state.isFocused
-  });
-  const classNames2 = (0, import_system40.useClassNames)({ component: "Calendar" });
-  const { select: selectClassNames } = (0, import_system40.useClassNames)({ component: "Select" });
-  const [selectedDropdown, setSelectedDropdown] = (0, import_react29.useState)();
-  let months = [];
-  let formatter = (0, import_i18n7.useDateFormatter)({
-    month: "long",
-    timeZone: state.timeZone
-  });
-  let numMonths = state.focusedDate.calendar.getMonthsInYear(state.focusedDate);
-  for (let i = 1; i <= numMonths; i++) {
-    let date = state.focusedDate.set({ month: i });
-    months.push(formatter.format(date.toDate(state.timeZone)));
-  }
-  const selectedValue = {
-    month: months[state.focusedDate.month - 1].substring(0, 3),
-    year: state.focusedDate.year
+  const classNames2 = (0, import_system39.useClassNames)({ component: "Calendar" });
+  const [selectedDropdown, setSelectedDropdown] = (0, import_react27.useState)();
+  const ViewMap = {
+    month: /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(MonthListBox_default, { setSelectedDropdown }),
+    year: /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(YearListBox_default, { setSelectedDropdown })
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
-    "div",
+  return /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(
+    import_react_aria_components31.Calendar,
     {
-      tabIndex: -1,
-      className: (0, import_system40.cn)(
+      className: (0, import_system39.cn)(
         "flex min-h-[350px] w-[360px] flex-col rounded-sm p-4  shadow-[0_4px_4px_rgba(165,165,165,0.25)]",
         classNames2.calendar
       ),
-      ...calendarProps,
-      ...calendarState,
-      ref,
-      children: selectedDropdown ? selectedDropdown === "month" ? /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
-        MonthDropdown_default,
-        {
-          setSelectedDropdown,
-          months,
-          state
-        }
-      ) : /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
-        YearDropdown_default,
-        {
-          setSelectedDropdown,
-          state
-        }
-      ) : /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)(import_jsx_runtime50.Fragment, { children: [
-        /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)("div", { className: "mb-4 flex items-center justify-between", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)("div", { className: "flex w-full gap-4", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)(
-              "button",
+      ...props,
+      children: selectedDropdown ? ViewMap[selectedDropdown] : /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(import_jsx_runtime48.Fragment, { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)("div", { className: "mb-4 flex items-center justify-between", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)("div", { className: "flex w-full gap-4", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(
+              CalendarListBox,
               {
-                disabled: state.isDisabled,
-                onClick: () => setSelectedDropdown("month"),
-                className: (0, import_system40.cn)(buttonStyles, selectClassNames),
-                "data-testid": "month",
-                children: [
-                  selectedValue.month,
-                  /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(import_icons.ChevronDown, {})
-                ]
+                type: "month",
+                isDisabled: props.isDisabled,
+                setSelectedDropdown
               }
             ),
-            /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)(
-              "button",
+            /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(
+              CalendarListBox,
               {
-                disabled: state.isDisabled,
-                onClick: () => setSelectedDropdown("year"),
-                className: (0, import_system40.cn)(buttonStyles, selectClassNames),
-                "data-testid": "year",
-                children: [
-                  selectedValue.year,
-                  /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(import_icons.ChevronDown, {})
-                ]
+                type: "year",
+                isDisabled: props.isDisabled,
+                setSelectedDropdown
               }
             )
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)(
-            "div",
-            {
-              className: (0, import_system40.cn)(
-                "flex w-full flex-nowrap justify-end gap-[10px] [&_button:disabled]:cursor-not-allowed [&_button]:px-2 [&_button]:py-1",
-                classNames2.calendarControllers
-              ),
-              children: [
-                /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(_Button, { ...prevPropsRest, disabled: prevIsDisabled, children: /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(import_icons.ChevronLeft, {}) }),
-                /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(_Button, { ...nextPropsRest, disabled: nextIsDisabled, children: /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(import_icons.ChevronRight, {}) })
-              ]
-            }
-          )
+          /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(MonthControls_default, {})
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(CalendarGrid, { state })
+        /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(_CalendarGrid, {})
       ] })
     }
   );
 };
 
 // src/DatePicker/DatePicker.tsx
-var import_react30 = require("react");
-var import_datepicker4 = require("@react-aria/datepicker");
-var import_utils12 = require("@react-aria/utils");
-var import_datepicker5 = require("@react-stately/datepicker");
-var import_system41 = require("@marigold/system");
-var import_jsx_runtime51 = require("react/jsx-runtime");
-var DatePicker = ({
+var import_react_aria_components32 = require("react-aria-components");
+var import_system40 = require("@marigold/system");
+var import_jsx_runtime49 = require("react/jsx-runtime");
+var _DatePicker = ({
   disabled,
   required,
-  readonly,
-  open,
+  readOnly,
   error,
-  shouldCloseOnSelect,
   variant,
   size,
-  width,
+  open,
   ...rest
 }) => {
   const props = {
     isDisabled: disabled,
-    isReadOnly: readonly,
+    isReadOnly: readOnly,
     isRequired: required,
+    isInvalid: error,
     isOpen: open,
     ...rest
   };
-  const state = (0, import_datepicker5.useDatePickerState)({
-    shouldCloseOnSelect,
-    ...props
-  });
-  const ref = (0, import_react30.useRef)(null);
-  const stateProps = (0, import_system41.useStateProps)({
-    focus: state.isOpen
-  });
-  const { groupProps, fieldProps, buttonProps, calendarProps } = (0, import_datepicker4.useDatePicker)(
-    props,
-    state,
-    ref
-  );
-  const { isDisabled, errorMessage, description, label } = props;
-  const classNames2 = (0, import_system41.useClassNames)({
+  const classNames2 = (0, import_system40.useClassNames)({
     component: "DatePicker",
     size,
     variant
   });
-  return /* @__PURE__ */ (0, import_jsx_runtime51.jsxs)(import_jsx_runtime51.Fragment, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime51.jsx)("div", { className: "flex w-full min-w-[300px]", ...groupProps, children: /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(
-      DateField,
+  return /* @__PURE__ */ (0, import_jsx_runtime49.jsxs)(FieldBase, { as: import_react_aria_components32.DatePicker, variant, size, ...props, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
+      _DateInput,
       {
-        ...fieldProps,
-        label,
-        isPressed: state.isOpen,
-        disabled,
-        required,
-        errorMessage,
-        error,
-        description: !state.isOpen && description,
-        triggerRef: ref,
-        width,
-        action: /* @__PURE__ */ (0, import_jsx_runtime51.jsx)("div", { className: classNames2.container, children: /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(
+        action: /* @__PURE__ */ (0, import_jsx_runtime49.jsx)("div", { className: classNames2.container, children: /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
           _Button,
           {
-            ...(0, import_utils12.mergeProps)(buttonProps, stateProps),
-            disabled: isDisabled,
-            children: /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(
+            size: "small",
+            disabled,
+            className: classNames2.button,
+            children: /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
               "svg",
               {
-                width: "24",
-                height: "24",
+                "data-testid": "action",
                 viewBox: "0 0 24 24",
+                width: 24,
+                height: 24,
                 fill: "currentColor",
-                children: /* @__PURE__ */ (0, import_jsx_runtime51.jsx)("path", { d: "M20.0906 19.2V6.6C20.0906 5.61 19.2806 4.8 18.2906 4.8H17.3906V3H15.5906V4.8H8.39062V3H6.59062V4.8H5.69063C4.69163 4.8 3.89962 5.61 3.89962 6.6L3.89062 19.2C3.89062 20.19 4.69163 21 5.69063 21H18.2906C19.2806 21 20.0906 20.19 20.0906 19.2ZM9.29062 11.1001H7.49061V12.9001H9.29062V11.1001ZM5.69062 8.40009H18.2906V6.60008H5.69062V8.40009ZM18.2906 10.2V19.2H5.69062V10.2H18.2906ZM14.6906 12.9001H16.4906V11.1001H14.6906V12.9001ZM12.8906 12.9001H11.0906V11.1001H12.8906V12.9001Z" })
+                children: /* @__PURE__ */ (0, import_jsx_runtime49.jsx)("path", { d: "M20.0906 19.2V6.6C20.0906 5.61 19.2806 4.8 18.2906 4.8H17.3906V3H15.5906V4.8H8.39062V3H6.59062V4.8H5.69063C4.69163 4.8 3.89962 5.61 3.89962 6.6L3.89062 19.2C3.89062 20.19 4.69163 21 5.69063 21H18.2906C19.2806 21 20.0906 20.19 20.0906 19.2ZM9.29062 11.1001H7.49061V12.9001H9.29062V11.1001ZM5.69062 8.40009H18.2906V6.60008H5.69062V8.40009ZM18.2906 10.2V19.2H5.69062V10.2H18.2906ZM14.6906 12.9001H16.4906V11.1001H14.6906V12.9001ZM12.8906 12.9001H11.0906V11.1001H12.8906V12.9001Z" })
               }
             )
           }
         ) })
       }
-    ) }),
-    state.isOpen && /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Popover, { triggerRef: ref, state, children: /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Calendar, { disabled, ...calendarProps }) })
+    ),
+    /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(_Popover, { children: /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(_Calendar, { disabled }) })
   ] });
 };
 
 // src/Inset/Inset.tsx
-var import_system42 = require("@marigold/system");
-var import_jsx_runtime52 = require("react/jsx-runtime");
-var Inset = ({ space, spaceX, spaceY, children }) => /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(
+var import_system41 = require("@marigold/system");
+var import_jsx_runtime50 = require("react/jsx-runtime");
+var Inset = ({ space, spaceX, spaceY, children }) => /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
   "div",
   {
-    className: (0, import_system42.cn)(
-      space && import_system42.paddingSpace[space],
-      !space && spaceX && import_system42.paddingSpaceX[spaceX],
-      !space && spaceY && import_system42.paddingSpaceY[spaceY]
+    className: (0, import_system41.cn)(
+      space && import_system41.paddingSpace[space],
+      !space && spaceX && import_system41.paddingSpaceX[spaceX],
+      !space && spaceY && import_system41.paddingSpaceY[spaceY]
     ),
     children
   }
 );
 
 // src/Link/Link.tsx
-var import_react31 = require("react");
-var import_react_aria_components13 = require("react-aria-components");
-var import_system43 = require("@marigold/system");
-var import_jsx_runtime53 = require("react/jsx-runtime");
-var _Link = (0, import_react31.forwardRef)(
+var import_react28 = require("react");
+var import_react_aria_components33 = require("react-aria-components");
+var import_system42 = require("@marigold/system");
+var import_jsx_runtime51 = require("react/jsx-runtime");
+var _Link = (0, import_react28.forwardRef)(
   ({ variant, size, disabled, children, ...props }, ref) => {
-    const classNames2 = (0, import_system43.useClassNames)({
+    const classNames2 = (0, import_system42.useClassNames)({
       component: "Link",
       variant,
       size
     });
-    return /* @__PURE__ */ (0, import_jsx_runtime53.jsx)(import_react_aria_components13.Link, { ...props, ref, className: classNames2, isDisabled: disabled, children });
+    return /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(import_react_aria_components33.Link, { ...props, ref, className: classNames2, isDisabled: disabled, children });
   }
 );
 
 // src/List/List.tsx
-var import_system44 = require("@marigold/system");
+var import_system43 = require("@marigold/system");
 
 // src/List/Context.ts
-var import_react32 = require("react");
-var ListContext = (0, import_react32.createContext)({});
-var useListContext = () => (0, import_react32.useContext)(ListContext);
+var import_react29 = require("react");
+var ListContext = (0, import_react29.createContext)({});
+var useListContext = () => (0, import_react29.useContext)(ListContext);
 
 // src/List/ListItem.tsx
-var import_jsx_runtime54 = require("react/jsx-runtime");
+var import_jsx_runtime52 = require("react/jsx-runtime");
 var ListItem = ({ children, ...props }) => {
   const { classNames: classNames2 } = useListContext();
-  return /* @__PURE__ */ (0, import_jsx_runtime54.jsx)("li", { ...props, className: classNames2, children });
+  return /* @__PURE__ */ (0, import_jsx_runtime52.jsx)("li", { ...props, className: classNames2, children });
 };
 
 // src/List/List.tsx
-var import_jsx_runtime55 = require("react/jsx-runtime");
+var import_jsx_runtime53 = require("react/jsx-runtime");
 var List = ({
   as = "ul",
   children,
@@ -2460,205 +1984,79 @@ var List = ({
   ...props
 }) => {
   const Component = as;
-  const classNames2 = (0, import_system44.useClassNames)({ component: "List", variant, size });
-  return /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(Component, { ...props, className: classNames2[as], children: /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(ListContext.Provider, { value: { classNames: classNames2.item }, children }) });
+  const classNames2 = (0, import_system43.useClassNames)({ component: "List", variant, size });
+  return /* @__PURE__ */ (0, import_jsx_runtime53.jsx)(Component, { ...props, className: classNames2[as], children: /* @__PURE__ */ (0, import_jsx_runtime53.jsx)(ListContext.Provider, { value: { classNames: classNames2.item }, children }) });
 };
 List.Item = ListItem;
 
 // src/Menu/Menu.tsx
-var import_react36 = require("react");
-var import_menu5 = require("@react-aria/menu");
-var import_utils15 = require("@react-aria/utils");
-var import_collections4 = require("@react-stately/collections");
-var import_tree2 = require("@react-stately/tree");
-var import_system48 = require("@marigold/system");
-
-// src/Menu/Context.ts
-var import_react33 = require("react");
-var MenuContext = (0, import_react33.createContext)({});
-var useMenuContext = () => (0, import_react33.useContext)(MenuContext);
+var import_react_aria_components36 = require("react-aria-components");
+var import_system46 = require("@marigold/system");
 
 // src/Menu/MenuItem.tsx
-var import_react34 = require("react");
-var import_focus7 = require("@react-aria/focus");
-var import_menu = require("@react-aria/menu");
-var import_utils13 = require("@react-aria/utils");
-var import_system45 = require("@marigold/system");
-var import_jsx_runtime56 = require("react/jsx-runtime");
-var MenuItem = ({
-  item,
-  state,
-  onAction,
-  className
-}) => {
-  const ref = (0, import_react34.useRef)(null);
-  const { onClose } = useMenuContext();
-  const { menuItemProps } = (0, import_menu.useMenuItem)(
-    {
-      key: item.key,
-      onAction,
-      onClose
-    },
-    state,
-    ref
-  );
-  const { isFocusVisible, focusProps } = (0, import_focus7.useFocusRing)();
-  const stateProps = (0, import_system45.useStateProps)({
-    focus: isFocusVisible
-  });
-  const { onPointerUp, ...props } = menuItemProps;
-  return /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(
-    "li",
-    {
-      ref,
-      className,
-      ...(0, import_utils13.mergeProps)(
-        props,
-        { onPointerDown: onPointerUp },
-        stateProps,
-        focusProps
-      ),
-      children: item.props.children
-    }
-  );
+var import_react_aria_components34 = require("react-aria-components");
+var import_system44 = require("@marigold/system");
+var import_jsx_runtime54 = require("react/jsx-runtime");
+var _MenuItem = ({ children, ...props }) => {
+  const classNames2 = (0, import_system44.useClassNames)({ component: "Menu" });
+  return /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(import_react_aria_components34.MenuItem, { ...props, className: classNames2.item, children });
 };
 
 // src/Menu/MenuSection.tsx
-var import_menu2 = require("@react-aria/menu");
-var import_system46 = require("@marigold/system");
-var import_jsx_runtime57 = require("react/jsx-runtime");
-var MenuSection = ({ onAction, item, state }) => {
-  let { itemProps, headingProps, groupProps } = (0, import_menu2.useMenuSection)({
-    heading: item.rendered,
-    "aria-label": item["aria-label"]
-  });
-  const className = (0, import_system46.useClassNames)({ component: "Menu" });
-  return /* @__PURE__ */ (0, import_jsx_runtime57.jsxs)(import_jsx_runtime57.Fragment, { children: [
-    item.key !== state.collection.getFirstKey() && /* @__PURE__ */ (0, import_jsx_runtime57.jsx)("li", { children: /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(_Divider, { variant: "section" }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime57.jsxs)("li", { ...itemProps, children: [
-      item.rendered && /* @__PURE__ */ (0, import_jsx_runtime57.jsx)("span", { ...headingProps, className: className.section, children: item.rendered }),
-      /* @__PURE__ */ (0, import_jsx_runtime57.jsx)("ul", { ...groupProps, className: "pb-1", children: [...item.props.children].map((node) => /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(
-        MenuItem,
-        {
-          item: node,
-          state,
-          onAction,
-          className: className.item
-        },
-        node.key
-      )) })
-    ] })
+var import_react_aria_components35 = require("react-aria-components");
+var import_system45 = require("@marigold/system");
+var import_jsx_runtime55 = require("react/jsx-runtime");
+var _MenuSection = ({ children, title, ...props }) => {
+  const className = (0, import_system45.useClassNames)({ component: "Menu" });
+  return /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)(import_react_aria_components35.Section, { ...props, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(_Header, { className: className.section, children: title }),
+    children
   ] });
 };
-var MenuSection_default = MenuSection;
 
-// src/Menu/MenuTrigger.tsx
-var import_react35 = require("react");
-var import_interactions4 = require("@react-aria/interactions");
-var import_menu3 = require("@react-aria/menu");
-var import_utils14 = require("@react-aria/utils");
-var import_menu4 = require("@react-stately/menu");
-var import_system47 = require("@marigold/system");
-var import_jsx_runtime58 = require("react/jsx-runtime");
-var MenuTrigger = ({
+// src/Menu/Menu.tsx
+var import_jsx_runtime56 = require("react/jsx-runtime");
+var _Menu = ({
+  children,
+  label,
+  variant,
+  size,
   disabled,
   open,
-  onOpenChange,
-  children
+  ...props
 }) => {
-  const [menuTrigger, menu] = import_react35.Children.toArray(children);
-  const menuTriggerRef = (0, import_react35.useRef)(null);
-  const menuRef = (0, import_utils14.useObjectRef)();
-  const state = (0, import_menu4.useMenuTriggerState)({
-    isOpen: open,
-    onOpenChange
-  });
-  const { menuTriggerProps, menuProps } = (0, import_menu3.useMenuTrigger)(
-    { trigger: "press", isDisabled: disabled },
-    state,
-    menuTriggerRef
-  );
-  const menuContext = {
-    ...menuProps,
-    ref: menuRef,
-    open: state.isOpen,
-    onClose: state.close,
-    autoFocus: state.focusStrategy
-  };
-  const isSmallScreen = (0, import_system47.useSmallScreen)();
-  return /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)(MenuContext.Provider, { value: menuContext, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
-      import_interactions4.PressResponder,
-      {
-        ...menuTriggerProps,
-        ref: menuTriggerRef,
-        isPressed: state.isOpen,
-        children: menuTrigger
-      }
-    ),
-    isSmallScreen ? /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(Tray, { state, children: menu }) : /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(Popover, { triggerRef: menuTriggerRef, scrollRef: menuRef, state, children: menu })
+  const classNames2 = (0, import_system46.useClassNames)({ component: "Menu", variant, size });
+  return /* @__PURE__ */ (0, import_jsx_runtime56.jsxs)(import_react_aria_components36.MenuTrigger, { ...props, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(_Button, { variant: "menu", disabled, children: label }),
+    /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(_Popover, { open, children: /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(import_react_aria_components36.Menu, { ...props, className: classNames2.container, children }) })
   ] });
 };
-
-// src/Menu/Menu.tsx
-var import_jsx_runtime59 = require("react/jsx-runtime");
-var Menu = ({ variant, size, ...props }) => {
-  const { ref: scrollRef, ...menuContext } = useMenuContext();
-  const ownProps = { ...props, ...menuContext };
-  const ref = (0, import_react36.useRef)(null);
-  const state = (0, import_tree2.useTreeState)({ ...ownProps, selectionMode: "none" });
-  const { menuProps } = (0, import_menu5.useMenu)(ownProps, state, ref);
-  (0, import_utils15.useSyncRef)({ ref: scrollRef }, ref);
-  const classNames2 = (0, import_system48.useClassNames)({ component: "Menu", variant, size });
-  return /* @__PURE__ */ (0, import_jsx_runtime59.jsx)("ul", { ref, className: classNames2.container, ...menuProps, children: [...state.collection].map((item) => {
-    if (item.type === "section") {
-      return /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
-        MenuSection_default,
-        {
-          item,
-          state,
-          onAction: props.onAction
-        },
-        item.key
-      );
-    }
-    return /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
-      MenuItem,
-      {
-        item,
-        state,
-        onAction: props.onAction,
-        className: classNames2.item
-      },
-      item.key
-    );
-  }) });
-};
-Menu.Trigger = MenuTrigger;
-Menu.Item = import_collections4.Item;
-Menu.Section = import_collections4.Section;
+_Menu.Item = _MenuItem;
+_Menu.Section = _MenuSection;
 
 // src/Menu/ActionMenu.tsx
-var import_system49 = require("@marigold/system");
-var import_jsx_runtime60 = require("react/jsx-runtime");
-var ActionMenu = (props) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime60.jsxs)(Menu.Trigger, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(_Button, { variant: "menu", size: "small", children: /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(import_system49.SVG, { viewBox: "0 0 24 24", children: /* @__PURE__ */ (0, import_jsx_runtime60.jsx)("path", { d: "M12.0117 7.47656C13.2557 7.47656 14.2734 6.45879 14.2734 5.21484C14.2734 3.9709 13.2557 2.95312 12.0117 2.95312C10.7678 2.95312 9.75 3.9709 9.75 5.21484C9.75 6.45879 10.7678 7.47656 12.0117 7.47656ZM12.0117 9.73828C10.7678 9.73828 9.75 10.7561 9.75 12C9.75 13.2439 10.7678 14.2617 12.0117 14.2617C13.2557 14.2617 14.2734 13.2439 14.2734 12C14.2734 10.7561 13.2557 9.73828 12.0117 9.73828ZM12.0117 16.5234C10.7678 16.5234 9.75 17.5412 9.75 18.7852C9.75 20.0291 10.7678 21.0469 12.0117 21.0469C13.2557 21.0469 14.2734 20.0291 14.2734 18.7852C14.2734 17.5412 13.2557 16.5234 12.0117 16.5234Z" }) }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(Menu, { ...props })
+var import_react_aria_components37 = require("react-aria-components");
+var import_system47 = require("@marigold/system");
+var import_jsx_runtime57 = require("react/jsx-runtime");
+var ActionMenu = ({ variant, size, ...props }) => {
+  const classNames2 = (0, import_system47.useClassNames)({ component: "Menu", variant, size });
+  return /* @__PURE__ */ (0, import_jsx_runtime57.jsxs)(import_react_aria_components37.MenuTrigger, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(_Button, { variant: "menu", size: "small", children: /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(import_system47.SVG, { viewBox: "0 0 24 24", children: /* @__PURE__ */ (0, import_jsx_runtime57.jsx)("path", { d: "M12.0117 7.47656C13.2557 7.47656 14.2734 6.45879 14.2734 5.21484C14.2734 3.9709 13.2557 2.95312 12.0117 2.95312C10.7678 2.95312 9.75 3.9709 9.75 5.21484C9.75 6.45879 10.7678 7.47656 12.0117 7.47656ZM12.0117 9.73828C10.7678 9.73828 9.75 10.7561 9.75 12C9.75 13.2439 10.7678 14.2617 12.0117 14.2617C13.2557 14.2617 14.2734 13.2439 14.2734 12C14.2734 10.7561 13.2557 9.73828 12.0117 9.73828ZM12.0117 16.5234C10.7678 16.5234 9.75 17.5412 9.75 18.7852C9.75 20.0291 10.7678 21.0469 12.0117 21.0469C13.2557 21.0469 14.2734 20.0291 14.2734 18.7852C14.2734 17.5412 13.2557 16.5234 12.0117 16.5234Z" }) }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(_Popover, { children: /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(import_react_aria_components37.Menu, { ...props, className: classNames2.container, children: props.children }) })
   ] });
 };
 
 // src/Message/Message.tsx
-var import_system50 = require("@marigold/system");
-var import_jsx_runtime61 = require("react/jsx-runtime");
+var import_system48 = require("@marigold/system");
+var import_jsx_runtime58 = require("react/jsx-runtime");
 var icons = {
-  success: () => /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(
+  success: () => /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
     "svg",
     {
       xmlns: "http://www.w3.org/2000/svg",
       viewBox: "0 0 24 24",
       fill: "currentColor",
-      children: /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
         "path",
         {
           fillRule: "evenodd",
@@ -2668,13 +2066,13 @@ var icons = {
       )
     }
   ),
-  info: () => /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(
+  info: () => /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
     "svg",
     {
       xmlns: "http://www.w3.org/2000/svg",
       viewBox: "0 0 24 24",
       fill: "currentColor",
-      children: /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
         "path",
         {
           fillRule: "evenodd",
@@ -2684,13 +2082,13 @@ var icons = {
       )
     }
   ),
-  warning: () => /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(
+  warning: () => /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
     "svg",
     {
       xmlns: "http://www.w3.org/2000/svg",
       viewBox: "0 0 24 24",
       fill: "currentColor",
-      children: /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
         "path",
         {
           fillRule: "evenodd",
@@ -2700,13 +2098,13 @@ var icons = {
       )
     }
   ),
-  error: () => /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(
+  error: () => /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
     "svg",
     {
       xmlns: "http://www.w3.org/2000/svg",
       viewBox: "0 0 24 24",
       fill: "currentColor",
-      children: /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
         "path",
         {
           fillRule: "evenodd",
@@ -2718,106 +2116,47 @@ var icons = {
   )
 };
 var Message = ({
-  messageTitle,
-  variant = "info",
-  size,
-  children,
-  ...props
-}) => {
-  const classNames2 = (0, import_system50.useClassNames)({ component: "Message", variant, size });
-  const Icon3 = icons[variant];
-  return /* @__PURE__ */ (0, import_jsx_runtime61.jsxs)(
-    "div",
-    {
-      className: (0, import_system50.cn)(
-        "grid auto-rows-min grid-cols-[min-content_auto] gap-1",
-        classNames2.container
-      ),
-      ...props,
-      children: [
-        /* @__PURE__ */ (0, import_jsx_runtime61.jsx)("div", { className: (0, import_system50.cn)("col-span-1 h-5 w-5 self-center", classNames2.icon), children: /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(Icon3, {}) }),
-        /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(
-          "div",
-          {
-            className: (0, import_system50.cn)("col-start-2 row-start-1 self-center", classNames2.title),
-            children: messageTitle
-          }
-        ),
-        /* @__PURE__ */ (0, import_jsx_runtime61.jsx)("div", { className: (0, import_system50.cn)("col-start-2", classNames2.content), children })
-      ]
-    }
-  );
-};
-
-// src/NumberField/NumberField.tsx
-var import_react38 = require("react");
-var import_react_aria_components16 = require("react-aria-components");
-var import_system53 = require("@marigold/system");
-
-// src/Input/_Input.tsx
-var import_react37 = require("react");
-var import_react_aria_components14 = require("react-aria-components");
-var import_system51 = require("@marigold/system");
-var import_jsx_runtime62 = require("react/jsx-runtime");
-var _Input = (0, import_react37.forwardRef)(
-  ({ type, icon, action, variant, size, className, ...props }, ref) => {
-    const classNames2 = (0, import_system51.useClassNames)({
-      component: "Input",
-      variant,
-      size
-    });
-    const inputIcon = icon ? (0, import_react37.cloneElement)(icon, {
-      className: (0, import_system51.cn)(
-        "pointer-events-none absolute",
-        classNames2.icon,
-        icon.props.className
-      ),
-      ...icon.props
-    }) : null;
-    const inputAction = action && !props.readOnly ? (0, import_react37.cloneElement)(action, {
-      className: (0, import_system51.cn)(
-        "absolute",
-        classNames2.action,
-        action.props.className
-      ),
-      ...action.props
-    }) : null;
-    return /* @__PURE__ */ (0, import_jsx_runtime62.jsxs)(
-      "div",
-      {
-        className: "group/input relative flex items-center",
-        "data-icon": icon && "",
-        "data-action": action && "",
-        children: [
-          inputIcon,
-          /* @__PURE__ */ (0, import_jsx_runtime62.jsx)(
-            import_react_aria_components14.Input,
-            {
-              ...props,
-              className: (0, import_system51.cn)(
-                "w-full flex-1",
-                "disabled:cursor-not-allowed",
-                "[&[type=file]]:border-none [&[type=file]]:p-0",
-                "[&[type=color]]:ml-0 [&[type=color]]:border-none [&[type=color]]:bg-transparent [&[type=color]]:p-0",
-                classNames2.input,
-                className
-              ),
-              ref,
-              type
-            }
-          ),
-          inputAction
-        ]
-      }
-    );
-  }
-);
+  messageTitle,
+  variant = "info",
+  size,
+  children,
+  ...props
+}) => {
+  const classNames2 = (0, import_system48.useClassNames)({ component: "Message", variant, size });
+  const Icon3 = icons[variant];
+  return /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)(
+    "div",
+    {
+      className: (0, import_system48.cn)(
+        "grid auto-rows-min grid-cols-[min-content_auto] gap-1",
+        classNames2.container
+      ),
+      ...props,
+      children: [
+        /* @__PURE__ */ (0, import_jsx_runtime58.jsx)("div", { className: (0, import_system48.cn)("col-span-1 h-5 w-5 self-center", classNames2.icon), children: /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(Icon3, {}) }),
+        /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
+          "div",
+          {
+            className: (0, import_system48.cn)("col-start-2 row-start-1 self-center", classNames2.title),
+            children: messageTitle
+          }
+        ),
+        /* @__PURE__ */ (0, import_jsx_runtime58.jsx)("div", { className: (0, import_system48.cn)("col-start-2", classNames2.content), children })
+      ]
+    }
+  );
+};
+
+// src/NumberField/NumberField.tsx
+var import_react30 = require("react");
+var import_react_aria_components39 = require("react-aria-components");
+var import_system50 = require("@marigold/system");
 
 // src/NumberField/StepButton.tsx
-var import_react_aria_components15 = require("react-aria-components");
-var import_system52 = require("@marigold/system");
-var import_jsx_runtime63 = require("react/jsx-runtime");
-var Plus = () => /* @__PURE__ */ (0, import_jsx_runtime63.jsx)("svg", { width: 16, height: 16, viewBox: "0 0 20 20", fill: "currentColor", children: /* @__PURE__ */ (0, import_jsx_runtime63.jsx)(
+var import_react_aria_components38 = require("react-aria-components");
+var import_system49 = require("@marigold/system");
+var import_jsx_runtime59 = require("react/jsx-runtime");
+var Plus = () => /* @__PURE__ */ (0, import_jsx_runtime59.jsx)("svg", { width: 16, height: 16, viewBox: "0 0 20 20", fill: "currentColor", children: /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
   "path",
   {
     fillRule: "evenodd",
@@ -2825,7 +2164,7 @@ var Plus = () => /* @__PURE__ */ (0, import_jsx_runtime63.jsx)("svg", { width: 1
     d: "M10 3a1 1 0 011 1v5h5a1 1 0 110 2h-5v5a1 1 0 11-2 0v-5H4a1 1 0 110-2h5V4a1 1 0 011-1z"
   }
 ) });
-var Minus = () => /* @__PURE__ */ (0, import_jsx_runtime63.jsx)("svg", { width: 16, height: 16, viewBox: "0 0 20 20", fill: "currentColor", children: /* @__PURE__ */ (0, import_jsx_runtime63.jsx)(
+var Minus = () => /* @__PURE__ */ (0, import_jsx_runtime59.jsx)("svg", { width: 16, height: 16, viewBox: "0 0 20 20", fill: "currentColor", children: /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
   "path",
   {
     fillRule: "evenodd",
@@ -2835,10 +2174,10 @@ var Minus = () => /* @__PURE__ */ (0, import_jsx_runtime63.jsx)("svg", { width:
 ) });
 var _StepButton = ({ direction, className, ...props }) => {
   const Icon3 = direction === "up" ? Plus : Minus;
-  return /* @__PURE__ */ (0, import_jsx_runtime63.jsx)(
-    import_react_aria_components15.Button,
+  return /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
+    import_react_aria_components38.Button,
     {
-      className: (0, import_system52.cn)(
+      className: (0, import_system49.cn)(
         [
           "flex items-center justify-center",
           "cursor-pointer data-[disabled]:cursor-not-allowed"
@@ -2846,14 +2185,14 @@ var _StepButton = ({ direction, className, ...props }) => {
         className
       ),
       ...props,
-      children: /* @__PURE__ */ (0, import_jsx_runtime63.jsx)(Icon3, {})
+      children: /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(Icon3, {})
     }
   );
 };
 
 // src/NumberField/NumberField.tsx
-var import_jsx_runtime64 = require("react/jsx-runtime");
-var _NumberField = (0, import_react38.forwardRef)(
+var import_jsx_runtime60 = require("react/jsx-runtime");
+var _NumberField = (0, import_react30.forwardRef)(
   ({
     variant,
     size,
@@ -2864,7 +2203,7 @@ var _NumberField = (0, import_react38.forwardRef)(
     hideStepper,
     ...rest
   }, ref) => {
-    const classNames2 = (0, import_system53.useClassNames)({
+    const classNames2 = (0, import_system50.useClassNames)({
       component: "NumberField",
       size,
       variant
@@ -2877,8 +2216,8 @@ var _NumberField = (0, import_react38.forwardRef)(
       ...rest
     };
     const showStepper = !hideStepper;
-    return /* @__PURE__ */ (0, import_jsx_runtime64.jsx)(FieldBase2, { as: import_react_aria_components16.NumberField, ...props, children: /* @__PURE__ */ (0, import_jsx_runtime64.jsxs)(import_react_aria_components16.Group, { className: (0, import_system53.cn)("flex items-stretch", classNames2.group), children: [
-      showStepper && /* @__PURE__ */ (0, import_jsx_runtime64.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(FieldBase, { as: import_react_aria_components39.NumberField, ...props, children: /* @__PURE__ */ (0, import_jsx_runtime60.jsxs)(import_react_aria_components39.Group, { className: (0, import_system50.cn)("flex items-stretch", classNames2.group), children: [
+      showStepper && /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(
         _StepButton,
         {
           className: classNames2.stepper,
@@ -2886,7 +2225,7 @@ var _NumberField = (0, import_react38.forwardRef)(
           slot: "decrement"
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime64.jsx)("div", { className: "flex-1", children: /* @__PURE__ */ (0, import_jsx_runtime64.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime60.jsx)("div", { className: "flex-1", children: /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(
         _Input,
         {
           ref,
@@ -2895,7 +2234,7 @@ var _NumberField = (0, import_react38.forwardRef)(
           className: classNames2.input
         }
       ) }),
-      showStepper && /* @__PURE__ */ (0, import_jsx_runtime64.jsx)(
+      showStepper && /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(
         _StepButton,
         {
           className: classNames2.stepper,
@@ -2908,37 +2247,37 @@ var _NumberField = (0, import_react38.forwardRef)(
 );
 
 // src/Provider/index.ts
-var import_system55 = require("@marigold/system");
+var import_system52 = require("@marigold/system");
 
 // src/Provider/MarigoldProvider.tsx
-var import_overlays4 = require("@react-aria/overlays");
-var import_system54 = require("@marigold/system");
-var import_jsx_runtime65 = require("react/jsx-runtime");
+var import_overlays = require("@react-aria/overlays");
+var import_system51 = require("@marigold/system");
+var import_jsx_runtime61 = require("react/jsx-runtime");
 function MarigoldProvider({
   children,
   theme
 }) {
-  const outerTheme = (0, import_system54.useTheme)();
-  const isTopLevel = outerTheme === import_system54.defaultTheme;
-  return /* @__PURE__ */ (0, import_jsx_runtime65.jsx)(import_system54.ThemeProvider, { theme, children: isTopLevel ? /* @__PURE__ */ (0, import_jsx_runtime65.jsx)(import_overlays4.OverlayProvider, { children }) : children });
+  const outerTheme = (0, import_system51.useTheme)();
+  const isTopLevel = outerTheme === import_system51.defaultTheme;
+  return /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(import_system51.ThemeProvider, { theme, children: isTopLevel ? /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(import_overlays.OverlayProvider, { children }) : children });
 }
 
 // src/Radio/Radio.tsx
-var import_react40 = require("react");
-var import_react_aria_components18 = require("react-aria-components");
-var import_system57 = require("@marigold/system");
+var import_react32 = require("react");
+var import_react_aria_components41 = require("react-aria-components");
+var import_system54 = require("@marigold/system");
 
 // src/Radio/Context.ts
-var import_react39 = require("react");
-var RadioGroupContext = (0, import_react39.createContext)(
+var import_react31 = require("react");
+var RadioGroupContext = (0, import_react31.createContext)(
   null
 );
-var useRadioGroupContext = () => (0, import_react39.useContext)(RadioGroupContext);
+var useRadioGroupContext = () => (0, import_react31.useContext)(RadioGroupContext);
 
 // src/Radio/RadioGroup.tsx
-var import_react_aria_components17 = require("react-aria-components");
-var import_system56 = require("@marigold/system");
-var import_jsx_runtime66 = require("react/jsx-runtime");
+var import_react_aria_components40 = require("react-aria-components");
+var import_system53 = require("@marigold/system");
+var import_jsx_runtime62 = require("react/jsx-runtime");
 var _RadioGroup = ({
   variant,
   size,
@@ -2954,7 +2293,7 @@ var _RadioGroup = ({
   width,
   ...rest
 }) => {
-  const classNames2 = (0, import_system56.useClassNames)({ component: "Radio", variant, size });
+  const classNames2 = (0, import_system53.useClassNames)({ component: "Radio", variant, size });
   const props = {
     isDisabled: disabled,
     isReadOnly: readOnly,
@@ -2962,10 +2301,10 @@ var _RadioGroup = ({
     isInvalid: error,
     ...rest
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime66.jsx)(
-    FieldBase2,
+  return /* @__PURE__ */ (0, import_jsx_runtime62.jsx)(
+    FieldBase,
     {
-      as: import_react_aria_components17.RadioGroup,
+      as: import_react_aria_components40.RadioGroup,
       width,
       label,
       description,
@@ -2973,18 +2312,18 @@ var _RadioGroup = ({
       variant,
       size,
       ...props,
-      children: /* @__PURE__ */ (0, import_jsx_runtime66.jsx)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime62.jsx)(
         "div",
         {
           role: "presentation",
           "data-testid": "group",
           "data-orientation": orientation,
-          className: (0, import_system56.cn)(
+          className: (0, import_system53.cn)(
             classNames2.group,
             "flex items-start",
             orientation === "vertical" ? "flex-col gap-[0.5ch]" : "flex-row gap-[1.5ch]"
           ),
-          children: /* @__PURE__ */ (0, import_jsx_runtime66.jsx)(RadioGroupContext.Provider, { value: { width, variant, size }, children })
+          children: /* @__PURE__ */ (0, import_jsx_runtime62.jsx)(RadioGroupContext.Provider, { value: { width, variant, size }, children })
         }
       )
     }
@@ -2992,33 +2331,33 @@ var _RadioGroup = ({
 };
 
 // src/Radio/Radio.tsx
-var import_jsx_runtime67 = require("react/jsx-runtime");
-var Dot = () => /* @__PURE__ */ (0, import_jsx_runtime67.jsx)("svg", { viewBox: "0 0 6 6", children: /* @__PURE__ */ (0, import_jsx_runtime67.jsx)("circle", { fill: "currentColor", cx: "3", cy: "3", r: "3" }) });
-var Icon2 = ({ checked, className, ...props }) => /* @__PURE__ */ (0, import_jsx_runtime67.jsx)(
+var import_jsx_runtime63 = require("react/jsx-runtime");
+var Dot = () => /* @__PURE__ */ (0, import_jsx_runtime63.jsx)("svg", { viewBox: "0 0 6 6", children: /* @__PURE__ */ (0, import_jsx_runtime63.jsx)("circle", { fill: "currentColor", cx: "3", cy: "3", r: "3" }) });
+var Icon2 = ({ checked, className, ...props }) => /* @__PURE__ */ (0, import_jsx_runtime63.jsx)(
   "div",
   {
-    className: (0, import_system57.cn)(
+    className: (0, import_system54.cn)(
       "bg-secondary-50 flex h-4 w-4 items-center justify-center rounded-[50%] border p-1",
       className
     ),
     "aria-hidden": "true",
     ...props,
-    children: checked ? /* @__PURE__ */ (0, import_jsx_runtime67.jsx)(Dot, {}) : null
+    children: checked ? /* @__PURE__ */ (0, import_jsx_runtime63.jsx)(Dot, {}) : null
   }
 );
-var _Radio = (0, import_react40.forwardRef)(
+var _Radio = (0, import_react32.forwardRef)(
   ({ value, disabled, width, children, ...props }, ref) => {
     const { variant, size, width: groupWidth } = useRadioGroupContext();
-    const classNames2 = (0, import_system57.useClassNames)({
+    const classNames2 = (0, import_system54.useClassNames)({
       component: "Radio",
       variant: variant || props.variant,
       size: size || props.size
     });
-    return /* @__PURE__ */ (0, import_jsx_runtime67.jsx)(
-      import_react_aria_components18.Radio,
+    return /* @__PURE__ */ (0, import_jsx_runtime63.jsx)(
+      import_react_aria_components41.Radio,
       {
         ref,
-        className: (0, import_system57.cn)(
+        className: (0, import_system54.cn)(
           "group/radio",
           "relative flex items-center gap-[1ch]",
           width || groupWidth || "w-full",
@@ -3027,18 +2366,18 @@ var _Radio = (0, import_react40.forwardRef)(
         value,
         isDisabled: disabled,
         ...props,
-        children: ({ isSelected }) => /* @__PURE__ */ (0, import_jsx_runtime67.jsxs)(import_jsx_runtime67.Fragment, { children: [
-          /* @__PURE__ */ (0, import_jsx_runtime67.jsx)(
+        children: ({ isSelected }) => /* @__PURE__ */ (0, import_jsx_runtime63.jsxs)(import_jsx_runtime63.Fragment, { children: [
+          /* @__PURE__ */ (0, import_jsx_runtime63.jsx)(
             Icon2,
             {
               checked: isSelected,
-              className: (0, import_system57.cn)(
+              className: (0, import_system54.cn)(
                 disabled ? "cursor-not-allowed" : "cursor-pointer",
                 classNames2.radio
               )
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime67.jsx)("div", { className: classNames2.label, children })
+          /* @__PURE__ */ (0, import_jsx_runtime63.jsx)("div", { className: classNames2.label, children })
         ] })
       }
     );
@@ -3047,10 +2386,10 @@ var _Radio = (0, import_react40.forwardRef)(
 _Radio.Group = _RadioGroup;
 
 // src/SearchField/SearchField.tsx
-var import_react41 = require("react");
-var import_react_aria_components19 = require("react-aria-components");
-var import_jsx_runtime68 = require("react/jsx-runtime");
-var SearchIcon2 = (props) => /* @__PURE__ */ (0, import_jsx_runtime68.jsx)(
+var import_react33 = require("react");
+var import_react_aria_components42 = require("react-aria-components");
+var import_jsx_runtime64 = require("react/jsx-runtime");
+var SearchIcon2 = (props) => /* @__PURE__ */ (0, import_jsx_runtime64.jsx)(
   "svg",
   {
     xmlns: "http://www.w3.org/2000/svg",
@@ -3059,10 +2398,10 @@ var SearchIcon2 = (props) => /* @__PURE__ */ (0, import_jsx_runtime68.jsx)(
     width: 24,
     height: 24,
     ...props,
-    children: /* @__PURE__ */ (0, import_jsx_runtime68.jsx)("path", { d: "M16.1865 14.5142H15.3057L14.9936 14.2131C16.0862 12.9421 16.744 11.292 16.744 9.497C16.744 5.49443 13.4996 2.25 9.497 2.25C5.49443 2.25 2.25 5.49443 2.25 9.497C2.25 13.4996 5.49443 16.744 9.497 16.744C11.292 16.744 12.9421 16.0862 14.2131 14.9936L14.5142 15.3057V16.1865L20.0888 21.75L21.75 20.0888L16.1865 14.5142ZM9.49701 14.5142C6.72085 14.5142 4.47986 12.2732 4.47986 9.49701C4.47986 6.72085 6.72085 4.47986 9.49701 4.47986C12.2732 4.47986 14.5142 6.72085 14.5142 9.49701C14.5142 12.2732 12.2732 14.5142 9.49701 14.5142Z" })
+    children: /* @__PURE__ */ (0, import_jsx_runtime64.jsx)("path", { d: "M16.1865 14.5142H15.3057L14.9936 14.2131C16.0862 12.9421 16.744 11.292 16.744 9.497C16.744 5.49443 13.4996 2.25 9.497 2.25C5.49443 2.25 2.25 5.49443 2.25 9.497C2.25 13.4996 5.49443 16.744 9.497 16.744C11.292 16.744 12.9421 16.0862 14.2131 14.9936L14.5142 15.3057V16.1865L20.0888 21.75L21.75 20.0888L16.1865 14.5142ZM9.49701 14.5142C6.72085 14.5142 4.47986 12.2732 4.47986 9.49701C4.47986 6.72085 6.72085 4.47986 9.49701 4.47986C12.2732 4.47986 14.5142 6.72085 14.5142 9.49701C14.5142 12.2732 12.2732 14.5142 9.49701 14.5142Z" })
   }
 );
-var _SearchField = (0, import_react41.forwardRef)(
+var _SearchField = (0, import_react33.forwardRef)(
   ({ disabled, required, readOnly, error, action, ...rest }, ref) => {
     const props = {
       ...rest,
@@ -3071,155 +2410,64 @@ var _SearchField = (0, import_react41.forwardRef)(
       isReadOnly: readOnly,
       isInvalid: error
     };
-    return /* @__PURE__ */ (0, import_jsx_runtime68.jsx)(FieldBase2, { as: import_react_aria_components19.SearchField, ...props, children: /* @__PURE__ */ (0, import_jsx_runtime68.jsx)(_Input, { ref, icon: /* @__PURE__ */ (0, import_jsx_runtime68.jsx)(SearchIcon2, {}) }) });
+    return /* @__PURE__ */ (0, import_jsx_runtime64.jsx)(FieldBase, { as: import_react_aria_components42.SearchField, ...props, children: /* @__PURE__ */ (0, import_jsx_runtime64.jsx)(_Input, { ref, icon: /* @__PURE__ */ (0, import_jsx_runtime64.jsx)(SearchIcon2, {}) }) });
   }
 );
 
 // src/Select/Select.tsx
-var import_react42 = require("react");
-var import_button3 = require("@react-aria/button");
-var import_focus8 = require("@react-aria/focus");
-var import_i18n8 = require("@react-aria/i18n");
-var import_select = require("@react-aria/select");
-var import_utils16 = require("@react-aria/utils");
-var import_collections5 = require("@react-stately/collections");
-var import_select2 = require("@react-stately/select");
-var import_system58 = require("@marigold/system");
-
-// src/Select/intl.ts
-var messages = {
-  "en-US": {
-    placeholder: "Select an option\u2026"
-  },
-  "de-DE": {
-    placeholder: "Option ausw\xE4hlen\u2026"
-  }
-};
-
-// src/Select/Select.tsx
-var import_jsx_runtime69 = require("react/jsx-runtime");
-var Select = (0, import_react42.forwardRef)(
+var import_react34 = require("react");
+var import_react_aria_components43 = require("react-aria-components");
+var import_system55 = require("@marigold/system");
+var import_jsx_runtime65 = require("react/jsx-runtime");
+var _Select = (0, import_react34.forwardRef)(
   ({
-    variant,
-    size,
     width,
-    open,
     disabled,
     required,
+    items,
+    variant,
+    size,
     error,
+    open,
     onChange,
     ...rest
   }, ref) => {
-    const formatMessage = (0, import_i18n8.useLocalizedStringFormatter)(messages);
     const props = {
-      isOpen: open,
       isDisabled: disabled,
+      isInvalid: error,
+      isOpen: open,
       isRequired: required,
-      validationState: error ? "invalid" : "valid",
-      placeholder: rest.placeholder || formatMessage.format("placeholder"),
       onSelectionChange: onChange,
       ...rest
     };
-    const buttonRef = (0, import_utils16.useObjectRef)(ref);
-    const listboxRef = (0, import_react42.useRef)(null);
-    const state = (0, import_select2.useSelectState)(props);
-    const {
-      labelProps,
-      triggerProps,
-      valueProps,
-      menuProps,
-      descriptionProps,
-      errorMessageProps
-    } = (0, import_select.useSelect)(props, state, buttonRef);
-    const { buttonProps } = (0, import_button3.useButton)(
-      { isDisabled: disabled, ...triggerProps },
-      buttonRef
-    );
-    const { focusProps, isFocusVisible } = (0, import_focus8.useFocusRing)();
-    const classNames2 = (0, import_system58.useClassNames)({ component: "Select", variant, size });
-    const isSmallScreen = (0, import_system58.useSmallScreen)();
-    const stateProps = (0, import_system58.useStateProps)({
-      disabled,
-      error,
-      focusVisible: isFocusVisible,
-      expanded: state.isOpen,
-      required
-    });
-    return /* @__PURE__ */ (0, import_jsx_runtime69.jsxs)(
-      FieldBase,
-      {
-        variant,
-        size,
-        width,
-        label: props.label,
-        labelProps: { elementType: "span", ...labelProps },
-        description: props.description,
-        descriptionProps,
-        error,
-        errorMessage: props.errorMessage,
-        errorMessageProps,
-        stateProps,
-        disabled,
-        children: [
-          /* @__PURE__ */ (0, import_jsx_runtime69.jsx)(
-            import_select.HiddenSelect,
-            {
-              state,
-              triggerRef: buttonRef,
-              label: props.label,
-              name: props.name,
-              isDisabled: disabled
-            }
-          ),
-          /* @__PURE__ */ (0, import_jsx_runtime69.jsxs)(
-            "button",
-            {
-              className: (0, import_system58.cn)(
-                "flex w-full items-center justify-between gap-1 overflow-hidden",
-                classNames2.select
-              ),
-              ref: buttonRef,
-              ...(0, import_utils16.mergeProps)(buttonProps, focusProps),
-              ...stateProps,
-              children: [
-                /* @__PURE__ */ (0, import_jsx_runtime69.jsx)("div", { className: "overflow-hidden whitespace-nowrap", ...valueProps, children: state.selectedItem ? state.selectedItem.rendered : props.placeholder }),
-                /* @__PURE__ */ (0, import_jsx_runtime69.jsx)(ChevronDown, { className: "h-4 w-4" })
-              ]
-            }
+    const classNames2 = (0, import_system55.useClassNames)({ component: "Select", variant, size });
+    return /* @__PURE__ */ (0, import_jsx_runtime65.jsxs)(FieldBase, { isOpen: true, as: import_react_aria_components43.Select, ref, ...props, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime65.jsxs)(
+        import_react_aria_components43.Button,
+        {
+          className: (0, import_system55.cn)(
+            "flex w-full items-center justify-between gap-1 overflow-hidden",
+            classNames2.select
           ),
-          isSmallScreen ? /* @__PURE__ */ (0, import_jsx_runtime69.jsx)(Tray, { state, children: /* @__PURE__ */ (0, import_jsx_runtime69.jsx)(
-            ListBox,
-            {
-              ref: listboxRef,
-              state,
-              variant,
-              size,
-              ...menuProps
-            }
-          ) }) : /* @__PURE__ */ (0, import_jsx_runtime69.jsx)(Popover, { state, triggerRef: buttonRef, scrollRef: listboxRef, children: /* @__PURE__ */ (0, import_jsx_runtime69.jsx)(
-            ListBox,
-            {
-              ref: listboxRef,
-              state,
-              variant,
-              size,
-              ...menuProps
-            }
-          ) })
-        ]
-      }
-    );
+          children: [
+            /* @__PURE__ */ (0, import_jsx_runtime65.jsx)(import_react_aria_components43.SelectValue, {}),
+            /* @__PURE__ */ (0, import_jsx_runtime65.jsx)(ChevronDown, { className: "h-4 w-4" })
+          ]
+        }
+      ),
+      /* @__PURE__ */ (0, import_jsx_runtime65.jsx)(_Popover, { children: /* @__PURE__ */ (0, import_jsx_runtime65.jsx)(_ListBox, { items, children: props.children }) })
+    ] });
   }
 );
-Select.Option = import_collections5.Item;
-Select.Section = import_collections5.Section;
+_Select.Option = _ListBox.Item;
+_Select.Section = _ListBox.Section;
 
 // src/Slider/Slider.tsx
-var import_react43 = require("react");
-var import_react_aria_components20 = require("react-aria-components");
-var import_system59 = require("@marigold/system");
-var import_jsx_runtime70 = require("react/jsx-runtime");
-var _Slider = (0, import_react43.forwardRef)(
+var import_react35 = require("react");
+var import_react_aria_components44 = require("react-aria-components");
+var import_system56 = require("@marigold/system");
+var import_jsx_runtime66 = require("react/jsx-runtime");
+var _Slider = (0, import_react35.forwardRef)(
   ({
     thumbLabels,
     variant,
@@ -3228,7 +2476,7 @@ var _Slider = (0, import_react43.forwardRef)(
     disabled,
     ...rest
   }, ref) => {
-    const classNames2 = (0, import_system59.useClassNames)({
+    const classNames2 = (0, import_system56.useClassNames)({
       component: "Slider",
       variant,
       size
@@ -3237,27 +2485,27 @@ var _Slider = (0, import_react43.forwardRef)(
       isDisabled: disabled,
       ...rest
     };
-    return /* @__PURE__ */ (0, import_jsx_runtime70.jsxs)(
-      import_react_aria_components20.Slider,
+    return /* @__PURE__ */ (0, import_jsx_runtime66.jsxs)(
+      import_react_aria_components44.Slider,
       {
-        className: (0, import_system59.cn)(
+        className: (0, import_system56.cn)(
           "grid grid-cols-[auto_1fr] gap-y-1",
           classNames2.container,
-          import_system59.width[width]
+          import_system56.width[width]
         ),
         ref,
         ...props,
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(_Label, { children: props.children }),
-          /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(import_react_aria_components20.SliderOutput, { className: (0, import_system59.cn)("flex justify-end", classNames2.output), children: ({ state }) => state.values.map((_, i) => state.getThumbValueLabel(i)).join(" \u2013 ") }),
-          /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(
-            import_react_aria_components20.SliderTrack,
+          /* @__PURE__ */ (0, import_jsx_runtime66.jsx)(_Label, { children: props.children }),
+          /* @__PURE__ */ (0, import_jsx_runtime66.jsx)(import_react_aria_components44.SliderOutput, { className: (0, import_system56.cn)("flex justify-end", classNames2.output), children: ({ state }) => state.values.map((_, i) => state.getThumbValueLabel(i)).join(" \u2013 ") }),
+          /* @__PURE__ */ (0, import_jsx_runtime66.jsx)(
+            import_react_aria_components44.SliderTrack,
             {
-              className: (0, import_system59.cn)("relative col-span-2 h-2 w-full", classNames2.track),
-              children: ({ state }) => state.values.map((_, i) => /* @__PURE__ */ (0, import_jsx_runtime70.jsx)(
-                import_react_aria_components20.SliderThumb,
+              className: (0, import_system56.cn)("relative col-span-2 h-2 w-full", classNames2.track),
+              children: ({ state }) => state.values.map((_, i) => /* @__PURE__ */ (0, import_jsx_runtime66.jsx)(
+                import_react_aria_components44.SliderThumb,
                 {
-                  className: (0, import_system59.cn)("top-1/2 cursor-pointer", classNames2.thumb),
+                  className: (0, import_system56.cn)("top-1/2 cursor-pointer", classNames2.thumb),
                   index: i,
                   "aria-label": thumbLabels == null ? void 0 : thumbLabels[i]
                 },
@@ -3272,12 +2520,12 @@ var _Slider = (0, import_react43.forwardRef)(
 );
 
 // src/Split/Split.tsx
-var import_jsx_runtime71 = require("react/jsx-runtime");
-var Split = (props) => /* @__PURE__ */ (0, import_jsx_runtime71.jsx)("div", { ...props, role: "separator", className: "grow" });
+var import_jsx_runtime67 = require("react/jsx-runtime");
+var Split = (props) => /* @__PURE__ */ (0, import_jsx_runtime67.jsx)("div", { ...props, role: "separator", className: "grow" });
 
 // src/Stack/Stack.tsx
-var import_system60 = require("@marigold/system");
-var import_jsx_runtime72 = require("react/jsx-runtime");
+var import_system57 = require("@marigold/system");
+var import_jsx_runtime68 = require("react/jsx-runtime");
 var Stack = ({
   children,
   space = 0,
@@ -3288,14 +2536,14 @@ var Stack = ({
   ...props
 }) => {
   var _a, _b, _c, _d;
-  return /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime68.jsx)(
     "div",
     {
-      className: (0, import_system60.cn)(
+      className: (0, import_system57.cn)(
         "flex flex-col",
-        import_system60.gapSpace[space],
-        alignX && ((_b = (_a = import_system60.alignment) == null ? void 0 : _a.vertical) == null ? void 0 : _b.alignmentX[alignX]),
-        alignY && ((_d = (_c = import_system60.alignment) == null ? void 0 : _c.vertical) == null ? void 0 : _d.alignmentY[alignY]),
+        import_system57.gapSpace[space],
+        alignX && ((_b = (_a = import_system57.alignment) == null ? void 0 : _a.vertical) == null ? void 0 : _b.alignmentX[alignX]),
+        alignY && ((_d = (_c = import_system57.alignment) == null ? void 0 : _c.vertical) == null ? void 0 : _d.alignmentY[alignY]),
         stretch && "h-full w-full"
       ),
       ...props,
@@ -3305,11 +2553,11 @@ var Stack = ({
 };
 
 // src/Switch/Switch.tsx
-var import_react44 = require("react");
-var import_react_aria_components21 = require("react-aria-components");
-var import_system61 = require("@marigold/system");
-var import_jsx_runtime73 = require("react/jsx-runtime");
-var _Switch = (0, import_react44.forwardRef)(
+var import_react36 = require("react");
+var import_react_aria_components45 = require("react-aria-components");
+var import_system58 = require("@marigold/system");
+var import_jsx_runtime69 = require("react/jsx-runtime");
+var _Switch = (0, import_react36.forwardRef)(
   ({
     variant,
     size,
@@ -3320,37 +2568,37 @@ var _Switch = (0, import_react44.forwardRef)(
     readOnly,
     ...rest
   }, ref) => {
-    const classNames2 = (0, import_system61.useClassNames)({ component: "Switch", size, variant });
+    const classNames2 = (0, import_system58.useClassNames)({ component: "Switch", size, variant });
     const props = {
       isDisabled: disabled,
       isReadOnly: readOnly,
       isSelected: selected,
       ...rest
     };
-    return /* @__PURE__ */ (0, import_jsx_runtime73.jsxs)(
-      import_react_aria_components21.Switch,
+    return /* @__PURE__ */ (0, import_jsx_runtime69.jsxs)(
+      import_react_aria_components45.Switch,
       {
         ...props,
         ref,
-        className: (0, import_system61.cn)(
-          import_system61.width[width],
+        className: (0, import_system58.cn)(
+          import_system58.width[width],
           "group/switch",
           "flex items-center justify-between gap-[1ch]",
           classNames2.container
         ),
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(_Label, { elementType: "span", children }),
-          /* @__PURE__ */ (0, import_jsx_runtime73.jsx)("div", { className: "relative", children: /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime69.jsx)(_Label, { elementType: "span", children }),
+          /* @__PURE__ */ (0, import_jsx_runtime69.jsx)("div", { className: "relative", children: /* @__PURE__ */ (0, import_jsx_runtime69.jsx)(
             "div",
             {
-              className: (0, import_system61.cn)(
+              className: (0, import_system58.cn)(
                 "h-6 w-12 basis-12 rounded-3xl group-disabled/switch:cursor-not-allowed ",
                 classNames2.track
               ),
-              children: /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(
+              children: /* @__PURE__ */ (0, import_jsx_runtime69.jsx)(
                 "div",
                 {
-                  className: (0, import_system61.cn)(
+                  className: (0, import_system58.cn)(
                     "h-[22px] w-[22px]",
                     "cubic-bezier(.7,0,.3,1)",
                     "absolute left-0 top-px",
@@ -3369,33 +2617,33 @@ var _Switch = (0, import_react44.forwardRef)(
 );
 
 // src/Table/Table.tsx
-var import_react52 = require("react");
+var import_react44 = require("react");
 var import_table9 = require("@react-aria/table");
 var import_table10 = require("@react-stately/table");
-var import_system68 = require("@marigold/system");
+var import_system65 = require("@marigold/system");
 
 // src/Table/Context.tsx
-var import_react45 = require("react");
-var TableContext = (0, import_react45.createContext)({});
-var useTableContext = () => (0, import_react45.useContext)(TableContext);
+var import_react37 = require("react");
+var TableContext = (0, import_react37.createContext)({});
+var useTableContext = () => (0, import_react37.useContext)(TableContext);
 
 // src/Table/TableBody.tsx
 var import_table = require("@react-aria/table");
-var import_jsx_runtime74 = require("react/jsx-runtime");
+var import_jsx_runtime70 = require("react/jsx-runtime");
 var TableBody = ({ children }) => {
   const { rowGroupProps } = (0, import_table.useTableRowGroup)();
-  return /* @__PURE__ */ (0, import_jsx_runtime74.jsx)("tbody", { ...rowGroupProps, children });
+  return /* @__PURE__ */ (0, import_jsx_runtime70.jsx)("tbody", { ...rowGroupProps, children });
 };
 
 // src/Table/TableCell.tsx
-var import_react46 = require("react");
-var import_focus9 = require("@react-aria/focus");
+var import_react38 = require("react");
+var import_focus2 = require("@react-aria/focus");
 var import_table2 = require("@react-aria/table");
-var import_utils17 = require("@react-aria/utils");
-var import_system62 = require("@marigold/system");
-var import_jsx_runtime75 = require("react/jsx-runtime");
-var TableCell = ({ cell }) => {
-  const ref = (0, import_react46.useRef)(null);
+var import_utils3 = require("@react-aria/utils");
+var import_system59 = require("@marigold/system");
+var import_jsx_runtime71 = require("react/jsx-runtime");
+var TableCell = ({ cell, align }) => {
+  const ref = (0, import_react38.useRef)(null);
   const { interactive, state, classNames: classNames2 } = useTableContext();
   const disabled = state.disabledKeys.has(cell.parentKey);
   const { gridCellProps } = (0, import_table2.useTableCell)(
@@ -3414,26 +2662,27 @@ var TableCell = ({ cell }) => {
     onMouseDown: (e) => e.stopPropagation(),
     onPointerDown: (e) => e.stopPropagation()
   };
-  const { focusProps, isFocusVisible } = (0, import_focus9.useFocusRing)();
-  const stateProps = (0, import_system62.useStateProps)({ disabled, focusVisible: isFocusVisible });
-  return /* @__PURE__ */ (0, import_jsx_runtime75.jsx)(
+  const { focusProps, isFocusVisible } = (0, import_focus2.useFocusRing)();
+  const stateProps = (0, import_system59.useStateProps)({ disabled, focusVisible: isFocusVisible });
+  return /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(
     "td",
     {
       ref,
       className: classNames2 == null ? void 0 : classNames2.cell,
-      ...(0, import_utils17.mergeProps)(cellProps, focusProps),
+      ...(0, import_utils3.mergeProps)(cellProps, focusProps),
       ...stateProps,
+      align,
       children: cell.rendered
     }
   );
 };
 
 // src/Table/TableCheckboxCell.tsx
-var import_react47 = require("react");
-var import_focus10 = require("@react-aria/focus");
+var import_react39 = require("react");
+var import_focus3 = require("@react-aria/focus");
 var import_table3 = require("@react-aria/table");
-var import_utils18 = require("@react-aria/utils");
-var import_system63 = require("@marigold/system");
+var import_utils4 = require("@react-aria/utils");
+var import_system60 = require("@marigold/system");
 
 // src/Table/utils.ts
 var mapCheckboxProps = ({
@@ -3456,9 +2705,9 @@ var mapCheckboxProps = ({
 };
 
 // src/Table/TableCheckboxCell.tsx
-var import_jsx_runtime76 = require("react/jsx-runtime");
-var TableCheckboxCell = ({ cell }) => {
-  const ref = (0, import_react47.useRef)(null);
+var import_jsx_runtime72 = require("react/jsx-runtime");
+var TableCheckboxCell = ({ cell, align }) => {
+  const ref = (0, import_react39.useRef)(null);
   const { state, classNames: classNames2 } = useTableContext();
   const disabled = state.disabledKeys.has(cell.parentKey);
   const { gridCellProps } = (0, import_table3.useTableCell)(
@@ -3471,36 +2720,38 @@ var TableCheckboxCell = ({ cell }) => {
   const { checkboxProps } = mapCheckboxProps(
     (0, import_table3.useTableSelectionCheckbox)({ key: cell.parentKey }, state)
   );
-  const { focusProps, isFocusVisible } = (0, import_focus10.useFocusRing)();
-  const stateProps = (0, import_system63.useStateProps)({ disabled, focusVisible: isFocusVisible });
-  return /* @__PURE__ */ (0, import_jsx_runtime76.jsx)(
+  const { focusProps, isFocusVisible } = (0, import_focus3.useFocusRing)();
+  const stateProps = (0, import_system60.useStateProps)({ disabled, focusVisible: isFocusVisible });
+  return /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(
     "td",
     {
       ref,
-      className: (0, import_system63.cn)("text-center align-middle leading-none", classNames2 == null ? void 0 : classNames2.cell),
-      ...(0, import_utils18.mergeProps)(gridCellProps, focusProps),
+      className: (0, import_system60.cn)("text-center align-middle leading-none", classNames2 == null ? void 0 : classNames2.cell),
+      align,
+      ...(0, import_utils4.mergeProps)(gridCellProps, focusProps),
       ...stateProps,
-      children: /* @__PURE__ */ (0, import_jsx_runtime76.jsx)(_Checkbox, { ...checkboxProps })
+      children: /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(_Checkbox, { ...checkboxProps })
     }
   );
 };
 
 // src/Table/TableColumnHeader.tsx
-var import_react48 = require("react");
-var import_focus11 = require("@react-aria/focus");
-var import_interactions5 = require("@react-aria/interactions");
+var import_react40 = require("react");
+var import_focus4 = require("@react-aria/focus");
+var import_interactions = require("@react-aria/interactions");
 var import_table4 = require("@react-aria/table");
-var import_utils20 = require("@react-aria/utils");
-var import_icons2 = require("@marigold/icons");
-var import_system64 = require("@marigold/system");
-var import_system65 = require("@marigold/system");
-var import_jsx_runtime77 = require("react/jsx-runtime");
+var import_utils6 = require("@react-aria/utils");
+var import_icons3 = require("@marigold/icons");
+var import_system61 = require("@marigold/system");
+var import_system62 = require("@marigold/system");
+var import_jsx_runtime73 = require("react/jsx-runtime");
 var TableColumnHeader = ({
   column,
-  width = "auto"
+  width = "auto",
+  align
 }) => {
   var _a, _b;
-  const ref = (0, import_react48.useRef)(null);
+  const ref = (0, import_react40.useRef)(null);
   const { state, classNames: classNames2 } = useTableContext();
   const { columnHeaderProps } = (0, import_table4.useTableColumnHeader)(
     {
@@ -3509,23 +2760,24 @@ var TableColumnHeader = ({
     state,
     ref
   );
-  const { hoverProps, isHovered } = (0, import_interactions5.useHover)({});
-  const { focusProps, isFocusVisible } = (0, import_focus11.useFocusRing)();
-  const stateProps = (0, import_system64.useStateProps)({
+  const { hoverProps, isHovered } = (0, import_interactions.useHover)({});
+  const { focusProps, isFocusVisible } = (0, import_focus4.useFocusRing)();
+  const stateProps = (0, import_system61.useStateProps)({
     hover: isHovered,
     focusVisible: isFocusVisible
   });
-  return /* @__PURE__ */ (0, import_jsx_runtime77.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime73.jsxs)(
     "th",
     {
       colSpan: column.colspan,
       ref,
-      className: (0, import_system64.cn)("cursor-default", import_system65.width[width], classNames2 == null ? void 0 : classNames2.header),
-      ...(0, import_utils20.mergeProps)(columnHeaderProps, hoverProps, focusProps),
+      className: (0, import_system61.cn)("cursor-default", import_system62.width[width], classNames2 == null ? void 0 : classNames2.header),
+      ...(0, import_utils6.mergeProps)(columnHeaderProps, hoverProps, focusProps),
       ...stateProps,
+      align,
       children: [
         column.rendered,
-        column.props.allowsSorting && (((_a = state.sortDescriptor) == null ? void 0 : _a.column) === column.key ? ((_b = state.sortDescriptor) == null ? void 0 : _b.direction) === "ascending" ? /* @__PURE__ */ (0, import_jsx_runtime77.jsx)(import_icons2.SortUp, { className: "inline-block" }) : /* @__PURE__ */ (0, import_jsx_runtime77.jsx)(import_icons2.SortDown, { className: "inline-block" }) : /* @__PURE__ */ (0, import_jsx_runtime77.jsx)(import_icons2.SortDown, { className: "inline-block" }))
+        column.props.allowsSorting && (((_a = state.sortDescriptor) == null ? void 0 : _a.column) === column.key ? ((_b = state.sortDescriptor) == null ? void 0 : _b.direction) === "ascending" ? /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(import_icons3.SortUp, { className: "inline-block" }) : /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(import_icons3.SortDown, { className: "inline-block" }) : /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(import_icons3.SortDown, { className: "inline-block" }))
       ]
     }
   );
@@ -3533,36 +2785,36 @@ var TableColumnHeader = ({
 
 // src/Table/TableHeader.tsx
 var import_table5 = require("@react-aria/table");
-var import_jsx_runtime78 = require("react/jsx-runtime");
+var import_jsx_runtime74 = require("react/jsx-runtime");
 var TableHeader = ({ children }) => {
   const { rowGroupProps } = (0, import_table5.useTableRowGroup)();
-  return /* @__PURE__ */ (0, import_jsx_runtime78.jsx)("thead", { ...rowGroupProps, children });
+  return /* @__PURE__ */ (0, import_jsx_runtime74.jsx)("thead", { ...rowGroupProps, children });
 };
 
 // src/Table/TableHeaderRow.tsx
-var import_react49 = require("react");
+var import_react41 = require("react");
 var import_table6 = require("@react-aria/table");
-var import_jsx_runtime79 = require("react/jsx-runtime");
+var import_jsx_runtime75 = require("react/jsx-runtime");
 var TableHeaderRow = ({ item, children }) => {
   const { state } = useTableContext();
-  const ref = (0, import_react49.useRef)(null);
+  const ref = (0, import_react41.useRef)(null);
   const { rowProps } = (0, import_table6.useTableHeaderRow)({ node: item }, state, ref);
-  return /* @__PURE__ */ (0, import_jsx_runtime79.jsx)("tr", { ...rowProps, ref, children });
+  return /* @__PURE__ */ (0, import_jsx_runtime75.jsx)("tr", { ...rowProps, ref, children });
 };
 
 // src/Table/TableRow.tsx
-var import_react50 = require("react");
-var import_focus12 = require("@react-aria/focus");
-var import_interactions6 = require("@react-aria/interactions");
+var import_react42 = require("react");
+var import_focus5 = require("@react-aria/focus");
+var import_interactions2 = require("@react-aria/interactions");
 var import_table7 = require("@react-aria/table");
-var import_utils21 = require("@react-aria/utils");
-var import_system66 = require("@marigold/system");
-var import_jsx_runtime80 = require("react/jsx-runtime");
+var import_utils7 = require("@react-aria/utils");
+var import_system63 = require("@marigold/system");
+var import_jsx_runtime76 = require("react/jsx-runtime");
 var TableRow = ({ children, row }) => {
-  const ref = (0, import_react50.useRef)(null);
+  const ref = (0, import_react42.useRef)(null);
   const { interactive, state, ...ctx } = useTableContext();
   const { variant, size } = row.props;
-  const classNames2 = (0, import_system66.useClassNames)({
+  const classNames2 = (0, import_system63.useClassNames)({
     component: "Table",
     variant: variant || ctx.variant,
     size: size || ctx.size
@@ -3576,28 +2828,28 @@ var TableRow = ({ children, row }) => {
   );
   const disabled = state.disabledKeys.has(row.key);
   const selected = state.selectionManager.isSelected(row.key);
-  const { focusProps, isFocusVisible } = (0, import_focus12.useFocusRing)({ within: true });
-  const { hoverProps, isHovered } = (0, import_interactions6.useHover)({
+  const { focusProps, isFocusVisible } = (0, import_focus5.useFocusRing)({ within: true });
+  const { hoverProps, isHovered } = (0, import_interactions2.useHover)({
     isDisabled: disabled || !interactive
   });
-  const stateProps = (0, import_system66.useStateProps)({
+  const stateProps = (0, import_system63.useStateProps)({
     disabled,
     selected,
     hover: isHovered,
     focusVisible: isFocusVisible,
     active: isPressed
   });
-  return /* @__PURE__ */ (0, import_jsx_runtime80.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime76.jsx)(
     "tr",
     {
       ref,
-      className: (0, import_system66.cn)(
+      className: (0, import_system63.cn)(
         [
           !interactive ? "cursor-text" : disabled ? "cursor-default" : "cursor-pointer"
         ],
         classNames2 == null ? void 0 : classNames2.row
       ),
-      ...(0, import_utils21.mergeProps)(rowProps, focusProps, hoverProps),
+      ...(0, import_utils7.mergeProps)(rowProps, focusProps, hoverProps),
       ...stateProps,
       children
     }
@@ -3605,18 +2857,19 @@ var TableRow = ({ children, row }) => {
 };
 
 // src/Table/TableSelectAllCell.tsx
-var import_react51 = require("react");
-var import_focus13 = require("@react-aria/focus");
-var import_interactions7 = require("@react-aria/interactions");
+var import_react43 = require("react");
+var import_focus6 = require("@react-aria/focus");
+var import_interactions3 = require("@react-aria/interactions");
 var import_table8 = require("@react-aria/table");
-var import_utils22 = require("@react-aria/utils");
-var import_system67 = require("@marigold/system");
-var import_jsx_runtime81 = require("react/jsx-runtime");
+var import_utils8 = require("@react-aria/utils");
+var import_system64 = require("@marigold/system");
+var import_jsx_runtime77 = require("react/jsx-runtime");
 var TableSelectAllCell = ({
   column,
-  width = "auto"
+  width = "auto",
+  align
 }) => {
-  const ref = (0, import_react51.useRef)(null);
+  const ref = (0, import_react43.useRef)(null);
   const { state, classNames: classNames2 } = useTableContext();
   const { columnHeaderProps } = (0, import_table8.useTableColumnHeader)(
     {
@@ -3626,30 +2879,31 @@ var TableSelectAllCell = ({
     ref
   );
   const { checkboxProps } = mapCheckboxProps((0, import_table8.useTableSelectAllCheckbox)(state));
-  const { hoverProps, isHovered } = (0, import_interactions7.useHover)({});
-  const { focusProps, isFocusVisible } = (0, import_focus13.useFocusRing)();
-  const stateProps = (0, import_system67.useStateProps)({
+  const { hoverProps, isHovered } = (0, import_interactions3.useHover)({});
+  const { focusProps, isFocusVisible } = (0, import_focus6.useFocusRing)();
+  const stateProps = (0, import_system64.useStateProps)({
     hover: isHovered,
     focusVisible: isFocusVisible
   });
-  return /* @__PURE__ */ (0, import_jsx_runtime81.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime77.jsx)(
     "th",
     {
       ref,
-      className: (0, import_system67.cn)(
-        import_system67.width[width],
+      className: (0, import_system64.cn)(
+        import_system64.width[width],
         ["text-center align-middle leading-none"],
         classNames2 == null ? void 0 : classNames2.header
       ),
-      ...(0, import_utils22.mergeProps)(columnHeaderProps, hoverProps, focusProps),
+      align,
+      ...(0, import_utils8.mergeProps)(columnHeaderProps, hoverProps, focusProps),
       ...stateProps,
-      children: /* @__PURE__ */ (0, import_jsx_runtime81.jsx)(_Checkbox, { ...checkboxProps })
+      children: /* @__PURE__ */ (0, import_jsx_runtime77.jsx)(_Checkbox, { ...checkboxProps })
     }
   );
 };
 
 // src/Table/Table.tsx
-var import_jsx_runtime82 = require("react/jsx-runtime");
+var import_jsx_runtime78 = require("react/jsx-runtime");
 var Table = ({
   variant,
   size,
@@ -3658,7 +2912,7 @@ var Table = ({
   ...props
 }) => {
   const interactive = selectionMode !== "none";
-  const tableRef = (0, import_react52.useRef)(null);
+  const tableRef = (0, import_react44.useRef)(null);
   const state = (0, import_table10.useTableState)({
     ...props,
     selectionMode,
@@ -3666,21 +2920,21 @@ var Table = ({
     props.selectionBehavior !== "replace"
   });
   const { gridProps } = (0, import_table9.useTable)(props, state, tableRef);
-  const classNames2 = (0, import_system68.useClassNames)({
+  const classNames2 = (0, import_system65.useClassNames)({
     component: "Table",
     variant,
     size
   });
   const { collection } = state;
-  return /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime78.jsx)(
     TableContext.Provider,
     {
       value: { state, interactive, classNames: classNames2, variant, size },
-      children: /* @__PURE__ */ (0, import_jsx_runtime82.jsxs)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime78.jsxs)(
         "table",
         {
           ref: tableRef,
-          className: (0, import_system68.cn)(
+          className: (0, import_system65.cn)(
             "group/table",
             "border-collapse overflow-auto whitespace-nowrap",
             stretch ? "table w-full" : "block",
@@ -3688,34 +2942,48 @@ var Table = ({
           ),
           ...gridProps,
           children: [
-            /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(TableHeader, { children: collection.headerRows.map((headerRow) => /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(TableHeaderRow, { item: headerRow, children: [...collection.getChildren(headerRow.key)].map(
+            /* @__PURE__ */ (0, import_jsx_runtime78.jsx)(TableHeader, { children: collection.headerRows.map((headerRow) => /* @__PURE__ */ (0, import_jsx_runtime78.jsx)(TableHeaderRow, { item: headerRow, children: [...collection.getChildren(headerRow.key)].map(
               (column) => {
-                var _a, _b, _c;
-                return ((_a = column.props) == null ? void 0 : _a.isSelectionCell) ? /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(
+                var _a, _b, _c, _d;
+                return ((_a = column.props) == null ? void 0 : _a.isSelectionCell) ? /* @__PURE__ */ (0, import_jsx_runtime78.jsx)(
                   TableSelectAllCell,
                   {
                     width: (_b = column.props) == null ? void 0 : _b.width,
                     column
                   },
                   column.key
-                ) : /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(
+                ) : /* @__PURE__ */ (0, import_jsx_runtime78.jsx)(
                   TableColumnHeader,
                   {
                     width: (_c = column.props) == null ? void 0 : _c.width,
-                    column
+                    column,
+                    align: (_d = column.props) == null ? void 0 : _d.align
                   },
                   column.key
                 );
               }
             ) }, headerRow.key)) }),
-            /* @__PURE__ */ (0, import_jsx_runtime82.jsxs)(TableBody, { children: [
+            /* @__PURE__ */ (0, import_jsx_runtime78.jsxs)(TableBody, { children: [
               ...collection.rows.map(
-                (row) => row.type === "item" && /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(TableRow, { row, children: [...collection.getChildren(row.key)].map(
-                  (cell) => {
-                    var _a;
-                    return ((_a = cell.props) == null ? void 0 : _a.isSelectionCell) ? /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(TableCheckboxCell, { cell }, cell.key) : /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(TableCell, { cell }, cell.key);
-                  }
-                ) }, row.key)
+                (row) => row.type === "item" && /* @__PURE__ */ (0, import_jsx_runtime78.jsx)(TableRow, { row, children: [...collection.getChildren(row.key)].map((cell, index) => {
+                  var _a, _b, _c;
+                  const currentColumn = collection.columns[index];
+                  return ((_a = cell.props) == null ? void 0 : _a.isSelectionCell) ? /* @__PURE__ */ (0, import_jsx_runtime78.jsx)(
+                    TableCheckboxCell,
+                    {
+                      align: (_b = currentColumn.props) == null ? void 0 : _b.align,
+                      cell
+                    },
+                    cell.key
+                  ) : /* @__PURE__ */ (0, import_jsx_runtime78.jsx)(
+                    TableCell,
+                    {
+                      align: (_c = currentColumn.props) == null ? void 0 : _c.align,
+                      cell
+                    },
+                    cell.key
+                  );
+                }) }, row.key)
               )
             ] })
           ]
@@ -3731,8 +2999,8 @@ Table.Header = import_table10.TableHeader;
 Table.Row = import_table10.Row;
 
 // src/Text/Text.tsx
-var import_system69 = require("@marigold/system");
-var import_jsx_runtime83 = require("react/jsx-runtime");
+var import_system66 = require("@marigold/system");
+var import_jsx_runtime79 = require("react/jsx-runtime");
 var Text2 = ({
   variant,
   size,
@@ -3745,27 +3013,27 @@ var Text2 = ({
   children,
   ...props
 }) => {
-  const theme = (0, import_system69.useTheme)();
-  const classNames2 = (0, import_system69.useClassNames)({
+  const theme = (0, import_system66.useTheme)();
+  const classNames2 = (0, import_system66.useClassNames)({
     component: "Text",
     variant,
     size
   });
-  return /* @__PURE__ */ (0, import_jsx_runtime83.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(
     "p",
     {
       ...props,
-      className: (0, import_system69.cn)(
+      className: (0, import_system66.cn)(
         classNames2,
         "text-[--color] outline-[--outline]",
-        fontStyle && import_system69.textStyle[fontStyle],
-        align && import_system69.textAlign[align],
-        cursor && import_system69.cursorStyle[cursor],
-        weight && import_system69.fontWeight[weight],
-        fontSize && import_system69.textSize[fontSize]
+        fontStyle && import_system66.textStyle[fontStyle],
+        align && import_system66.textAlign[align],
+        cursor && import_system66.cursorStyle[cursor],
+        weight && import_system66.fontWeight[weight],
+        fontSize && import_system66.textSize[fontSize]
       ),
-      style: (0, import_system69.createVar)({
-        color: color && theme.colors && (0, import_system69.get)(
+      style: (0, import_system66.createVar)({
+        color: color && theme.colors && (0, import_system66.get)(
           theme.colors,
           color.replace("-", "."),
           color
@@ -3778,11 +3046,11 @@ var Text2 = ({
 };
 
 // src/TextArea/TextArea.tsx
-var import_react53 = require("react");
-var import_react_aria_components22 = require("react-aria-components");
-var import_system70 = require("@marigold/system");
-var import_jsx_runtime84 = require("react/jsx-runtime");
-var _TextArea = (0, import_react53.forwardRef)(
+var import_react45 = require("react");
+var import_react_aria_components46 = require("react-aria-components");
+var import_system67 = require("@marigold/system");
+var import_jsx_runtime80 = require("react/jsx-runtime");
+var _TextArea = (0, import_react45.forwardRef)(
   ({
     variant,
     size,
@@ -3793,7 +3061,7 @@ var _TextArea = (0, import_react53.forwardRef)(
     rows,
     ...rest
   }, ref) => {
-    const classNames2 = (0, import_system70.useClassNames)({ component: "TextArea", variant, size });
+    const classNames2 = (0, import_system67.useClassNames)({ component: "TextArea", variant, size });
     const props = {
       isDisabled: disabled,
       isReadOnly: readOnly,
@@ -3801,15 +3069,15 @@ var _TextArea = (0, import_react53.forwardRef)(
       isRequired: required,
       ...rest
     };
-    return /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(FieldBase2, { as: import_react_aria_components22.TextField, ...props, variant, size, children: /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(import_react_aria_components22.TextArea, { className: classNames2, ref, rows }) });
+    return /* @__PURE__ */ (0, import_jsx_runtime80.jsx)(FieldBase, { as: import_react_aria_components46.TextField, ...props, variant, size, children: /* @__PURE__ */ (0, import_jsx_runtime80.jsx)(import_react_aria_components46.TextArea, { className: classNames2, ref, rows }) });
   }
 );
 
 // src/TextField/TextField.tsx
-var import_react54 = require("react");
-var import_react_aria_components23 = require("react-aria-components");
-var import_jsx_runtime85 = require("react/jsx-runtime");
-var _TextField = (0, import_react54.forwardRef)(
+var import_react46 = require("react");
+var import_react_aria_components47 = require("react-aria-components");
+var import_jsx_runtime81 = require("react/jsx-runtime");
+var _TextField = (0, import_react46.forwardRef)(
   ({
     variant,
     size,
@@ -3826,13 +3094,13 @@ var _TextField = (0, import_react54.forwardRef)(
       isRequired: required,
       ...rest
     };
-    return /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(FieldBase2, { as: import_react_aria_components23.TextField, ...props, children: /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(_Input, { ref }) });
+    return /* @__PURE__ */ (0, import_jsx_runtime81.jsx)(FieldBase, { as: import_react_aria_components47.TextField, ...props, children: /* @__PURE__ */ (0, import_jsx_runtime81.jsx)(_Input, { ref }) });
   }
 );
 
 // src/Tiles/Tiles.tsx
-var import_system71 = require("@marigold/system");
-var import_jsx_runtime86 = require("react/jsx-runtime");
+var import_system68 = require("@marigold/system");
+var import_jsx_runtime82 = require("react/jsx-runtime");
 var Tiles = ({
   space = 0,
   stretch = false,
@@ -3845,29 +3113,29 @@ var Tiles = ({
   if (stretch) {
     column = `minmax(${column}, 1fr)`;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(
     "div",
     {
       ...props,
-      className: (0, import_system71.cn)(
+      className: (0, import_system68.cn)(
         "grid",
-        import_system71.gapSpace[space],
+        import_system68.gapSpace[space],
         "grid-cols-[repeat(auto-fit,var(--column))]",
         equalHeight && "auto-rows-[1fr]"
       ),
-      style: (0, import_system71.createVar)({ column, tilesWidth }),
+      style: (0, import_system68.createVar)({ column, tilesWidth }),
       children
     }
   );
 };
 
 // src/Tooltip/Tooltip.tsx
-var import_react_aria_components25 = require("react-aria-components");
-var import_system72 = require("@marigold/system");
+var import_react_aria_components49 = require("react-aria-components");
+var import_system69 = require("@marigold/system");
 
 // src/Tooltip/TooltipTrigger.tsx
-var import_react_aria_components24 = require("react-aria-components");
-var import_jsx_runtime87 = require("react/jsx-runtime");
+var import_react_aria_components48 = require("react-aria-components");
+var import_jsx_runtime83 = require("react/jsx-runtime");
 var _TooltipTrigger = ({
   delay = 1e3,
   children,
@@ -3881,32 +3149,32 @@ var _TooltipTrigger = ({
     isOpen: open,
     delay
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(import_react_aria_components24.TooltipTrigger, { ...props, children });
+  return /* @__PURE__ */ (0, import_jsx_runtime83.jsx)(import_react_aria_components48.TooltipTrigger, { ...props, children });
 };
 
 // src/Tooltip/Tooltip.tsx
-var import_jsx_runtime88 = require("react/jsx-runtime");
+var import_jsx_runtime84 = require("react/jsx-runtime");
 var _Tooltip = ({ children, variant, size, open, ...rest }) => {
   const props = {
     ...rest,
     isOpen: open
   };
-  const classNames2 = (0, import_system72.useClassNames)({ component: "Tooltip", variant, size });
-  return /* @__PURE__ */ (0, import_jsx_runtime88.jsxs)(import_react_aria_components25.Tooltip, { ...props, className: (0, import_system72.cn)("group/tooltip", classNames2.container), children: [
-    /* @__PURE__ */ (0, import_jsx_runtime88.jsx)(import_react_aria_components25.OverlayArrow, { className: classNames2.arrow, children: /* @__PURE__ */ (0, import_jsx_runtime88.jsx)("svg", { width: 8, height: 8, viewBox: "0 0 8 8", children: /* @__PURE__ */ (0, import_jsx_runtime88.jsx)("path", { d: "M0 0 L4 4 L8 0" }) }) }),
+  const classNames2 = (0, import_system69.useClassNames)({ component: "Tooltip", variant, size });
+  return /* @__PURE__ */ (0, import_jsx_runtime84.jsxs)(import_react_aria_components49.Tooltip, { ...props, className: (0, import_system69.cn)("group/tooltip", classNames2.container), children: [
+    /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(import_react_aria_components49.OverlayArrow, { className: classNames2.arrow, children: /* @__PURE__ */ (0, import_jsx_runtime84.jsx)("svg", { width: 8, height: 8, viewBox: "0 0 8 8", children: /* @__PURE__ */ (0, import_jsx_runtime84.jsx)("path", { d: "M0 0 L4 4 L8 0" }) }) }),
     children
   ] });
 };
 _Tooltip.Trigger = _TooltipTrigger;
 
 // src/TagGroup/Tag.tsx
-var import_react_aria_components27 = require("react-aria-components");
-var import_system74 = require("@marigold/system");
+var import_react_aria_components51 = require("react-aria-components");
+var import_system71 = require("@marigold/system");
 
 // src/TagGroup/TagGroup.tsx
-var import_react_aria_components26 = require("react-aria-components");
-var import_system73 = require("@marigold/system");
-var import_jsx_runtime89 = require("react/jsx-runtime");
+var import_react_aria_components50 = require("react-aria-components");
+var import_system70 = require("@marigold/system");
+var import_jsx_runtime85 = require("react/jsx-runtime");
 var _TagGroup = ({
   width,
   items,
@@ -3915,24 +3183,24 @@ var _TagGroup = ({
   size,
   ...rest
 }) => {
-  const classNames2 = (0, import_system73.useClassNames)({ component: "Tag", variant, size });
-  return /* @__PURE__ */ (0, import_jsx_runtime89.jsx)(FieldBase2, { as: import_react_aria_components26.TagGroup, ...rest, children: /* @__PURE__ */ (0, import_jsx_runtime89.jsx)(import_react_aria_components26.TagList, { items, className: classNames2.listItems, children }) });
+  const classNames2 = (0, import_system70.useClassNames)({ component: "Tag", variant, size });
+  return /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(FieldBase, { as: import_react_aria_components50.TagGroup, ...rest, children: /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(import_react_aria_components50.TagList, { items, className: classNames2.listItems, children }) });
 };
 
 // src/TagGroup/Tag.tsx
-var import_jsx_runtime90 = require("react/jsx-runtime");
+var import_jsx_runtime86 = require("react/jsx-runtime");
 var CloseButton2 = ({ className }) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime90.jsx)(import_react_aria_components27.Button, { slot: "remove", className, children: /* @__PURE__ */ (0, import_jsx_runtime90.jsx)("svg", { viewBox: "0 0 20 20", fill: "currentColor", width: 20, height: 20, children: /* @__PURE__ */ (0, import_jsx_runtime90.jsx)("path", { d: "M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" }) }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(import_react_aria_components51.Button, { slot: "remove", className, children: /* @__PURE__ */ (0, import_jsx_runtime86.jsx)("svg", { viewBox: "0 0 20 20", fill: "currentColor", width: 20, height: 20, children: /* @__PURE__ */ (0, import_jsx_runtime86.jsx)("path", { d: "M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" }) }) });
 };
 var _Tag = ({ variant, size, children, ...props }) => {
   let textValue = typeof children === "string" ? children : void 0;
-  const classNames2 = (0, import_system74.useClassNames)({ component: "Tag", variant, size });
-  return /* @__PURE__ */ (0, import_jsx_runtime90.jsx)(import_react_aria_components27.Tag, { textValue, ...props, className: classNames2.tag, children: ({ allowsRemoving }) => /* @__PURE__ */ (0, import_jsx_runtime90.jsxs)(import_jsx_runtime90.Fragment, { children: [
+  const classNames2 = (0, import_system71.useClassNames)({ component: "Tag", variant, size });
+  return /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(import_react_aria_components51.Tag, { textValue, ...props, className: classNames2.tag, children: ({ allowsRemoving }) => /* @__PURE__ */ (0, import_jsx_runtime86.jsxs)(import_jsx_runtime86.Fragment, { children: [
     children,
-    allowsRemoving && /* @__PURE__ */ (0, import_jsx_runtime90.jsx)(
+    allowsRemoving && /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(
       CloseButton2,
       {
-        className: (0, import_system74.cn)("flex items-center", classNames2.closeButton)
+        className: (0, import_system71.cn)("flex items-center", classNames2.closeButton)
       }
     )
   ] }) });
@@ -3943,11 +3211,11 @@ _Tag.Group = _TagGroup;
 var import_visually_hidden = require("@react-aria/visually-hidden");
 
 // src/XLoader/XLoader.tsx
-var import_react55 = require("react");
-var import_system75 = require("@marigold/system");
-var import_jsx_runtime91 = require("react/jsx-runtime");
-var XLoader = (0, import_react55.forwardRef)((props, ref) => /* @__PURE__ */ (0, import_jsx_runtime91.jsxs)(
-  import_system75.SVG,
+var import_react47 = require("react");
+var import_system72 = require("@marigold/system");
+var import_jsx_runtime87 = require("react/jsx-runtime");
+var XLoader = (0, import_react47.forwardRef)((props, ref) => /* @__PURE__ */ (0, import_jsx_runtime87.jsxs)(
+  import_system72.SVG,
   {
     id: "XLoader",
     xmlns: "http://www.w3.org/2000/svg",
@@ -3956,13 +3224,13 @@ var XLoader = (0, import_react55.forwardRef)((props, ref) => /* @__PURE__ */ (0,
     ...props,
     ...ref,
     children: [
-      /* @__PURE__ */ (0, import_jsx_runtime91.jsx)("path", { id: "XMLID_1_", d: "M35.3 27h26.5l54 74.1H88.7z" }),
-      /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime87.jsx)("path", { id: "XMLID_1_", d: "M35.3 27h26.5l54 74.1H88.7z" }),
+      /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(
         "path",
         {
           id: "XMLID_5_",
           d: "M124.3 12.8h-.7c-2.7 0-4.9-2.2-4.9-4.9v-.7c0-2.7 2.2-4.9 4.9-4.9h.7c2.7 0 4.9 2.2 4.9 4.9v.7c0 2.7-2.2 4.9-4.9 4.9z",
-          children: /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(
+          children: /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(
             "animate",
             {
               attributeName: "opacity",
@@ -3975,12 +3243,12 @@ var XLoader = (0, import_react55.forwardRef)((props, ref) => /* @__PURE__ */ (0,
           )
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(
         "path",
         {
           id: "XMLID_18_",
           d: "M115.9 24.4h-.7c-2.7 0-4.9-2.2-4.9-4.9v-.7c0-2.7 2.2-4.9 4.9-4.9h.7c2.7 0 4.9 2.2 4.9 4.9v.7c0 2.7-2.2 4.9-4.9 4.9z",
-          children: /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(
+          children: /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(
             "animate",
             {
               attributeName: "opacity",
@@ -3993,12 +3261,12 @@ var XLoader = (0, import_react55.forwardRef)((props, ref) => /* @__PURE__ */ (0,
           )
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(
         "path",
         {
           id: "XMLID_19_",
           d: "M107.5 35.9h-.7c-2.7 0-4.9-2.2-4.9-4.9v-.7c0-2.7 2.2-4.9 4.9-4.9h.7c2.7 0 4.9 2.2 4.9 4.9v.7c0 2.7-2.2 4.9-4.9 4.9z",
-          children: /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(
+          children: /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(
             "animate",
             {
               attributeName: "opacity",
@@ -4011,12 +3279,12 @@ var XLoader = (0, import_react55.forwardRef)((props, ref) => /* @__PURE__ */ (0,
           )
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(
         "path",
         {
           id: "XMLID_20_",
           d: "M99.1 47.5h-.7c-2.7 0-4.9-2.2-4.9-4.9v-.7c0-2.7 2.2-4.9 4.9-4.9h.7c2.7 0 4.9 2.2 4.9 4.9v.7c0 2.7-2.2 4.9-4.9 4.9z",
-          children: /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(
+          children: /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(
             "animate",
             {
               attributeName: "opacity",
@@ -4029,12 +3297,12 @@ var XLoader = (0, import_react55.forwardRef)((props, ref) => /* @__PURE__ */ (0,
           )
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(
         "path",
         {
           id: "XMLID_21_",
           d: "M90.7 59H90c-2.7 0-4.9-2.2-4.9-4.9v-.7c0-2.7 2.2-4.9 4.9-4.9h.7c2.7 0 4.9 2.2 4.9 4.9v.7c0 2.8-2.2 4.9-4.9 4.9z",
-          children: /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(
+          children: /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(
             "animate",
             {
               attributeName: "opacity",
@@ -4047,12 +3315,12 @@ var XLoader = (0, import_react55.forwardRef)((props, ref) => /* @__PURE__ */ (0,
           )
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(
         "path",
         {
           id: "XMLID_22_",
           d: "M68 89.8h-.7c-2.7 0-4.9-2.2-4.9-4.9v-.7c0-2.7 2.2-4.9 4.9-4.9h.7c2.7 0 4.9 2.2 4.9 4.9v.8c0 2.6-2.2 4.8-4.9 4.8z",
-          children: /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(
+          children: /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(
             "animate",
             {
               attributeName: "opacity",
@@ -4065,12 +3333,12 @@ var XLoader = (0, import_react55.forwardRef)((props, ref) => /* @__PURE__ */ (0,
           )
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(
         "path",
         {
           id: "XMLID_23_",
           d: "M59.6 101.4h-.7c-2.7 0-4.9-2.2-4.9-4.9v-.7c0-2.7 2.2-4.9 4.9-4.9h.7c2.7 0 4.9 2.2 4.9 4.9v.7c0 2.7-2.2 4.9-4.9 4.9z",
-          children: /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(
+          children: /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(
             "animate",
             {
               attributeName: "opacity",
@@ -4083,12 +3351,12 @@ var XLoader = (0, import_react55.forwardRef)((props, ref) => /* @__PURE__ */ (0,
           )
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(
         "path",
         {
           id: "XMLID_24_",
           d: "M51.2 112.9h-.7c-2.7 0-4.9-2.2-4.9-4.9v-.7c0-2.7 2.2-4.9 4.9-4.9h.7c2.7 0 4.9 2.2 4.9 4.9v.7c-.1 2.8-2.2 4.9-4.9 4.9z",
-          children: /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(
+          children: /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(
             "animate",
             {
               attributeName: "opacity",
@@ -4101,12 +3369,12 @@ var XLoader = (0, import_react55.forwardRef)((props, ref) => /* @__PURE__ */ (0,
           )
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(
         "path",
         {
           id: "XMLID_25_",
           d: "M42.8 124.5h-.7c-2.7 0-4.9-2.2-4.9-4.9v-.7c0-2.7 2.2-4.9 4.9-4.9h.7c2.7 0 4.9 2.2 4.9 4.9v.7c-.1 2.7-2.2 4.9-4.9 4.9z",
-          children: /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(
+          children: /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(
             "animate",
             {
               attributeName: "opacity",
@@ -4119,12 +3387,12 @@ var XLoader = (0, import_react55.forwardRef)((props, ref) => /* @__PURE__ */ (0,
           )
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(
         "path",
         {
           id: "XMLID_26_",
           d: "M34.4 136h-.7c-2.7 0-4.9-2.2-4.9-4.9v-.7c0-2.7 2.2-4.9 4.9-4.9h.7c2.7 0 4.9 2.2 4.9 4.9v.7c-.1 2.7-2.2 4.9-4.9 4.9z",
-          children: /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(
+          children: /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(
             "animate",
             {
               attributeName: "opacity",
@@ -4137,12 +3405,12 @@ var XLoader = (0, import_react55.forwardRef)((props, ref) => /* @__PURE__ */ (0,
           )
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(
         "path",
         {
           id: "XMLID_27_",
           d: "M26 147.6h-.7c-2.7 0-4.9-2.2-4.9-4.9v-.7c0-2.7 2.2-4.9 4.9-4.9h.7c2.7 0 4.9 2.2 4.9 4.9v.7c-.1 2.8-2.2 4.9-4.9 4.9z",
-          children: /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(
+          children: /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(
             "animate",
             {
               attributeName: "opacity",
@@ -4160,25 +3428,25 @@ var XLoader = (0, import_react55.forwardRef)((props, ref) => /* @__PURE__ */ (0,
 ));
 
 // src/Tabs/Tabs.tsx
-var import_react_aria_components31 = require("react-aria-components");
-var import_system78 = require("@marigold/system");
+var import_react_aria_components55 = require("react-aria-components");
+var import_system75 = require("@marigold/system");
 
 // src/Tabs/Context.ts
-var import_react56 = require("react");
-var TabContext = (0, import_react56.createContext)({});
-var useTabContext = () => (0, import_react56.useContext)(TabContext);
+var import_react48 = require("react");
+var TabContext = (0, import_react48.createContext)({});
+var useTabContext = () => (0, import_react48.useContext)(TabContext);
 
 // src/Tabs/Tab.tsx
-var import_react_aria_components28 = require("react-aria-components");
-var import_system76 = require("@marigold/system");
-var import_jsx_runtime92 = require("react/jsx-runtime");
+var import_react_aria_components52 = require("react-aria-components");
+var import_system73 = require("@marigold/system");
+var import_jsx_runtime88 = require("react/jsx-runtime");
 var _Tab = (props) => {
   const { classNames: classNames2 } = useTabContext();
-  return /* @__PURE__ */ (0, import_jsx_runtime92.jsx)(
-    import_react_aria_components28.Tab,
+  return /* @__PURE__ */ (0, import_jsx_runtime88.jsx)(
+    import_react_aria_components52.Tab,
     {
       ...props,
-      className: (0, import_system76.cn)(
+      className: (0, import_system73.cn)(
         "flex cursor-pointer justify-center aria-disabled:cursor-not-allowed",
         classNames2.tab
       ),
@@ -4188,42 +3456,42 @@ var _Tab = (props) => {
 };
 
 // src/Tabs/TabList.tsx
-var import_react_aria_components29 = require("react-aria-components");
-var import_system77 = require("@marigold/system");
-var import_jsx_runtime93 = require("react/jsx-runtime");
+var import_react_aria_components53 = require("react-aria-components");
+var import_system74 = require("@marigold/system");
+var import_jsx_runtime89 = require("react/jsx-runtime");
 var _TabList = ({ space = 2, ...props }) => {
   const { classNames: classNames2 } = useTabContext();
-  return /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(
-    import_react_aria_components29.TabList,
+  return /* @__PURE__ */ (0, import_jsx_runtime89.jsx)(
+    import_react_aria_components53.TabList,
     {
       ...props,
-      className: (0, import_system77.cn)("flex", import_system77.gapSpace[space], classNames2.tabsList),
+      className: (0, import_system74.cn)("flex", import_system74.gapSpace[space], classNames2.tabsList),
       children: props.children
     }
   );
 };
 
 // src/Tabs/TabPanel.tsx
-var import_react_aria_components30 = require("react-aria-components");
-var import_jsx_runtime94 = require("react/jsx-runtime");
+var import_react_aria_components54 = require("react-aria-components");
+var import_jsx_runtime90 = require("react/jsx-runtime");
 var _TabPanel = (props) => {
   const { classNames: classNames2 } = useTabContext();
-  return /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(import_react_aria_components30.TabPanel, { ...props, className: classNames2.tabpanel, children: props.children });
+  return /* @__PURE__ */ (0, import_jsx_runtime90.jsx)(import_react_aria_components54.TabPanel, { ...props, className: classNames2.tabpanel, children: props.children });
 };
 
 // src/Tabs/Tabs.tsx
-var import_jsx_runtime95 = require("react/jsx-runtime");
+var import_jsx_runtime91 = require("react/jsx-runtime");
 var _Tabs = ({ disabled, variant, size = "medium", ...rest }) => {
   const props = {
     isDisabled: disabled,
     ...rest
   };
-  const classNames2 = (0, import_system78.useClassNames)({
+  const classNames2 = (0, import_system75.useClassNames)({
     component: "Tabs",
     size,
     variant
   });
-  return /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(TabContext.Provider, { value: { classNames: classNames2 }, children: /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(import_react_aria_components31.Tabs, { ...props, className: classNames2.container, children: props.children }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(TabContext.Provider, { value: { classNames: classNames2 }, children: /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(import_react_aria_components55.Tabs, { ...props, className: classNames2.container, children: props.children }) });
 };
 _Tabs.List = _TabList;
 _Tabs.TabPanel = _TabPanel;
@@ -4241,8 +3509,6 @@ _Tabs.Item = _Tab;
   Breakout,
   Button,
   Calendar,
-  CalendarCell,
-  CalendarGrid,
   Card,
   Center,
   Checkbox,
@@ -4259,6 +3525,7 @@ _Tabs.Item = _Tab;
   FieldGroup,
   FieldGroupContext,
   Footer,
+  Form,
   Header,
   Headline,
   Image,
@@ -4273,7 +3540,6 @@ _Tabs.Item = _Tab;
   Message,
   Modal,
   NumberField,
-  Overlay,
   Popover,
   Radio,
   RadioGroup,
@@ -4292,11 +3558,10 @@ _Tabs.Item = _Tab;
   ThemeProvider,
   Tiles,
   Tooltip,
-  Tray,
-  TrayWrapper,
   Underlay,
   VisuallyHidden,
   XLoader,
+  _Calendar,
   useAsyncList,
   useFieldGroupContext,
   useListData,