@marigold/components 0.2.0 → 0.3.3

package/dist/components.esm.js

@@ -1,13 +1,18 @@
-import React, { forwardRef, Children, useRef, useState, useEffect } from 'react';
+import React, { Children, forwardRef, useRef, useState, useEffect } from 'react';
 import flattenChildren from 'react-keyed-flatten-children';
-import { Element, useStyles, ThemeProvider } from '@marigold/system';
-export { ThemeProvider, useTheme } from '@marigold/system';
-import { Check, Notification, Exclamation, SVG, Required, Close, Info, ArrowUp, ArrowDown } from '@marigold/icons';
+import { Box, SVG, conditional, useTheme, ThemeProvider, Global, __defaultTheme } from '@marigold/system';
+export { Box, ThemeProvider, useTheme } from '@marigold/system';
+import { Check, Notification, Exclamation, Required, Close, Info, ArrowUp, ArrowDown } from '@marigold/icons';
 import { useButton } from '@react-aria/button';
+import { useFocusRing, FocusScope } from '@react-aria/focus';
+import { VisuallyHidden } from '@react-aria/visually-hidden';
+export { VisuallyHidden } from '@react-aria/visually-hidden';
+import { useCheckbox } from '@react-aria/checkbox';
+import { useToggleState } from '@react-stately/toggle';
 import { useOverlayTriggerState } from '@react-stately/overlays';
 import { useOverlay, usePreventScroll, useModal, OverlayContainer, OverlayProvider, DismissButton, useOverlayTrigger, useOverlayPosition } from '@react-aria/overlays';
 import { useDialog } from '@react-aria/dialog';
-import { FocusScope, useFocusRing } from '@react-aria/focus';
+import { useSeparator } from '@react-aria/separator';
 import { useLink } from '@react-aria/link';
 export { SSRProvider } from '@react-aria/ssr';
 import { useSelectState } from '@react-stately/select';
