@spark-web/button 1.1.2 → 1.3.1

package/README.md

@@ -1,6 +1,7 @@
 ---
 title: Button
 storybookPath: forms-buttons-button--default
+isExperimentalPackage: true
 ---
 
 Buttons are clickable elements that are used to trigger actions. They
@@ -196,25 +197,17 @@ with the exception of `href` vs `onClick` props.
 </Text>
 ```
 
-## Props
-
-| Prop              | Type                                                                                     | Default   | Description                                                                                                                               |
-| ----------------- | ---------------------------------------------------------------------------------------- | --------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
-| aria-controls?    | string                                                                                   |           | Identifies the element (or elements) whose contents or presence are controlled by the current element. Only applicable for `Button`.      |
-| aria-describedby? | string                                                                                   |           | Identifies the element (or elements) that describes the object. Only applicable for `Button`.                                             |
-| aria-expanded?    | string                                                                                   |           | Indicates whether the element, or another grouping element it controls, is currently expanded or collapsed. Only applicable for `Button`. |
-| children          | string \| React.ReactElement\<IconProps>                                                 |           | Children element to be rendered inside the button.                                                                                        |
-| data?             | [DataAttributeMap][data-attribute-map]                                                   |           | Allows setting of data attributes on the button.                                                                                          |
-| disabled?         | boolean                                                                                  |           | When true, prevents `onClick` from firing. Only applicable for `Button`.                                                                  |
-| href              | string                                                                                   |           | Specifies the url the button should redirect to upon being clicked. Only applicable for `ButtonLink`.                                     |
-| id?               | string                                                                                   |           | Unique identifier for the button.                                                                                                         |
-| label?            | string                                                                                   |           | Implicit label for buttons only required for icon-only buttons for accessibility reasons.                                                 |
-| loading?          | boolean                                                                                  |           | When true, the button will display a loading spinner.                                                                                     |
-| onClick?          | Function                                                                                 |           | Function to be fired following a click event of the button. Only applicable for `Button`.                                                 |
-| prominence?       | 'high' \| 'low'                                                                          | 'high'    | Sets the visual prominence of the button.                                                                                                 |
-| size?             | 'medium' \| 'large'                                                                      | 'medium'  | Sets the size of the button.                                                                                                              |
-| tone?             | 'primary' \| 'secondary' \| 'neutral' \| 'positive' \| 'caution' \| 'critical' \| 'info' | 'primary' | Sets the tone of the button.                                                                                                              |
-| type?             | 'button' \| 'submit' \| 'reset'                                                          | 'button'  | Sets the button type. Only applicable for `Button`.                                                                                       |
-
-[data-attribute-map]:
-  https://github.com/brighte-labs/spark-web/blob/e7f6f4285b4cfd876312cc89fbdd094039aa239a/packages/utils/src/internal/buildDataAttributes.ts#L1
+## BaseButton
+
+Unstyled button primitive that:
+
+- Forwards the button ref
+- Provides a default type of `button` (so it doesn't accidently submit forms if
+  left off)
+- Prevents `onClick` from firing when disabled without disabling the button
+- Forces focus of the underlying button when clicked (to address a bug in
+  Safari)
+
+## Button Props
+
+<PropsTable displayName="Button" />

package/dist/declarations/src/BaseButton.d.ts

@@ -0,0 +1,10 @@
+import type { BoxProps } from '@spark-web/box';
+import type { MouseEvent as ReactMouseEvent } from 'react';
+import type { NativeButtonProps } from './types';
+export declare type BaseButtonProps = NativeButtonProps & Partial<BoxProps>;
+export declare const BaseButton: import("react").ForwardRefExoticComponent<NativeButtonProps & Partial<BoxProps> & import("react").RefAttributes<HTMLButtonElement>>;
+/**
+ * handle "disabled" behaviour w/o disabling buttons
+ * @see https://axesslab.com/disabled-buttons-suck/
+ */
+export declare function getPreventableClickHandler(onClick: BaseButtonProps['onClick'], disabled: boolean): (event: ReactMouseEvent<HTMLButtonElement, MouseEvent>) => void;

package/dist/declarations/src/Button.d.ts

@@ -1,4 +1,4 @@
-import type { MouseEvent as ReactMouseEvent } from 'react';
+/// <reference types="react" />
 import type { CommonButtonProps, NativeButtonProps } from './types';
 export declare type ButtonProps = CommonButtonProps & {
     /**
@@ -26,9 +26,3 @@ export declare type ButtonProps = CommonButtonProps & {
  * action will occur when the user interacts with it.
  */
 export declare const Button: import("react").ForwardRefExoticComponent<ButtonProps & import("react").RefAttributes<HTMLButtonElement>>;
-/**
- * Prevent click events when the component is "disabled".
- * Note: we don't want to actually disable a button element for several reasons.
- * One being because that would prohibit the use of tooltips.
- */
-export declare function getPreventableClickHandler(onClick: NativeButtonProps['onClick'], disabled: boolean): (event: ReactMouseEvent<HTMLButtonElement, MouseEvent>) => void;

package/dist/declarations/src/ButtonLink.d.ts

@@ -5,5 +5,5 @@ export declare type ButtonLinkProps = LinkComponentProps & CommonButtonProps;
 /** The appearance of a `Button`, with the semantics of a link. */
 export declare const ButtonLink: <Comp extends import("react").ElementType<any> = "a">(props: {
     as?: Comp | undefined;
-    ref?: import("react").Ref<Comp extends "symbol" | "clipPath" | "filter" | "mask" | "marker" | "svg" | "animate" | "animateMotion" | "animateTransform" | "circle" | "defs" | "desc" | "ellipse" | "feBlend" | "feColorMatrix" | "feComponentTransfer" | "feComposite" | "feConvolveMatrix" | "feDiffuseLighting" | "feDisplacementMap" | "feDistantLight" | "feDropShadow" | "feFlood" | "feFuncA" | "feFuncB" | "feFuncG" | "feFuncR" | "feGaussianBlur" | "feImage" | "feMerge" | "feMergeNode" | "feMorphology" | "feOffset" | "fePointLight" | "feSpecularLighting" | "feSpotLight" | "feTile" | "feTurbulence" | "foreignObject" | "g" | "image" | "line" | "linearGradient" | "metadata" | "mpath" | "path" | "pattern" | "polygon" | "polyline" | "radialGradient" | "rect" | "stop" | "switch" | "text" | "textPath" | "tspan" | "use" | "view" | keyof HTMLElementTagNameMap | "set" ? (HTMLElementTagNameMap & Pick<SVGElementTagNameMap, "symbol" | "clipPath" | "filter" | "mask" | "marker" | "svg" | "animate" | "animateMotion" | "animateTransform" | "circle" | "defs" | "desc" | "ellipse" | "feBlend" | "feColorMatrix" | "feComponentTransfer" | "feComposite" | "feConvolveMatrix" | "feDiffuseLighting" | "feDisplacementMap" | "feDistantLight" | "feDropShadow" | "feFlood" | "feFuncA" | "feFuncB" | "feFuncG" | "feFuncR" | "feGaussianBlur" | "feImage" | "feMerge" | "feMergeNode" | "feMorphology" | "feOffset" | "fePointLight" | "feSpecularLighting" | "feSpotLight" | "feTile" | "feTurbulence" | "foreignObject" | "g" | "image" | "line" | "linearGradient" | "metadata" | "mpath" | "path" | "pattern" | "polygon" | "polyline" | "radialGradient" | "rect" | "stop" | "switch" | "text" | "textPath" | "tspan" | "use" | "view" | "set">)[Comp] : Comp extends new (...args: any) => any ? InstanceType<Comp> : undefined> | undefined;
+    ref?: import("react").Ref<Comp extends "symbol" | "svg" | "animate" | "animateMotion" | "animateTransform" | "circle" | "clipPath" | "defs" | "desc" | "ellipse" | "feBlend" | "feColorMatrix" | "feComponentTransfer" | "feComposite" | "feConvolveMatrix" | "feDiffuseLighting" | "feDisplacementMap" | "feDistantLight" | "feDropShadow" | "feFlood" | "feFuncA" | "feFuncB" | "feFuncG" | "feFuncR" | "feGaussianBlur" | "feImage" | "feMerge" | "feMergeNode" | "feMorphology" | "feOffset" | "fePointLight" | "feSpecularLighting" | "feSpotLight" | "feTile" | "feTurbulence" | "filter" | "foreignObject" | "g" | "image" | "line" | "linearGradient" | "marker" | "mask" | "metadata" | "mpath" | "path" | "pattern" | "polygon" | "polyline" | "radialGradient" | "rect" | "stop" | "switch" | "text" | "textPath" | "tspan" | "use" | "view" | "set" | keyof HTMLElementTagNameMap ? (HTMLElementTagNameMap & Pick<SVGElementTagNameMap, "symbol" | "svg" | "animate" | "animateMotion" | "animateTransform" | "circle" | "clipPath" | "defs" | "desc" | "ellipse" | "feBlend" | "feColorMatrix" | "feComponentTransfer" | "feComposite" | "feConvolveMatrix" | "feDiffuseLighting" | "feDisplacementMap" | "feDistantLight" | "feDropShadow" | "feFlood" | "feFuncA" | "feFuncB" | "feFuncG" | "feFuncR" | "feGaussianBlur" | "feImage" | "feMerge" | "feMergeNode" | "feMorphology" | "feOffset" | "fePointLight" | "feSpecularLighting" | "feSpotLight" | "feTile" | "feTurbulence" | "filter" | "foreignObject" | "g" | "image" | "line" | "linearGradient" | "marker" | "mask" | "metadata" | "mpath" | "path" | "pattern" | "polygon" | "polyline" | "radialGradient" | "rect" | "stop" | "switch" | "text" | "textPath" | "tspan" | "use" | "view" | "set">)[Comp] : Comp extends new (...args: any) => any ? InstanceType<Comp> : undefined> | undefined;
 } & Omit<import("react").PropsWithoutRef<import("react").ComponentProps<Comp>>, "as"> & ButtonLinkProps) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;

package/dist/declarations/src/index.d.ts

@@ -1,4 +1,6 @@
+export { BaseButton } from './BaseButton';
 export { Button } from './Button';
 export { ButtonLink } from './ButtonLink';
+export type { BaseButtonProps } from './BaseButton';
 export type { ButtonProps } from './Button';
 export type { ButtonLinkProps } from './ButtonLink';

package/dist/declarations/src/types.d.ts

@@ -5,10 +5,10 @@ import type { ButtonHTMLAttributes, ReactElement } from 'react';
 import type { mapTokens } from './utils';
 export declare type ButtonSize = keyof typeof mapTokens[keyof typeof mapTokens];
 export declare type ButtonProminence = 'high' | 'low' | 'none';
-export declare type ButtonTone = BackgroundTone;
+export declare type ButtonTone = Exclude<BackgroundTone, 'disabled'>;
 declare type ChildrenWithText = {
     label?: never;
-    children: string | [ReactElement<IconProps>, string] | [string, ReactElement<IconProps>];
+    children: string | number | [ReactElement<IconProps>, string | number] | [string | number, ReactElement<IconProps>];
 };
 declare type IconOnly = {
     /**

package/dist/declarations/src/utils.d.ts

@@ -2,19 +2,30 @@ import type { BoxProps } from '@spark-web/box';
 import type { ForegroundTone } from '@spark-web/text';
 import type { BrighteTheme } from '@spark-web/theme';
 import type { ButtonProminence, ButtonTone } from './types';
-declare type ButtonStyles = {
+declare type BaseButtonStyles = {
     background: BoxProps['background'];
     border?: BoxProps['border'];
     borderWidth?: BoxProps['borderWidth'];
     textTone?: ForegroundTone;
+};
+declare type HoverButtonStyles = {
     backgroundHover: keyof BrighteTheme['backgroundInteractions'];
     borderHover?: keyof BrighteTheme['border']['color'];
     textToneHover?: keyof BrighteTheme['color']['foreground'];
+};
+declare type ActiveButtonStyles = {
     backgroundActive: keyof BrighteTheme['backgroundInteractions'];
     borderActive?: keyof BrighteTheme['border']['color'];
     textToneActive?: keyof BrighteTheme['color']['foreground'];
 };
-export declare const variants: Record<ButtonProminence, Record<ButtonTone, ButtonStyles | undefined>>;
+declare type DisabledButtonStyles = {
+    backgroundDisabled: keyof BrighteTheme['color']['background'];
+    borderDisabled?: keyof BrighteTheme['border']['color'];
+    textToneDisabled: keyof BrighteTheme['color']['foreground'];
+};
+declare type ButtonStyles = BaseButtonStyles & HoverButtonStyles & ActiveButtonStyles & DisabledButtonStyles;
+declare type Variants = Record<ButtonProminence, Record<ButtonTone, ButtonStyles | undefined>>;
+export declare const variants: Variants;
 export declare const mapTokens: {
     readonly fontSize: {
         readonly medium: "small";

package/dist/spark-web-button.cjs.dev.js

@@ -4,51 +4,124 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
-var a11y = require('@spark-web/a11y');
 var box = require('@spark-web/box');
-var spinner = require('@spark-web/spinner');
-var internal = require('@spark-web/utils/internal');
+var utils = require('@spark-web/utils');
 var react = require('react');
-var text = require('@spark-web/text');
 var jsxRuntime = require('react/jsx-runtime');
+var a11y = require('@spark-web/a11y');
+var spinner = require('@spark-web/spinner');
+var text = require('@spark-web/text');
 var css = require('@emotion/css');
 var theme = require('@spark-web/theme');
 var link = require('@spark-web/link');
+var internal = require('@spark-web/utils/internal');
 var ts = require('@spark-web/utils/ts');
 
+var _excluded$2 = ["onClick", "disabled", "type"];
+var BaseButton = /*#__PURE__*/react.forwardRef(function (_ref, forwardedRef) {
+  var onClickProp = _ref.onClick,
+      _ref$disabled = _ref.disabled,
+      disabled = _ref$disabled === void 0 ? false : _ref$disabled,
+      _ref$type = _ref.type,
+      type = _ref$type === void 0 ? 'button' : _ref$type,
+      consumerProps = _objectWithoutProperties(_ref, _excluded$2);
+
+  var internalRef = react.useRef(null);
+  var composedRef = utils.useComposedRefs(internalRef, forwardedRef);
+  /**
+   * In Safari buttons are not focused automatically by the browser once
+   * pressed, the default behaviour is to focus the nearest focusable ancestor.
+   * To fix this we need to manually focus the button element after the user
+   * presses the element.
+   */
+
+  var onClick = react.useCallback(function (event) {
+    var _internalRef$current;
+
+    (_internalRef$current = internalRef.current) === null || _internalRef$current === void 0 ? void 0 : _internalRef$current.focus();
+    var preventableClickHandler = getPreventableClickHandler(onClickProp, disabled);
+    preventableClickHandler(event);
+  }, [disabled, onClickProp]);
+  return /*#__PURE__*/jsxRuntime.jsx(box.Box, _objectSpread(_objectSpread({}, consumerProps), {}, {
+    as: "button",
+    ref: composedRef,
+    "aria-disabled": disabled,
+    onClick: onClick,
+    type: type
+  }));
+});
+BaseButton.displayName = 'BaseButton';
+/**
+ * handle "disabled" behaviour w/o disabling buttons
+ * @see https://axesslab.com/disabled-buttons-suck/
+ */
+
+function getPreventableClickHandler(onClick, disabled) {
+  return function handleClick(event) {
+    if (disabled) {
+      event.preventDefault();
+    } else {
+      onClick === null || onClick === void 0 ? void 0 : onClick(event);
+    }
+  };
+}
+
+var highDisabledStyles = {
+  backgroundDisabled: 'disabled',
+  borderDisabled: 'fieldDisabled',
+  textToneDisabled: 'neutralInverted'
+};
+var highDisabledAltStyles = {
+  backgroundDisabled: 'neutral',
+  borderDisabled: 'standard',
+  textToneDisabled: 'placeholder'
+};
+var lowDisabledStyles = {
+  backgroundDisabled: 'inputDisabled',
+  textToneDisabled: 'disabled'
+};
+var lowDisabledAltStyles = {
+  backgroundDisabled: 'inputDisabled',
+  borderDisabled: 'fieldDisabled',
+  textToneDisabled: 'disabled'
+};
+var noneDisabledStyles = {
+  backgroundDisabled: 'neutral',
+  textToneDisabled: 'disabled'
+};
 var variants = {
   high: {
-    primary: {
+    primary: _objectSpread({
       background: 'primary',
       backgroundHover: 'primaryHover',
       backgroundActive: 'primaryActive'
-    },
-    secondary: {
+    }, highDisabledStyles),
+    secondary: _objectSpread({
       background: 'secondary',
       backgroundHover: 'secondaryHover',
       backgroundActive: 'secondaryActive'
-    },
-    neutral: {
+    }, highDisabledStyles),
+    neutral: _objectSpread({
       background: 'neutral',
       border: 'field',
       backgroundHover: 'neutralHover',
       backgroundActive: 'neutralActive'
-    },
-    positive: {
+    }, highDisabledAltStyles),
+    positive: _objectSpread({
       background: 'positive',
       backgroundHover: 'positiveHover',
       backgroundActive: 'positiveActive'
-    },
-    critical: {
+    }, highDisabledStyles),
+    critical: _objectSpread({
       background: 'critical',
       backgroundHover: 'criticalHover',
       backgroundActive: 'criticalActive'
-    },
+    }, highDisabledStyles),
     caution: undefined,
     info: undefined
   },
   low: {
-    primary: {
+    primary: _objectSpread({
       background: 'surface',
       border: 'primary',
       borderWidth: 'large',
@@ -59,8 +132,8 @@ var variants = {
       backgroundActive: 'none',
       borderActive: 'primaryActive',
       textToneActive: 'primaryActive'
-    },
-    secondary: {
+    }, lowDisabledAltStyles),
+    secondary: _objectSpread({
       background: 'surface',
       border: 'secondary',
       borderWidth: 'large',
@@ -71,76 +144,76 @@ var variants = {
       backgroundActive: 'none',
       borderActive: 'secondaryActive',
       textToneActive: 'secondaryActive'
-    },
-    neutral: {
+    }, lowDisabledAltStyles),
+    neutral: _objectSpread({
       background: 'neutralLow',
       backgroundHover: 'neutralLowHover',
       backgroundActive: 'neutralLowActive'
-    },
-    positive: {
+    }, lowDisabledStyles),
+    positive: _objectSpread({
       background: 'positiveLow',
       backgroundHover: 'positiveLowHover',
       backgroundActive: 'positiveLowActive'
-    },
-    caution: {
+    }, lowDisabledStyles),
+    caution: _objectSpread({
       background: 'cautionLow',
       backgroundHover: 'cautionLowHover',
       backgroundActive: 'cautionLowActive'
-    },
-    critical: {
+    }, lowDisabledStyles),
+    critical: _objectSpread({
       background: 'criticalLow',
       backgroundHover: 'criticalLowHover',
       backgroundActive: 'criticalLowActive'
-    },
-    info: {
+    }, lowDisabledStyles),
+    info: _objectSpread({
       background: 'infoLow',
       backgroundHover: 'infoLowHover',
       backgroundActive: 'infoLowActive'
-    }
+    }, lowDisabledStyles)
   },
   none: {
-    primary: {
+    primary: _objectSpread({
       background: 'surface',
       textTone: 'primaryActive',
       backgroundHover: 'primaryLowHover',
       backgroundActive: 'primaryLowActive'
-    },
-    secondary: {
+    }, noneDisabledStyles),
+    secondary: _objectSpread({
       background: 'surface',
       textTone: 'secondaryActive',
       backgroundHover: 'secondaryLowHover',
       backgroundActive: 'secondaryLowActive'
-    },
-    neutral: {
+    }, noneDisabledStyles),
+    neutral: _objectSpread({
       background: 'surface',
       textTone: 'neutral',
       backgroundHover: 'neutralLowHover',
       backgroundActive: 'neutralLowActive'
-    },
-    positive: {
+    }, noneDisabledStyles),
+    positive: _objectSpread({
       background: 'surface',
       textTone: 'positive',
       backgroundHover: 'positiveLowHover',
       backgroundActive: 'positiveLowActive'
-    },
-    caution: {
+    }, noneDisabledStyles),
+    caution: _objectSpread({
       background: 'surface',
       textTone: 'caution',
       backgroundHover: 'cautionLowHover',
       backgroundActive: 'cautionLowActive'
-    },
-    critical: {
+    }, noneDisabledStyles),
+    critical: _objectSpread({
       background: 'surface',
       textTone: 'critical',
       backgroundHover: 'criticalLowHover',
       backgroundActive: 'criticalLowActive'
-    },
-    info: {
+    }, noneDisabledStyles),
+    info: _objectSpread({
       background: 'surface',
       textTone: 'info',
       backgroundHover: 'infoLowHover',
       backgroundActive: 'infoLowActive'
-    }
+    }, noneDisabledStyles)
   }
 };
 var mapTokens = {
@@ -166,7 +239,7 @@ var resolveButtonChildren = function resolveButtonChildren(_ref) {
       tone = _ref.tone;
   var variant = variants[prominence][tone];
   return react.Children.map(children, function (child) {
-    if (typeof child === 'string') {
+    if (typeof child === 'string' || typeof child === 'number') {
       return /*#__PURE__*/jsxRuntime.jsx(HiddenWhenLoading, {
         isLoading: isLoading,
         children: /*#__PURE__*/jsxRuntime.jsx(text.Text, {
@@ -222,9 +295,12 @@ function useButtonStyles(_ref) {
   var focusRingStyles = a11y.useFocusRing({
     tone: tone
   });
+  var disabledFocusRingStyles = a11y.useFocusRing({
+    tone: 'disabled'
+  });
   var variant = variants[prominence][tone];
   var isLarge = size === 'large';
-  var transitionColours = {
+  var transitionColors = {
     transitionProperty: 'color, background-color, border-color, text-decoration-color',
     transitionTimingFunction: 'cubic-bezier(0.02, 1.505, 0.745, 1.235)',
     transitionDuration: "".concat(theme$1.animation.standard.duration, "ms")
@@ -244,27 +320,39 @@ function useButtonStyles(_ref) {
     position: 'relative',
     width: iconOnly ? mapTokens.size[size] : undefined,
     // interactions styles
-    className: css.css(_objectSpread(_objectSpread({}, transitionColours), {}, {
-      '&:hover': {
-        borderColor: variant !== null && variant !== void 0 && variant.borderHover ? theme$1.border.color[variant.borderHover] : undefined,
-        backgroundColor: variant !== null && variant !== void 0 && variant.backgroundHover ? theme$1.backgroundInteractions[variant.backgroundHover] : undefined,
-        // Style button text when hovering
-        '> *': _objectSpread(_objectSpread({}, transitionColours), {}, {
-          color: variant !== null && variant !== void 0 && variant.textToneHover ? theme$1.color.foreground[variant.textToneHover] : undefined,
-          stroke: variant !== null && variant !== void 0 && variant.textToneHover ? theme$1.color.foreground[variant.textToneHover] : undefined
-        })
+    className: css.css(_objectSpread(_objectSpread({}, transitionColors), {}, {
+      '&:not([aria-disabled=true])': {
+        ':hover': {
+          borderColor: variant !== null && variant !== void 0 && variant.borderHover ? theme$1.border.color[variant.borderHover] : undefined,
+          backgroundColor: variant !== null && variant !== void 0 && variant.backgroundHover ? theme$1.backgroundInteractions[variant.backgroundHover] : undefined,
+          // Style button text when hovering
+          '> *': _objectSpread(_objectSpread({}, transitionColors), {}, {
+            color: variant !== null && variant !== void 0 && variant.textToneHover ? theme$1.color.foreground[variant.textToneHover] : undefined,
+            stroke: variant !== null && variant !== void 0 && variant.textToneHover ? theme$1.color.foreground[variant.textToneHover] : undefined
+          })
+        },
+        ':active': {
+          borderColor: variant !== null && variant !== void 0 && variant.borderActive ? theme$1.border.color[variant.borderActive] : undefined,
+          backgroundColor: variant !== null && variant !== void 0 && variant.backgroundActive ? theme$1.backgroundInteractions[variant === null || variant === void 0 ? void 0 : variant.backgroundActive] : undefined,
+          transform: 'scale(0.98)',
+          // Style button text when it's active
+          '> *': _objectSpread(_objectSpread({}, transitionColors), {}, {
+            color: variant !== null && variant !== void 0 && variant.textToneActive ? theme$1.color.foreground[variant.textToneActive] : undefined,
+            stroke: variant !== null && variant !== void 0 && variant.textToneActive ? theme$1.color.foreground[variant.textToneActive] : undefined
+          })
+        },
+        ':focus': focusRingStyles
       },
-      '&:active': {
-        borderColor: variant !== null && variant !== void 0 && variant.borderActive ? theme$1.border.color[variant.borderActive] : undefined,
-        backgroundColor: variant !== null && variant !== void 0 && variant.backgroundActive ? theme$1.backgroundInteractions[variant === null || variant === void 0 ? void 0 : variant.backgroundActive] : undefined,
-        transform: 'scale(0.98)',
-        // Style button text when it's active
-        '> *': _objectSpread(_objectSpread({}, transitionColours), {}, {
-          color: variant !== null && variant !== void 0 && variant.textToneActive ? theme$1.color.foreground[variant.textToneActive] : undefined,
-          stroke: variant !== null && variant !== void 0 && variant.textToneActive ? theme$1.color.foreground[variant.textToneActive] : undefined
-        })
-      },
-      ':focus': focusRingStyles
+      '&[aria-disabled=true]': {
+        backgroundColor: variant !== null && variant !== void 0 && variant.backgroundDisabled ? theme$1.color.background[variant === null || variant === void 0 ? void 0 : variant.backgroundDisabled] : undefined,
+        borderColor: variant !== null && variant !== void 0 && variant.borderDisabled ? theme$1.border.color[variant.borderDisabled] : undefined,
+        cursor: 'default',
+        '*': {
+          color: variant !== null && variant !== void 0 && variant.textToneDisabled ? theme$1.color.foreground[variant.textToneDisabled] : undefined,
+          stroke: variant !== null && variant !== void 0 && variant.textToneDisabled ? theme$1.color.foreground[variant.textToneDisabled] : undefined
+        },
+        ':focus': disabledFocusRingStyles
+      }
     }))
   };
   return buttonStyleProps;
@@ -276,13 +364,12 @@ var _excluded$1 = ["aria-controls", "aria-describedby", "aria-expanded", "data",
  * Buttons are used to initialize an action, their label should express what
  * action will occur when the user interacts with it.
  */
-var Button = /*#__PURE__*/react.forwardRef(function (_ref, ref) {
+var Button = /*#__PURE__*/react.forwardRef(function (_ref, forwardedRef) {
   var ariaControls = _ref['aria-controls'],
       ariaDescribedBy = _ref['aria-describedby'],
       ariaExpanded = _ref['aria-expanded'],
       data = _ref.data,
-      _ref$disabled = _ref.disabled,
-      disabled = _ref$disabled === void 0 ? false : _ref$disabled,
+      disabled = _ref.disabled,
       id = _ref.id,
       _ref$loading = _ref.loading,
       loading = _ref$loading === void 0 ? false : _ref$loading,
@@ -293,8 +380,7 @@ var Button = /*#__PURE__*/react.forwardRef(function (_ref, ref) {
       size = _ref$size === void 0 ? 'medium' : _ref$size,
       _ref$tone = _ref.tone,
       tone = _ref$tone === void 0 ? 'primary' : _ref$tone,
-      _ref$type = _ref.type,
-      type = _ref$type === void 0 ? 'button' : _ref$type,
+      type = _ref.type,
       props = _objectWithoutProperties(_ref, _excluded$1);
 
   var iconOnly = Boolean(props.label);
@@ -307,24 +393,17 @@ var Button = /*#__PURE__*/react.forwardRef(function (_ref, ref) {
   var isDisabled = disabled || loading;
   var isLoading = loading && !disabled;
   var variant = variants[prominence][tone];
-  /**
-   * handle "disabled" behaviour w/o disabling buttons
-   * @see https://axesslab.com/disabled-buttons-suck/
-   */
-
-  var handleClick = getPreventableClickHandler(onClick, isDisabled);
-  return /*#__PURE__*/jsxRuntime.jsxs(box.Box, _objectSpread(_objectSpread(_objectSpread({
+  return /*#__PURE__*/jsxRuntime.jsxs(BaseButton, _objectSpread(_objectSpread({}, buttonStyleProps), {}, {
     "aria-controls": ariaControls,
     "aria-describedby": ariaDescribedBy,
-    "aria-disabled": isDisabled,
     "aria-expanded": ariaExpanded,
     "aria-label": props.label,
-    as: "button",
+    data: data,
+    disabled: isDisabled,
     id: id,
-    onClick: handleClick,
-    ref: ref,
-    type: type
-  }, buttonStyleProps), data ? internal.buildDataAttributes(data) : undefined), {}, {
+    onClick: onClick,
+    ref: forwardedRef,
+    type: type,
     children: [resolveButtonChildren(_objectSpread(_objectSpread({}, props), {}, {
       isLoading: isLoading,
       prominence: prominence,
@@ -336,21 +415,6 @@ var Button = /*#__PURE__*/react.forwardRef(function (_ref, ref) {
   }));
 });
 Button.displayName = 'Button';
-/**
- * Prevent click events when the component is "disabled".
- * Note: we don't want to actually disable a button element for several reasons.
- * One being because that would prohibit the use of tooltips.
- */
-
-function getPreventableClickHandler(onClick, disabled) {
-  return function handleClick(event) {
-    if (disabled) {
-      event.preventDefault();
-    } else {
-      onClick === null || onClick === void 0 ? void 0 : onClick(event);
-    }
-  };
-}
 
 function Loading(_ref2) {
   var tone = _ref2.tone;
@@ -413,5 +477,6 @@ var ButtonLink = ts.forwardRefWithAs(function (_ref, ref) {
   }));
 });
 
+exports.BaseButton = BaseButton;
 exports.Button = Button;
 exports.ButtonLink = ButtonLink;