@marigold/components 7.0.0 → 7.2.0

package/dist/index.mjs

@@ -37,9 +37,7 @@ var ChevronDown = forwardRef2(
 // src/Accordion/useAccordionItem.ts
 import { useButton } from "@react-aria/button";
 import { useSelectableItem } from "@react-aria/selection";
-import { mergeProps, useId } from "@react-aria/utils";
-import { isAppleDevice } from "@react-aria/utils";
-import { isMac } from "@react-aria/utils";
+import { isAppleDevice, isMac, mergeProps, useId } from "@react-aria/utils";
 function isNonContiguousSelectionModifier(e) {
   return isAppleDevice() ? e.altKey : e.ctrlKey;
 }
@@ -61,9 +59,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) {
@@ -141,16 +137,17 @@ var AccordionItem = ({
   ...props
 }) => {
   const ref = 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);
   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);
@@ -187,14 +184,14 @@ var AccordionItem = ({
         ]
       }
     ) }),
-    expanded || defaultExpanded ? /* @__PURE__ */ jsx3(
+    /* @__PURE__ */ jsx3(
       "div",
       {
         ...mergeProps2(regionProps, focusProps, stateProps),
-        className: classNames2.item,
+        className: expanded || defaultExpanded ? classNames2.item : cn(classNames2.item, "hidden"),
         children: item.props.children
       }
-    ) : null
+    )
   ] });
 };
 