@@ -87,146 +92,97 @@ function _createForOfIteratorHelperLoose(o, allowArrayLike) {
   throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
 
-var _excluded = ["variant", "as", "css", "children", "className", "display", "height", "width", "minWidth", "maxWidth", "position", "top", "bottom", "right", "left", "zIndex", "p", "px", "py", "pt", "pb", "pl", "pr", "m", "mx", "my", "mt", "mb", "ml", "mr", "flexDirection", "flexWrap", "flexShrink", "flexGrow", "alignItems", "justifyContent", "bg", "border", "borderRadius", "boxShadow", "opacity", "overflow", "transition"];
-var Box = /*#__PURE__*/forwardRef(function (_ref, ref) {
-  var variant = _ref.variant,
-      _ref$as = _ref.as,
-      as = _ref$as === void 0 ? 'div' : _ref$as,
-      css = _ref.css,
+var _excluded = ["space", "align", "children"];
+var ALIGNMENT = {
+  top: 'flex-start',
+  center: 'center',
+  bottom: 'flex-end'
+};
+var Inline = function Inline(_ref) {
+  var _ref$space = _ref.space,
+      space = _ref$space === void 0 ? 'none' : _ref$space,
+      _ref$align = _ref.align,
+      align = _ref$align === void 0 ? 'center' : _ref$align,
       children = _ref.children,
-      className = _ref.className,
-      display = _ref.display,
-      height = _ref.height,
-      width = _ref.width,
-      minWidth = _ref.minWidth,
-      maxWidth = _ref.maxWidth,
-      position = _ref.position,
-      top = _ref.top,
-      bottom = _ref.bottom,
-      right = _ref.right,
-      left = _ref.left,
-      zIndex = _ref.zIndex,
-      p = _ref.p,
-      px = _ref.px,
-      py = _ref.py,
-      pt = _ref.pt,
-      pb = _ref.pb,
-      pl = _ref.pl,
-      pr = _ref.pr,
-      m = _ref.m,
-      mx = _ref.mx,
-      my = _ref.my,
-      mt = _ref.mt,
-      mb = _ref.mb,
-      ml = _ref.ml,
-      mr = _ref.mr,
-      flexDirection = _ref.flexDirection,
-      flexWrap = _ref.flexWrap,
-      flexShrink = _ref.flexShrink,
-      flexGrow = _ref.flexGrow,
-      alignItems = _ref.alignItems,
-      justifyContent = _ref.justifyContent,
-      bg = _ref.bg,
-      border = _ref.border,
-      borderRadius = _ref.borderRadius,
-      boxShadow = _ref.boxShadow,
-      opacity = _ref.opacity,
-      overflow = _ref.overflow,
-      transition = _ref.transition,
       props = _objectWithoutPropertiesLoose(_ref, _excluded);
 
-  return React.createElement(Element, Object.assign({
-    as: as,
-    ref: ref,
-    variant: variant,
-    css: _extends({}, {
-      display: display,
-      height: height,
-      width: width,
-      minWidth: minWidth,
-      maxWidth: maxWidth,
-      position: position,
-      top: top,
-      bottom: bottom,
-      right: right,
-      left: left,
-      zIndex: zIndex,
-      p: p,
-      px: px,
-      py: py,
-      pt: pt,
-      pb: pb,
-      pl: pl,
-      pr: pr,
-      m: m,
-      mx: mx,
-      my: my,
-      mt: mt,
-      mb: mb,
-      ml: ml,
-      mr: mr,
-      flexDirection: flexDirection,
-      flexWrap: flexWrap,
-      flexShrink: flexShrink,
-      flexGrow: flexGrow,
-      alignItems: alignItems,
-      justifyContent: justifyContent,
-      bg: bg,
-      border: border,
-      borderRadius: borderRadius,
-      boxShadow: boxShadow,
-      opacity: opacity,
-      overflow: overflow,
-      transition: transition
-    }, css),
-    className: className
-  }, props), children);
-});
+  return React.createElement(Box, Object.assign({
+    display: "inline-flex",
+    css: {
+      '> * + *': {
+        pl: space
+      }
+    },
+    alignItems: ALIGNMENT[align]
+  }, props), Children.map(flattenChildren(children), function (child) {
+    return React.createElement(Box, null, React.cloneElement(child, {}, child.props.children));
+  }));
+};
+
+var _excluded$1 = ["space", "align", "children"];
+var ALIGNMENT$1 = {
+  left: 'flex-start',
+  center: 'center',
+  right: 'flex-end'
+};
+var Stack = function Stack(_ref) {
+  var _ref$space = _ref.space,
+      space = _ref$space === void 0 ? 'none' : _ref$space,
+      _ref$align = _ref.align,
+      align = _ref$align === void 0 ? 'left' : _ref$align,
+      children = _ref.children,
+      props = _objectWithoutPropertiesLoose(_ref, _excluded$1);
+
+  return React.createElement(Box, Object.assign({}, props, {
+    display: "flex",
+    flexDirection: "column",
+    alignItems: ALIGNMENT$1[align],
+    css: {
+      '> * + *': {
+        pt: space
+      }
+    }
+  }), Children.map(flattenChildren(children), function (child) {
+    return React.createElement(Box, null, React.cloneElement(child, {}, child.props.children));
+  }));
+};
+
+var _excluded$2 = ["space", "verticalAlignment", "children"];
+// ---------------
 
-var _excluded$1 = ["variant", "space", "verticalAlignment", "children", "className"];
 var ActionGroup = function ActionGroup(_ref) {
-  var _ref$variant = _ref.variant,
-      variant = _ref$variant === void 0 ? 'default' : _ref$variant,
-      _ref$space = _ref.space,
+  var _ref$space = _ref.space,
       space = _ref$space === void 0 ? 'none' : _ref$space,
       _ref$verticalAlignmen = _ref.verticalAlignment,
       verticalAlignment = _ref$verticalAlignmen === void 0 ? false : _ref$verticalAlignmen,
       children = _ref.children,
-      className = _ref.className,
-      props = _objectWithoutPropertiesLoose(_ref, _excluded$1);
+      props = _objectWithoutPropertiesLoose(_ref, _excluded$2);
 
-  var childStyle = verticalAlignment ? {
-    marginBottom: space
-  } : {
-    marginRight: space
-  };
-  return React.createElement(Box, Object.assign({
-    variant: "actionGroup." + variant,
-    className: className
-  }, props), Children.map(flattenChildren(children), function (child, i) {
-    return child !== null && child !== undefined && React.createElement(Box, {
-      as: verticalAlignment ? 'div' : 'span',
-      css: i < Children.count(children) - 1 ? childStyle : undefined
-    }, child);
-  }));
+  return verticalAlignment ? React.createElement(Stack, Object.assign({
+    space: space
+  }, props), children) : React.createElement(Inline, Object.assign({
+    space: space
+  }, props), children);
 };
 
-var _excluded$2 = ["variant", "children"];
+var _excluded$3 = ["variant", "children"];
 var ICON_MAP = {
   success: Check,
   warning: Notification,
   error: Exclamation
-};
+}; // Component
+// ---------------
+
 var Alert = function Alert(_ref) {
   var _ref$variant = _ref.variant,
       variant = _ref$variant === void 0 ? 'success' : _ref$variant,
       children = _ref.children,
-      props = _objectWithoutPropertiesLoose(_ref, _excluded$2);
+      props = _objectWithoutPropertiesLoose(_ref, _excluded$3);
 
   var Icon = ICON_MAP[variant];
   return React.createElement(Box, Object.assign({}, props, {
     display: "flex",
-    variant: "alerts." + variant
+    variant: "alert." + variant
   }), React.createElement(Box, {
     display: "inline-block",
     alignItems: "center",
@@ -244,16 +200,18 @@ var Alert = function Alert(_ref) {
   }, children));
 };
 
-var _excluded$3 = ["variant", "bgColor", "borderColor", "children"];
+var _excluded$4 = ["variant", "bgColor", "borderColor", "children"];
+// ---------------
+
 var Badge = function Badge(_ref) {
   var _ref$variant = _ref.variant,
-      variant = _ref$variant === void 0 ? 'default' : _ref$variant,
+      variant = _ref$variant === void 0 ? '' : _ref$variant,
       _ref$bgColor = _ref.bgColor,
       bgColor = _ref$bgColor === void 0 ? 'transparent' : _ref$bgColor,
       _ref$borderColor = _ref.borderColor,
       borderColor = _ref$borderColor === void 0 ? 'transparent' : _ref$borderColor,
       children = _ref.children,
-      props = _objectWithoutPropertiesLoose(_ref, _excluded$3);
+      props = _objectWithoutPropertiesLoose(_ref, _excluded$4);
 
   return React.createElement(Box, Object.assign({
     css: {
@@ -264,7 +222,9 @@ var Badge = function Badge(_ref) {
   }, props), children);
 };
 
-var _excluded$4 = ["as", "variant", "size", "disabled", "children", "className"];
+var _excluded$5 = ["as", "variant", "size", "space", "disabled", "children", "className"];
+// ---------------
+
 var Button = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var _ref$as = _ref.as,
       as = _ref$as === void 0 ? 'button' : _ref$as,
@@ -272,10 +232,12 @@ var Button = /*#__PURE__*/forwardRef(function (_ref, ref) {
       variant = _ref$variant === void 0 ? 'primary' : _ref$variant,
       _ref$size = _ref.size,
       size = _ref$size === void 0 ? 'large' : _ref$size,
+      _ref$space = _ref.space,
+      space = _ref$space === void 0 ? 'none' : _ref$space,
       disabled = _ref.disabled,
       children = _ref.children,
       className = _ref.className,
-      props = _objectWithoutPropertiesLoose(_ref, _excluded$4);
+      props = _objectWithoutPropertiesLoose(_ref, _excluded$5);
 
   var _useButton = useButton(_extends({}, props, {
     elementType: typeof as === 'string' ? as : 'span',
@@ -285,25 +247,28 @@ var Button = /*#__PURE__*/forwardRef(function (_ref, ref) {
 
   return React.createElement(Box, Object.assign({}, buttonProps, props, {
     as: as,
+    display: "inline-flex",
+    alignItems: "center",
     variant: ["button." + variant, "button." + size],
     className: className,
-    ref: ref
-  }), React.createElement(Box, {
-    as: "span",
-    display: "inline-flex",
-    alignItems: "center"
-  }, children));
+    ref: ref,
+    css: {
+      columnGap: space
+    }
+  }), children);
 });
 
-var _excluded$5 = ["variant", "title", "width", "className", "children"];
+var _excluded$6 = ["variant", "title", "width", "className", "children"];
+// ---------------
+
 var Card = function Card(_ref) {
   var _ref$variant = _ref.variant,
-      variant = _ref$variant === void 0 ? 'default' : _ref$variant,
+      variant = _ref$variant === void 0 ? '' : _ref$variant,
       title = _ref.title,
       width = _ref.width,
       className = _ref.className,
       children = _ref.children,
-      props = _objectWithoutPropertiesLoose(_ref, _excluded$5);
+      props = _objectWithoutPropertiesLoose(_ref, _excluded$6);
 
   return React.createElement(Box, Object.assign({}, props, {
     variant: "card." + variant,
@@ -316,85 +281,85 @@ var Card = function Card(_ref) {
   }, title), children);
 };
 
-var _excluded$6 = ["disabled"],
-    _excluded2 = ["disabled", "error"];
-var CheckboxChecked = function CheckboxChecked(_ref) {
-  var _ref$disabled = _ref.disabled,
+var CheckboxIcon = function CheckboxIcon(_ref) {
+  var _ref$variant = _ref.variant,
+      variant = _ref$variant === void 0 ? '' : _ref$variant,
+      _ref$checked = _ref.checked,
+      checked = _ref$checked === void 0 ? false : _ref$checked,
+      _ref$disabled = _ref.disabled,
       disabled = _ref$disabled === void 0 ? false : _ref$disabled,
-      props = _objectWithoutPropertiesLoose(_ref, _excluded$6);
-
-  return React.createElement(SVG, Object.assign({
+      _ref$error = _ref.error,
+      error = _ref$error === void 0 ? false : _ref$error;
+  var conditionalStates = disabled ? {
+    disabled: disabled
+  } : {
+    checked: checked,
+    error: error
+  };
+  return React.createElement(SVG, {
     width: "16",
     height: "32",
     viewBox: "0 0 16 32",
-    fill: "none"
-  }, props), React.createElement(Box, {
+    fill: "none",
+    "aria-hidden": "true"
+  }, React.createElement(Box, {
     as: "rect",
     x: "0.5",
     y: "8.5",
     width: "15px",
     height: "15px",
     rx: "1.5",
-    variant: disabled ? 'checkbox.checked.disabled' : 'checkbox.checked'
-  }), React.createElement(Box, {
+    variant: conditional("checkbox." + variant, conditionalStates)
+  }), checked && React.createElement(Box, {
+    __baseCSS: {
+      fill: 'gray00'
+    },
     as: "path",
     fillRule: "evenodd",
     clipRule: "evenodd",
-    d: "M13.9571 12.8338L12.4085 11.2852L6.08699 17.6007L3.59887 15.1126L2.04163 16.6588L6.08682 20.704L13.9571 12.8338Z",
-    variant: "checkbox.checked.icon"
-  }));
-};
-var CheckboxUnchecked = function CheckboxUnchecked(_ref2) {
-  var _ref2$disabled = _ref2.disabled,
-      disabled = _ref2$disabled === void 0 ? false : _ref2$disabled,
-      _ref2$error = _ref2.error,
-      error = _ref2$error === void 0 ? false : _ref2$error,
-      props = _objectWithoutPropertiesLoose(_ref2, _excluded2);
-
-  return React.createElement(SVG, Object.assign({
-    width: "16",
-    height: "32",
-    viewBox: "0 0 16 32",
-    fill: "none"
-  }, props), React.createElement(Box, {
-    as: "rect",
-    x: "0.5",
-    y: "8.5",
-    width: "15px",
-    height: "15px",
-    rx: "1.5",
-    variant: disabled ? 'checkbox.unchecked.disabled' : error ? 'checkbox.unchecked.error' : 'checkbox.unchecked'
+    d: "M13.9571 12.8338L12.4085 11.2852L6.08699 17.6007L3.59887 15.1126L2.04163 16.6588L6.08682 20.704L13.9571 12.8338Z"
   }));
 };
 
-var _excluded$7 = ["variant", "required", "children"];
-var Label = function Label(_ref) {
+var _excluded$7 = ["variant", "required", "color", "children"],
+    _excluded2 = ["required", "children"];
+var LabelBase = function LabelBase(_ref) {
   var _ref$variant = _ref.variant,
       variant = _ref$variant === void 0 ? 'above' : _ref$variant,
-      required = _ref.required,
+      _ref$color = _ref.color,
+      color = _ref$color === void 0 ? 'text' : _ref$color,
       children = _ref.children,
       props = _objectWithoutPropertiesLoose(_ref, _excluded$7);
 
+  return React.createElement(Box, Object.assign({}, props, {
+    as: "label",
+    __baseCSS: {
+      color: color
+    },
+    variant: "label." + variant
+  }), children);
+};
+var Label = function Label(_ref2) {
+  var required = _ref2.required,
+      children = _ref2.children,
+      props = _objectWithoutPropertiesLoose(_ref2, _excluded2);
+
   return required ? React.createElement(Box, {
     as: "span",
     display: "inline-flex",
     alignItems: "center"
-  }, React.createElement(Box, Object.assign({}, props, {
-    as: "label",
-    variant: "label." + variant
-  }), children), required && React.createElement(Box, {
+  }, React.createElement(LabelBase, Object.assign({}, props), children), required && React.createElement(Box, {
     as: Required,
     size: 16,
     css: {
-      color: 'red60'
+      color: 'error'
     }
-  })) : React.createElement(Box, Object.assign({}, props, {
-    as: "label",
-    variant: "label." + variant
-  }), children);
+  })) : React.createElement(LabelBase, Object.assign({}, props), children);
 };
 
 var _excluded$8 = ["variant", "children", "className"];
+// ---------------
+
 var ValidationMessage = function ValidationMessage(_ref) {
   var _ref$variant = _ref.variant,
       variant = _ref$variant === void 0 ? 'error' : _ref$variant,
@@ -411,82 +376,64 @@ var ValidationMessage = function ValidationMessage(_ref) {
   }, props), children);
 };
 
-var _excluded$9 = ["className", "variant", "error"],
-    _excluded2$1 = ["label", "required", "error", "errorMessage"];
+var _excluded$9 = ["error"],
+    _excluded2$1 = ["label", "required", "labelVariant", "error", "errorMessage"];
 
-var CheckboxIcon = function CheckboxIcon(_ref) {
-  var variant = _ref.variant,
-      checked = _ref.checked,
-      disabled = _ref.disabled,
-      error = _ref.error;
+var CheckboxInput = function CheckboxInput(_ref) {
+  var error = _ref.error,
+      props = _objectWithoutPropertiesLoose(_ref, _excluded$9);
 
-  if (checked) {
-    return React.createElement(Box, {
-      as: CheckboxChecked,
-      variant: "checkbox." + variant,
-      disabled: disabled
-    });
-  }
+  var state = useToggleState(props);
+  var ref = React.useRef(null);
 
-  return React.createElement(Box, {
-    as: CheckboxUnchecked,
-    variant: "checkbox." + variant,
-    disabled: disabled,
-    error: error
-  });
-};
+  var _useCheckbox = useCheckbox(props, state, ref),
+      inputProps = _useCheckbox.inputProps;
 
-var CheckboxInput = function CheckboxInput(_ref2) {
-  var className = _ref2.className,
-      _ref2$variant = _ref2.variant,
-      variant = _ref2$variant === void 0 ? 'default' : _ref2$variant,
-      error = _ref2.error,
-      props = _objectWithoutPropertiesLoose(_ref2, _excluded$9);
+  var _useFocusRing = useFocusRing(),
+      focusProps = _useFocusRing.focusProps;
 
   return React.createElement(Box, {
-    display: "inline-block",
-    className: className
-  }, React.createElement(Box, Object.assign({
+    pr: "xsmall"
+  }, React.createElement(VisuallyHidden, null, React.createElement(Box, Object.assign({
     as: "input",
     type: "checkbox",
-    css: {
-      position: 'absolute',
-      opacity: 0,
-      zIndex: -1,
-      width: 1,
-      height: 1,
-      overflow: 'hidden'
-    }
-  }, props)), React.createElement(CheckboxIcon, {
+    disabled: props.disabled
+  }, inputProps, focusProps, {
+    ref: ref
+  }, props))), React.createElement(CheckboxIcon, {
     checked: props.checked,
-    variant: variant,
+    variant: props.variant,
     disabled: props.disabled,
     error: error
   }));
 };
 
-var Checkbox = function Checkbox(_ref3) {
-  var label = _ref3.label,
-      required = _ref3.required,
-      error = _ref3.error,
-      errorMessage = _ref3.errorMessage,
-      props = _objectWithoutPropertiesLoose(_ref3, _excluded2$1);
-
-  if (label) {
-    return React.createElement(React.Fragment, null, React.createElement(Label, {
-      htmlFor: props.id,
-      required: required,
-      variant: props.disabled ? 'disabled' : 'inline'
-    }, React.createElement(Box, Object.assign({
-      as: CheckboxInput,
-      pr: "8px",
-      error: error
-    }, props)), label), error && errorMessage && React.createElement(ValidationMessage, null, React.createElement(Exclamation, {
-      size: 16
-    }), errorMessage));
-  }
-
-  return React.createElement(CheckboxInput, Object.assign({}, props));
+var Checkbox = function Checkbox(_ref2) {
+  var label = _ref2.label,
+      required = _ref2.required,
+      _ref2$labelVariant = _ref2.labelVariant,
+      labelVariant = _ref2$labelVariant === void 0 ? 'inline' : _ref2$labelVariant,
+      error = _ref2.error,
+      errorMessage = _ref2.errorMessage,
+      props = _objectWithoutPropertiesLoose(_ref2, _excluded2$1);
+
+  return React.createElement(React.Fragment, null, React.createElement(Box, {
+    as: Label,
+    __baseCSS: {
+      ':hover': {
+        cursor: props.disabled ? 'not-allowed' : 'pointer'
+      }
+    },
+    htmlFor: props.id,
+    required: required,
+    variant: "label." + labelVariant,
+    color: props.disabled ? 'disabled' : 'text'
+  }, React.createElement(Box, Object.assign({
+    as: CheckboxInput,
+    error: error
+  }, props)), label), error && errorMessage && React.createElement(ValidationMessage, null, React.createElement(Exclamation, {
+    size: 16
+  }), errorMessage));
 };
 
 var _excluded$a = ["width", "children"];
@@ -513,9 +460,25 @@ var Column = function Column(_ref) {
 };
 
 var _excluded$b = ["space", "horizontalAlign", "verticalAlign", "className", "children"];
+
+var useAlignment = function useAlignment(direction) {
+  switch (direction) {
+    case 'right':
+      return 'flex-end';
+
+    case 'bottom':
+      return 'flex-end';
+
+    case 'center':
+      return 'center';
+  }
+
+  return 'flex-start';
+};
+
 var Columns = function Columns(_ref) {
   var _ref$space = _ref.space,
-      space = _ref$space === void 0 ? 0 : _ref$space,
+      space = _ref$space === void 0 ? 'none' : _ref$space,
       _ref$horizontalAlign = _ref.horizontalAlign,
       horizontalAlign = _ref$horizontalAlign === void 0 ? 'left' : _ref$horizontalAlign,
       _ref$verticalAlign = _ref.verticalAlign,
@@ -524,75 +487,96 @@ var Columns = function Columns(_ref) {
       children = _ref.children,
       props = _objectWithoutPropertiesLoose(_ref, _excluded$b);
 
-  var columnItems = flattenChildren(children);
-  var childClassNames = useStyles({
-    css: {
-      p: space / 2 + "px"
-    }
-  }); // horizontal Alignment
-
-  var justify = 'flex-start';
+  var justifyContent = useAlignment(horizontalAlign);
+  var alignItems = useAlignment(verticalAlign);
+  /**
+   * transform space string to space value from theme
+   */
 
-  if (horizontalAlign === 'right') {
-    justify = 'flex-end';
-  } else if (horizontalAlign === 'center') {
-    justify = 'center';
-  } // vertical Alignment
-
-
-  var alignItems = 'flex-start';
-
-  if (verticalAlign === 'bottom') {
-    alignItems = 'flex-end';
-  } else if (verticalAlign === 'center') {
-    alignItems = 'center';
-  }
+  var _useTheme = useTheme(),
+      css = _useTheme.css;
 
+  var spaceObject = css({
+    space: space
+  });
+  var spaceValue = Object.values(spaceObject)[0];
   return React.createElement(Box, {
-    p: space + "px",
+    p: space,
     display: "flex",
     className: className
   }, React.createElement(Box, Object.assign({
-    width: "calc(100% + " + space + "px)",
-    m: -space / 2 + "px",
+    width: "calc(100% + " + spaceValue + "px)",
+    m: -spaceValue / 2 + "px",
     display: "flex",
     flexWrap: "wrap",
     alignItems: alignItems,
-    justifyContent: justify
-  }, props), Children.map(columnItems, function (child) {
-    return React.cloneElement(child, {
-      className: childClassNames
-    }, React.createElement(Box, {
-      className: child && child.props.className
+    justifyContent: justifyContent
+  }, props), Children.map(flattenChildren(children), function (child) {
+    return React.cloneElement(child, {}, React.createElement(Box, {
+      css: {
+        p: spaceValue / 2 + "px"
+      }
     }, child.props.children));
   })));
 };
 
-var _excluded$c = ["as", "variant", "children"];
-var Heading = function Heading(_ref) {
+var _excluded$c = ["as", "variant", "children", "className", "align", "color", "cursor", "outline", "userSelect"];
+// ---------------
+
+var Text = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var _ref$as = _ref.as,
-      as = _ref$as === void 0 ? 'h2' : _ref$as,
+      as = _ref$as === void 0 ? 'span' : _ref$as,
       _ref$variant = _ref.variant,
-      variant = _ref$variant === void 0 ? 'h2' : _ref$variant,
+      variant = _ref$variant === void 0 ? 'body' : _ref$variant,
       children = _ref.children,
+      className = _ref.className,
+      align = _ref.align,
+      color = _ref.color,
+      cursor = _ref.cursor,
+      outline = _ref.outline,
+      userSelect = _ref.userSelect,
       props = _objectWithoutPropertiesLoose(_ref, _excluded$c);
 
   return React.createElement(Box, Object.assign({}, props, {
     as: as,
-    variant: "text." + variant
+    variant: "text." + variant,
+    css: {
+      textAlign: align,
+      color: color,
+      cursor: cursor,
+      outline: outline,
+      userSelect: userSelect
+    },
+    className: className,
+    ref: ref
   }), children);
-};
+});
+
+var _excluded$d = ["variant", "backdropVariant", "children"],
+    _excluded2$2 = ["isDismissable", "isOpen", "onClose"];
+// ---------------
 
-var _excluded$d = ["children"];
 var ModalDialog = function ModalDialog(_ref) {
-  var children = _ref.children,
+  var variant = _ref.variant,
+      _ref$backdropVariant = _ref.backdropVariant,
+      backdropVariant = _ref$backdropVariant === void 0 ? 'backdrop' : _ref$backdropVariant,
+      children = _ref.children,
       props = _objectWithoutPropertiesLoose(_ref, _excluded$d);
 
-  // Handle interacting outside the dialog and pressing
+  var isDismissable = props.isDismissable,
+      isOpen = props.isOpen,
+      onClose = props.onClose,
+      restProps = _objectWithoutPropertiesLoose(props, _excluded2$2); // Handle interacting outside the dialog and pressing
   // the Escape key to close the modal.
+
+
   var ref = React.useRef();
 
-  var _useOverlay = useOverlay(props, ref),
+  var _useOverlay = useOverlay({
+    isDismissable: isDismissable,
+    isOpen: isOpen,
+    onClose: onClose
+  }, ref),
       overlayProps = _useOverlay.overlayProps,
       underlayProps = _useOverlay.underlayProps; // Prevent scrolling while the modal is open, and hide content
   // outside the modal from screen readers.
@@ -607,24 +591,38 @@ var ModalDialog = function ModalDialog(_ref) {
       dialogProps = _useDialog.dialogProps;
 
   return React.createElement(Box, Object.assign({
-    variant: "dialog.modalWrapper"
+    __baseCSS: {
+      display: 'grid',
+      placeItems: 'center',
+      position: 'fixed',
+      zIndex: 100,
+      top: 0,
+      left: 0,
+      bottom: 0,
+      right: 0
+    },
+    variant: "dialog." + backdropVariant
   }, underlayProps), React.createElement(FocusScope, {
     contain: true,
     restoreFocus: true,
     autoFocus: true
   }, React.createElement(Box, Object.assign({}, overlayProps, dialogProps, modalProps, {
     ref: ref,
-    variant: "dialog.modalBody"
-  }), children)));
+    variant: variant ? "dialog." + variant : "dialog"
+  }, restProps), children)));
 };
 
-var _excluded$e = ["children", "title", "className", "isOpen", "close"];
+var _excluded$e = ["backdropVariant", "children", "className", "close", "isOpen", "title", "variant"];
+// ---------------
+
 var Dialog = function Dialog(_ref) {
-  var children = _ref.children,
-      title = _ref.title,
+  var backdropVariant = _ref.backdropVariant,
+      children = _ref.children,
       className = _ref.className,
-      isOpen = _ref.isOpen,
       close = _ref.close,
+      isOpen = _ref.isOpen,
+      title = _ref.title,
+      variant = _ref.variant,
       props = _objectWithoutPropertiesLoose(_ref, _excluded$e);
 
   var closeButtonRef = React.useRef(); // useButton ensures that focus management is handled correctly,
@@ -638,29 +636,56 @@ var Dialog = function Dialog(_ref) {
   }, closeButtonRef),
       closeButtonProps = _useButton.buttonProps;
 
-  return React.createElement(OverlayContainer, null, React.createElement(ModalDialog, {
+  return React.createElement(OverlayContainer, null, React.createElement(ModalDialog, Object.assign({
+    variant: variant,
+    backdropVariant: backdropVariant,
     isOpen: isOpen,
     onClose: close,
     isDismissable: true
-  }, React.createElement(Box, Object.assign({
-    variant: "dialog.wrapper",
-    className: className
   }, props), React.createElement(Box, {
-    variant: "dialog.body"
-  }, title && React.createElement(Heading, {
+    __baseCSS: {
+      display: 'flex',
+      justifyContent: 'space-between',
+      borderRadius: 'small',
+      pl: 'large',
+      pb: 'large'
+    },
+    className: className
+  }, React.createElement(Box, {
+    pt: "medium"
+  }, title && React.createElement(Text, {
     as: "h4",
-    variant: "h4"
+    variant: "headline4"
   }, title), children), React.createElement(Box, {
-    variant: "dialog.onClose"
-  }, React.createElement(Button, Object.assign({
-    variant: "close",
-    size: "xsmall"
+    __baseCSS: {
+      display: 'flex',
+      justifyContent: 'flex-end',
+      alignItems: 'start',
+      paddingTop: 'xsmall',
+      paddingX: 'xsmall'
+    }
+  }, React.createElement(Box, Object.assign({
+    as: Button,
+    __baseCSS: {
+      color: 'text',
+      bg: 'transparent',
+      lineHeight: 'xsmall',
+      px: 'xxsmall',
+      ':hover': {
+        color: 'text',
+        bg: 'transparent',
+        cursor: 'pointer'
+      },
+      ':focus': {
+        outline: 0
+      }
+    }
   }, closeButtonProps, {
     ref: closeButtonRef
   }), React.createElement(Close, {
     size: 16
   }))))));
-}; // use this hook to get the overlayTriggerState and openButton props for using the dialog component
+}; // get the overlayTriggerState and openButton props for using the dialog component
 
 var useDialogButtonProps = function useDialogButtonProps() {
   var state = useOverlayTriggerState({});
@@ -681,21 +706,33 @@ var useDialogButtonProps = function useDialogButtonProps() {
 };
 
 var _excluded$f = ["variant"];
+// ---------------
+
 var Divider = function Divider(_ref) {
   var _ref$variant = _ref.variant,
-      variant = _ref$variant === void 0 ? 'regular' : _ref$variant,
+      variant = _ref$variant === void 0 ? '' : _ref$variant,
       props = _objectWithoutPropertiesLoose(_ref, _excluded$f);
 
-  return React.createElement(Box, Object.assign({}, props, {
-    as: "hr",
+  var _useSeparator = useSeparator(props),
+      separatorProps = _useSeparator.separatorProps;
+
+  return React.createElement(Box, Object.assign({
+    __baseCSS: {
+      width: '100%',
+      height: '1px',
+      m: 'none',
+      bg: 'text'
+    },
     variant: "divider." + variant
-  }));
+  }, props, separatorProps));
 };
 
 var _excluded$g = ["variant", "type"];
+// ---------------
+
 var Input = function Input(_ref) {
   var _ref$variant = _ref.variant,
-      variant = _ref$variant === void 0 ? 'default' : _ref$variant,
+      variant = _ref$variant === void 0 ? '' : _ref$variant,
       _ref$type = _ref.type,
       type = _ref$type === void 0 ? 'text' : _ref$type,
       props = _objectWithoutPropertiesLoose(_ref, _excluded$g);
@@ -707,11 +744,16 @@ var Input = function Input(_ref) {
   }));
 };
 
-var _excluded$h = ["type", "className", "htmlFor", "label", "required", "error", "errorMessage", "disabled"];
+var _excluded$h = ["type", "variant", "labelVariant", "htmlFor", "label", "required", "error", "errorMessage", "disabled"];
+// ---------------
+
 var Field = function Field(_ref) {
   var _ref$type = _ref.type,
       type = _ref$type === void 0 ? 'text' : _ref$type,
-      className = _ref.className,
+      _ref$variant = _ref.variant,
+      variant = _ref$variant === void 0 ? '' : _ref$variant,
+      _ref$labelVariant = _ref.labelVariant,
+      labelVariant = _ref$labelVariant === void 0 ? 'above' : _ref$labelVariant,
       htmlFor = _ref.htmlFor,
       label = _ref.label,
       required = _ref.required,
@@ -721,76 +763,36 @@ var Field = function Field(_ref) {
       props = _objectWithoutPropertiesLoose(_ref, _excluded$h);
 
   return React.createElement(React.Fragment, null, React.createElement(Label, {
-    variant: disabled ? 'disabled' : 'above',
+    variant: labelVariant,
     htmlFor: htmlFor,
     required: required
   }, label), React.createElement(Input, Object.assign({}, props, {
     type: type,
     id: htmlFor,
     disabled: disabled,
-    variant: error ? 'error' : 'default',
-    className: className
+    variant: variant
   })), error && errorMessage && React.createElement(ValidationMessage, null, React.createElement(Exclamation, {
     size: 16
   }), errorMessage));
 };
 
-var _excluded$i = ["show", "children"];
-var Hidden = function Hidden(_ref) {
-  var _ref$show = _ref.show,
-      show = _ref$show === void 0 ? false : _ref$show,
-      children = _ref.children,
-      props = _objectWithoutPropertiesLoose(_ref, _excluded$i);
-
-  return React.createElement(Box, Object.assign({}, props, {
-    as: "span",
-    display: show ? 'display' : 'none'
-  }), children);
-};
+var _excluded$i = ["variant"];
+// ---------------
 
-var _excluded$j = ["variant"];
 var Image = function Image(_ref) {
   var _ref$variant = _ref.variant,
       variant = _ref$variant === void 0 ? 'fullWidth' : _ref$variant,
-      props = _objectWithoutPropertiesLoose(_ref, _excluded$j);
+      props = _objectWithoutPropertiesLoose(_ref, _excluded$i);
 
   return React.createElement(Box, Object.assign({}, props, {
     as: "img",
-    variant: "images." + variant
+    variant: "image." + variant
   }));
 };
 
-var _excluded$k = ["as", "variant", "children", "className", "align", "color", "cursor", "outline", "userSelect"];
-var Text = /*#__PURE__*/forwardRef(function (_ref, ref) {
-  var _ref$as = _ref.as,
-      as = _ref$as === void 0 ? 'span' : _ref$as,
-      _ref$variant = _ref.variant,
-      variant = _ref$variant === void 0 ? 'body' : _ref$variant,
-      children = _ref.children,
-      className = _ref.className,
-      align = _ref.align,
-      color = _ref.color,
-      cursor = _ref.cursor,
-      outline = _ref.outline,
-      userSelect = _ref.userSelect,
-      props = _objectWithoutPropertiesLoose(_ref, _excluded$k);
+var _excluded$j = ["as", "variant", "children", "disabled"];
+// ---------------
 
-  return React.createElement(Box, Object.assign({}, props, {
-    as: as,
-    variant: "text." + variant,
-    css: {
-      textAlign: align,
-      color: color,
-      cursor: cursor,
-      outline: outline,
-      userSelect: userSelect
-    },
-    className: className,
-    ref: ref
-  }), children);
-});
-
-var _excluded$l = ["as", "variant", "children", "disabled"];
 var Link = function Link(_ref) {
   var _ref$as = _ref.as,
       as = _ref$as === void 0 ? 'a' : _ref$as,
@@ -798,7 +800,7 @@ var Link = function Link(_ref) {
       variant = _ref$variant === void 0 ? 'link' : _ref$variant,
       children = _ref.children,
       disabled = _ref.disabled,
-      props = _objectWithoutPropertiesLoose(_ref, _excluded$l);
+      props = _objectWithoutPropertiesLoose(_ref, _excluded$j);
 
   var ref = useRef();
 
@@ -815,7 +817,9 @@ var Link = function Link(_ref) {
   }), children);
 };
 
-var _excluded$m = ["variant", "label", "onClick", "show", "children"];
+var _excluded$k = ["variant", "label", "onClick", "show", "children"];
+// ---------------
+
 var Menu = function Menu(_ref) {
   var _ref$variant = _ref.variant,
       variant = _ref$variant === void 0 ? 'default' : _ref$variant,
@@ -825,7 +829,7 @@ var Menu = function Menu(_ref) {
       _ref$show = _ref.show,
       show = _ref$show === void 0 ? false : _ref$show,
       children = _ref.children,
-      props = _objectWithoutPropertiesLoose(_ref, _excluded$m);
+      props = _objectWithoutPropertiesLoose(_ref, _excluded$k);
 
   return React.createElement(Box, Object.assign({
     variant: "menu." + variant
@@ -840,13 +844,15 @@ var Menu = function Menu(_ref) {
   }, children) : null);
 };
 
-var _excluded$n = ["variant", "className", "children"];
+var _excluded$l = ["variant", "className", "children"];
+// ---------------
+
 var MenuItem = function MenuItem(_ref) {
   var _ref$variant = _ref.variant,
       variant = _ref$variant === void 0 ? 'default' : _ref$variant,
       className = _ref.className,
       children = _ref.children,
-      props = _objectWithoutPropertiesLoose(_ref, _excluded$n);
+      props = _objectWithoutPropertiesLoose(_ref, _excluded$l);
 
   return React.createElement(Box, {
     variant: "menuItem." + variant,
@@ -856,14 +862,16 @@ var MenuItem = function MenuItem(_ref) {
   }, props), children));
 };
 
-var _excluded$o = ["messageTitle", "variant", "className", "children"];
+var _excluded$m = ["messageTitle", "variant", "className", "children"];
+// ---------------
+
 var Message = function Message(_ref) {
   var messageTitle = _ref.messageTitle,
       _ref$variant = _ref.variant,
       variant = _ref$variant === void 0 ? 'info' : _ref$variant,
       className = _ref.className,
       children = _ref.children,
-      props = _objectWithoutPropertiesLoose(_ref, _excluded$o);
+      props = _objectWithoutPropertiesLoose(_ref, _excluded$m);
 
   var icon = React.createElement(Info, null);
 
@@ -877,15 +885,15 @@ var Message = function Message(_ref) {
 
   return React.createElement(Box, Object.assign({
     display: "inline-block",
-    variant: "messages." + variant,
+    variant: "message." + variant,
     className: className
   }, props), React.createElement(Box, {
     display: "flex",
     alignItems: "center",
-    variant: "messages.title"
-  }, icon, React.createElement(Heading, {
+    variant: "message.title"
+  }, icon, React.createElement(Text, {
     as: "h4",
-    variant: "h4"
+    variant: "headline4"
   }, messageTitle)), React.createElement(Box, {
     css: {
       color: 'black'
@@ -893,167 +901,126 @@ var Message = function Message(_ref) {
   }, children));
 };
 
-// import { css } from '@theme-ui/css';
-// const GlobalStyles = () => {
-//   const theme = useTheme();
-//   const styles = css({
-//     body: { variant: 'root.body' },
-//     html: { variant: 'root.html' },
-//   })(theme);
-//   return <Global styles={styles} />;
-// };
-// a merge of the ThemeProvider and the react-aria OverlayProvider
-
-var MarigoldProvider = function MarigoldProvider(_ref) {
+// ---------------
+
+function MarigoldProvider(_ref) {
   var theme = _ref.theme,
       children = _ref.children;
+  var outer = useTheme();
+  var isTopLevel = outer.theme === __defaultTheme;
   return React.createElement(ThemeProvider, {
     theme: theme
-  }, React.createElement(OverlayProvider, null, children));
-};
+  }, isTopLevel ? React.createElement(React.Fragment, null, React.createElement(Global, null), React.createElement(OverlayProvider, null, children)) : children);
+}
 
-var _excluded$p = ["disabled"],
-    _excluded2$2 = ["disabled", "error"];
-var RadioChecked = function RadioChecked(_ref) {
-  var _ref$disabled = _ref.disabled,
+var RadioIcon = function RadioIcon(_ref) {
+  var _ref$variant = _ref.variant,
+      variant = _ref$variant === void 0 ? '' : _ref$variant,
+      _ref$checked = _ref.checked,
+      checked = _ref$checked === void 0 ? false : _ref$checked,
+      _ref$disabled = _ref.disabled,
       disabled = _ref$disabled === void 0 ? false : _ref$disabled,
-      props = _objectWithoutPropertiesLoose(_ref, _excluded$p);
-
-  return React.createElement(SVG, Object.assign({
+      _ref$error = _ref.error,
+      error = _ref$error === void 0 ? false : _ref$error;
+  var conditionalStates = disabled ? {
+    disabled: disabled
+  } : {
+    checked: checked,
+    error: error
+  };
+  return React.createElement(SVG, {
     width: "16",
     height: "32",
     viewBox: "0 0 16 32",
-    fill: "none"
-  }, props), React.createElement(Box, {
-    as: "circle",
-    cx: "8",
-    cy: "16",
-    r: "7.5",
-    variant: disabled ? 'radio.checked.disabled' : 'radio.checked'
-  }), React.createElement(Box, {
+    fill: "none",
+    "aria-hidden": "true"
+  }, React.createElement(Box, {
+    variant: conditional("radio." + variant, conditionalStates),
     as: "circle",
     cx: "8",
     cy: "16",
-    r: "3",
-    variant: "radio.checked.circle"
-  }));
-};
-var RadioUnchecked = function RadioUnchecked(_ref2) {
-  var _ref2$disabled = _ref2.disabled,
-      disabled = _ref2$disabled === void 0 ? false : _ref2$disabled,
-      _ref2$error = _ref2.error,
-      error = _ref2$error === void 0 ? false : _ref2$error,
-      props = _objectWithoutPropertiesLoose(_ref2, _excluded2$2);
-
-  return React.createElement(SVG, Object.assign({
-    width: "16",
-    height: "32",
-    viewBox: "0 0 16 32",
-    fill: "none"
-  }, props), React.createElement(Box, {
-    as: "circle",
+    r: "7.5"
+  }), checked && React.createElement("circle", {
+    fill: "white",
     cx: "8",
     cy: "16",
-    r: "7.5",
-    variant: disabled ? 'radio.unchecked.disabled' : error ? 'radio.unchecked.error' : 'radio.unchecked'
+    r: "3"
   }));
 };
 
-var _excluded$q = ["className", "variant", "error"],
-    _excluded2$3 = ["label", "required", "error", "errorMessage"];
+var _excluded$n = ["error"],
+    _excluded2$3 = ["label", "required", "labelVariant", "error", "errorMessage"];
 
-var RadioIcon = function RadioIcon(_ref) {
-  var variant = _ref.variant,
-      checked = _ref.checked,
-      disabled = _ref.disabled,
-      error = _ref.error;
+var RadioInput = function RadioInput(_ref) {
+  var error = _ref.error,
+      props = _objectWithoutPropertiesLoose(_ref, _excluded$n);
 
-  if (checked) {
-    return React.createElement(Box, {
-      as: RadioChecked,
-      variant: "radio." + variant,
-      disabled: disabled
-    });
-  }
+  var _useFocusRing = useFocusRing(),
+      focusProps = _useFocusRing.focusProps;
 
   return React.createElement(Box, {
-    as: RadioUnchecked,
-    variant: "radio." + variant,
-    disabled: disabled,
+    pr: "xsmall"
+  }, React.createElement(VisuallyHidden, null, React.createElement("input", Object.assign({
+    type: "radio",
+    disabled: props.disabled
+  }, focusProps, props))), React.createElement(RadioIcon, {
+    variant: props.variant,
+    disabled: props.disabled,
+    checked: props.checked,
     error: error
-  });
+  }));
 };
 
-var RadioInput = function RadioInput(_ref2) {
-  var className = _ref2.className,
-      _ref2$variant = _ref2.variant,
-      variant = _ref2$variant === void 0 ? 'default' : _ref2$variant,
+var Radio = function Radio(_ref2) {
+  var label = _ref2.label,
+      required = _ref2.required,
+      _ref2$labelVariant = _ref2.labelVariant,
+      labelVariant = _ref2$labelVariant === void 0 ? 'inline' : _ref2$labelVariant,
       error = _ref2.error,
-      props = _objectWithoutPropertiesLoose(_ref2, _excluded$q);
-
-  return React.createElement(Box, {
-    display: "inline-block",
-    className: className
-  }, React.createElement(Box, Object.assign({
-    as: "input",
-    type: "radio",
-    css: {
-      position: 'absolute',
-      opacity: 0,
-      zIndex: -1,
-      width: 1,
-      height: 1,
-      overflow: 'hidden'
+      errorMessage = _ref2.errorMessage,
+      props = _objectWithoutPropertiesLoose(_ref2, _excluded2$3);
+
+  return React.createElement(React.Fragment, null, React.createElement(Box, {
+    as: Label,
+    htmlFor: props.id,
+    required: required,
+    variant: "label." + labelVariant,
+    css: props.disabled ? {
+      color: 'disabled',
+      ':hover': {
+        cursor: 'not-allowed'
+      }
+    } : {
+      color: 'text',
+      ':hover': {
+        cursor: 'pointer'
+      }
     }
-  }, props)), React.createElement(RadioIcon, {
-    checked: props.checked,
-    variant: variant,
-    disabled: props.disabled,
+  }, React.createElement(Box, Object.assign({
+    as: RadioInput,
     error: error
-  }));
+  }, props)), label), error && errorMessage && React.createElement(ValidationMessage, null, React.createElement(Exclamation, {
+    size: 16
+  }), errorMessage));
 };
 
-var Radio = function Radio(_ref3) {
-  var label = _ref3.label,
-      required = _ref3.required,
-      error = _ref3.error,
-      errorMessage = _ref3.errorMessage,
-      props = _objectWithoutPropertiesLoose(_ref3, _excluded2$3);
-
-  if (label) {
-    return React.createElement(React.Fragment, null, React.createElement(Label, {
-      htmlFor: props.id,
-      required: required,
-      variant: props.disabled ? 'disabled' : 'inline'
-    }, React.createElement(Box, Object.assign({
-      as: RadioInput,
-      pr: "8px",
-      error: error
-    }, props)), label), error && errorMessage && React.createElement(ValidationMessage, null, React.createElement(Exclamation, {
-      size: 16
-    }), errorMessage));
-  }
-
-  return React.createElement(RadioInput, Object.assign({}, props));
-};
+var _excluded$o = ["variant", "className"];
+// ---------------
 
-var _excluded$r = ["variant", "className"];
 var Slider = function Slider(_ref) {
   var _ref$variant = _ref.variant,
-      variant = _ref$variant === void 0 ? 'slider' : _ref$variant,
+      variant = _ref$variant === void 0 ? '' : _ref$variant,
       className = _ref.className,
-      props = _objectWithoutPropertiesLoose(_ref, _excluded$r);
+      props = _objectWithoutPropertiesLoose(_ref, _excluded$o);
 
-  var classNames = useStyles({
-    variant: "form." + variant,
+  return React.createElement(Box, Object.assign({
+    as: "input",
+    type: "range",
     css: {
       verticalAlign: 'middle'
     },
+    variant: "slider." + variant,
     className: className
-  });
-  return React.createElement("input", Object.assign({
-    type: "range",
-    className: classNames
   }, props));
 };
 
@@ -1132,6 +1099,7 @@ var ListBox = function ListBox(props) {
 
   return React.createElement(Box, Object.assign({
     as: "ul",
+    p: "none",
     css: {
       listStyle: 'none'
     }
@@ -1151,13 +1119,13 @@ var ListBox = function ListBox(props) {
   }));
 };
 
-var _excluded$s = ["children", "className", "isOpen", "onClose"];
+var _excluded$p = ["children", "className", "isOpen", "onClose"];
 var Popover = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var children = _ref.children,
       className = _ref.className,
       isOpen = _ref.isOpen,
       onClose = _ref.onClose,
-      otherProps = _objectWithoutPropertiesLoose(_ref, _excluded$s);
+      otherProps = _objectWithoutPropertiesLoose(_ref, _excluded$p);
 
   // Handle events that should cause the popup to close,
   var _useOverlay = useOverlay({
@@ -1182,9 +1150,13 @@ var Popover = /*#__PURE__*/forwardRef(function (_ref, ref) {
   }))));
 });
 
-var _excluded$t = ["placeholder", "disabled", "required", "error", "errorMessage", "width", "className"];
+var _excluded$q = ["labelVariant", "placeholder", "disabled", "required", "error", "errorMessage", "width", "className"];
+// ---------------
+
 var Select = function Select(_ref) {
-  var _ref$placeholder = _ref.placeholder,
+  var _ref$labelVariant = _ref.labelVariant,
+      labelVariant = _ref$labelVariant === void 0 ? 'above' : _ref$labelVariant,
+      _ref$placeholder = _ref.placeholder,
       placeholder = _ref$placeholder === void 0 ? 'Select an option' : _ref$placeholder,
       disabled = _ref.disabled,
       required = _ref.required,
@@ -1192,7 +1164,7 @@ var Select = function Select(_ref) {
       errorMessage = _ref.errorMessage,
       width = _ref.width,
       className = _ref.className,
-      props = _objectWithoutPropertiesLoose(_ref, _excluded$t);
+      props = _objectWithoutPropertiesLoose(_ref, _excluded$q);
 
   var state = useSelectState(props);
   var overlayTriggerState = useOverlayTriggerState({});
@@ -1235,7 +1207,7 @@ var Select = function Select(_ref) {
     width: width && width
   }, props.label && React.createElement(Box, null, React.createElement(Label, Object.assign({}, labelProps, {
     htmlFor: labelProps.id,
-    variant: disabled ? 'disabled' : 'above'
+    variant: labelVariant
   }), required ? React.createElement(Box, {
     as: "span",
     display: "inline-flex",
@@ -1267,7 +1239,7 @@ var Select = function Select(_ref) {
     as: ArrowUp,
     size: 16,
     css: {
-      fill: disabled ? 'disabled' : 'text'
+      fill: 'text'
     }
   }) : React.createElement(Box, {
     as: ArrowDown,
@@ -1279,7 +1251,7 @@ var Select = function Select(_ref) {
     as: Popover
   }, overlayProps, positionProps, {
     css: {
-      width: width ? width : triggerRef.current && triggerRef.current.offsetWidth + 'px'
+      width: triggerRef.current && triggerRef.current.offsetWidth + 'px'
     },
     ref: overlayRef,
     isOpen: state.isOpen,
@@ -1301,38 +1273,12 @@ var Select = function Select(_ref) {
   }), React.createElement(ValidationMessage, null, errorMessage)));
 };
 
-var _excluded$u = ["space", "align", "children"];
-var ALIGNMENT = {
-  left: 'flex-start',
-  center: 'center',
-  right: 'flex-end'
-};
-var Stack = function Stack(_ref) {
-  var _ref$space = _ref.space,
-      space = _ref$space === void 0 ? 'none' : _ref$space,
-      _ref$align = _ref.align,
-      align = _ref$align === void 0 ? 'left' : _ref$align,
-      children = _ref.children,
-      props = _objectWithoutPropertiesLoose(_ref, _excluded$u);
+var _excluded$r = ["variant", "htmlFor", "label", "error", "errorMessage", "required", "className", "children"];
+// ---------------
 
-  return React.createElement(Box, Object.assign({}, props, {
-    display: "flex",
-    flexDirection: "column",
-    alignItems: ALIGNMENT[align],
-    css: {
-      '> * + *': {
-        pt: space
-      }
-    }
-  }), Children.map(flattenChildren(children), function (child) {
-    return React.createElement(Box, null, React.cloneElement(child, {}, child.props.children));
-  }));
-};
-
-var _excluded$v = ["variant", "htmlFor", "label", "error", "errorMessage", "required", "className", "children"];
 var Textarea = function Textarea(_ref) {
   var _ref$variant = _ref.variant,
-      variant = _ref$variant === void 0 ? 'default' : _ref$variant,
+      variant = _ref$variant === void 0 ? '' : _ref$variant,
       _ref$htmlFor = _ref.htmlFor,
       htmlFor = _ref$htmlFor === void 0 ? 'textarea' : _ref$htmlFor,
       label = _ref.label,
@@ -1341,7 +1287,7 @@ var Textarea = function Textarea(_ref) {
       required = _ref.required,
       _ref$className = _ref.className,
       className = _ref$className === void 0 ? '' : _ref$className,
-      props = _objectWithoutPropertiesLoose(_ref, _excluded$v);
+      props = _objectWithoutPropertiesLoose(_ref, _excluded$r);
 
   return React.createElement(Box, null, label && React.createElement(Label, {
     htmlFor: htmlFor,
@@ -1360,15 +1306,15 @@ var Textarea = function Textarea(_ref) {
   }), errorMessage));
 };
 
-var _excluded$w = ["children"];
+var _excluded$s = ["children"];
 var Container = function Container(_ref) {
   var children = _ref.children,
-      props = _objectWithoutPropertiesLoose(_ref, _excluded$w);
+      props = _objectWithoutPropertiesLoose(_ref, _excluded$s);
 
   return React.createElement(Box, Object.assign({}, props, {
     width: "100%"
   }), children);
 };
 
-export { ActionGroup, Alert, Badge, Box, Button, Card, Checkbox, Column, Columns, Container, Dialog, Divider, Field, Heading, Hidden, Image, Input, Label, Link, MarigoldProvider, Menu, MenuItem, Message, Radio, Select, Slider, Stack, Text, Textarea, ValidationMessage, useDialogButtonProps };
+export { ActionGroup, Alert, Badge, Button, Card, Checkbox, Column, Columns, Container, Dialog, Divider, Field, Image, Inline, Input, Label, LabelBase, Link, MarigoldProvider, Menu, MenuItem, Message, Radio, Select, Slider, Stack, Text, Textarea, ValidationMessage, useDialogButtonProps };
 //# sourceMappingURL=components.esm.js.map