@@ -204,26 +201,25 @@ var Accordion = ({ children, ...props }) => {
   const ownProps = {
     ...props,
     // we have to do this because JSX childs are not supported
-    children: Children.toArray(children).map((child) => {
-      if (!isValidElement(child)) {
-        return child;
-      }
-      return cloneElement(child, {
-        hasChildItems: false,
-        ...child.props
-      });
-    })
+    children: []
   };
+  Children.forEach(children, (child) => {
+    var _a;
+    if (isValidElement(child) && typeof ((_a = child.props) == null ? void 0 : _a.children) !== "string") {
+      const clone = cloneElement(child, {
+        hasChildItems: false
+      });
+      ownProps.children.push(clone);
+      return;
+    }
+    ownProps.children.push(child);
+  });
   const ref = useRef2(null);
   const state = useTreeState({
     selectionMode: "single",
     ...ownProps
   });
-  const { accordionProps } = useAccordion(
-    { ...ownProps, children },
-    state,
-    ref
-  );
+  const { accordionProps } = useAccordion({ ...ownProps }, state, ref);
   delete accordionProps.onKeyDownCapture;
   return /* @__PURE__ */ jsx4("div", { ...accordionProps, ref, children: [...state.collection].map((item) => /* @__PURE__ */ jsx4(
     AccordionItem,
@@ -308,53 +304,48 @@ import {
 import React2 from "react";
 import { ComboBox, ComboBoxStateContext as ComboBoxStateContext2 } from "react-aria-components";
 
-// src/FieldBase/_FieldBase.tsx
+// src/FieldBase/FieldBase.tsx
 import { forwardRef as forwardRef3 } from "react";
 import { cn as cn6, width as twWidth, useClassNames as useClassNames4 } from "@marigold/system";
 
-// src/HelpText/_HelpText.tsx
+// src/HelpText/HelpText.tsx
 import { FieldError, Text } from "react-aria-components";
 import { cn as cn4, useClassNames as useClassNames2 } from "@marigold/system";
 import { jsx as jsx7, jsxs as jsxs3 } from "react/jsx-runtime";
+var Icon = ({ className }) => /* @__PURE__ */ jsx7(
+  "svg",
+  {
+    className: cn4("h-4 w-4 shrink-0", className),
+    viewBox: "0 0 24 24",
+    role: "presentation",
+    fill: "currentColor",
+    children: /* @__PURE__ */ jsx7("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" })
+  }
+);
 var HelpText = ({
   variant,
   size,
   description,
-  error,
   errorMessage,
   ...props
 }) => {
-  const hasErrorMessage = errorMessage && error;
   const classNames2 = useClassNames2({
     component: "HelpText",
     variant,
     size
   });
-  if (!description && !errorMessage) {
-    return null;
-  }
   return /* @__PURE__ */ jsxs3("div", { className: cn4(classNames2.container), children: [
-    /* @__PURE__ */ jsxs3(
-      FieldError,
-      {
-        ...props,
-        className: "grid grid-flow-col items-center justify-start gap-1",
-        children: [
-          /* @__PURE__ */ jsx7(
-            "svg",
-            {
-              className: cn4("h-4 w-4", classNames2.icon),
-              viewBox: "0 0 24 24",
-              role: "presentation",
-              fill: "currentColor",
-              children: /* @__PURE__ */ jsx7("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__ */ jsx7(Text, { slot: "description", children: description })
+    /* @__PURE__ */ jsx7(FieldError, { ...props, className: "peer/error flex flex-col", children: (validation) => {
+      const messages = (typeof errorMessage === "function" ? errorMessage(validation) : errorMessage) || validation.validationErrors;
+      return Array.isArray(messages) ? messages.map((msg) => /* @__PURE__ */ jsxs3("div", { className: "flex items-center justify-start gap-1", children: [
+        /* @__PURE__ */ jsx7(Icon, { className: classNames2.icon }),
+        msg
+      ] })) : /* @__PURE__ */ jsxs3("div", { className: "flex items-center justify-start gap-1", children: [
+        /* @__PURE__ */ jsx7(Icon, { className: classNames2.icon }),
+        messages
+      ] });
+    } }),
+    /* @__PURE__ */ jsx7(Text, { slot: "description", className: "peer-first/error:hidden", children: description })
   ] });
 };
 
@@ -399,7 +390,7 @@ var _Label = ({ size, variant, children, ...props }) => {
   );
 };
 
-// src/FieldBase/_FieldBase.tsx
+// src/FieldBase/FieldBase.tsx
 import { jsx as jsx10, jsxs as jsxs5 } from "react/jsx-runtime";
 var fixedForwardRef = forwardRef3;
 var _FieldBase = (props, ref) => {
@@ -438,8 +429,7 @@ var _FieldBase = (props, ref) => {
             variant,
             size,
             description,
-            errorMessage,
-            error: props.isInvalid
+            errorMessage
           }
         )
       ]
@@ -567,12 +557,47 @@ _ListBox.Section = _Section;
 // src/Overlay/Popover.tsx
 import { forwardRef as forwardRef6 } from "react";
 import { Popover } from "react-aria-components";
-import { cn as cn11, useClassNames as useClassNames8, useSmallScreen, useTheme } from "@marigold/system";
+import { cn as cn11, useClassNames as useClassNames8, useSmallScreen } from "@marigold/system";
+
+// src/Provider/OverlayContainerProvider.tsx
+import { createContext as createContext3, useContext as useContext3 } from "react";
+import { useIsSSR } from "@react-aria/ssr";
+var OverlayContainerContext = createContext3(void 0);
+var OverlayContainerProvider = OverlayContainerContext.Provider;
+var usePortalContainer = () => {
+  const portalContainer = useContext3(OverlayContainerContext);
+  const isSSR = useIsSSR();
+  const portal = isSSR ? null : portalContainer ? document.getElementById(portalContainer) : document.body;
+  return portal;
+};
 
 // src/Overlay/Underlay.tsx
 import { ModalOverlay } from "react-aria-components";
 import { cn as cn10, useClassNames as useClassNames7 } from "@marigold/system";
+
+// src/Provider/index.ts
+import { useTheme as useTheme2, ThemeProvider as ThemeProvider2 } from "@marigold/system";
+
+// src/Provider/MarigoldProvider.tsx
+import { OverlayProvider } from "@react-aria/overlays";
+import {
+  ThemeProvider,
+  defaultTheme,
+  useTheme
+} from "@marigold/system";
 import { jsx as jsx15 } from "react/jsx-runtime";
+function MarigoldProvider({
+  children,
+  theme,
+  portalContainer
+}) {
+  const outerTheme = useTheme();
+  const isTopLevel = outerTheme === defaultTheme;
+  return /* @__PURE__ */ jsx15(ThemeProvider, { theme, children: isTopLevel ? /* @__PURE__ */ jsx15(OverlayContainerProvider, { value: portalContainer, children: /* @__PURE__ */ jsx15(OverlayProvider, { children }) }) : children });
+}
+
+// src/Overlay/Underlay.tsx
+import { jsx as jsx16 } from "react/jsx-runtime";
 var Underlay = ({
   size,
   variant,
@@ -588,7 +613,8 @@ var Underlay = ({
     isKeyboardDismissDisabled: keyboardDismissable,
     ...rest
   };
-  return /* @__PURE__ */ jsx15(
+  const portal = usePortalContainer();
+  return /* @__PURE__ */ jsx16(
     ModalOverlay,
     {
       className: ({ isEntering, isExiting }) => cn10(
@@ -599,15 +625,16 @@ var Underlay = ({
       ),
       ...props,
       "data-testid": "underlay-id",
+      UNSTABLE_portalContainer: portal,
       children: props.children
     }
   );
 };
 
 // src/Overlay/Popover.tsx
-import { Fragment, jsx as jsx16, jsxs as jsxs7 } from "react/jsx-runtime";
+import { Fragment, jsx as jsx17, jsxs as jsxs7 } from "react/jsx-runtime";
 var _Popover = forwardRef6(
-  ({ keyboardDismissDisabled, placement, open, children, ...rest }, ref) => {
+  ({ keyboardDismissDisabled, placement, open, children, container, ...rest }, ref) => {
     const props = {
       isKeyboardDismissDisabled: keyboardDismissDisabled,
       isOpen: open,
@@ -621,10 +648,10 @@ var _Popover = forwardRef6(
       className: "w-[--trigger-width]"
     });
     const isSmallScreen = useSmallScreen();
-    const theme = useTheme();
-    return /* @__PURE__ */ jsx16(Fragment, { children: isSmallScreen ? /* @__PURE__ */ jsxs7(Fragment, { children: [
-      /* @__PURE__ */ jsx16(Underlay, { open, variant: "modal" }),
-      /* @__PURE__ */ jsx16(
+    const portal = usePortalContainer();
+    return /* @__PURE__ */ jsx17(Fragment, { children: isSmallScreen ? /* @__PURE__ */ jsxs7(Fragment, { children: [
+      /* @__PURE__ */ jsx17(Underlay, { open, variant: "modal" }),
+      /* @__PURE__ */ jsx17(
         Popover,
         {
           ref,
@@ -632,18 +659,18 @@ var _Popover = forwardRef6(
           className: cn11(
             "!left-0 bottom-0 !mt-auto flex !max-h-fit w-full flex-col"
           ),
-          "data-theme": theme.name,
+          UNSTABLE_portalContainer: portal,
           children
         }
       )
-    ] }) : /* @__PURE__ */ jsx16(
+    ] }) : /* @__PURE__ */ jsx17(
       Popover,
       {
         ref,
         ...props,
         className: classNames2,
         offset: 0,
-        "data-theme": theme.name,
+        UNSTABLE_portalContainer: portal,
         children
       }
     ) });
@@ -659,7 +686,7 @@ import { cn as cn13 } from "@marigold/system";
 import { forwardRef as forwardRef7 } from "react";
 import { Button } from "react-aria-components";
 import { cn as cn12, useClassNames as useClassNames9 } from "@marigold/system";
-import { jsx as jsx17 } from "react/jsx-runtime";
+import { jsx as jsx18 } from "react/jsx-runtime";
 var _Button = forwardRef7(
   ({ children, variant, size, className, disabled, fullWidth, ...props }, ref) => {
     const classNames2 = useClassNames9({
@@ -668,7 +695,7 @@ var _Button = forwardRef7(
       size,
       className
     });
-    return /* @__PURE__ */ jsx17(
+    return /* @__PURE__ */ jsx18(
       Button,
       {
         ...props,
@@ -686,10 +713,10 @@ var _Button = forwardRef7(
 );
 
 // src/Autocomplete/ClearButton.tsx
-import { jsx as jsx18 } from "react/jsx-runtime";
+import { jsx as jsx19 } from "react/jsx-runtime";
 var AutocompleteClearButton = ({ className }) => {
   let state = React.useContext(ComboBoxStateContext);
-  return /* @__PURE__ */ jsx18(
+  return /* @__PURE__ */ jsx19(
     _Button,
     {
       "aria-label": "Clear",
@@ -699,7 +726,7 @@ var AutocompleteClearButton = ({ className }) => {
         "cursor-pointer appearance-none border-none p-0 pr-1",
         className
       ),
-      children: /* @__PURE__ */ jsx18(
+      children: /* @__PURE__ */ jsx19(
         "svg",
         {
           xmlns: "http://www.w3.org/2000/svg",
@@ -707,7 +734,7 @@ var AutocompleteClearButton = ({ className }) => {
           fill: "currentColor",
           width: 20,
           height: 20,
-          children: /* @__PURE__ */ jsx18("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__ */ jsx19("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" })
         }
       )
     }
@@ -715,15 +742,15 @@ var AutocompleteClearButton = ({ className }) => {
 };
 
 // src/Autocomplete/Autocomplete.tsx
-import { Fragment as Fragment2, jsx as jsx19, jsxs as jsxs8 } from "react/jsx-runtime";
+import { Fragment as Fragment2, jsx as jsx20, jsxs as jsxs8 } from "react/jsx-runtime";
 var SearchInput = ({ onSubmit, ref }) => {
   const state = React2.useContext(ComboBoxStateContext2);
-  return /* @__PURE__ */ jsx19(
+  return /* @__PURE__ */ jsx20(
     _Input,
     {
       ref,
-      icon: /* @__PURE__ */ jsx19(SearchIcon, {}),
-      action: (state == null ? void 0 : state.inputValue) !== "" ? /* @__PURE__ */ jsx19(AutocompleteClearButton, {}) : void 0,
+      icon: /* @__PURE__ */ jsx20(SearchIcon, {}),
+      action: (state == null ? void 0 : state.inputValue) !== "" ? /* @__PURE__ */ jsx20(AutocompleteClearButton, {}) : void 0,
       onKeyDown: (e) => {
         if (e.key === "Enter" || e.key === "Escape") {
           e.preventDefault();
@@ -737,7 +764,7 @@ var SearchInput = ({ onSubmit, ref }) => {
     }
   );
 };
-var SearchIcon = (props) => /* @__PURE__ */ jsx19(
+var SearchIcon = (props) => /* @__PURE__ */ jsx20(
   "svg",
   {
     xmlns: "http://www.w3.org/2000/svg",
@@ -746,7 +773,7 @@ var SearchIcon = (props) => /* @__PURE__ */ jsx19(
     width: 24,
     height: 24,
     ...props,
-    children: /* @__PURE__ */ jsx19("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__ */ jsx20("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 = forwardRef8(
@@ -774,9 +801,9 @@ var _Autocomplete = forwardRef8(
       isRequired: required,
       ...rest
     };
-    return /* @__PURE__ */ jsx19(Fragment2, { children: /* @__PURE__ */ jsxs8(FieldBase, { as: ComboBox, ...props, children: [
-      /* @__PURE__ */ jsx19(SearchInput, { onSubmit, ref }),
-      /* @__PURE__ */ jsx19(_Popover, { children: /* @__PURE__ */ jsx19(_ListBox, { children }) })
+    return /* @__PURE__ */ jsx20(Fragment2, { children: /* @__PURE__ */ jsxs8(FieldBase, { as: ComboBox, ...props, children: [
+      /* @__PURE__ */ jsx20(SearchInput, { onSubmit, ref }),
+      /* @__PURE__ */ jsx20(_Popover, { children: /* @__PURE__ */ jsx20(_ListBox, { children }) })
     ] }) });
   }
 );
@@ -785,7 +812,7 @@ _Autocomplete.Item = _ListBox.Item;
 // src/ComboBox/ComboBox.tsx
 import { forwardRef as forwardRef9 } from "react";
 import { ComboBox as ComboBox2 } from "react-aria-components";
-import { jsx as jsx20, jsxs as jsxs9 } from "react/jsx-runtime";
+import { jsx as jsx21, jsxs as jsxs9 } from "react/jsx-runtime";
 var _ComboBox = forwardRef9(
   ({
     variant,
@@ -811,13 +838,13 @@ var _ComboBox = forwardRef9(
       ...rest
     };
     return /* @__PURE__ */ jsxs9(FieldBase, { as: ComboBox2, ref, ...props, children: [
-      /* @__PURE__ */ jsx20(
+      /* @__PURE__ */ jsx21(
         _Input,
         {
-          action: /* @__PURE__ */ jsx20(_Button, { className: "absolute right-2 h-4 w-4 border-none bg-transparent p-0", children: /* @__PURE__ */ jsx20(ChevronDown, { className: "h-4 w-4" }) })
+          action: /* @__PURE__ */ jsx21(_Button, { className: "absolute right-2 h-4 w-4 border-none bg-transparent p-0", children: /* @__PURE__ */ jsx21(ChevronDown, { className: "h-4 w-4" }) })
         }
       ),
-      /* @__PURE__ */ jsx20(_Popover, { children: /* @__PURE__ */ jsx20(_ListBox, { children }) })
+      /* @__PURE__ */ jsx21(_Popover, { children: /* @__PURE__ */ jsx21(_ListBox, { children }) })
     ] });
   }
 );
@@ -825,15 +852,15 @@ _ComboBox.Item = _ListBox.Item;
 
 // src/Badge/Badge.tsx
 import { useClassNames as useClassNames10 } from "@marigold/system";
-import { jsx as jsx21 } from "react/jsx-runtime";
+import { jsx as jsx22 } from "react/jsx-runtime";
 var Badge = ({ variant, size, children, ...props }) => {
   const classNames2 = useClassNames10({ component: "Badge", variant, size });
-  return /* @__PURE__ */ jsx21("div", { ...props, className: classNames2, children });
+  return /* @__PURE__ */ jsx22("div", { ...props, className: classNames2, children });
 };
 
 // src/Breakout/Breakout.tsx
 import { alignment, cn as cn14, createVar as createVar4 } from "@marigold/system";
-import { jsx as jsx22 } from "react/jsx-runtime";
+import { jsx as jsx23 } from "react/jsx-runtime";
 var Breakout = ({
   height,
   children,
@@ -843,7 +870,7 @@ var Breakout = ({
   ...props
 }) => {
   var _a, _b, _c, _d;
-  return /* @__PURE__ */ jsx22(
+  return /* @__PURE__ */ jsx23(
     "div",
     {
       className: cn14(
@@ -862,10 +889,10 @@ var Breakout = ({
 
 // src/Body/Body.tsx
 import { useClassNames as useClassNames11 } from "@marigold/system";
-import { jsx as jsx23 } from "react/jsx-runtime";
+import { jsx as jsx24 } from "react/jsx-runtime";
 var Body = ({ children, variant, size, ...props }) => {
   const classNames2 = useClassNames11({ component: "Body", variant, size });
-  return /* @__PURE__ */ jsx23("section", { ...props, className: classNames2, children });
+  return /* @__PURE__ */ jsx24("section", { ...props, className: classNames2, children });
 };
 
 // src/Card/Card.tsx
@@ -881,7 +908,7 @@ import {
   paddingTop,
   useClassNames as useClassNames12
 } from "@marigold/system";
-import { jsx as jsx24 } from "react/jsx-runtime";
+import { jsx as jsx25 } from "react/jsx-runtime";
 var Card = ({
   children,
   variant,
@@ -897,7 +924,7 @@ var Card = ({
   ...props
 }) => {
   const classNames2 = useClassNames12({ component: "Card", variant, size });
-  return /* @__PURE__ */ jsx24(
+  return /* @__PURE__ */ jsx25(
     "div",
     {
       ...props,
@@ -920,14 +947,14 @@ var Card = ({
 
 // src/Center/Center.tsx
 import { cn as cn16, createVar as createVar5, gapSpace as gapSpace3 } from "@marigold/system";
-import { jsx as jsx25 } from "react/jsx-runtime";
+import { jsx as jsx26 } from "react/jsx-runtime";
 var Center = ({
   maxWidth = "100%",
   space = 0,
   children,
   ...props
 }) => {
-  return /* @__PURE__ */ jsx25(
+  return /* @__PURE__ */ jsx26(
     "div",
     {
       ...props,
@@ -946,8 +973,8 @@ var Center = ({
 import { forwardRef as forwardRef10 } from "react";
 import { Checkbox } from "react-aria-components";
 import { cn as cn17, useClassNames as useClassNames13 } from "@marigold/system";
-import { Fragment as Fragment3, jsx as jsx26, jsxs as jsxs10 } from "react/jsx-runtime";
-var CheckMark = () => /* @__PURE__ */ jsx26("svg", { viewBox: "0 0 12 10", children: /* @__PURE__ */ jsx26(
+import { Fragment as Fragment3, jsx as jsx27, jsxs as jsxs10 } from "react/jsx-runtime";
+var CheckMark = () => /* @__PURE__ */ jsx27("svg", { viewBox: "0 0 12 10", children: /* @__PURE__ */ jsx27(
   "path",
   {
     fill: "currentColor",
@@ -955,7 +982,7 @@ var CheckMark = () => /* @__PURE__ */ jsx26("svg", { viewBox: "0 0 12 10", child
     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__ */ jsx26("svg", { width: "12", height: "3", viewBox: "0 0 12 3", children: /* @__PURE__ */ jsx26(
+var IndeterminateMark = () => /* @__PURE__ */ jsx27("svg", { width: "12", height: "3", viewBox: "0 0 12 3", children: /* @__PURE__ */ jsx27(
   "path",
   {
     fill: "currentColor",
@@ -963,8 +990,8 @@ var IndeterminateMark = () => /* @__PURE__ */ jsx26("svg", { width: "12", height
     d: "M11.5 2.04018H0.5V0.46875H11.5V2.04018Z"
   }
 ) });
-var Icon = ({ className, checked, indeterminate, ...props }) => {
-  return /* @__PURE__ */ jsx26(
+var Icon2 = ({ className, checked, indeterminate, ...props }) => {
+  return /* @__PURE__ */ jsx27(
     "div",
     {
       "aria-hidden": "true",
@@ -976,7 +1003,7 @@ var Icon = ({ className, checked, indeterminate, ...props }) => {
         className
       ),
       ...props,
-      children: indeterminate ? /* @__PURE__ */ jsx26(IndeterminateMark, {}) : checked ? /* @__PURE__ */ jsx26(CheckMark, {}) : null
+      children: indeterminate ? /* @__PURE__ */ jsx27(IndeterminateMark, {}) : checked ? /* @__PURE__ */ jsx27(CheckMark, {}) : null
     }
   );
 };
@@ -1006,7 +1033,7 @@ var _Checkbox = forwardRef10(
       ...rest
     };
     const classNames2 = useClassNames13({ component: "Checkbox", variant, size });
-    return /* @__PURE__ */ jsx26(
+    return /* @__PURE__ */ jsx27(
       Checkbox,
       {
         ref,
@@ -1017,15 +1044,15 @@ var _Checkbox = forwardRef10(
         ),
         ...props,
         children: ({ isSelected, isIndeterminate }) => /* @__PURE__ */ jsxs10(Fragment3, { children: [
-          /* @__PURE__ */ jsx26(
-            Icon,
+          /* @__PURE__ */ jsx27(
+            Icon2,
             {
               checked: isSelected,
               indeterminate: isIndeterminate,
               className: classNames2.checkbox
             }
           ),
-          /* @__PURE__ */ jsx26("div", { className: classNames2.label, children })
+          /* @__PURE__ */ jsx27("div", { className: classNames2.label, children })
         ] })
       }
     );
@@ -1035,7 +1062,7 @@ var _Checkbox = forwardRef10(
 // src/Checkbox/CheckboxGroup.tsx
 import { CheckboxGroup } from "react-aria-components";
 import { useClassNames as useClassNames14 } from "@marigold/system";
-import { jsx as jsx27 } from "react/jsx-runtime";
+import { jsx as jsx28 } from "react/jsx-runtime";
 var _CheckboxGroup = ({
   children,
   variant,
@@ -1060,13 +1087,13 @@ var _CheckboxGroup = ({
     isInvalid: error,
     ...rest
   };
-  return /* @__PURE__ */ jsx27(FieldBase, { as: CheckboxGroup, ...props, children });
+  return /* @__PURE__ */ jsx28(FieldBase, { as: CheckboxGroup, ...props, children });
 };
 
 // src/Columns/Columns.tsx
-import { Children as Children3, cloneElement as cloneElement3, isValidElement as isValidElement2 } from "react";
+import { Children as Children3 } from "react";
 import { cn as cn18, createVar as createVar6, gapSpace as gapSpace4 } from "@marigold/system";
-import { jsx as jsx28 } from "react/jsx-runtime";
+import { jsx as jsx29 } from "react/jsx-runtime";
 var Columns = ({
   space = 0,
   columns,
@@ -1082,7 +1109,7 @@ var Columns = ({
       )}`
     );
   }
-  return /* @__PURE__ */ jsx28(
+  return /* @__PURE__ */ jsx29(
     "div",
     {
       className: cn18(
@@ -1091,14 +1118,14 @@ var Columns = ({
         gapSpace4[space]
       ),
       ...props,
-      children: Children3.map(children, (child, idx) => /* @__PURE__ */ jsx28(
+      children: Children3.map(children, (child, idx) => /* @__PURE__ */ jsx29(
         "div",
         {
           className: cn18(
             "grow-[--columnSize] basis-[calc((var(--collapseAt)_-_100%)_*_999)]"
           ),
           style: createVar6({ collapseAt, columnSize: columns[idx] }),
-          children: isValidElement2(child) ? cloneElement3(child) : child
+          children: child
         }
       ))
     }
@@ -1113,7 +1140,7 @@ import {
   gridColumn,
   placeItems
 } from "@marigold/system";
-import { jsx as jsx29 } from "react/jsx-runtime";
+import { jsx as jsx30 } from "react/jsx-runtime";
 var content = {
   small: "20ch",
   medium: "45ch",
@@ -1133,7 +1160,7 @@ var Container = ({
   ...props
 }) => {
   const maxWidth = contentType === "content" ? content[size] : header[size];
-  return /* @__PURE__ */ jsx29(
+  return /* @__PURE__ */ jsx30(
     "div",
     {
       ...props,
@@ -1150,7 +1177,7 @@ var Container = ({
 };
 
 // src/Dialog/Dialog.tsx
-import { useContext as useContext3 } from "react";
+import { useContext as useContext4 } from "react";
 import { Dialog, OverlayTriggerStateContext } from "react-aria-components";
 import { cn as cn21, useClassNames as useClassNames16 } from "@marigold/system";
 
@@ -1162,9 +1189,9 @@ import {
   get,
   textAlign,
   useClassNames as useClassNames15,
-  useTheme as useTheme2
+  useTheme as useTheme3
 } from "@marigold/system";
-import { jsx as jsx30 } from "react/jsx-runtime";
+import { jsx as jsx31 } from "react/jsx-runtime";
 var _Headline = ({
   variant,
   size,
@@ -1174,13 +1201,13 @@ var _Headline = ({
   level = 1,
   ...props
 }) => {
-  const theme = useTheme2();
+  const theme = useTheme3();
   const classNames2 = useClassNames15({
     component: "Headline",
     variant,
     size: size != null ? size : `level-${level}`
   });
-  return /* @__PURE__ */ jsx30(
+  return /* @__PURE__ */ jsx31(
     Heading,
     {
       level: Number(level),
@@ -1206,30 +1233,28 @@ import { DialogTrigger } from "react-aria-components";
 // src/Overlay/Modal.tsx
 import { forwardRef as forwardRef11 } from "react";
 import { Modal } from "react-aria-components";
-import { useTheme as useTheme3 } from "@marigold/system";
-import { jsx as jsx31 } from "react/jsx-runtime";
+import { jsx as jsx32 } from "react/jsx-runtime";
 var _Modal = forwardRef11(({ open, dismissable, keyboardDismissable, ...rest }, ref) => {
-  const theme = useTheme3();
   const props = {
     isOpen: open,
     isDismissable: dismissable,
     isKeyboardDismissDisabled: keyboardDismissable,
     ...rest
   };
-  return /* @__PURE__ */ jsx31(
+  return /* @__PURE__ */ jsx32(
     Underlay,
     {
       dismissable,
       keyboardDismissable,
       open,
       variant: "modal",
-      children: /* @__PURE__ */ jsx31(Modal, { ref, "data-theme": theme.name, ...props, children: props.children })
+      children: /* @__PURE__ */ jsx32(Modal, { ref, ...props, children: props.children })
     }
   );
 });
 
 // src/Dialog/DialogTrigger.tsx
-import { jsx as jsx32, jsxs as jsxs11 } from "react/jsx-runtime";
+import { jsx as jsx33, jsxs as jsxs11 } from "react/jsx-runtime";
 var _DialogTrigger = ({
   open,
   dismissable,
@@ -1246,10 +1271,10 @@ var _DialogTrigger = ({
   const hasDialogTrigger = dialogTrigger.type !== _Dialog;
   const currentDialog = children.length < 2 ? !hasDialogTrigger && dialogTrigger : dialog;
   if (isNonModal)
-    return /* @__PURE__ */ jsx32(DialogTrigger, { ...props, children: props.children });
+    return /* @__PURE__ */ jsx33(DialogTrigger, { ...props, children: props.children });
   return /* @__PURE__ */ jsxs11(DialogTrigger, { ...props, children: [
     hasDialogTrigger && dialogTrigger,
-    /* @__PURE__ */ jsx32(
+    /* @__PURE__ */ jsx33(
       _Modal,
       {
         dismissable,
@@ -1261,10 +1286,10 @@ var _DialogTrigger = ({
 };
 
 // src/Dialog/Dialog.tsx
-import { Fragment as Fragment4, jsx as jsx33, jsxs as jsxs12 } from "react/jsx-runtime";
+import { Fragment as Fragment4, jsx as jsx34, jsxs as jsxs12 } from "react/jsx-runtime";
 var CloseButton = ({ className }) => {
-  const { close } = useContext3(OverlayTriggerStateContext);
-  return /* @__PURE__ */ jsx33("div", { className: "flex justify-end", children: /* @__PURE__ */ jsx33(
+  const { close } = useContext4(OverlayTriggerStateContext);
+  return /* @__PURE__ */ jsx34("div", { className: "flex justify-end", children: /* @__PURE__ */ jsx34(
     "button",
     {
       className: cn21(
@@ -1272,7 +1297,7 @@ var CloseButton = ({ className }) => {
         className
       ),
       onClick: close,
-      children: /* @__PURE__ */ jsx33("svg", { viewBox: "0 0 20 20", fill: "currentColor", children: /* @__PURE__ */ jsx33(
+      children: /* @__PURE__ */ jsx34("svg", { viewBox: "0 0 20 20", fill: "currentColor", children: /* @__PURE__ */ jsx34(
         "path",
         {
           fillRule: "evenodd",
@@ -1283,7 +1308,7 @@ var CloseButton = ({ className }) => {
     }
   ) });
 };
-var DialogHeadline = ({ children }) => /* @__PURE__ */ jsx33(_Headline, { slot: "title", children });
+var DialogHeadline = ({ children }) => /* @__PURE__ */ jsx34(_Headline, { slot: "title", children });
 var _Dialog = ({
   variant,
   size,
@@ -1292,7 +1317,7 @@ var _Dialog = ({
   ...props
 }) => {
   const classNames2 = useClassNames16({ component: "Dialog", variant, size });
-  let state = useContext3(OverlayTriggerStateContext);
+  let state = useContext4(OverlayTriggerStateContext);
   let children = props.children;
   if (typeof children === "function") {
     children = children({
@@ -1300,13 +1325,13 @@ var _Dialog = ({
       })
     });
   }
-  return /* @__PURE__ */ jsx33(
+  return /* @__PURE__ */ jsx34(
     Dialog,
     {
       ...props,
       className: cn21("relative outline-none", classNames2.container),
       children: /* @__PURE__ */ jsxs12(Fragment4, { children: [
-        closeButton && /* @__PURE__ */ jsx33(CloseButton, { className: classNames2.closeButton }),
+        closeButton && /* @__PURE__ */ jsx34(CloseButton, { className: classNames2.closeButton }),
         children
       ] })
     }
@@ -1318,141 +1343,44 @@ _Dialog.Headline = DialogHeadline;
 // src/Divider/Divider.tsx
 import { Separator } from "react-aria-components";
 import { useClassNames as useClassNames17 } from "@marigold/system";
-import { jsx as jsx34 } from "react/jsx-runtime";
+import { jsx as jsx35 } from "react/jsx-runtime";
 var _Divider = ({ variant, ...props }) => {
   const classNames2 = useClassNames17({ component: "Divider", variant });
-  return /* @__PURE__ */ jsx34(Separator, { className: classNames2, ...props });
-};
-
-// src/FieldBase/FieldBase.tsx
-import {
-  cn as cn23,
-  width as twWidth2,
-  useClassNames as useClassNames19
-} from "@marigold/system";
-
-// src/HelpText/HelpText.tsx
-import { SVG as SVG4, cn as cn22, useClassNames as useClassNames18 } from "@marigold/system";
-import { Fragment as Fragment5, jsx as jsx35, jsxs as jsxs13 } from "react/jsx-runtime";
-var HelpText2 = ({
-  variant,
-  size,
-  disabled,
-  description,
-  descriptionProps,
-  error,
-  errorMessage,
-  errorMessageProps,
-  ...props
-}) => {
-  const hasErrorMessage = errorMessage && error;
-  const classNames2 = useClassNames18({
-    component: "HelpText",
-    variant,
-    size
-  });
-  return /* @__PURE__ */ jsx35(
-    "div",
-    {
-      ...props,
-      ...hasErrorMessage ? errorMessageProps : descriptionProps,
-      className: cn22("flex items-center gap-1", classNames2.container),
-      children: hasErrorMessage ? /* @__PURE__ */ jsxs13(Fragment5, { children: [
-        /* @__PURE__ */ jsx35(
-          SVG4,
-          {
-            className: cn22("h-4 w-4", classNames2.icon),
-            viewBox: "0 0 24 24",
-            role: "presentation",
-            children: /* @__PURE__ */ jsx35("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__ */ jsx35(Fragment5, { children: description })
-    }
-  );
-};
-
-// src/FieldBase/FieldBase.tsx
-import { jsx as jsx36, jsxs as jsxs14 } from "react/jsx-runtime";
-var FieldBase2 = ({
-  children,
-  variant,
-  size,
-  width = "full",
-  disabled,
-  label,
-  labelProps,
-  description,
-  descriptionProps,
-  error,
-  errorMessage,
-  errorMessageProps,
-  stateProps,
-  ...props
-}) => {
-  const hasHelpText = !!description || errorMessage && error;
-  const classNames2 = useClassNames19({
-    component: "Field",
-    variant,
-    size
-  });
-  return /* @__PURE__ */ jsxs14(
-    "div",
-    {
-      ...props,
-      ...stateProps,
-      className: cn23("group/field", twWidth2[width], classNames2),
-      children: [
-        label ? /* @__PURE__ */ jsx36(_Label, { variant, size, ...labelProps, children: label }) : /* @__PURE__ */ jsx36("span", { "aria-hidden": "true" }),
-        children,
-        hasHelpText && /* @__PURE__ */ jsx36(
-          HelpText2,
-          {
-            variant,
-            size,
-            disabled,
-            description,
-            descriptionProps,
-            error,
-            errorMessage,
-            errorMessageProps
-          }
-        )
-      ]
-    }
-  );
+  return /* @__PURE__ */ jsx35(Separator, { className: classNames2, ...props });
 };
 
 // src/Footer/Footer.tsx
-import { useClassNames as useClassNames20 } from "@marigold/system";
-import { jsx as jsx37 } from "react/jsx-runtime";
+import { useClassNames as useClassNames18 } from "@marigold/system";
+import { jsx as jsx36 } from "react/jsx-runtime";
 var Footer = ({ children, variant, size, ...props }) => {
-  const classNames2 = useClassNames20({ component: "Footer", variant, size });
-  return /* @__PURE__ */ jsx37("footer", { ...props, className: classNames2, children });
+  const classNames2 = useClassNames18({ component: "Footer", variant, size });
+  return /* @__PURE__ */ jsx36("footer", { ...props, className: classNames2, children });
 };
 
+// src/Form/Form.tsx
+import { Form } from "react-aria-components";
+
 // src/Header/Header.tsx
 import { Header } from "react-aria-components";
-import { useClassNames as useClassNames21 } from "@marigold/system";
-import { jsx as jsx38 } from "react/jsx-runtime";
+import { useClassNames as useClassNames19 } from "@marigold/system";
+import { jsx as jsx37 } from "react/jsx-runtime";
 var _Header = ({ variant, size, ...props }) => {
-  const classNames2 = useClassNames21({
+  const classNames2 = useClassNames19({
     component: "Header",
     variant,
     size
   });
-  return /* @__PURE__ */ jsx38(Header, { className: classNames2, ...props, children: props.children });
+  return /* @__PURE__ */ jsx37(Header, { className: classNames2, ...props, children: props.children });
 };
 
 // src/Image/Image.tsx
 import {
-  cn as cn24,
+  cn as cn22,
   objectFit,
   objectPosition,
-  useClassNames as useClassNames22
+  useClassNames as useClassNames20
 } from "@marigold/system";
-import { jsx as jsx39 } from "react/jsx-runtime";
+import { jsx as jsx38 } from "react/jsx-runtime";
 var Image = ({
   variant,
   size,
@@ -1460,13 +1388,13 @@ var Image = ({
   position = "none",
   ...props
 }) => {
-  const classNames2 = useClassNames22({ component: "Image", variant, size });
-  return /* @__PURE__ */ jsx39(
+  const classNames2 = useClassNames20({ component: "Image", variant, size });
+  return /* @__PURE__ */ jsx38(
     "img",
     {
       ...props,
       alt: props.alt,
-      className: cn24(
+      className: cn22(
         fit !== "none" && "h-full w-full",
         classNames2,
         objectFit[fit],
@@ -1479,10 +1407,10 @@ var Image = ({
 // src/Inline/Inline.tsx
 import {
   alignment as alignment2,
-  cn as cn25,
+  cn as cn23,
   gapSpace as gapSpace5
 } from "@marigold/system";
-import { jsx as jsx40 } from "react/jsx-runtime";
+import { jsx as jsx39 } from "react/jsx-runtime";
 var Inline = ({
   space = 0,
   orientation,
@@ -1492,11 +1420,11 @@ var Inline = ({
   ...props
 }) => {
   var _a2, _b2, _c, _d;
-  return /* @__PURE__ */ jsx40(
+  return /* @__PURE__ */ jsx39(
     "div",
     {
       ...props,
-      className: cn25(
+      className: cn23(
         "flex flex-wrap",
         gapSpace5[space],
         alignX && ((_b2 = (_a2 = alignment2) == null ? void 0 : _a2.horizontal) == null ? void 0 : _b2.alignmentX[alignX]),
@@ -1508,186 +1436,102 @@ var Inline = ({
 };
 
 // src/DateField/DateField.tsx
-import { createCalendar } from "@internationalized/date";
-import { useRef as useRef4 } from "react";
-import { useDateField } from "@react-aria/datepicker";
-import { useFocusRing as useFocusRing3 } from "@react-aria/focus";
-import { useLocale } from "@react-aria/i18n";
-import { useHover } from "@react-aria/interactions";
-import { mergeProps as mergeProps4 } from "@react-aria/utils";
-import { useDateFieldState } from "@react-stately/datepicker";
-import { cn as cn27, useClassNames as useClassNames23, useStateProps as useStateProps3 } from "@marigold/system";
+import { forwardRef as forwardRef12 } from "react";
+import { DateField } from "react-aria-components";
+
+// src/DateField/DateInput.tsx
+import { DateInput, Group } from "react-aria-components";
+import { useClassNames as useClassNames21 } from "@marigold/system";
 
 // src/DateField/DateSegment.tsx
-import { useRef as useRef3 } from "react";
-import { useDateSegment } from "@react-aria/datepicker";
-import { useFocusRing as useFocusRing2 } from "@react-aria/focus";
-import { mergeProps as mergeProps3 } from "@react-aria/utils";
-import { cn as cn26, useStateProps as useStateProps2 } from "@marigold/system";
-import { jsx as jsx41, jsxs as jsxs15 } from "react/jsx-runtime";
-var DateSegment = ({
-  className,
-  segment,
-  state,
-  isPrevPlaceholder
-}) => {
-  const ref = useRef3(null);
-  const { segmentProps } = useDateSegment(segment, state, ref);
-  const { focusProps, isFocused } = useFocusRing2({
-    within: true,
-    isTextInput: true
-  });
-  const stateProps = useStateProps2({
-    disabled: state.isDisabled,
-    focusVisible: isFocused
-  });
-  const { isPlaceholder, placeholder, text, type, maxValue } = segment;
-  return /* @__PURE__ */ jsxs15(
-    "div",
+import { DateSegment } from "react-aria-components";
+import { cn as cn24 } from "@marigold/system";
+import { Fragment as Fragment5, jsx as jsx40, jsxs as jsxs13 } from "react/jsx-runtime";
+var _DateSegment = ({ segment, ...props }) => {
+  return /* @__PURE__ */ jsx40(
+    DateSegment,
     {
-      ...mergeProps3(segmentProps, stateProps, focusProps),
-      ref,
-      className: cn26(
-        "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__ */ jsx41(
+      children: ({ text, placeholder, isPlaceholder }) => /* @__PURE__ */ jsxs13(Fragment5, { children: [
+        /* @__PURE__ */ jsx40(
           "span",
           {
             "aria-hidden": "true",
-            className: cn26(
+            className: cn24(
               isPlaceholder ? "visible block" : "invisible hidden",
               "pointer-events-none w-full text-center"
             ),
             children: isPlaceholder && (placeholder == null ? void 0 : placeholder.toUpperCase())
           }
         ),
-        /* @__PURE__ */ jsx41("span", { children: isPlaceholder ? "" : type === "month" || type === "day" ? Number(text) < 10 ? "0" + text : text : text })
-      ]
+        /* @__PURE__ */ jsx40("span", { children: isPlaceholder ? "" : (segment.type === "month" || segment.type === "day") && Number(segment.text) < 10 ? "0" + segment.text : text })
+      ] })
     }
   );
 };
 
+// src/DateField/DateInput.tsx
+import { jsx as jsx41, jsxs as jsxs14 } from "react/jsx-runtime";
+var _DateInput = ({ variant, size, action, ...props }) => {
+  const classNames2 = useClassNames21({ component: "DateField", variant, size });
+  return /* @__PURE__ */ jsxs14(Group, { className: classNames2.field, children: [
+    /* @__PURE__ */ jsx41(DateInput, { className: "flex flex-1 items-center", ...props, children: (segment) => /* @__PURE__ */ jsx41(_DateSegment, { className: classNames2.segment, segment }) }),
+    action ? action : /* @__PURE__ */ jsx41("div", { className: "flex items-center justify-center", children: /* @__PURE__ */ jsx41(
+      "svg",
+      {
+        "data-testid": "action",
+        className: classNames2.action,
+        viewBox: "0 0 24 24",
+        width: 24,
+        height: 24,
+        children: /* @__PURE__ */ jsx41("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
-import { jsx as jsx42, jsxs as jsxs16 } from "react/jsx-runtime";
-var DateField = ({
-  disabled,
-  readOnly,
-  required,
-  error,
-  errorMessage,
-  errorMessageProps,
-  variant,
-  size,
-  action,
-  isPressed,
-  triggerRef,
-  width,
-  ...res
-}) => {
-  const { locale } = useLocale();
-  const props = {
-    isDisabled: disabled,
-    isReadOnly: readOnly,
-    isRequired: required,
-    ...res
-  };
-  const { label, description } = props;
-  const state = useDateFieldState({
-    ...props,
-    locale,
-    createCalendar
-  });
-  const ref = useRef4(null);
-  const { fieldProps, labelProps, descriptionProps } = useDateField(
-    props,
-    state,
-    ref
-  );
-  const classNames2 = useClassNames23({ component: "DateField", variant, size });
-  const { focusProps, isFocused } = useFocusRing3({
-    within: true,
-    isTextInput: true,
-    autoFocus: props.autoFocus
-  });
-  const { hoverProps, isHovered } = useHover({ isDisabled: disabled });
-  const stateProps = useStateProps3({
-    hover: isHovered,
-    error,
-    readOnly,
+import { jsx as jsx42 } from "react/jsx-runtime";
+var _DateField = forwardRef12(
+  ({
+    variant,
+    size,
+    action,
     disabled,
     required,
-    focus: isFocused || isPressed
-  });
-  return /* @__PURE__ */ jsx42(
-    FieldBase2,
-    {
-      error,
-      errorMessage,
-      errorMessageProps,
-      label,
-      labelProps,
-      description,
-      descriptionProps,
-      disabled,
-      stateProps,
-      variant,
-      size,
-      width,
-      children: /* @__PURE__ */ jsxs16(
-        "div",
-        {
-          ...mergeProps4(fieldProps, focusProps, stateProps, hoverProps),
-          className: cn27(
-            "relative flex flex-row flex-nowrap",
-            "cursor-text aria-disabled:cursor-not-allowed",
-            classNames2.field
-          ),
-          "data-testid": "date-field",
-          ref: triggerRef,
-          children: [
-            /* @__PURE__ */ jsx42("div", { ref, className: "flex basis-full items-center", children: state.segments.map((segment, i) => {
-              var _a;
-              return /* @__PURE__ */ jsx42(
-                DateSegment,
-                {
-                  className: classNames2.segment,
-                  isPrevPlaceholder: (_a = state.segments[i - 1]) == null ? void 0 : _a.isPlaceholder,
-                  segment,
-                  state
-                },
-                i
-              );
-            }) }),
-            action ? action : /* @__PURE__ */ jsx42("div", { className: "flex items-center justify-center", children: /* @__PURE__ */ jsx42(
-              "svg",
-              {
-                "data-testid": "action",
-                className: cn27(classNames2.action),
-                viewBox: "0 0 24 24",
-                width: 24,
-                height: 24,
-                children: /* @__PURE__ */ jsx42("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__ */ jsx42(
+      FieldBase,
+      {
+        as: DateField,
+        variant,
+        size,
+        ref,
+        ...props,
+        children: /* @__PURE__ */ jsx42(_DateInput, { action })
+      }
+    );
+  }
+);
 
 // src/Calendar/Calendar.tsx
 import { useState } from "react";
 import { Calendar } from "react-aria-components";
-import { cn as cn31, useClassNames as useClassNames28 } from "@marigold/system";
+import { cn as cn28, useClassNames as useClassNames26 } from "@marigold/system";
 
 // src/Calendar/CalendarGrid.tsx
 import {
@@ -1695,20 +1539,20 @@ import {
   CalendarGrid,
   CalendarGridBody
 } from "react-aria-components";
-import { cn as cn28, useClassNames as useClassNames25 } from "@marigold/system";
+import { cn as cn25, useClassNames as useClassNames23 } from "@marigold/system";
 
 // src/Calendar/CalendarGridHeader.tsx
 import { startOfWeek, today } from "@internationalized/date";
-import { useContext as useContext4, useMemo } from "react";
+import { useContext as useContext5, useMemo } from "react";
 import { CalendarStateContext } from "react-aria-components";
 import { useCalendarGrid } from "@react-aria/calendar";
-import { useDateFormatter, useLocale as useLocale2 } from "@react-aria/i18n";
-import { useClassNames as useClassNames24 } from "@marigold/system";
+import { useDateFormatter, useLocale } from "@react-aria/i18n";
+import { useClassNames as useClassNames22 } from "@marigold/system";
 import { jsx as jsx43 } from "react/jsx-runtime";
 function CalendarGridHeader(props) {
-  const state = useContext4(CalendarStateContext);
+  const state = useContext5(CalendarStateContext);
   const { headerProps } = useCalendarGrid(props, state);
-  const { locale } = useLocale2();
+  const { locale } = useLocale();
   const dayFormatter = useDateFormatter({
     weekday: "short",
     timeZone: state.timeZone
@@ -1721,21 +1565,21 @@ function CalendarGridHeader(props) {
       return dayFormatter.format(dateDay);
     });
   }, [locale, state.timeZone, dayFormatter]);
-  const classNames2 = useClassNames24({ component: "Calendar" });
+  const classNames2 = useClassNames22({ component: "Calendar" });
   return /* @__PURE__ */ jsx43("thead", { ...headerProps, children: /* @__PURE__ */ jsx43("tr", { children: weekDays.map((day, index) => /* @__PURE__ */ jsx43("th", { className: classNames2.calendarHeader, children: day.substring(0, 2) }, index)) }) });
 }
 
 // src/Calendar/CalendarGrid.tsx
-import { jsx as jsx44, jsxs as jsxs17 } from "react/jsx-runtime";
+import { jsx as jsx44, jsxs as jsxs15 } from "react/jsx-runtime";
 var _CalendarGrid = () => {
-  const classNames2 = useClassNames25({ component: "Calendar" });
-  return /* @__PURE__ */ jsxs17(CalendarGrid, { className: classNames2.calendarGrid, children: [
+  const classNames2 = useClassNames23({ component: "Calendar" });
+  return /* @__PURE__ */ jsxs15(CalendarGrid, { className: classNames2.calendarGrid, children: [
     /* @__PURE__ */ jsx44(CalendarGridHeader, {}),
     /* @__PURE__ */ jsx44(CalendarGridBody, { children: (date) => /* @__PURE__ */ jsx44(
       CalendarCell,
       {
         date,
-        className: cn28(
+        className: cn25(
           "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
         )
@@ -1745,10 +1589,10 @@ var _CalendarGrid = () => {
 };
 
 // src/Calendar/CalendarListBox.tsx
-import { useContext as useContext5 } from "react";
+import { useContext as useContext6 } from "react";
 import { CalendarStateContext as CalendarStateContext2 } from "react-aria-components";
 import { ChevronDown as ChevronDown2 } from "@marigold/icons";
-import { cn as cn29, useClassNames as useClassNames26 } from "@marigold/system";
+import { cn as cn26, useClassNames as useClassNames24 } from "@marigold/system";
 
 // src/Calendar/useFormattedMonths.tsx
 import { useDateFormatter as useDateFormatter2 } from "@react-aria/i18n";
@@ -1767,22 +1611,22 @@ function useFormattedMonths(timeZone, focusedDate) {
 }
 
 // src/Calendar/CalendarListBox.tsx
-import { jsx as jsx45, jsxs as jsxs18 } from "react/jsx-runtime";
+import { jsx as jsx45, jsxs as jsxs16 } from "react/jsx-runtime";
 function CalendarListBox({
   type,
   isDisabled,
   setSelectedDropdown
 }) {
-  const state = useContext5(CalendarStateContext2);
+  const state = useContext6(CalendarStateContext2);
   const months = useFormattedMonths(state.timeZone, state.focusedDate);
   const buttonStyles = "flex items-center justify-between gap-1 overflow-hidden";
-  const { select: selectClassNames } = useClassNames26({ component: "Select" });
-  return /* @__PURE__ */ jsxs18(
+  const { select: selectClassNames } = useClassNames24({ component: "Select" });
+  return /* @__PURE__ */ jsxs16(
     "button",
     {
       disabled: isDisabled,
       onClick: () => setSelectedDropdown(type),
-      className: cn29(buttonStyles, selectClassNames),
+      className: cn26(buttonStyles, selectClassNames),
       "data-testid": type,
       children: [
         type === "month" ? months[state.focusedDate.month - 1].substring(0, 3) : state.focusedDate.year,
@@ -1793,18 +1637,17 @@ function CalendarListBox({
 }
 
 // src/Calendar/MonthControls.tsx
-import React4 from "react";
 import { Button as Button2 } from "react-aria-components";
 import { ChevronLeft, ChevronRight } from "@marigold/icons";
-import { cn as cn30, useClassNames as useClassNames27 } from "@marigold/system";
-import { jsx as jsx46, jsxs as jsxs19 } from "react/jsx-runtime";
+import { cn as cn27, useClassNames as useClassNames25 } from "@marigold/system";
+import { jsx as jsx46, jsxs as jsxs17 } from "react/jsx-runtime";
 function MonthControls() {
-  const classNames2 = useClassNames27({ component: "Calendar" });
-  const buttonClassNames = useClassNames27({ component: "Button" });
-  return /* @__PURE__ */ jsxs19(
+  const classNames2 = useClassNames25({ component: "Calendar" });
+  const buttonClassNames = useClassNames25({ component: "Button" });
+  return /* @__PURE__ */ jsxs17(
     "div",
     {
-      className: cn30(
+      className: cn27(
         "flex w-full flex-nowrap justify-end gap-[10px] [&_button:disabled]:cursor-not-allowed [&_button]:px-2 [&_button]:py-1",
         classNames2.calendarControllers
       ),
@@ -1812,7 +1655,7 @@ function MonthControls() {
         /* @__PURE__ */ jsx46(
           Button2,
           {
-            className: cn30(
+            className: cn27(
               "inline-flex items-center justify-center gap-[0.5ch]",
               buttonClassNames
             ),
@@ -1823,7 +1666,7 @@ function MonthControls() {
         /* @__PURE__ */ jsx46(
           Button2,
           {
-            className: cn30(
+            className: cn27(
               "inline-flex items-center justify-center gap-[0.5ch]",
               buttonClassNames
             ),
@@ -1835,14 +1678,14 @@ function MonthControls() {
     }
   );
 }
-var MonthControls_default = React4.memo(MonthControls);
+var MonthControls_default = MonthControls;
 
 // src/Calendar/MonthListBox.tsx
-import { useContext as useContext6 } from "react";
+import { useContext as useContext7 } from "react";
 import { CalendarStateContext as CalendarStateContext3 } from "react-aria-components";
 import { jsx as jsx47 } from "react/jsx-runtime";
 var MonthListBox = ({ setSelectedDropdown }) => {
-  const state = useContext6(CalendarStateContext3);
+  const state = useContext7(CalendarStateContext3);
   const months = useFormattedMonths(state.timeZone, state.focusedDate);
   let onChange = (index) => {
     let value = Number(index) + 1;
@@ -1877,15 +1720,15 @@ var MonthListBox_default = MonthListBox;
 
 // src/Calendar/YearListBox.tsx
 import {
-  useContext as useContext7,
+  useContext as useContext8,
   useEffect as useEffect2,
-  useRef as useRef5
+  useRef as useRef3
 } from "react";
 import { CalendarStateContext as CalendarStateContext4 } from "react-aria-components";
 import { useDateFormatter as useDateFormatter3 } from "@react-aria/i18n";
 import { jsx as jsx48 } from "react/jsx-runtime";
 var YearListBox = ({ setSelectedDropdown }) => {
-  const state = useContext7(CalendarStateContext4);
+  const state = useContext8(CalendarStateContext4);
   const years = [];
   let formatter = useDateFormatter3({
     year: "numeric",
@@ -1898,7 +1741,7 @@ var YearListBox = ({ setSelectedDropdown }) => {
       formatted: formatter.format(date.toDate(state.timeZone))
     });
   }
-  const activeButtonRef = useRef5(null);
+  const activeButtonRef = useRef3(null);
   useEffect2(() => {
     if (activeButtonRef.current) {
       const activeButton = activeButtonRef.current;
@@ -1950,7 +1793,7 @@ var YearListBox = ({ setSelectedDropdown }) => {
 var YearListBox_default = YearListBox;
 
 // src/Calendar/Calendar.tsx
-import { Fragment as Fragment6, jsx as jsx49, jsxs as jsxs20 } from "react/jsx-runtime";
+import { Fragment as Fragment6, jsx as jsx49, jsxs as jsxs18 } from "react/jsx-runtime";
 var _Calendar = ({
   disabled,
   readOnly,
@@ -1963,7 +1806,7 @@ var _Calendar = ({
     isReadOnly: readOnly,
     ...rest
   };
-  const classNames2 = useClassNames28({ component: "Calendar" });
+  const classNames2 = useClassNames26({ component: "Calendar" });
   const [selectedDropdown, setSelectedDropdown] = useState();
   const ViewMap = {
     month: /* @__PURE__ */ jsx49(MonthListBox_default, { setSelectedDropdown }),
@@ -1972,14 +1815,14 @@ var _Calendar = ({
   return /* @__PURE__ */ jsx49(
     Calendar,
     {
-      className: cn31(
+      className: cn28(
         "flex min-h-[350px] w-[360px] flex-col rounded-sm p-4  shadow-[0_4px_4px_rgba(165,165,165,0.25)]",
         classNames2.calendar
       ),
       ...props,
-      children: selectedDropdown ? ViewMap[selectedDropdown] : /* @__PURE__ */ jsxs20(Fragment6, { children: [
-        /* @__PURE__ */ jsxs20("div", { className: "mb-4 flex items-center justify-between", children: [
-          /* @__PURE__ */ jsxs20("div", { className: "flex w-full gap-4", children: [
+      children: selectedDropdown ? ViewMap[selectedDropdown] : /* @__PURE__ */ jsxs18(Fragment6, { children: [
+        /* @__PURE__ */ jsxs18("div", { className: "mb-4 flex items-center justify-between", children: [
+          /* @__PURE__ */ jsxs18("div", { className: "flex w-full gap-4", children: [
             /* @__PURE__ */ jsx49(
               CalendarListBox,
               {
@@ -2006,242 +1849,73 @@ var _Calendar = ({
 };
 
 // src/DatePicker/DatePicker.tsx
-import { useRef as useRef8 } from "react";
-import { useDatePicker } from "@react-aria/datepicker";
-import { mergeProps as mergeProps5 } from "@react-aria/utils";
-import { useDatePickerState } from "@react-stately/datepicker";
-import { useClassNames as useClassNames31, useStateProps as useStateProps4 } from "@marigold/system";
-
-// src/Overlay/Overlay.tsx
-import { useRef as useRef6 } from "react";
-import {
-  Overlay as ReactAriaOverlay
-} from "@react-aria/overlays";
-import { useTheme as useTheme4 } from "@marigold/system";
-import { jsx as jsx50 } from "react/jsx-runtime";
-var Overlay = ({ children, container, open }) => {
-  const nodeRef = useRef6(null);
-  const theme = useTheme4();
-  let mountOverlay = open;
-  if (!mountOverlay) {
-    return null;
-  }
-  return /* @__PURE__ */ jsx50(ReactAriaOverlay, { portalContainer: container, children: /* @__PURE__ */ jsx50(
-    "div",
-    {
-      ref: nodeRef,
-      "data-testid": "overlay",
-      "data-theme": theme.name,
-      className: "opacity-100",
-      children
-    }
-  ) });
-};
-
-// src/Overlay/_Popover.tsx
-import { forwardRef as forwardRef12, useRef as useRef7 } from "react";
-import { FocusScope } from "@react-aria/focus";
-import {
-  DismissButton,
-  usePopover
-} from "@react-aria/overlays";
-import { useClassNames as useClassNames29 } from "@marigold/system";
-import { jsx as jsx51, jsxs as jsxs21 } from "react/jsx-runtime";
-var Popover2 = forwardRef12(
-  (props, ref) => {
-    const fallbackRef = useRef7(null);
-    const popoverRef = ref || fallbackRef;
-    let { children, state, ...otherProps } = props;
-    return /* @__PURE__ */ jsx51(Overlay, { open: state.isOpen, ...otherProps, children: /* @__PURE__ */ jsx51(PopoverWrapper, { ref: popoverRef, ...props, children }) });
-  }
-);
-var PopoverWrapper = forwardRef12(
-  ({
-    children,
-    isNonModal,
-    state,
-    keyboardDismissDisabled,
-    ...props
-  }, ref) => {
-    const { popoverProps, underlayProps, placement } = usePopover(
-      {
-        ...props,
-        isNonModal,
-        isKeyboardDismissDisabled: keyboardDismissDisabled,
-        popoverRef: ref,
-        placement: "bottom left"
-      },
-      state
-    );
-    const classNames2 = useClassNames29({
-      component: "Popover",
-      variant: placement
-    });
-    return /* @__PURE__ */ jsxs21(FocusScope, { restoreFocus: true, children: [
-      !isNonModal && /* @__PURE__ */ jsx51(Underlay, { ...underlayProps }),
-      /* @__PURE__ */ jsxs21(
-        "div",
-        {
-          ...popoverProps,
-          className: classNames2,
-          style: {
-            ...popoverProps.style,
-            minWidth: props.triggerRef.current ? props.triggerRef.current.offsetWidth : void 0
-          },
-          ref,
-          role: "presentation",
-          children: [
-            !isNonModal && /* @__PURE__ */ jsx51(DismissButton, { onDismiss: state.close }),
-            children,
-            /* @__PURE__ */ jsx51(DismissButton, { onDismiss: state.close })
-          ]
-        }
-      )
-    ] });
-  }
-);
-
-// src/Overlay/Tray.tsx
-import { forwardRef as forwardRef13 } from "react";
-import { FocusScope as FocusScope2 } from "@react-aria/focus";
-import {
-  DismissButton as DismissButton2,
-  useModalOverlay
-} from "@react-aria/overlays";
-import { useObjectRef } from "@react-aria/utils";
-
-// src/Overlay/_Underlay.tsx
-import { cn as cn32, useClassNames as useClassNames30 } from "@marigold/system";
-import { jsx as jsx52 } from "react/jsx-runtime";
-var Underlay2 = ({ size, variant, ...props }) => {
-  const classNames2 = useClassNames30({ component: "Underlay", size, variant });
-  return /* @__PURE__ */ jsx52("div", { className: cn32("fixed inset-0 z-40", classNames2), ...props });
-};
-
-// src/Overlay/Tray.tsx
-import { jsx as jsx53, jsxs as jsxs22 } from "react/jsx-runtime";
-var Tray = forwardRef13(
-  ({ state, children, ...props }, ref) => {
-    const trayRef = useObjectRef(ref);
-    return /* @__PURE__ */ jsx53(Overlay, { open: state.isOpen, children: /* @__PURE__ */ jsx53(TrayWrapper, { state, ...props, ref: trayRef, children }) });
-  }
-);
-var TrayWrapper = forwardRef13(
-  ({ children, state, ...props }, ref) => {
-    let { modalProps, underlayProps } = useModalOverlay(
-      {
-        ...props,
-        isDismissable: true
-      },
-      state,
-      ref
-    );
-    return /* @__PURE__ */ jsx53(FocusScope2, { contain: true, restoreFocus: true, autoFocus: true, children: /* @__PURE__ */ jsx53(Underlay2, { ...underlayProps, variant: "modal", children: /* @__PURE__ */ jsxs22(
-      "div",
-      {
-        ...modalProps,
-        ref,
-        className: "absolute bottom-0 w-full",
-        "data-testid": "tray",
-        children: [
-          /* @__PURE__ */ jsx53(DismissButton2, { onDismiss: state.close }),
-          children,
-          /* @__PURE__ */ jsx53(DismissButton2, { onDismiss: state.close })
-        ]
-      }
-    ) }) });
-  }
-);
-
-// src/DatePicker/DatePicker.tsx
-import { Fragment as Fragment7, jsx as jsx54, jsxs as jsxs23 } from "react/jsx-runtime";
-var DatePicker = ({
+import { DatePicker } from "react-aria-components";
+import { useClassNames as useClassNames27 } from "@marigold/system";
+import { jsx as jsx50, jsxs as jsxs19 } from "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 = useDatePickerState({
-    shouldCloseOnSelect,
-    ...props
-  });
-  const ref = useRef8(null);
-  const stateProps = useStateProps4({
-    focus: state.isOpen
-  });
-  const { groupProps, fieldProps, buttonProps, calendarProps } = useDatePicker(
-    props,
-    state,
-    ref
-  );
-  const { isDisabled, errorMessage, description, label } = props;
-  const classNames2 = useClassNames31({
+  const classNames2 = useClassNames27({
     component: "DatePicker",
     size,
     variant
   });
-  return /* @__PURE__ */ jsxs23(Fragment7, { children: [
-    /* @__PURE__ */ jsx54("div", { className: "flex w-full min-w-[300px]", ...groupProps, children: /* @__PURE__ */ jsx54(
-      DateField,
+  return /* @__PURE__ */ jsxs19(FieldBase, { as: DatePicker, variant, size, ...props, children: [
+    /* @__PURE__ */ jsx50(
+      _DateInput,
       {
-        ...fieldProps,
-        label,
-        isPressed: state.isOpen,
-        disabled,
-        required,
-        errorMessage,
-        error,
-        description: !state.isOpen && description,
-        triggerRef: ref,
-        width,
-        action: /* @__PURE__ */ jsx54("div", { className: classNames2.container, children: /* @__PURE__ */ jsx54(
+        action: /* @__PURE__ */ jsx50("div", { className: classNames2.container, children: /* @__PURE__ */ jsx50(
           _Button,
           {
-            ...mergeProps5(buttonProps, stateProps),
-            disabled: isDisabled,
-            children: /* @__PURE__ */ jsx54(
+            size: "small",
+            disabled,
+            className: classNames2.button,
+            children: /* @__PURE__ */ jsx50(
               "svg",
               {
-                width: "24",
-                height: "24",
+                "data-testid": "action",
                 viewBox: "0 0 24 24",
+                width: 24,
+                height: 24,
                 fill: "currentColor",
-                children: /* @__PURE__ */ jsx54("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__ */ jsx50("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__ */ jsx54(Popover2, { triggerRef: ref, state, children: /* @__PURE__ */ jsx54(_Calendar, { disabled, ...calendarProps }) })
+    ),
+    /* @__PURE__ */ jsx50(_Popover, { children: /* @__PURE__ */ jsx50(_Calendar, { disabled }) })
   ] });
 };
 
 // src/Inset/Inset.tsx
 import {
-  cn as cn33,
+  cn as cn29,
   paddingSpace as paddingSpace2,
   paddingSpaceX as paddingSpaceX2,
   paddingSpaceY as paddingSpaceY2
 } from "@marigold/system";
-import { jsx as jsx55 } from "react/jsx-runtime";
-var Inset = ({ space, spaceX, spaceY, children }) => /* @__PURE__ */ jsx55(
+import { jsx as jsx51 } from "react/jsx-runtime";
+var Inset = ({ space, spaceX, spaceY, children }) => /* @__PURE__ */ jsx51(
   "div",
   {
-    className: cn33(
+    className: cn29(
       space && paddingSpace2[space],
       !space && spaceX && paddingSpaceX2[spaceX],
       !space && spaceY && paddingSpaceY2[spaceY]
@@ -2251,38 +1925,38 @@ var Inset = ({ space, spaceX, spaceY, children }) => /* @__PURE__ */ jsx55(
 );
 
 // src/Link/Link.tsx
-import { forwardRef as forwardRef14 } from "react";
+import { forwardRef as forwardRef13 } from "react";
 import { Link } from "react-aria-components";
-import { useClassNames as useClassNames32 } from "@marigold/system";
-import { jsx as jsx56 } from "react/jsx-runtime";
-var _Link = forwardRef14(
+import { useClassNames as useClassNames28 } from "@marigold/system";
+import { jsx as jsx52 } from "react/jsx-runtime";
+var _Link = forwardRef13(
   ({ variant, size, disabled, children, ...props }, ref) => {
-    const classNames2 = useClassNames32({
+    const classNames2 = useClassNames28({
       component: "Link",
       variant,
       size
     });
-    return /* @__PURE__ */ jsx56(Link, { ...props, ref, className: classNames2, isDisabled: disabled, children });
+    return /* @__PURE__ */ jsx52(Link, { ...props, ref, className: classNames2, isDisabled: disabled, children });
   }
 );
 
 // src/List/List.tsx
-import { useClassNames as useClassNames33 } from "@marigold/system";
+import { useClassNames as useClassNames29 } from "@marigold/system";
 
 // src/List/Context.ts
-import { createContext as createContext3, useContext as useContext8 } from "react";
-var ListContext = createContext3({});
-var useListContext = () => useContext8(ListContext);
+import { createContext as createContext4, useContext as useContext9 } from "react";
+var ListContext = createContext4({});
+var useListContext = () => useContext9(ListContext);
 
 // src/List/ListItem.tsx
-import { jsx as jsx57 } from "react/jsx-runtime";
+import { jsx as jsx53 } from "react/jsx-runtime";
 var ListItem = ({ children, ...props }) => {
   const { classNames: classNames2 } = useListContext();
-  return /* @__PURE__ */ jsx57("li", { ...props, className: classNames2, children });
+  return /* @__PURE__ */ jsx53("li", { ...props, className: classNames2, children });
 };
 
 // src/List/List.tsx
-import { jsx as jsx58 } from "react/jsx-runtime";
+import { jsx as jsx54 } from "react/jsx-runtime";
 var List = ({
   as = "ul",
   children,
@@ -2291,50 +1965,51 @@ var List = ({
   ...props
 }) => {
   const Component = as;
-  const classNames2 = useClassNames33({ component: "List", variant, size });
-  return /* @__PURE__ */ jsx58(Component, { ...props, className: classNames2[as], children: /* @__PURE__ */ jsx58(ListContext.Provider, { value: { classNames: classNames2.item }, children }) });
+  const classNames2 = useClassNames29({ component: "List", variant, size });
+  return /* @__PURE__ */ jsx54(Component, { ...props, className: classNames2[as], children: /* @__PURE__ */ jsx54(ListContext.Provider, { value: { classNames: classNames2.item }, children }) });
 };
 List.Item = ListItem;
 
 // src/Menu/Menu.tsx
 import { Menu, MenuTrigger } from "react-aria-components";
-import { useClassNames as useClassNames36 } from "@marigold/system";
+import { useClassNames as useClassNames32 } from "@marigold/system";
 
 // src/Menu/MenuItem.tsx
 import { MenuItem } from "react-aria-components";
-import { useClassNames as useClassNames34 } from "@marigold/system";
-import { jsx as jsx59 } from "react/jsx-runtime";
+import { useClassNames as useClassNames30 } from "@marigold/system";
+import { jsx as jsx55 } from "react/jsx-runtime";
 var _MenuItem = ({ children, ...props }) => {
-  const classNames2 = useClassNames34({ component: "Menu" });
-  return /* @__PURE__ */ jsx59(MenuItem, { ...props, className: classNames2.item, children });
+  const classNames2 = useClassNames30({ component: "Menu" });
+  return /* @__PURE__ */ jsx55(MenuItem, { ...props, className: classNames2.item, children });
 };
 
 // src/Menu/MenuSection.tsx
 import { Section as Section2 } from "react-aria-components";
-import { useClassNames as useClassNames35 } from "@marigold/system";
-import { jsx as jsx60, jsxs as jsxs24 } from "react/jsx-runtime";
+import { useClassNames as useClassNames31 } from "@marigold/system";
+import { jsx as jsx56, jsxs as jsxs20 } from "react/jsx-runtime";
 var _MenuSection = ({ children, title, ...props }) => {
-  const className = useClassNames35({ component: "Menu" });
-  return /* @__PURE__ */ jsxs24(Section2, { ...props, children: [
-    /* @__PURE__ */ jsx60(_Header, { className: className.section, children: title }),
+  const className = useClassNames31({ component: "Menu" });
+  return /* @__PURE__ */ jsxs20(Section2, { ...props, children: [
+    /* @__PURE__ */ jsx56(_Header, { className: className.section, children: title }),
     children
   ] });
 };
 
 // src/Menu/Menu.tsx
-import { jsx as jsx61, jsxs as jsxs25 } from "react/jsx-runtime";
+import { jsx as jsx57, jsxs as jsxs21 } from "react/jsx-runtime";
 var _Menu = ({
   children,
   label,
   variant,
   size,
+  disabled,
   open,
   ...props
 }) => {
-  const classNames2 = useClassNames36({ component: "Menu", variant, size });
-  return /* @__PURE__ */ jsxs25(MenuTrigger, { ...props, children: [
-    /* @__PURE__ */ jsx61(_Button, { variant: "menu", children: label }),
-    /* @__PURE__ */ jsx61(_Popover, { open, children: /* @__PURE__ */ jsx61(Menu, { ...props, className: classNames2.container, children }) })
+  const classNames2 = useClassNames32({ component: "Menu", variant, size });
+  return /* @__PURE__ */ jsxs21(MenuTrigger, { ...props, children: [
+    /* @__PURE__ */ jsx57(_Button, { variant: "menu", disabled, children: label }),
+    /* @__PURE__ */ jsx57(_Popover, { open, children: /* @__PURE__ */ jsx57(Menu, { ...props, className: classNames2.container, children }) })
   ] });
 };
 _Menu.Item = _MenuItem;
@@ -2342,27 +2017,32 @@ _Menu.Section = _MenuSection;
 
 // src/Menu/ActionMenu.tsx
 import { Menu as Menu2, MenuTrigger as MenuTrigger2 } from "react-aria-components";
-import { SVG as SVG5, useClassNames as useClassNames37 } from "@marigold/system";
-import { jsx as jsx62, jsxs as jsxs26 } from "react/jsx-runtime";
-var ActionMenu = ({ variant, size, ...props }) => {
-  const classNames2 = useClassNames37({ component: "Menu", variant, size });
-  return /* @__PURE__ */ jsxs26(MenuTrigger2, { children: [
-    /* @__PURE__ */ jsx62(_Button, { variant: "menu", size: "small", children: /* @__PURE__ */ jsx62(SVG5, { viewBox: "0 0 24 24", children: /* @__PURE__ */ jsx62("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__ */ jsx62(_Popover, { children: /* @__PURE__ */ jsx62(Menu2, { ...props, className: classNames2.container, children: props.children }) })
+import { SVG as SVG4, useClassNames as useClassNames33 } from "@marigold/system";
+import { jsx as jsx58, jsxs as jsxs22 } from "react/jsx-runtime";
+var ActionMenu = ({
+  variant,
+  size,
+  disabled,
+  ...props
+}) => {
+  const classNames2 = useClassNames33({ component: "Menu", variant, size });
+  return /* @__PURE__ */ jsxs22(MenuTrigger2, { children: [
+    /* @__PURE__ */ jsx58(_Button, { variant: "menu", size: "small", disabled, children: /* @__PURE__ */ jsx58(SVG4, { viewBox: "0 0 24 24", children: /* @__PURE__ */ jsx58("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__ */ jsx58(_Popover, { children: /* @__PURE__ */ jsx58(Menu2, { ...props, className: classNames2.container, children: props.children }) })
   ] });
 };
 
 // src/Message/Message.tsx
-import { cn as cn34, useClassNames as useClassNames38 } from "@marigold/system";
-import { jsx as jsx63, jsxs as jsxs27 } from "react/jsx-runtime";
+import { cn as cn30, useClassNames as useClassNames34 } from "@marigold/system";
+import { jsx as jsx59, jsxs as jsxs23 } from "react/jsx-runtime";
 var icons = {
-  success: () => /* @__PURE__ */ jsx63(
+  success: () => /* @__PURE__ */ jsx59(
     "svg",
     {
       xmlns: "http://www.w3.org/2000/svg",
       viewBox: "0 0 24 24",
       fill: "currentColor",
-      children: /* @__PURE__ */ jsx63(
+      children: /* @__PURE__ */ jsx59(
         "path",
         {
           fillRule: "evenodd",
@@ -2372,13 +2052,13 @@ var icons = {
       )
     }
   ),
-  info: () => /* @__PURE__ */ jsx63(
+  info: () => /* @__PURE__ */ jsx59(
     "svg",
     {
       xmlns: "http://www.w3.org/2000/svg",
       viewBox: "0 0 24 24",
       fill: "currentColor",
-      children: /* @__PURE__ */ jsx63(
+      children: /* @__PURE__ */ jsx59(
         "path",
         {
           fillRule: "evenodd",
@@ -2388,13 +2068,13 @@ var icons = {
       )
     }
   ),
-  warning: () => /* @__PURE__ */ jsx63(
+  warning: () => /* @__PURE__ */ jsx59(
     "svg",
     {
       xmlns: "http://www.w3.org/2000/svg",
       viewBox: "0 0 24 24",
       fill: "currentColor",
-      children: /* @__PURE__ */ jsx63(
+      children: /* @__PURE__ */ jsx59(
         "path",
         {
           fillRule: "evenodd",
@@ -2404,13 +2084,13 @@ var icons = {
       )
     }
   ),
-  error: () => /* @__PURE__ */ jsx63(
+  error: () => /* @__PURE__ */ jsx59(
     "svg",
     {
       xmlns: "http://www.w3.org/2000/svg",
       viewBox: "0 0 24 24",
       fill: "currentColor",
-      children: /* @__PURE__ */ jsx63(
+      children: /* @__PURE__ */ jsx59(
         "path",
         {
           fillRule: "evenodd",
@@ -2428,41 +2108,41 @@ var Message = ({
   children,
   ...props
 }) => {
-  const classNames2 = useClassNames38({ component: "Message", variant, size });
-  const Icon3 = icons[variant];
-  return /* @__PURE__ */ jsxs27(
+  const classNames2 = useClassNames34({ component: "Message", variant, size });
+  const Icon4 = icons[variant];
+  return /* @__PURE__ */ jsxs23(
     "div",
     {
-      className: cn34(
+      className: cn30(
         "grid auto-rows-min grid-cols-[min-content_auto] gap-1",
         classNames2.container
       ),
       ...props,
       children: [
-        /* @__PURE__ */ jsx63("div", { className: cn34("col-span-1 h-5 w-5 self-center", classNames2.icon), children: /* @__PURE__ */ jsx63(Icon3, {}) }),
-        /* @__PURE__ */ jsx63(
+        /* @__PURE__ */ jsx59("div", { className: cn30("col-span-1 h-5 w-5 self-center", classNames2.icon), children: /* @__PURE__ */ jsx59(Icon4, {}) }),
+        /* @__PURE__ */ jsx59(
           "div",
           {
-            className: cn34("col-start-2 row-start-1 self-center", classNames2.title),
+            className: cn30("col-start-2 row-start-1 self-center", classNames2.title),
             children: messageTitle
           }
         ),
-        /* @__PURE__ */ jsx63("div", { className: cn34("col-start-2", classNames2.content), children })
+        /* @__PURE__ */ jsx59("div", { className: cn30("col-start-2", classNames2.content), children })
       ]
     }
   );
 };
 
 // src/NumberField/NumberField.tsx
-import { forwardRef as forwardRef15 } from "react";
-import { Group, NumberField } from "react-aria-components";
-import { cn as cn36, useClassNames as useClassNames39 } from "@marigold/system";
+import { forwardRef as forwardRef14 } from "react";
+import { Group as Group2, NumberField } from "react-aria-components";
+import { cn as cn32, useClassNames as useClassNames35 } from "@marigold/system";
 
 // src/NumberField/StepButton.tsx
 import { Button as Button3 } from "react-aria-components";
-import { cn as cn35 } from "@marigold/system";
-import { jsx as jsx64 } from "react/jsx-runtime";
-var Plus = () => /* @__PURE__ */ jsx64("svg", { width: 16, height: 16, viewBox: "0 0 20 20", fill: "currentColor", children: /* @__PURE__ */ jsx64(
+import { cn as cn31 } from "@marigold/system";
+import { jsx as jsx60 } from "react/jsx-runtime";
+var Plus = () => /* @__PURE__ */ jsx60("svg", { width: 16, height: 16, viewBox: "0 0 20 20", fill: "currentColor", children: /* @__PURE__ */ jsx60(
   "path",
   {
     fillRule: "evenodd",
@@ -2470,7 +2150,7 @@ var Plus = () => /* @__PURE__ */ jsx64("svg", { width: 16, height: 16, viewBox:
     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__ */ jsx64("svg", { width: 16, height: 16, viewBox: "0 0 20 20", fill: "currentColor", children: /* @__PURE__ */ jsx64(
+var Minus = () => /* @__PURE__ */ jsx60("svg", { width: 16, height: 16, viewBox: "0 0 20 20", fill: "currentColor", children: /* @__PURE__ */ jsx60(
   "path",
   {
     fillRule: "evenodd",
@@ -2479,11 +2159,11 @@ var Minus = () => /* @__PURE__ */ jsx64("svg", { width: 16, height: 16, viewBox:
   }
 ) });
 var _StepButton = ({ direction, className, ...props }) => {
-  const Icon3 = direction === "up" ? Plus : Minus;
-  return /* @__PURE__ */ jsx64(
+  const Icon4 = direction === "up" ? Plus : Minus;
+  return /* @__PURE__ */ jsx60(
     Button3,
     {
-      className: cn35(
+      className: cn31(
         [
           "flex items-center justify-center",
           "cursor-pointer data-[disabled]:cursor-not-allowed"
@@ -2491,14 +2171,14 @@ var _StepButton = ({ direction, className, ...props }) => {
         className
       ),
       ...props,
-      children: /* @__PURE__ */ jsx64(Icon3, {})
+      children: /* @__PURE__ */ jsx60(Icon4, {})
     }
   );
 };
 
 // src/NumberField/NumberField.tsx
-import { jsx as jsx65, jsxs as jsxs28 } from "react/jsx-runtime";
-var _NumberField = forwardRef15(
+import { jsx as jsx61, jsxs as jsxs24 } from "react/jsx-runtime";
+var _NumberField = forwardRef14(
   ({
     variant,
     size,
@@ -2509,7 +2189,7 @@ var _NumberField = forwardRef15(
     hideStepper,
     ...rest
   }, ref) => {
-    const classNames2 = useClassNames39({
+    const classNames2 = useClassNames35({
       component: "NumberField",
       size,
       variant
@@ -2522,8 +2202,8 @@ var _NumberField = forwardRef15(
       ...rest
     };
     const showStepper = !hideStepper;
-    return /* @__PURE__ */ jsx65(FieldBase, { as: NumberField, ...props, children: /* @__PURE__ */ jsxs28(Group, { className: cn36("flex items-stretch", classNames2.group), children: [
-      showStepper && /* @__PURE__ */ jsx65(
+    return /* @__PURE__ */ jsx61(FieldBase, { as: NumberField, ...props, children: /* @__PURE__ */ jsxs24(Group2, { className: cn32("flex items-stretch", classNames2.group), children: [
+      showStepper && /* @__PURE__ */ jsx61(
         _StepButton,
         {
           className: classNames2.stepper,
@@ -2531,7 +2211,7 @@ var _NumberField = forwardRef15(
           slot: "decrement"
         }
       ),
-      /* @__PURE__ */ jsx65("div", { className: "flex-1", children: /* @__PURE__ */ jsx65(
+      /* @__PURE__ */ jsx61("div", { className: "flex-1", children: /* @__PURE__ */ jsx61(
         _Input,
         {
           ref,
@@ -2540,7 +2220,7 @@ var _NumberField = forwardRef15(
           className: classNames2.input
         }
       ) }),
-      showStepper && /* @__PURE__ */ jsx65(
+      showStepper && /* @__PURE__ */ jsx61(
         _StepButton,
         {
           className: classNames2.stepper,
@@ -2552,44 +2232,24 @@ var _NumberField = forwardRef15(
   }
 );
 
-// src/Provider/index.ts
-import { useTheme as useTheme6, ThemeProvider as ThemeProvider2 } from "@marigold/system";
-
-// src/Provider/MarigoldProvider.tsx
-import { OverlayProvider } from "@react-aria/overlays";
-import {
-  ThemeProvider,
-  defaultTheme,
-  useTheme as useTheme5
-} from "@marigold/system";
-import { jsx as jsx66 } from "react/jsx-runtime";
-function MarigoldProvider({
-  children,
-  theme
-}) {
-  const outerTheme = useTheme5();
-  const isTopLevel = outerTheme === defaultTheme;
-  return /* @__PURE__ */ jsx66(ThemeProvider, { theme, children: isTopLevel ? /* @__PURE__ */ jsx66(OverlayProvider, { children }) : children });
-}
-
 // src/Radio/Radio.tsx
 import {
-  forwardRef as forwardRef16
+  forwardRef as forwardRef15
 } from "react";
 import { Radio } from "react-aria-components";
-import { cn as cn38, useClassNames as useClassNames41 } from "@marigold/system";
+import { cn as cn34, useClassNames as useClassNames37 } from "@marigold/system";
 
 // src/Radio/Context.ts
-import { createContext as createContext4, useContext as useContext9 } from "react";
-var RadioGroupContext = createContext4(
+import { createContext as createContext5, useContext as useContext10 } from "react";
+var RadioGroupContext = createContext5(
   null
 );
-var useRadioGroupContext = () => useContext9(RadioGroupContext);
+var useRadioGroupContext = () => useContext10(RadioGroupContext);
 
 // src/Radio/RadioGroup.tsx
 import { RadioGroup } from "react-aria-components";
-import { cn as cn37, useClassNames as useClassNames40 } from "@marigold/system";
-import { jsx as jsx67 } from "react/jsx-runtime";
+import { cn as cn33, useClassNames as useClassNames36 } from "@marigold/system";
+import { jsx as jsx62 } from "react/jsx-runtime";
 var _RadioGroup = ({
   variant,
   size,
@@ -2605,7 +2265,7 @@ var _RadioGroup = ({
   width,
   ...rest
 }) => {
-  const classNames2 = useClassNames40({ component: "Radio", variant, size });
+  const classNames2 = useClassNames36({ component: "Radio", variant, size });
   const props = {
     isDisabled: disabled,
     isReadOnly: readOnly,
@@ -2613,7 +2273,7 @@ var _RadioGroup = ({
     isInvalid: error,
     ...rest
   };
-  return /* @__PURE__ */ jsx67(
+  return /* @__PURE__ */ jsx62(
     FieldBase,
     {
       as: RadioGroup,
@@ -2624,18 +2284,18 @@ var _RadioGroup = ({
       variant,
       size,
       ...props,
-      children: /* @__PURE__ */ jsx67(
+      children: /* @__PURE__ */ jsx62(
         "div",
         {
           role: "presentation",
           "data-testid": "group",
           "data-orientation": orientation,
-          className: cn37(
+          className: cn33(
             classNames2.group,
             "flex items-start",
             orientation === "vertical" ? "flex-col gap-[0.5ch]" : "flex-row gap-[1.5ch]"
           ),
-          children: /* @__PURE__ */ jsx67(RadioGroupContext.Provider, { value: { width, variant, size }, children })
+          children: /* @__PURE__ */ jsx62(RadioGroupContext.Provider, { value: { width, variant, size }, children })
         }
       )
     }
@@ -2643,33 +2303,33 @@ var _RadioGroup = ({
 };
 
 // src/Radio/Radio.tsx
-import { Fragment as Fragment8, jsx as jsx68, jsxs as jsxs29 } from "react/jsx-runtime";
-var Dot = () => /* @__PURE__ */ jsx68("svg", { viewBox: "0 0 6 6", children: /* @__PURE__ */ jsx68("circle", { fill: "currentColor", cx: "3", cy: "3", r: "3" }) });
-var Icon2 = ({ checked, className, ...props }) => /* @__PURE__ */ jsx68(
+import { Fragment as Fragment7, jsx as jsx63, jsxs as jsxs25 } from "react/jsx-runtime";
+var Dot = () => /* @__PURE__ */ jsx63("svg", { viewBox: "0 0 6 6", children: /* @__PURE__ */ jsx63("circle", { fill: "currentColor", cx: "3", cy: "3", r: "3" }) });
+var Icon3 = ({ checked, className, ...props }) => /* @__PURE__ */ jsx63(
   "div",
   {
-    className: cn38(
+    className: cn34(
       "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__ */ jsx68(Dot, {}) : null
+    children: checked ? /* @__PURE__ */ jsx63(Dot, {}) : null
   }
 );
-var _Radio = forwardRef16(
+var _Radio = forwardRef15(
   ({ value, disabled, width, children, ...props }, ref) => {
     const { variant, size, width: groupWidth } = useRadioGroupContext();
-    const classNames2 = useClassNames41({
+    const classNames2 = useClassNames37({
       component: "Radio",
       variant: variant || props.variant,
       size: size || props.size
     });
-    return /* @__PURE__ */ jsx68(
+    return /* @__PURE__ */ jsx63(
       Radio,
       {
         ref,
-        className: cn38(
+        className: cn34(
           "group/radio",
           "relative flex items-center gap-[1ch]",
           width || groupWidth || "w-full",
@@ -2678,18 +2338,18 @@ var _Radio = forwardRef16(
         value,
         isDisabled: disabled,
         ...props,
-        children: ({ isSelected }) => /* @__PURE__ */ jsxs29(Fragment8, { children: [
-          /* @__PURE__ */ jsx68(
-            Icon2,
+        children: ({ isSelected }) => /* @__PURE__ */ jsxs25(Fragment7, { children: [
+          /* @__PURE__ */ jsx63(
+            Icon3,
             {
               checked: isSelected,
-              className: cn38(
+              className: cn34(
                 disabled ? "cursor-not-allowed" : "cursor-pointer",
                 classNames2.radio
               )
             }
           ),
-          /* @__PURE__ */ jsx68("div", { className: classNames2.label, children })
+          /* @__PURE__ */ jsx63("div", { className: classNames2.label, children })
         ] })
       }
     );
@@ -2698,10 +2358,10 @@ var _Radio = forwardRef16(
 _Radio.Group = _RadioGroup;
 
 // src/SearchField/SearchField.tsx
-import { forwardRef as forwardRef17 } from "react";
+import { forwardRef as forwardRef16 } from "react";
 import { SearchField } from "react-aria-components";
-import { jsx as jsx69 } from "react/jsx-runtime";
-var SearchIcon2 = (props) => /* @__PURE__ */ jsx69(
+import { jsx as jsx64 } from "react/jsx-runtime";
+var SearchIcon2 = (props) => /* @__PURE__ */ jsx64(
   "svg",
   {
     xmlns: "http://www.w3.org/2000/svg",
@@ -2710,10 +2370,10 @@ var SearchIcon2 = (props) => /* @__PURE__ */ jsx69(
     width: 24,
     height: 24,
     ...props,
-    children: /* @__PURE__ */ jsx69("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__ */ jsx64("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 = forwardRef17(
+var _SearchField = forwardRef16(
   ({ disabled, required, readOnly, error, action, ...rest }, ref) => {
     const props = {
       ...rest,
@@ -2722,20 +2382,20 @@ var _SearchField = forwardRef17(
       isReadOnly: readOnly,
       isInvalid: error
     };
-    return /* @__PURE__ */ jsx69(FieldBase, { as: SearchField, ...props, children: /* @__PURE__ */ jsx69(_Input, { ref, icon: /* @__PURE__ */ jsx69(SearchIcon2, {}) }) });
+    return /* @__PURE__ */ jsx64(FieldBase, { as: SearchField, ...props, children: /* @__PURE__ */ jsx64(_Input, { ref, icon: /* @__PURE__ */ jsx64(SearchIcon2, {}) }) });
   }
 );
 
 // src/Select/Select.tsx
-import { forwardRef as forwardRef18 } from "react";
+import { forwardRef as forwardRef17 } from "react";
 import {
   Button as Button4,
   Select,
   SelectValue
 } from "react-aria-components";
-import { cn as cn39, useClassNames as useClassNames42 } from "@marigold/system";
-import { jsx as jsx70, jsxs as jsxs30 } from "react/jsx-runtime";
-var _Select = forwardRef18(
+import { cn as cn35, useClassNames as useClassNames38 } from "@marigold/system";
+import { jsx as jsx65, jsxs as jsxs26 } from "react/jsx-runtime";
+var _Select = forwardRef17(
   ({
     width,
     disabled,
@@ -2756,30 +2416,48 @@ var _Select = forwardRef18(
       onSelectionChange: onChange,
       ...rest
     };
-    const classNames2 = useClassNames42({ component: "Select", variant, size });
-    return /* @__PURE__ */ jsxs30(FieldBase, { isOpen: true, as: Select, ref, ...props, children: [
-      /* @__PURE__ */ jsxs30(
+    const classNames2 = useClassNames38({ component: "Select", variant, size });
+    return /* @__PURE__ */ jsxs26(FieldBase, { isOpen: true, as: Select, ref, ...props, children: [
+      /* @__PURE__ */ jsxs26(
         Button4,
         {
-          className: cn39(
+          className: cn35(
             "flex w-full items-center justify-between gap-1 overflow-hidden",
             classNames2.select
           ),
           children: [
-            /* @__PURE__ */ jsx70(SelectValue, {}),
-            /* @__PURE__ */ jsx70(ChevronDown, { className: "h-4 w-4" })
+            /* @__PURE__ */ jsx65(SelectValue, {}),
+            /* @__PURE__ */ jsx65(ChevronDown, { className: "h-4 w-4" })
           ]
         }
       ),
-      /* @__PURE__ */ jsx70(_Popover, { children: /* @__PURE__ */ jsx70(_ListBox, { items, children: props.children }) })
+      /* @__PURE__ */ jsx65(_Popover, { children: /* @__PURE__ */ jsx65(_ListBox, { items, children: props.children }) })
     ] });
   }
 );
 _Select.Option = _ListBox.Item;
 _Select.Section = _ListBox.Section;
 
+// src/Scrollable/Scrollable.tsx
+import { cn as cn36, createVar as createVar9, width as twWidth2 } from "@marigold/system";
+import { jsx as jsx66 } from "react/jsx-runtime";
+var Scrollable = ({
+  children,
+  width = "full",
+  height,
+  ...props
+}) => /* @__PURE__ */ jsx66(
+  "div",
+  {
+    ...props,
+    className: cn36(["sticky h-[--height] overflow-auto", twWidth2[width]]),
+    style: createVar9({ height }),
+    children
+  }
+);
+
 // src/Slider/Slider.tsx
-import { forwardRef as forwardRef19 } from "react";
+import { forwardRef as forwardRef18 } from "react";
 import {
   Slider,
   SliderOutput,
@@ -2787,12 +2465,12 @@ import {
   SliderTrack
 } from "react-aria-components";
 import {
-  cn as cn40,
+  cn as cn37,
   width as twWidth3,
-  useClassNames as useClassNames43
+  useClassNames as useClassNames39
 } from "@marigold/system";
-import { jsx as jsx71, jsxs as jsxs31 } from "react/jsx-runtime";
-var _Slider = forwardRef19(
+import { jsx as jsx67, jsxs as jsxs27 } from "react/jsx-runtime";
+var _Slider = forwardRef18(
   ({
     thumbLabels,
     variant,
@@ -2801,7 +2479,7 @@ var _Slider = forwardRef19(
     disabled,
     ...rest
   }, ref) => {
-    const classNames2 = useClassNames43({
+    const classNames2 = useClassNames39({
       component: "Slider",
       variant,
       size
@@ -2810,10 +2488,10 @@ var _Slider = forwardRef19(
       isDisabled: disabled,
       ...rest
     };
-    return /* @__PURE__ */ jsxs31(
+    return /* @__PURE__ */ jsxs27(
       Slider,
       {
-        className: cn40(
+        className: cn37(
           "grid grid-cols-[auto_1fr] gap-y-1",
           classNames2.container,
           twWidth3[width]
@@ -2821,16 +2499,16 @@ var _Slider = forwardRef19(
         ref,
         ...props,
         children: [
-          /* @__PURE__ */ jsx71(_Label, { children: props.children }),
-          /* @__PURE__ */ jsx71(SliderOutput, { className: cn40("flex justify-end", classNames2.output), children: ({ state }) => state.values.map((_, i) => state.getThumbValueLabel(i)).join(" \u2013 ") }),
-          /* @__PURE__ */ jsx71(
+          /* @__PURE__ */ jsx67(_Label, { children: props.children }),
+          /* @__PURE__ */ jsx67(SliderOutput, { className: cn37("flex justify-end", classNames2.output), children: ({ state }) => state.values.map((_, i) => state.getThumbValueLabel(i)).join(" \u2013 ") }),
+          /* @__PURE__ */ jsx67(
             SliderTrack,
             {
-              className: cn40("relative col-span-2 h-2 w-full", classNames2.track),
-              children: ({ state }) => state.values.map((_, i) => /* @__PURE__ */ jsx71(
+              className: cn37("relative col-span-2 h-2 w-full", classNames2.track),
+              children: ({ state }) => state.values.map((_, i) => /* @__PURE__ */ jsx67(
                 SliderThumb,
                 {
-                  className: cn40("top-1/2 cursor-pointer", classNames2.thumb),
+                  className: cn37("top-1/2 cursor-pointer", classNames2.thumb),
                   index: i,
                   "aria-label": thumbLabels == null ? void 0 : thumbLabels[i]
                 },
@@ -2845,16 +2523,16 @@ var _Slider = forwardRef19(
 );
 
 // src/Split/Split.tsx
-import { jsx as jsx72 } from "react/jsx-runtime";
-var Split = (props) => /* @__PURE__ */ jsx72("div", { ...props, role: "separator", className: "grow" });
+import { jsx as jsx68 } from "react/jsx-runtime";
+var Split = (props) => /* @__PURE__ */ jsx68("div", { ...props, role: "separator", className: "grow" });
 
 // src/Stack/Stack.tsx
 import {
   alignment as alignment3,
-  cn as cn41,
+  cn as cn38,
   gapSpace as gapSpace6
 } from "@marigold/system";
-import { jsx as jsx73 } from "react/jsx-runtime";
+import { jsx as jsx69 } from "react/jsx-runtime";
 var Stack = ({
   children,
   space = 0,
@@ -2865,10 +2543,10 @@ var Stack = ({
   ...props
 }) => {
   var _a, _b, _c, _d;
-  return /* @__PURE__ */ jsx73(
+  return /* @__PURE__ */ jsx69(
     "div",
     {
-      className: cn41(
+      className: cn38(
         "flex flex-col",
         gapSpace6[space],
         alignX && ((_b = (_a = alignment3) == null ? void 0 : _a.vertical) == null ? void 0 : _b.alignmentX[alignX]),
@@ -2882,15 +2560,15 @@ var Stack = ({
 };
 
 // src/Switch/Switch.tsx
-import { forwardRef as forwardRef20 } from "react";
+import { forwardRef as forwardRef19 } from "react";
 import { Switch } from "react-aria-components";
 import {
-  cn as cn42,
+  cn as cn39,
   width as twWidth4,
-  useClassNames as useClassNames44
+  useClassNames as useClassNames40
 } from "@marigold/system";
-import { jsx as jsx74, jsxs as jsxs32 } from "react/jsx-runtime";
-var _Switch = forwardRef20(
+import { jsx as jsx70, jsxs as jsxs28 } from "react/jsx-runtime";
+var _Switch = forwardRef19(
   ({
     variant,
     size,
@@ -2901,37 +2579,37 @@ var _Switch = forwardRef20(
     readOnly,
     ...rest
   }, ref) => {
-    const classNames2 = useClassNames44({ component: "Switch", size, variant });
+    const classNames2 = useClassNames40({ component: "Switch", size, variant });
     const props = {
       isDisabled: disabled,
       isReadOnly: readOnly,
       isSelected: selected,
       ...rest
     };
-    return /* @__PURE__ */ jsxs32(
+    return /* @__PURE__ */ jsxs28(
       Switch,
       {
         ...props,
         ref,
-        className: cn42(
+        className: cn39(
           twWidth4[width],
           "group/switch",
           "flex items-center justify-between gap-[1ch]",
           classNames2.container
         ),
         children: [
-          /* @__PURE__ */ jsx74(_Label, { elementType: "span", children }),
-          /* @__PURE__ */ jsx74("div", { className: "relative", children: /* @__PURE__ */ jsx74(
+          /* @__PURE__ */ jsx70(_Label, { elementType: "span", children }),
+          /* @__PURE__ */ jsx70("div", { className: "relative", children: /* @__PURE__ */ jsx70(
             "div",
             {
-              className: cn42(
+              className: cn39(
                 "h-6 w-12 basis-12 rounded-3xl group-disabled/switch:cursor-not-allowed ",
                 classNames2.track
               ),
-              children: /* @__PURE__ */ jsx74(
+              children: /* @__PURE__ */ jsx70(
                 "div",
                 {
-                  className: cn42(
+                  className: cn39(
                     "h-[22px] w-[22px]",
                     "cubic-bezier(.7,0,.3,1)",
                     "absolute left-0 top-px",
@@ -2950,7 +2628,7 @@ var _Switch = forwardRef20(
 );
 
 // src/Table/Table.tsx
-import { useRef as useRef15 } from "react";
+import { useRef as useRef10 } from "react";
 import { useTable } from "@react-aria/table";
 import {
   TableBody as Body2,
@@ -2960,30 +2638,30 @@ import {
   Row,
   useTableState
 } from "@react-stately/table";
-import { cn as cn47, useClassNames as useClassNames46 } from "@marigold/system";
+import { cn as cn45, useClassNames as useClassNames42 } from "@marigold/system";
 
 // src/Table/Context.tsx
-import { createContext as createContext5, useContext as useContext10 } from "react";
-var TableContext = createContext5({});
-var useTableContext = () => useContext10(TableContext);
+import { createContext as createContext6, useContext as useContext11 } from "react";
+var TableContext = createContext6({});
+var useTableContext = () => useContext11(TableContext);
 
 // src/Table/TableBody.tsx
 import { useTableRowGroup } from "@react-aria/table";
-import { jsx as jsx75 } from "react/jsx-runtime";
+import { jsx as jsx71 } from "react/jsx-runtime";
 var TableBody = ({ children }) => {
   const { rowGroupProps } = useTableRowGroup();
-  return /* @__PURE__ */ jsx75("tbody", { ...rowGroupProps, children });
+  return /* @__PURE__ */ jsx71("tbody", { ...rowGroupProps, children });
 };
 
 // src/Table/TableCell.tsx
-import { useRef as useRef9 } from "react";
-import { useFocusRing as useFocusRing4 } from "@react-aria/focus";
+import { useRef as useRef4 } from "react";
+import { useFocusRing as useFocusRing2 } from "@react-aria/focus";
 import { useTableCell } from "@react-aria/table";
-import { mergeProps as mergeProps6 } from "@react-aria/utils";
-import { useStateProps as useStateProps5 } from "@marigold/system";
-import { jsx as jsx76 } from "react/jsx-runtime";
-var TableCell = ({ cell }) => {
-  const ref = useRef9(null);
+import { mergeProps as mergeProps3 } from "@react-aria/utils";
+import { cn as cn40, useStateProps as useStateProps2 } from "@marigold/system";
+import { jsx as jsx72 } from "react/jsx-runtime";
+var TableCell = ({ cell, align = "left" }) => {
+  const ref = useRef4(null);
   const { interactive, state, classNames: classNames2 } = useTableContext();
   const disabled = state.disabledKeys.has(cell.parentKey);
   const { gridCellProps } = useTableCell(
@@ -3002,26 +2680,27 @@ var TableCell = ({ cell }) => {
     onMouseDown: (e) => e.stopPropagation(),
     onPointerDown: (e) => e.stopPropagation()
   };
-  const { focusProps, isFocusVisible } = useFocusRing4();
-  const stateProps = useStateProps5({ disabled, focusVisible: isFocusVisible });
-  return /* @__PURE__ */ jsx76(
+  const { focusProps, isFocusVisible } = useFocusRing2();
+  const stateProps = useStateProps2({ disabled, focusVisible: isFocusVisible });
+  return /* @__PURE__ */ jsx72(
     "td",
     {
       ref,
-      className: classNames2 == null ? void 0 : classNames2.cell,
-      ...mergeProps6(cellProps, focusProps),
+      className: cn40(classNames2 == null ? void 0 : classNames2.cell),
+      ...mergeProps3(cellProps, focusProps),
       ...stateProps,
+      align,
       children: cell.rendered
     }
   );
 };
 
 // src/Table/TableCheckboxCell.tsx
-import { useRef as useRef10 } from "react";
-import { useFocusRing as useFocusRing5 } from "@react-aria/focus";
+import { useRef as useRef5 } from "react";
+import { useFocusRing as useFocusRing3 } from "@react-aria/focus";
 import { useTableCell as useTableCell2, useTableSelectionCheckbox } from "@react-aria/table";
-import { mergeProps as mergeProps7 } from "@react-aria/utils";
-import { cn as cn43, useStateProps as useStateProps6 } from "@marigold/system";
+import { mergeProps as mergeProps4 } from "@react-aria/utils";
+import { cn as cn41, useStateProps as useStateProps3 } from "@marigold/system";
 
 // src/Table/utils.ts
 var mapCheckboxProps = ({
@@ -3044,9 +2723,9 @@ var mapCheckboxProps = ({
 };
 
 // src/Table/TableCheckboxCell.tsx
-import { jsx as jsx77 } from "react/jsx-runtime";
+import { jsx as jsx73 } from "react/jsx-runtime";
 var TableCheckboxCell = ({ cell }) => {
-  const ref = useRef10(null);
+  const ref = useRef5(null);
   const { state, classNames: classNames2 } = useTableContext();
   const disabled = state.disabledKeys.has(cell.parentKey);
   const { gridCellProps } = useTableCell2(
@@ -3059,36 +2738,37 @@ var TableCheckboxCell = ({ cell }) => {
   const { checkboxProps } = mapCheckboxProps(
     useTableSelectionCheckbox({ key: cell.parentKey }, state)
   );
-  const { focusProps, isFocusVisible } = useFocusRing5();
-  const stateProps = useStateProps6({ disabled, focusVisible: isFocusVisible });
-  return /* @__PURE__ */ jsx77(
+  const { focusProps, isFocusVisible } = useFocusRing3();
+  const stateProps = useStateProps3({ disabled, focusVisible: isFocusVisible });
+  return /* @__PURE__ */ jsx73(
     "td",
     {
       ref,
-      className: cn43("text-center align-middle leading-none", classNames2 == null ? void 0 : classNames2.cell),
-      ...mergeProps7(gridCellProps, focusProps),
+      className: cn41("text-center align-middle leading-none", classNames2 == null ? void 0 : classNames2.cell),
+      ...mergeProps4(gridCellProps, focusProps),
       ...stateProps,
-      children: /* @__PURE__ */ jsx77(_Checkbox, { ...checkboxProps })
+      children: /* @__PURE__ */ jsx73(_Checkbox, { ...checkboxProps })
     }
   );
 };
 
 // src/Table/TableColumnHeader.tsx
-import { useRef as useRef11 } from "react";
-import { useFocusRing as useFocusRing6 } from "@react-aria/focus";
-import { useHover as useHover2 } from "@react-aria/interactions";
+import { useRef as useRef6 } from "react";
+import { useFocusRing as useFocusRing4 } from "@react-aria/focus";
+import { useHover } from "@react-aria/interactions";
 import { useTableColumnHeader } from "@react-aria/table";
-import { mergeProps as mergeProps8 } from "@react-aria/utils";
+import { mergeProps as mergeProps5 } from "@react-aria/utils";
 import { SortDown, SortUp } from "@marigold/icons";
-import { cn as cn44, useStateProps as useStateProps7 } from "@marigold/system";
+import { cn as cn42, useStateProps as useStateProps4 } from "@marigold/system";
 import { width as twWidth5 } from "@marigold/system";
-import { jsx as jsx78, jsxs as jsxs33 } from "react/jsx-runtime";
+import { jsx as jsx74, jsxs as jsxs29 } from "react/jsx-runtime";
 var TableColumnHeader = ({
   column,
-  width = "auto"
+  width = "auto",
+  align = "left"
 }) => {
   var _a, _b;
-  const ref = useRef11(null);
+  const ref = useRef6(null);
   const { state, classNames: classNames2 } = useTableContext();
   const { columnHeaderProps } = useTableColumnHeader(
     {
@@ -3097,23 +2777,24 @@ var TableColumnHeader = ({
     state,
     ref
   );
-  const { hoverProps, isHovered } = useHover2({});
-  const { focusProps, isFocusVisible } = useFocusRing6();
-  const stateProps = useStateProps7({
+  const { hoverProps, isHovered } = useHover({});
+  const { focusProps, isFocusVisible } = useFocusRing4();
+  const stateProps = useStateProps4({
     hover: isHovered,
     focusVisible: isFocusVisible
   });
-  return /* @__PURE__ */ jsxs33(
+  return /* @__PURE__ */ jsxs29(
     "th",
     {
       colSpan: column.colspan,
       ref,
-      className: cn44("cursor-default", twWidth5[width], classNames2 == null ? void 0 : classNames2.header),
-      ...mergeProps8(columnHeaderProps, hoverProps, focusProps),
+      className: cn42("cursor-default", twWidth5[width], classNames2 == null ? void 0 : classNames2.header),
+      ...mergeProps5(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__ */ jsx78(SortUp, { className: "inline-block" }) : /* @__PURE__ */ jsx78(SortDown, { className: "inline-block" }) : /* @__PURE__ */ jsx78(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__ */ jsx74(SortUp, { className: "inline-block" }) : /* @__PURE__ */ jsx74(SortDown, { className: "inline-block" }) : /* @__PURE__ */ jsx74(SortDown, { className: "inline-block" }))
       ]
     }
   );
@@ -3121,36 +2802,43 @@ var TableColumnHeader = ({
 
 // src/Table/TableHeader.tsx
 import { useTableRowGroup as useTableRowGroup2 } from "@react-aria/table";
-import { jsx as jsx79 } from "react/jsx-runtime";
-var TableHeader = ({ children }) => {
+import { jsx as jsx75 } from "react/jsx-runtime";
+var TableHeader = ({ stickyHeader, children }) => {
   const { rowGroupProps } = useTableRowGroup2();
-  return /* @__PURE__ */ jsx79("thead", { ...rowGroupProps, children });
+  return /* @__PURE__ */ jsx75(
+    "thead",
+    {
+      ...rowGroupProps,
+      className: stickyHeader ? "[&_th]:sticky [&_th]:top-0" : "",
+      children
+    }
+  );
 };
 
 // src/Table/TableHeaderRow.tsx
-import { useRef as useRef12 } from "react";
+import { useRef as useRef7 } from "react";
 import { useTableHeaderRow } from "@react-aria/table";
-import { jsx as jsx80 } from "react/jsx-runtime";
+import { jsx as jsx76 } from "react/jsx-runtime";
 var TableHeaderRow = ({ item, children }) => {
   const { state } = useTableContext();
-  const ref = useRef12(null);
+  const ref = useRef7(null);
   const { rowProps } = useTableHeaderRow({ node: item }, state, ref);
-  return /* @__PURE__ */ jsx80("tr", { ...rowProps, ref, children });
+  return /* @__PURE__ */ jsx76("tr", { ...rowProps, ref, children });
 };
 
 // src/Table/TableRow.tsx
-import { useRef as useRef13 } from "react";
-import { useFocusRing as useFocusRing7 } from "@react-aria/focus";
-import { useHover as useHover3 } from "@react-aria/interactions";
+import { useRef as useRef8 } from "react";
+import { useFocusRing as useFocusRing5 } from "@react-aria/focus";
+import { useHover as useHover2 } from "@react-aria/interactions";
 import { useTableRow } from "@react-aria/table";
-import { mergeProps as mergeProps9 } from "@react-aria/utils";
-import { cn as cn45, useClassNames as useClassNames45, useStateProps as useStateProps8 } from "@marigold/system";
-import { jsx as jsx81 } from "react/jsx-runtime";
+import { mergeProps as mergeProps6 } from "@react-aria/utils";
+import { cn as cn43, useClassNames as useClassNames41, useStateProps as useStateProps5 } from "@marigold/system";
+import { jsx as jsx77 } from "react/jsx-runtime";
 var TableRow = ({ children, row }) => {
-  const ref = useRef13(null);
+  const ref = useRef8(null);
   const { interactive, state, ...ctx } = useTableContext();
   const { variant, size } = row.props;
-  const classNames2 = useClassNames45({
+  const classNames2 = useClassNames41({
     component: "Table",
     variant: variant || ctx.variant,
     size: size || ctx.size
@@ -3164,28 +2852,28 @@ var TableRow = ({ children, row }) => {
   );
   const disabled = state.disabledKeys.has(row.key);
   const selected = state.selectionManager.isSelected(row.key);
-  const { focusProps, isFocusVisible } = useFocusRing7({ within: true });
-  const { hoverProps, isHovered } = useHover3({
+  const { focusProps, isFocusVisible } = useFocusRing5({ within: true });
+  const { hoverProps, isHovered } = useHover2({
     isDisabled: disabled || !interactive
   });
-  const stateProps = useStateProps8({
+  const stateProps = useStateProps5({
     disabled,
     selected,
     hover: isHovered,
     focusVisible: isFocusVisible,
     active: isPressed
   });
-  return /* @__PURE__ */ jsx81(
+  return /* @__PURE__ */ jsx77(
     "tr",
     {
       ref,
-      className: cn45(
+      className: cn43(
         [
           !interactive ? "cursor-text" : disabled ? "cursor-default" : "cursor-pointer"
         ],
         classNames2 == null ? void 0 : classNames2.row
       ),
-      ...mergeProps9(rowProps, focusProps, hoverProps),
+      ...mergeProps6(rowProps, focusProps, hoverProps),
       ...stateProps,
       children
     }
@@ -3193,25 +2881,26 @@ var TableRow = ({ children, row }) => {
 };
 
 // src/Table/TableSelectAllCell.tsx
-import { useRef as useRef14 } from "react";
-import { useFocusRing as useFocusRing8 } from "@react-aria/focus";
-import { useHover as useHover4 } from "@react-aria/interactions";
+import { useRef as useRef9 } from "react";
+import { useFocusRing as useFocusRing6 } from "@react-aria/focus";
+import { useHover as useHover3 } from "@react-aria/interactions";
 import {
   useTableColumnHeader as useTableColumnHeader2,
   useTableSelectAllCheckbox
 } from "@react-aria/table";
-import { mergeProps as mergeProps10 } from "@react-aria/utils";
+import { mergeProps as mergeProps7 } from "@react-aria/utils";
 import {
-  cn as cn46,
+  cn as cn44,
   width as twWidth6,
-  useStateProps as useStateProps9
+  useStateProps as useStateProps6
 } from "@marigold/system";
-import { jsx as jsx82 } from "react/jsx-runtime";
+import { jsx as jsx78 } from "react/jsx-runtime";
 var TableSelectAllCell = ({
   column,
-  width = "auto"
+  width = "auto",
+  align = "left"
 }) => {
-  const ref = useRef14(null);
+  const ref = useRef9(null);
   const { state, classNames: classNames2 } = useTableContext();
   const { columnHeaderProps } = useTableColumnHeader2(
     {
@@ -3221,39 +2910,37 @@ var TableSelectAllCell = ({
     ref
   );
   const { checkboxProps } = mapCheckboxProps(useTableSelectAllCheckbox(state));
-  const { hoverProps, isHovered } = useHover4({});
-  const { focusProps, isFocusVisible } = useFocusRing8();
-  const stateProps = useStateProps9({
+  const { hoverProps, isHovered } = useHover3({});
+  const { focusProps, isFocusVisible } = useFocusRing6();
+  const stateProps = useStateProps6({
     hover: isHovered,
     focusVisible: isFocusVisible
   });
-  return /* @__PURE__ */ jsx82(
+  return /* @__PURE__ */ jsx78(
     "th",
     {
       ref,
-      className: cn46(
-        twWidth6[width],
-        ["text-center align-middle leading-none"],
-        classNames2 == null ? void 0 : classNames2.header
-      ),
-      ...mergeProps10(columnHeaderProps, hoverProps, focusProps),
+      className: cn44(twWidth6[width], ["  leading-none"], classNames2 == null ? void 0 : classNames2.header),
+      ...mergeProps7(columnHeaderProps, hoverProps, focusProps),
       ...stateProps,
-      children: /* @__PURE__ */ jsx82(_Checkbox, { ...checkboxProps })
+      align,
+      children: /* @__PURE__ */ jsx78(_Checkbox, { ...checkboxProps })
     }
   );
 };
 
 // src/Table/Table.tsx
-import { jsx as jsx83, jsxs as jsxs34 } from "react/jsx-runtime";
+import { jsx as jsx79, jsxs as jsxs30 } from "react/jsx-runtime";
 var Table = ({
   variant,
   size,
   stretch,
   selectionMode = "none",
+  stickyHeader,
   ...props
 }) => {
   const interactive = selectionMode !== "none";
-  const tableRef = useRef15(null);
+  const tableRef = useRef10(null);
   const state = useTableState({
     ...props,
     selectionMode,
@@ -3261,56 +2948,64 @@ var Table = ({
     props.selectionBehavior !== "replace"
   });
   const { gridProps } = useTable(props, state, tableRef);
-  const classNames2 = useClassNames46({
+  const classNames2 = useClassNames42({
     component: "Table",
     variant,
     size
   });
   const { collection } = state;
-  return /* @__PURE__ */ jsx83(
+  return /* @__PURE__ */ jsx79(
     TableContext.Provider,
     {
       value: { state, interactive, classNames: classNames2, variant, size },
-      children: /* @__PURE__ */ jsxs34(
+      children: /* @__PURE__ */ jsxs30(
         "table",
         {
           ref: tableRef,
-          className: cn47(
+          className: cn45(
             "group/table",
-            "border-collapse overflow-auto whitespace-nowrap",
+            "border-collapse whitespace-nowrap",
             stretch ? "table w-full" : "block",
             classNames2.table
           ),
           ...gridProps,
           children: [
-            /* @__PURE__ */ jsx83(TableHeader, { children: collection.headerRows.map((headerRow) => /* @__PURE__ */ jsx83(TableHeaderRow, { item: headerRow, children: [...collection.getChildren(headerRow.key)].map(
+            /* @__PURE__ */ jsx79(TableHeader, { stickyHeader, children: collection.headerRows.map((headerRow) => /* @__PURE__ */ jsx79(TableHeaderRow, { item: headerRow, children: [...collection.getChildren(headerRow.key)].map(
               (column) => {
-                var _a, _b, _c;
-                return ((_a = column.props) == null ? void 0 : _a.isSelectionCell) ? /* @__PURE__ */ jsx83(
+                var _a, _b, _c, _d, _e;
+                return ((_a = column.props) == null ? void 0 : _a.isSelectionCell) ? /* @__PURE__ */ jsx79(
                   TableSelectAllCell,
                   {
                     width: (_b = column.props) == null ? void 0 : _b.width,
-                    column
+                    column,
+                    align: (_c = column.props) == null ? void 0 : _c.align
                   },
                   column.key
-                ) : /* @__PURE__ */ jsx83(
+                ) : /* @__PURE__ */ jsx79(
                   TableColumnHeader,
                   {
-                    width: (_c = column.props) == null ? void 0 : _c.width,
-                    column
+                    width: (_d = column.props) == null ? void 0 : _d.width,
+                    column,
+                    align: (_e = column.props) == null ? void 0 : _e.align
                   },
                   column.key
                 );
               }
             ) }, headerRow.key)) }),
-            /* @__PURE__ */ jsxs34(TableBody, { children: [
+            /* @__PURE__ */ jsxs30(TableBody, { children: [
               ...collection.rows.map(
-                (row) => row.type === "item" && /* @__PURE__ */ jsx83(TableRow, { row, children: [...collection.getChildren(row.key)].map(
-                  (cell) => {
-                    var _a;
-                    return ((_a = cell.props) == null ? void 0 : _a.isSelectionCell) ? /* @__PURE__ */ jsx83(TableCheckboxCell, { cell }, cell.key) : /* @__PURE__ */ jsx83(TableCell, { cell }, cell.key);
-                  }
-                ) }, row.key)
+                (row) => row.type === "item" && /* @__PURE__ */ jsx79(TableRow, { row, children: [...collection.getChildren(row.key)].map((cell, index) => {
+                  var _a, _b;
+                  const currentColumn = collection.columns[index];
+                  return ((_a = cell.props) == null ? void 0 : _a.isSelectionCell) ? /* @__PURE__ */ jsx79(TableCheckboxCell, { cell }, cell.key) : /* @__PURE__ */ jsx79(
+                    TableCell,
+                    {
+                      align: (_b = currentColumn.props) == null ? void 0 : _b.align,
+                      cell
+                    },
+                    cell.key
+                  );
+                }) }, row.key)
               )
             ] })
           ]
@@ -3327,18 +3022,18 @@ Table.Row = Row;
 
 // src/Text/Text.tsx
 import {
-  cn as cn48,
-  createVar as createVar9,
+  cn as cn46,
+  createVar as createVar10,
   cursorStyle,
   fontWeight,
   get as get2,
   textAlign as textAlign2,
   textSize,
   textStyle,
-  useClassNames as useClassNames47,
-  useTheme as useTheme7
+  useClassNames as useClassNames43,
+  useTheme as useTheme4
 } from "@marigold/system";
-import { jsx as jsx84 } from "react/jsx-runtime";
+import { jsx as jsx80 } from "react/jsx-runtime";
 var Text2 = ({
   variant,
   size,
@@ -3351,17 +3046,17 @@ var Text2 = ({
   children,
   ...props
 }) => {
-  const theme = useTheme7();
-  const classNames2 = useClassNames47({
+  const theme = useTheme4();
+  const classNames2 = useClassNames43({
     component: "Text",
     variant,
     size
   });
-  return /* @__PURE__ */ jsx84(
+  return /* @__PURE__ */ jsx80(
     "p",
     {
       ...props,
-      className: cn48(
+      className: cn46(
         classNames2,
         "text-[--color] outline-[--outline]",
         fontStyle && textStyle[fontStyle],
@@ -3370,7 +3065,7 @@ var Text2 = ({
         weight && fontWeight[weight],
         fontSize && textSize[fontSize]
       ),
-      style: createVar9({
+      style: createVar10({
         color: color && theme.colors && get2(
           theme.colors,
           color.replace("-", "."),
@@ -3384,11 +3079,11 @@ var Text2 = ({
 };
 
 // src/TextArea/TextArea.tsx
-import { forwardRef as forwardRef21 } from "react";
+import { forwardRef as forwardRef20 } from "react";
 import { TextArea, TextField } from "react-aria-components";
-import { useClassNames as useClassNames48 } from "@marigold/system";
-import { jsx as jsx85 } from "react/jsx-runtime";
-var _TextArea = forwardRef21(
+import { useClassNames as useClassNames44 } from "@marigold/system";
+import { jsx as jsx81 } from "react/jsx-runtime";
+var _TextArea = forwardRef20(
   ({
     variant,
     size,
@@ -3399,7 +3094,7 @@ var _TextArea = forwardRef21(
     rows,
     ...rest
   }, ref) => {
-    const classNames2 = useClassNames48({ component: "TextArea", variant, size });
+    const classNames2 = useClassNames44({ component: "TextArea", variant, size });
     const props = {
       isDisabled: disabled,
       isReadOnly: readOnly,
@@ -3407,15 +3102,15 @@ var _TextArea = forwardRef21(
       isRequired: required,
       ...rest
     };
-    return /* @__PURE__ */ jsx85(FieldBase, { as: TextField, ...props, variant, size, children: /* @__PURE__ */ jsx85(TextArea, { className: classNames2, ref, rows }) });
+    return /* @__PURE__ */ jsx81(FieldBase, { as: TextField, ...props, variant, size, children: /* @__PURE__ */ jsx81(TextArea, { className: classNames2, ref, rows }) });
   }
 );
 
 // src/TextField/TextField.tsx
-import { forwardRef as forwardRef22 } from "react";
+import { forwardRef as forwardRef21 } from "react";
 import { TextField as TextField2 } from "react-aria-components";
-import { jsx as jsx86 } from "react/jsx-runtime";
-var _TextField = forwardRef22(
+import { jsx as jsx82 } from "react/jsx-runtime";
+var _TextField = forwardRef21(
   ({
     variant,
     size,
@@ -3432,13 +3127,13 @@ var _TextField = forwardRef22(
       isRequired: required,
       ...rest
     };
-    return /* @__PURE__ */ jsx86(FieldBase, { as: TextField2, ...props, children: /* @__PURE__ */ jsx86(_Input, { ref }) });
+    return /* @__PURE__ */ jsx82(FieldBase, { as: TextField2, ...props, children: /* @__PURE__ */ jsx82(_Input, { ref }) });
   }
 );
 
 // src/Tiles/Tiles.tsx
-import { cn as cn49, createVar as createVar10, gapSpace as gapSpace7 } from "@marigold/system";
-import { jsx as jsx87 } from "react/jsx-runtime";
+import { cn as cn47, createVar as createVar11, gapSpace as gapSpace7 } from "@marigold/system";
+import { jsx as jsx83 } from "react/jsx-runtime";
 var Tiles = ({
   space = 0,
   stretch = false,
@@ -3451,17 +3146,17 @@ var Tiles = ({
   if (stretch) {
     column = `minmax(${column}, 1fr)`;
   }
-  return /* @__PURE__ */ jsx87(
+  return /* @__PURE__ */ jsx83(
     "div",
     {
       ...props,
-      className: cn49(
+      className: cn47(
         "grid",
         gapSpace7[space],
         "grid-cols-[repeat(auto-fit,var(--column))]",
         equalHeight && "auto-rows-[1fr]"
       ),
-      style: createVar10({ column, tilesWidth }),
+      style: createVar11({ column, tilesWidth }),
       children
     }
   );
@@ -3469,11 +3164,11 @@ var Tiles = ({
 
 // src/Tooltip/Tooltip.tsx
 import { OverlayArrow, Tooltip } from "react-aria-components";
-import { cn as cn50, useClassNames as useClassNames49 } from "@marigold/system";
+import { cn as cn48, useClassNames as useClassNames45 } from "@marigold/system";
 
 // src/Tooltip/TooltipTrigger.tsx
 import { TooltipTrigger } from "react-aria-components";
-import { jsx as jsx88 } from "react/jsx-runtime";
+import { jsx as jsx84 } from "react/jsx-runtime";
 var _TooltipTrigger = ({
   delay = 1e3,
   children,
@@ -3487,19 +3182,19 @@ var _TooltipTrigger = ({
     isOpen: open,
     delay
   };
-  return /* @__PURE__ */ jsx88(TooltipTrigger, { ...props, children });
+  return /* @__PURE__ */ jsx84(TooltipTrigger, { ...props, children });
 };
 
 // src/Tooltip/Tooltip.tsx
-import { jsx as jsx89, jsxs as jsxs35 } from "react/jsx-runtime";
+import { jsx as jsx85, jsxs as jsxs31 } from "react/jsx-runtime";
 var _Tooltip = ({ children, variant, size, open, ...rest }) => {
   const props = {
     ...rest,
     isOpen: open
   };
-  const classNames2 = useClassNames49({ component: "Tooltip", variant, size });
-  return /* @__PURE__ */ jsxs35(Tooltip, { ...props, className: cn50("group/tooltip", classNames2.container), children: [
-    /* @__PURE__ */ jsx89(OverlayArrow, { className: classNames2.arrow, children: /* @__PURE__ */ jsx89("svg", { width: 8, height: 8, viewBox: "0 0 8 8", children: /* @__PURE__ */ jsx89("path", { d: "M0 0 L4 4 L8 0" }) }) }),
+  const classNames2 = useClassNames45({ component: "Tooltip", variant, size });
+  return /* @__PURE__ */ jsxs31(Tooltip, { ...props, className: cn48("group/tooltip", classNames2.container), children: [
+    /* @__PURE__ */ jsx85(OverlayArrow, { className: classNames2.arrow, children: /* @__PURE__ */ jsx85("svg", { width: 8, height: 8, viewBox: "0 0 8 8", children: /* @__PURE__ */ jsx85("path", { d: "M0 0 L4 4 L8 0" }) }) }),
     children
   ] });
 };
@@ -3507,12 +3202,12 @@ _Tooltip.Trigger = _TooltipTrigger;
 
 // src/TagGroup/Tag.tsx
 import { Button as Button5, Tag } from "react-aria-components";
-import { cn as cn51, useClassNames as useClassNames51 } from "@marigold/system";
+import { cn as cn49, useClassNames as useClassNames47 } from "@marigold/system";
 
 // src/TagGroup/TagGroup.tsx
 import { TagGroup, TagList } from "react-aria-components";
-import { useClassNames as useClassNames50 } from "@marigold/system";
-import { jsx as jsx90 } from "react/jsx-runtime";
+import { useClassNames as useClassNames46 } from "@marigold/system";
+import { jsx as jsx86 } from "react/jsx-runtime";
 var _TagGroup = ({
   width,
   items,
@@ -3521,24 +3216,24 @@ var _TagGroup = ({
   size,
   ...rest
 }) => {
-  const classNames2 = useClassNames50({ component: "Tag", variant, size });
-  return /* @__PURE__ */ jsx90(FieldBase, { as: TagGroup, ...rest, children: /* @__PURE__ */ jsx90(TagList, { items, className: classNames2.listItems, children }) });
+  const classNames2 = useClassNames46({ component: "Tag", variant, size });
+  return /* @__PURE__ */ jsx86(FieldBase, { as: TagGroup, ...rest, children: /* @__PURE__ */ jsx86(TagList, { items, className: classNames2.listItems, children }) });
 };
 
 // src/TagGroup/Tag.tsx
-import { Fragment as Fragment9, jsx as jsx91, jsxs as jsxs36 } from "react/jsx-runtime";
+import { Fragment as Fragment8, jsx as jsx87, jsxs as jsxs32 } from "react/jsx-runtime";
 var CloseButton2 = ({ className }) => {
-  return /* @__PURE__ */ jsx91(Button5, { slot: "remove", className, children: /* @__PURE__ */ jsx91("svg", { viewBox: "0 0 20 20", fill: "currentColor", width: 20, height: 20, children: /* @__PURE__ */ jsx91("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__ */ jsx87(Button5, { slot: "remove", className, children: /* @__PURE__ */ jsx87("svg", { viewBox: "0 0 20 20", fill: "currentColor", width: 20, height: 20, children: /* @__PURE__ */ jsx87("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 = useClassNames51({ component: "Tag", variant, size });
-  return /* @__PURE__ */ jsx91(Tag, { textValue, ...props, className: classNames2.tag, children: ({ allowsRemoving }) => /* @__PURE__ */ jsxs36(Fragment9, { children: [
+  const classNames2 = useClassNames47({ component: "Tag", variant, size });
+  return /* @__PURE__ */ jsx87(Tag, { textValue, ...props, className: classNames2.tag, children: ({ allowsRemoving }) => /* @__PURE__ */ jsxs32(Fragment8, { children: [
     children,
-    allowsRemoving && /* @__PURE__ */ jsx91(
+    allowsRemoving && /* @__PURE__ */ jsx87(
       CloseButton2,
       {
-        className: cn51("flex items-center", classNames2.closeButton)
+        className: cn49("flex items-center", classNames2.closeButton)
       }
     )
   ] }) });
@@ -3549,11 +3244,11 @@ _Tag.Group = _TagGroup;
 import { VisuallyHidden } from "@react-aria/visually-hidden";
 
 // src/XLoader/XLoader.tsx
-import { forwardRef as forwardRef23 } from "react";
-import { SVG as SVG6 } from "@marigold/system";
-import { jsx as jsx92, jsxs as jsxs37 } from "react/jsx-runtime";
-var XLoader = forwardRef23((props, ref) => /* @__PURE__ */ jsxs37(
-  SVG6,
+import { forwardRef as forwardRef22 } from "react";
+import { SVG as SVG5 } from "@marigold/system";
+import { jsx as jsx88, jsxs as jsxs33 } from "react/jsx-runtime";
+var XLoader = forwardRef22((props, ref) => /* @__PURE__ */ jsxs33(
+  SVG5,
   {
     id: "XLoader",
     xmlns: "http://www.w3.org/2000/svg",
@@ -3562,13 +3257,13 @@ var XLoader = forwardRef23((props, ref) => /* @__PURE__ */ jsxs37(
     ...props,
     ...ref,
     children: [
-      /* @__PURE__ */ jsx92("path", { id: "XMLID_1_", d: "M35.3 27h26.5l54 74.1H88.7z" }),
-      /* @__PURE__ */ jsx92(
+      /* @__PURE__ */ jsx88("path", { id: "XMLID_1_", d: "M35.3 27h26.5l54 74.1H88.7z" }),
+      /* @__PURE__ */ jsx88(
         "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__ */ jsx92(
+          children: /* @__PURE__ */ jsx88(
             "animate",
             {
               attributeName: "opacity",
@@ -3581,12 +3276,12 @@ var XLoader = forwardRef23((props, ref) => /* @__PURE__ */ jsxs37(
           )
         }
       ),
-      /* @__PURE__ */ jsx92(
+      /* @__PURE__ */ jsx88(
         "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__ */ jsx92(
+          children: /* @__PURE__ */ jsx88(
             "animate",
             {
               attributeName: "opacity",
@@ -3599,12 +3294,12 @@ var XLoader = forwardRef23((props, ref) => /* @__PURE__ */ jsxs37(
           )
         }
       ),
-      /* @__PURE__ */ jsx92(
+      /* @__PURE__ */ jsx88(
         "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__ */ jsx92(
+          children: /* @__PURE__ */ jsx88(
             "animate",
             {
               attributeName: "opacity",
@@ -3617,12 +3312,12 @@ var XLoader = forwardRef23((props, ref) => /* @__PURE__ */ jsxs37(
           )
         }
       ),
-      /* @__PURE__ */ jsx92(
+      /* @__PURE__ */ jsx88(
         "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__ */ jsx92(
+          children: /* @__PURE__ */ jsx88(
             "animate",
             {
               attributeName: "opacity",
@@ -3635,12 +3330,12 @@ var XLoader = forwardRef23((props, ref) => /* @__PURE__ */ jsxs37(
           )
         }
       ),
-      /* @__PURE__ */ jsx92(
+      /* @__PURE__ */ jsx88(
         "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__ */ jsx92(
+          children: /* @__PURE__ */ jsx88(
             "animate",
             {
               attributeName: "opacity",
@@ -3653,12 +3348,12 @@ var XLoader = forwardRef23((props, ref) => /* @__PURE__ */ jsxs37(
           )
         }
       ),
-      /* @__PURE__ */ jsx92(
+      /* @__PURE__ */ jsx88(
         "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__ */ jsx92(
+          children: /* @__PURE__ */ jsx88(
             "animate",
             {
               attributeName: "opacity",
@@ -3671,12 +3366,12 @@ var XLoader = forwardRef23((props, ref) => /* @__PURE__ */ jsxs37(
           )
         }
       ),
-      /* @__PURE__ */ jsx92(
+      /* @__PURE__ */ jsx88(
         "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__ */ jsx92(
+          children: /* @__PURE__ */ jsx88(
             "animate",
             {
               attributeName: "opacity",
@@ -3689,12 +3384,12 @@ var XLoader = forwardRef23((props, ref) => /* @__PURE__ */ jsxs37(
           )
         }
       ),
-      /* @__PURE__ */ jsx92(
+      /* @__PURE__ */ jsx88(
         "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__ */ jsx92(
+          children: /* @__PURE__ */ jsx88(
             "animate",
             {
               attributeName: "opacity",
@@ -3707,12 +3402,12 @@ var XLoader = forwardRef23((props, ref) => /* @__PURE__ */ jsxs37(
           )
         }
       ),
-      /* @__PURE__ */ jsx92(
+      /* @__PURE__ */ jsx88(
         "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__ */ jsx92(
+          children: /* @__PURE__ */ jsx88(
             "animate",
             {
               attributeName: "opacity",
@@ -3725,12 +3420,12 @@ var XLoader = forwardRef23((props, ref) => /* @__PURE__ */ jsxs37(
           )
         }
       ),
-      /* @__PURE__ */ jsx92(
+      /* @__PURE__ */ jsx88(
         "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__ */ jsx92(
+          children: /* @__PURE__ */ jsx88(
             "animate",
             {
               attributeName: "opacity",
@@ -3743,12 +3438,12 @@ var XLoader = forwardRef23((props, ref) => /* @__PURE__ */ jsxs37(
           )
         }
       ),
-      /* @__PURE__ */ jsx92(
+      /* @__PURE__ */ jsx88(
         "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__ */ jsx92(
+          children: /* @__PURE__ */ jsx88(
             "animate",
             {
               attributeName: "opacity",
@@ -3767,24 +3462,24 @@ var XLoader = forwardRef23((props, ref) => /* @__PURE__ */ jsxs37(
 
 // src/Tabs/Tabs.tsx
 import { Tabs } from "react-aria-components";
-import { useClassNames as useClassNames52 } from "@marigold/system";
+import { useClassNames as useClassNames48 } from "@marigold/system";
 
 // src/Tabs/Context.ts
-import { createContext as createContext6, useContext as useContext11 } from "react";
-var TabContext = createContext6({});
-var useTabContext = () => useContext11(TabContext);
+import { createContext as createContext7, useContext as useContext12 } from "react";
+var TabContext = createContext7({});
+var useTabContext = () => useContext12(TabContext);
 
 // src/Tabs/Tab.tsx
 import { Tab } from "react-aria-components";
-import { cn as cn52 } from "@marigold/system";
-import { jsx as jsx93 } from "react/jsx-runtime";
+import { cn as cn50 } from "@marigold/system";
+import { jsx as jsx89 } from "react/jsx-runtime";
 var _Tab = (props) => {
   const { classNames: classNames2 } = useTabContext();
-  return /* @__PURE__ */ jsx93(
+  return /* @__PURE__ */ jsx89(
     Tab,
     {
       ...props,
-      className: cn52(
+      className: cn50(
         "flex cursor-pointer justify-center aria-disabled:cursor-not-allowed",
         classNames2.tab
       ),
@@ -3795,15 +3490,15 @@ var _Tab = (props) => {
 
 // src/Tabs/TabList.tsx
 import { TabList } from "react-aria-components";
-import { cn as cn53, gapSpace as gapSpace8 } from "@marigold/system";
-import { jsx as jsx94 } from "react/jsx-runtime";
+import { cn as cn51, gapSpace as gapSpace8 } from "@marigold/system";
+import { jsx as jsx90 } from "react/jsx-runtime";
 var _TabList = ({ space = 2, ...props }) => {
   const { classNames: classNames2 } = useTabContext();
-  return /* @__PURE__ */ jsx94(
+  return /* @__PURE__ */ jsx90(
     TabList,
     {
       ...props,
-      className: cn53("flex", gapSpace8[space], classNames2.tabsList),
+      className: cn51("flex", gapSpace8[space], classNames2.tabsList),
       children: props.children
     }
   );
@@ -3811,25 +3506,25 @@ var _TabList = ({ space = 2, ...props }) => {
 
 // src/Tabs/TabPanel.tsx
 import { TabPanel } from "react-aria-components";
-import { jsx as jsx95 } from "react/jsx-runtime";
+import { jsx as jsx91 } from "react/jsx-runtime";
 var _TabPanel = (props) => {
   const { classNames: classNames2 } = useTabContext();
-  return /* @__PURE__ */ jsx95(TabPanel, { ...props, className: classNames2.tabpanel, children: props.children });
+  return /* @__PURE__ */ jsx91(TabPanel, { ...props, className: classNames2.tabpanel, children: props.children });
 };
 
 // src/Tabs/Tabs.tsx
-import { jsx as jsx96 } from "react/jsx-runtime";
+import { jsx as jsx92 } from "react/jsx-runtime";
 var _Tabs = ({ disabled, variant, size = "medium", ...rest }) => {
   const props = {
     isDisabled: disabled,
     ...rest
   };
-  const classNames2 = useClassNames52({
+  const classNames2 = useClassNames48({
     component: "Tabs",
     size,
     variant
   });
-  return /* @__PURE__ */ jsx96(TabContext.Provider, { value: { classNames: classNames2 }, children: /* @__PURE__ */ jsx96(Tabs, { ...props, className: classNames2.container, children: props.children }) });
+  return /* @__PURE__ */ jsx92(TabContext.Provider, { value: { classNames: classNames2 }, children: /* @__PURE__ */ jsx92(Tabs, { ...props, className: classNames2.container, children: props.children }) });
 };
 _Tabs.List = _TabList;
 _Tabs.TabPanel = _TabPanel;
@@ -3854,14 +3549,15 @@ export {
   Columns,
   _ComboBox as ComboBox,
   Container,
-  DateField,
-  DatePicker,
+  _DateField as DateField,
+  _DatePicker as DatePicker,
   _Dialog as Dialog,
   _Divider as Divider,
-  FieldBase2 as FieldBase,
+  FieldBase,
   FieldGroup,
   FieldGroupContext,
   Footer,
+  Form,
   _Header as Header,
   _Headline as Headline,
   Image,
@@ -3876,10 +3572,11 @@ export {
   Message,
   _Modal as Modal,
   _NumberField as NumberField,
-  Overlay,
-  Popover2 as Popover,
+  OverlayContainerProvider,
+  _Popover as Popover,
   _Radio as Radio,
   _RadioGroup as RadioGroup,
+  Scrollable,
   _SearchField as SearchField,
   _Select as Select,
   _Slider as Slider,
@@ -3895,8 +3592,6 @@ export {
   ThemeProvider2 as ThemeProvider,
   Tiles,
   _Tooltip as Tooltip,
-  Tray,
-  TrayWrapper,
   Underlay,
   VisuallyHidden,
   XLoader,
@@ -3904,5 +3599,6 @@ export {
   useAsyncList,
   useFieldGroupContext,
   useListData,
-  useTheme6 as useTheme
+  usePortalContainer,
+  useTheme2 as useTheme
 };