@workday/canvas-kit-react 7.0.0-alpha.0-next.5 → 7.0.0-alpha.78-next.6

package/dist/es6/button/lib/BaseButton.d.ts

@@ -0,0 +1,31 @@
+import * as React from 'react';
+import { GrowthBehavior } from '@workday/canvas-kit-react/common';
+import { BoxProps } from '@workday/canvas-kit-react/layout';
+import { ButtonColors, ButtonSizes, IconPositions, TertiaryButtonSizes } from './types';
+import { CanvasSystemIcon } from '@workday/design-assets-types';
+export interface ButtonContainerProps extends BoxProps, GrowthBehavior {
+    colors?: ButtonColors;
+    /**
+     * There are four button sizes: `extraSmall`, `small`, `medium`, and `large`.
+     * If no size is provided, it will default to `medium`.
+     *
+     * @default 'medium'
+     */
+    size?: ButtonSizes;
+    /**
+     * The ref to the button that the styled component renders.
+     */
+    ref?: React.Ref<HTMLButtonElement>;
+    /**
+     * Whether the icon should received filled (colored background layer) or regular styles.
+     * Corresponds to `toggled` in ToolbarIconButton
+     */
+    fillIcon?: boolean;
+}
+export declare const getMinWidthStyles: (children: React.ReactNode, size: ButtonSizes | TertiaryButtonSizes) => "auto" | "24px" | "32px" | "40px" | "80px" | "48px" | "112px" | "96px";
+export declare const getPaddingStyles: (children: React.ReactNode, size: ButtonSizes | TertiaryButtonSizes, icon: CanvasSystemIcon | undefined, iconPosition: IconPositions | undefined) => string | 0;
+export declare const BaseButton: import("../../common").ElementComponent<"button", ButtonContainerProps> & {
+    Icon: import("../../common").ElementComponent<"span", import("./parts/ButtonLabelIcon").ButtonLabelIconProps>;
+    Label: import("../../common").ElementComponent<"span", import("./parts/ButtonLabel").ButtonLabelProps>;
+};
+//# sourceMappingURL=BaseButton.d.ts.map

package/dist/es6/button/lib/BaseButton.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"BaseButton.d.ts","sourceRoot":"","sources":["../../../../button/lib/BaseButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAK/B,OAAO,EAEL,cAAc,EAMf,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAC,QAAQ,EAAa,MAAM,kCAAkC,CAAC;AAGtE,OAAO,EAAC,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,mBAAmB,EAAC,MAAM,SAAS,CAAC;AAGtF,OAAO,EAAC,gBAAgB,EAAC,MAAM,8BAA8B,CAAC;AAE9D,MAAM,WAAW,oBAAqB,SAAQ,QAAQ,EAAE,cAAc;IACpE,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB;;OAEG;IACH,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACnC;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAgLD,eAAO,MAAM,iBAAiB,aAClB,MAAM,SAAS,QACnB,WAAW,GAAG,mBAAmB,2EAcxC,CAAC;AAEF,eAAO,MAAM,gBAAgB,aACjB,MAAM,SAAS,QACnB,WAAW,GAAG,mBAAmB,QACjC,gBAAgB,GAAG,SAAS,gBACpB,aAAa,GAAG,SAAS,eAiDxC,CAAC;AAEF,eAAO,MAAM,UAAU;;;CAarB,CAAC"}

package/dist/es6/button/lib/BaseButton.js

@@ -0,0 +1,174 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+import * as React from 'react';
+import { ButtonLabelIcon } from './parts/ButtonLabelIcon';
+import { ButtonLabel } from './parts/ButtonLabel';
+import { createComponent, mouseFocusBehavior, focusRing, styled, } from '@workday/canvas-kit-react/common';
+import { boxStyleFn } from '@workday/canvas-kit-react/layout';
+import { borderRadius, space, spaceNumbers, type } from '@workday/canvas-kit-react/tokens';
+function getIconColorSelectors(_a, color, fill) {
+    var themePrimary = _a.canvas.palette.primary;
+    return {
+        '&:focus span, &:hover span, & span': {
+            '.wd-icon-fill, .wd-icon-accent, .wd-icon-accent2': {
+                fill: color,
+            },
+            '.wd-icon-background': {
+                fill: fill ? color : undefined,
+            },
+            '.wd-icon-background ~ .wd-icon-accent, .wd-icon-background ~ .wd-icon-accent2': {
+                fill: fill
+                    ? color === themePrimary.contrast
+                        ? themePrimary.main
+                        : themePrimary.contrast
+                    : color,
+            },
+        },
+    };
+}
+var ButtonContainer = styled('button')(__assign(__assign({}, type.levels.subtext.large), { cursor: 'pointer', display: 'inline-flex', alignItems: 'center', justifyContent: 'center', boxSizing: 'border-box', boxShadow: 'none', outline: 'none', fontWeight: type.properties.fontWeights.bold, lineHeight: 'normal', whiteSpace: 'nowrap', WebkitFontSmoothing: 'antialiased', MozOsxFontSmoothing: 'grayscale', borderRadius: borderRadius.circle, position: 'relative', verticalAlign: 'middle', overflow: 'hidden', border: '1px solid transparent', background: 'transparent', transition: 'box-shadow 120ms linear, border 120ms linear, background-color 120ms linear, color 120ms linear', '&:disabled, &:disabled:active': {
+        cursor: 'default',
+        boxShadow: 'none',
+        opacity: 0.4,
+    }, '&:hover:active': { transitionDuration: '40ms' }, '& > *:first-of-type': {
+        marginLeft: '0',
+    }, '& > *:last-of-type': {
+        marginRight: 0,
+    } }), function (_a) {
+    var size = _a.size;
+    switch (size) {
+        case 'large':
+            return __assign(__assign({}, type.levels.body.small), { fontWeight: type.properties.fontWeights.bold, height: '48px', '& > * ': {
+                    margin: "0 " + spaceNumbers.xxs / 2 + "px",
+                } });
+        case 'medium':
+        default:
+            return {
+                height: space.xl,
+                '& > * ': {
+                    margin: "0 " + spaceNumbers.xxs / 2 + "px",
+                },
+            };
+        case 'small':
+            return {
+                height: space.l,
+                '& > * ': {
+                    margin: "0 " + spaceNumbers.xxxs / 2 + "px",
+                },
+            };
+        case 'extraSmall':
+            return __assign(__assign({}, type.levels.subtext.medium), { fontWeight: type.properties.fontWeights.bold, height: space.m, '& > * ': {
+                    margin: "0 " + spaceNumbers.xxxs / 2 + "px",
+                } });
+    }
+}, function (_a) {
+    var grow = _a.grow;
+    return grow && { width: '100%', maxWidth: '100%' };
+}, function (_a) {
+    var colors = _a.colors, fillIcon = _a.fillIcon, theme = _a.theme;
+    if (!colors) {
+        return;
+    }
+    var baseStyles = __assign({ backgroundColor: colors.default.background, borderColor: colors.default.border, color: colors.default.label }, (colors.default.icon && __assign({ '.wd-icon-fill, .wd-icon-accent, .wd-icon-accent2, .wd-icon-background': {
+            transition: 'fill 120ms ease-in',
+        } }, getIconColorSelectors(theme, colors.default.icon, fillIcon))));
+    var hoverStyles = {
+        '&:hover': __assign({ backgroundColor: colors.hover.background, borderColor: colors.hover.border, color: colors.hover.label }, (colors.hover.icon && getIconColorSelectors(theme, colors.hover.icon, fillIcon))),
+    };
+    var activeStyles = {
+        '&:active, &:focus:active, &:hover:active': __assign({ backgroundColor: colors.active.background, borderColor: colors.active.border, color: colors.active.label }, (colors.active.icon && getIconColorSelectors(theme, colors.active.icon, fillIcon))),
+    };
+    return __assign(__assign(__assign(__assign(__assign(__assign({}, baseStyles), { '&:focus': __assign(__assign({ backgroundColor: colors.focus.background, borderColor: colors.focus.border, color: colors.focus.label }, (colors.focus.focusRing || focusRing({ separation: 2 }, theme))), (colors.focus.icon && getIconColorSelectors(theme, colors.focus.icon, fillIcon))) }), activeStyles), hoverStyles), { '&:disabled, &:active:disabled, &:focus:disabled, &:hover:disabled': __assign({ backgroundColor: colors.disabled.background, borderColor: colors.disabled.border, color: colors.disabled.label, opacity: colors.disabled.opacity }, (colors.disabled.icon && getIconColorSelectors(theme, colors.disabled.icon, fillIcon))) }), mouseFocusBehavior({
+        '&:focus': __assign(__assign(__assign(__assign({}, baseStyles), { outline: 'none', boxShadow: 'none', animation: 'none' }), hoverStyles), activeStyles),
+    }));
+}, boxStyleFn);
+export var getMinWidthStyles = function (children, size) {
+    switch (size) {
+        case 'large':
+            return children ? '112px' : '48px';
+        case 'medium':
+            return children ? '96px' : space.xl;
+        case 'small':
+            return children ? space.xxxl : space.l;
+        case 'extraSmall':
+            return children ? 'auto' : space.m;
+        default:
+            return children ? '96px' : space.xl;
+    }
+};
+export var getPaddingStyles = function (children, size, icon, iconPosition) {
+    // In order to calculate the correct padding, we need to know its children
+    // and what side the icon is on and if there's an icon provided
+    if (!children) {
+        // icon buttons do not have any padding
+        return 0;
+    }
+    // If there are children AND an icon
+    // 1. We check what side the icon is in
+    // 2. Adjust padding to visually center the icon and text
+    // If there is children (most likely just text)
+    // 1. We keep the padding the same on both side
+    switch (size) {
+        case 'large':
+            return icon
+                ? iconPosition === 'start'
+                    ? "0 " + space.l + " 0 " + space.m
+                    : "0 " + space.m + " 0 " + space.l
+                : "0 " + space.l;
+        case 'medium':
+            return icon
+                ? iconPosition === 'start'
+                    ? "0 " + space.m + " 0 20px"
+                    : "0 20px 0 " + space.m
+                : "0 " + space.m;
+        case 'small':
+            return icon
+                ? iconPosition === 'start'
+                    ? "0 20px 0 " + space.s
+                    : "0 " + space.s + " 0 20px"
+                : "0 " + space.s;
+        case 'extraSmall':
+            return icon
+                ? iconPosition === 'start'
+                    ? "0 " + space.xs + " 0 " + space.xxs
+                    : "0 " + space.xxs + " 0 " + space.xs
+                : "0 " + space.xs;
+        default:
+            return icon
+                ? iconPosition === 'start'
+                    ? "0 " + space.m + " 0 20px"
+                    : "0 20px 0 " + space.m
+                : "0 " + space.m;
+    }
+};
+export var BaseButton = createComponent('button')({
+    displayName: 'Button',
+    Component: function (_a, ref, Element) {
+        var children = _a.children, elemProps = __rest(_a, ["children"]);
+        return (React.createElement(ButtonContainer, __assign({ as: Element, ref: ref }, elemProps), children));
+    },
+    subComponents: {
+        Icon: ButtonLabelIcon,
+        Label: ButtonLabel,
+    },
+});

package/dist/es6/button/lib/DeleteButton.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeleteButton.d.ts","sourceRoot":"","sources":["../../../../button/lib/DeleteButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EACL,cAAc,EAEd,SAAS,EAGV,MAAM,kCAAkC,CAAC;AAE1C,MAAM,WAAW,iBAAkB,SAAQ,SAAS,EAAE,cAAc;IAClE;;;OAGG;IACH,IAAI,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC;IACpC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B;AAyBD,eAAO,MAAM,YAAY,sEAwBvB,CAAC"}
+{"version":3,"file":"DeleteButton.d.ts","sourceRoot":"","sources":["../../../../button/lib/DeleteButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EACL,cAAc,EAEd,SAAS,EAGV,MAAM,kCAAkC,CAAC;AAE1C,MAAM,WAAW,iBAAkB,SAAQ,SAAS,EAAE,cAAc;IAClE;;;OAGG;IACH,IAAI,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC;IACpC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B;AA0BD,eAAO,MAAM,YAAY,sEA0BvB,CAAC"}

package/dist/es6/button/lib/DeleteButton.js

@@ -21,7 +21,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import * as React from 'react';
-import { ButtonContainer, ButtonLabel } from './parts';
+import { BaseButton, getMinWidthStyles, getPaddingStyles } from './BaseButton';
 import { useTheme, createComponent, } from '@workday/canvas-kit-react/common';
 var getDeleteButtonColors = function (_a) {
     var themeError = _a.canvas.palette.error;
@@ -41,6 +41,7 @@ var getDeleteButtonColors = function (_a) {
         },
         disabled: {
             background: themeError.light,
+            opacity: '1',
         },
     });
 };
@@ -54,7 +55,7 @@ export var DeleteButton = createComponent('button')({
         // TODO: Fix useTheme and make it a real hook
         // eslint-disable-next-line react-hooks/rules-of-hooks
         theme = _b === void 0 ? useTheme() : _b, _c = _a.size, size = _c === void 0 ? 'medium' : _c, children = _a.children, elemProps = __rest(_a, ["theme", "size", "children"]);
-        return (React.createElement(ButtonContainer, __assign({ ref: ref, as: Element, colors: getDeleteButtonColors(theme), size: size }, elemProps),
-            React.createElement(ButtonLabel, null, children)));
+        return (React.createElement(BaseButton, __assign({ padding: getPaddingStyles(children, size, undefined, undefined), minWidth: getMinWidthStyles(children, size), ref: ref, as: Element, colors: getDeleteButtonColors(theme), size: size }, elemProps),
+            React.createElement(BaseButton.Label, null, children)));
     },
 });

package/dist/es6/button/lib/PrimaryButton.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { GrowthBehavior, Themeable, EmotionCanvasTheme } from '@workday/canvas-kit-react/common';
+import { GrowthBehavior, Themeable } from '@workday/canvas-kit-react/common';
 import { CanvasSystemIcon } from '@workday/design-assets-types';
 import { ButtonSizes, IconPositions } from './types';
 export interface PrimaryButtonProps extends Themeable, GrowthBehavior {
@@ -15,20 +15,15 @@ export interface PrimaryButtonProps extends Themeable, GrowthBehavior {
      * @default 'medium'
      */
     size?: ButtonSizes;
-    /**
-     * The data label of the Button.
-     * Note: not displayed at `small` size
-     */
-    dataLabel?: String;
     /**
      * The icon of the Button.
      * Note: not displayed at `small` size
      */
     icon?: CanvasSystemIcon;
     /**
-     * Button icon positions can either be `left` or `right`.
-     * If no value is provided, it defaults to `left`.
-     * @default 'left'
+     * Button icon positions can either be `start` or `end`.
+     * If no value is provided, it defaults to `start`.
+     * @default 'start'
      */
     iconPosition?: IconPositions;
     /**
@@ -39,71 +34,4 @@ export interface PrimaryButtonProps extends Themeable, GrowthBehavior {
     children?: React.ReactNode;
 }
 export declare const PrimaryButton: import("../../common").ElementComponent<"button", PrimaryButtonProps>;
-export declare const getPrimaryButtonColors: (variant: 'inverse' | undefined, theme: EmotionCanvasTheme) => {
-    default: {
-        background: string;
-        icon: string;
-        label: string;
-        labelData?: undefined;
-    };
-    hover: {
-        background: string;
-        icon?: undefined;
-        label?: undefined;
-        labelData?: undefined;
-    };
-    active: {
-        background: string;
-        icon?: undefined;
-        label?: undefined;
-        labelData?: undefined;
-    };
-    focus: {
-        background: string;
-        border?: undefined;
-        icon?: undefined;
-        label?: undefined;
-        labelData?: undefined;
-        focusRing?: undefined;
-    };
-    disabled: {
-        background: string;
-        icon?: undefined;
-        label?: undefined;
-        labelData?: undefined;
-    };
-} | {
-    default: {
-        background: string;
-        icon: string;
-        label: string;
-        labelData: string;
-    };
-    hover: {
-        background: string;
-        icon: string;
-        label: string;
-        labelData: string;
-    };
-    active: {
-        background: string;
-        icon: string;
-        label: string;
-        labelData: string;
-    };
-    focus: {
-        background: string;
-        border: string;
-        icon: string;
-        label: string;
-        labelData: string;
-        focusRing: import("@emotion/react").CSSObject;
-    };
-    disabled: {
-        background: string;
-        icon: string;
-        label: string;
-        labelData: string;
-    };
-};
 //# sourceMappingURL=PrimaryButton.d.ts.map

package/dist/es6/button/lib/PrimaryButton.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PrimaryButton.d.ts","sourceRoot":"","sources":["../../../../button/lib/PrimaryButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EACL,cAAc,EAEd,SAAS,EACT,kBAAkB,EAGnB,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EAAC,gBAAgB,EAAC,MAAM,8BAA8B,CAAC;AAG9D,OAAO,EAAC,WAAW,EAAE,aAAa,EAAC,MAAM,SAAS,CAAC;AAEnD,MAAM,WAAW,kBAAmB,SAAQ,SAAS,EAAE,cAAc;IACnE;;;OAGG;IACH,OAAO,CAAC,EAAE,SAAS,CAAC;IACpB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,IAAI,CAAC,EAAE,gBAAgB,CAAC;IACxB;;;;OAIG;IACH,YAAY,CAAC,EAAE,aAAa,CAAC;IAC7B;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B;AAYD,eAAO,MAAM,aAAa,uEA+CxB,CAAC;AAEH,eAAO,MAAM,sBAAsB,YACxB,SAAS,GAAG,SAAS,SACvB,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2E1B,CAAC"}
+{"version":3,"file":"PrimaryButton.d.ts","sourceRoot":"","sources":["../../../../button/lib/PrimaryButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EACL,cAAc,EAEd,SAAS,EAIV,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EAAC,gBAAgB,EAAC,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAC,WAAW,EAAE,aAAa,EAAC,MAAM,SAAS,CAAC;AA2EnD,MAAM,WAAW,kBAAmB,SAAQ,SAAS,EAAE,cAAc;IACnE;;;OAGG;IACH,OAAO,CAAC,EAAE,SAAS,CAAC;IACpB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB;;;OAGG;IACH,IAAI,CAAC,EAAE,gBAAgB,CAAC;IACxB;;;;OAIG;IACH,YAAY,CAAC,EAAE,aAAa,CAAC;IAC7B;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B;AAED,eAAO,MAAM,aAAa,uEA+CxB,CAAC"}

package/dist/es6/button/lib/PrimaryButton.js

@@ -23,34 +23,8 @@ var __rest = (this && this.__rest) || function (s, e) {
 import * as React from 'react';
 import { useTheme, createComponent, focusRing, } from '@workday/canvas-kit-react/common';
 import { colors } from '@workday/canvas-kit-react/tokens';
-import { ButtonContainer, ButtonLabel, ButtonLabelData, ButtonLabelIcon } from './parts';
-// Button sizes where data labels are enabled
-var dataLabelSizes = ['medium', 'large'];
-// All disabled buttons are set to 40% opacity.
-// This will eventually live in the ButtonContainer styles, but for now we're scoping it to Primary, Secondary, and Tertiary buttons.
-var disabledButtonOpacity = {
-    '&:disabled, &:disabled:active': {
-        opacity: 0.4,
-    },
-};
-export var PrimaryButton = createComponent('button')({
-    displayName: 'PrimaryButton',
-    Component: function (_a, ref, Element) {
-        var 
-        // TODO: Fix useTheme and make it a real hook
-        // eslint-disable-next-line react-hooks/rules-of-hooks
-        _b = _a.theme, 
-        // TODO: Fix useTheme and make it a real hook
-        // eslint-disable-next-line react-hooks/rules-of-hooks
-        theme = _b === void 0 ? useTheme() : _b, _c = _a.size, size = _c === void 0 ? 'medium' : _c, _d = _a.iconPosition, iconPosition = _d === void 0 ? 'left' : _d, variant = _a.variant, dataLabel = _a.dataLabel, icon = _a.icon, _e = _a.shouldMirrorIcon, shouldMirrorIcon = _e === void 0 ? false : _e, children = _a.children, elemProps = __rest(_a, ["theme", "size", "iconPosition", "variant", "dataLabel", "icon", "shouldMirrorIcon", "children"]);
-        return (React.createElement(ButtonContainer, __assign({ ref: ref, as: Element, colors: getPrimaryButtonColors(variant, theme), size: size, extraStyles: disabledButtonOpacity }, elemProps),
-            icon && iconPosition === 'left' && (React.createElement(ButtonLabelIcon, { size: size, iconPosition: iconPosition, icon: icon, shouldMirrorIcon: shouldMirrorIcon })),
-            React.createElement(ButtonLabel, null, children),
-            dataLabel && dataLabelSizes.includes(size) && React.createElement(ButtonLabelData, null, dataLabel),
-            icon && iconPosition === 'right' && (React.createElement(ButtonLabelIcon, { size: size, iconPosition: iconPosition, icon: icon, shouldMirrorIcon: shouldMirrorIcon }))));
-    },
-});
-export var getPrimaryButtonColors = function (variant, theme) {
+import { BaseButton, getMinWidthStyles, getPaddingStyles } from './BaseButton';
+var getPrimaryButtonColors = function (variant, theme) {
     var themePrimary = theme.canvas.palette.primary;
     switch (variant) {
         case undefined:
@@ -80,29 +54,25 @@ export var getPrimaryButtonColors = function (variant, theme) {
                     background: colors.frenchVanilla100,
                     icon: colors.blackPepper400,
                     label: colors.blackPepper400,
-                    labelData: colors.blackPepper400,
                 },
                 hover: {
                     background: colors.soap300,
                     icon: colors.blackPepper500,
                     label: colors.blackPepper500,
-                    labelData: colors.blackPepper500,
                 },
                 active: {
-                    background: colors.soap300,
+                    background: colors.soap400,
                     icon: colors.blackPepper500,
                     label: colors.blackPepper500,
-                    labelData: colors.blackPepper500,
                 },
                 focus: {
                     background: colors.frenchVanilla100,
                     border: colors.blackPepper400,
                     icon: colors.blackPepper400,
                     label: colors.blackPepper400,
-                    labelData: colors.blackPepper400,
                     focusRing: focusRing({
                         separation: 1,
-                        innerColor: colors.blackPepper500,
+                        innerColor: colors.blackPepper400,
                         outerColor: colors.frenchVanilla100,
                     }, theme),
                 },
@@ -111,8 +81,18 @@ export var getPrimaryButtonColors = function (variant, theme) {
                     background: colors.frenchVanilla100,
                     icon: colors.blackPepper400,
                     label: colors.blackPepper400,
-                    labelData: colors.blackPepper400,
                 },
             };
     }
 };
+export var PrimaryButton = createComponent('button')({
+    displayName: 'PrimaryButton',
+    Component: function (_a, ref, Element) {
+        var _b = _a.size, size = _b === void 0 ? 'medium' : _b, _c = _a.iconPosition, iconPosition = _c === void 0 ? 'start' : _c, variant = _a.variant, icon = _a.icon, _d = _a.shouldMirrorIcon, shouldMirrorIcon = _d === void 0 ? false : _d, children = _a.children, elemProps = __rest(_a, ["size", "iconPosition", "variant", "icon", "shouldMirrorIcon", "children"]);
+        var theme = useTheme();
+        return (React.createElement(BaseButton, __assign({ ref: ref, size: size, colors: getPrimaryButtonColors(variant, theme), padding: getPaddingStyles(children, size, icon, iconPosition), minWidth: getMinWidthStyles(children, size), as: Element }, elemProps),
+            icon && iconPosition === 'start' && (React.createElement(BaseButton.Icon, { size: size, iconPosition: iconPosition, icon: icon, shouldMirrorIcon: shouldMirrorIcon })),
+            children && React.createElement(BaseButton.Label, null, children),
+            icon && iconPosition === 'end' && (React.createElement(BaseButton.Icon, { size: size, iconPosition: iconPosition, icon: icon, shouldMirrorIcon: shouldMirrorIcon }))));
+    },
+});

package/dist/es6/button/lib/SecondaryButton.d.ts

@@ -15,11 +15,6 @@ export interface SecondaryButtonProps extends Themeable, GrowthBehavior {
      * @default 'medium'
      */
     size?: ButtonSizes;
-    /**
-     * The data label of the Button.
-     * Note: not displayed at `small` size
-     */
-    dataLabel?: String;
     /**
      * The icon of the Button.
      * Note: not displayed at `small` size

package/dist/es6/button/lib/SecondaryButton.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SecondaryButton.d.ts","sourceRoot":"","sources":["../../../../button/lib/SecondaryButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EACL,cAAc,EAEd,SAAS,EACT,kBAAkB,EAGnB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAC,gBAAgB,EAAC,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAC,YAAY,EAAE,WAAW,EAAE,aAAa,EAAC,MAAM,SAAS,CAAC;AAGjE,MAAM,WAAW,oBAAqB,SAAQ,SAAS,EAAE,cAAc;IACrE;;;OAGG;IACH,OAAO,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;IAChC;;;;;OAKG;IACH,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,IAAI,CAAC,EAAE,gBAAgB,CAAC;IACxB;;;;OAIG;IACH,YAAY,CAAC,EAAE,aAAa,CAAC;IAC7B;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B;AAYD,eAAO,MAAM,eAAe,yEA+C1B,CAAC;AAEH,eAAO,MAAM,wBAAwB,YAC1B,SAAS,GAAG,SAAS,SACvB,kBAAkB,KACxB,YA4FF,CAAC"}
+{"version":3,"file":"SecondaryButton.d.ts","sourceRoot":"","sources":["../../../../button/lib/SecondaryButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EACL,cAAc,EAEd,SAAS,EACT,kBAAkB,EAGnB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAC,gBAAgB,EAAC,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAC,YAAY,EAAE,WAAW,EAAE,aAAa,EAAC,MAAM,SAAS,CAAC;AAGjE,MAAM,WAAW,oBAAqB,SAAQ,SAAS,EAAE,cAAc;IACrE;;;OAGG;IACH,OAAO,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;IAChC;;;;;OAKG;IACH,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB;;;OAGG;IACH,IAAI,CAAC,EAAE,gBAAgB,CAAC;IACxB;;;;OAIG;IACH,YAAY,CAAC,EAAE,aAAa,CAAC;IAC7B;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B;AAED,eAAO,MAAM,eAAe,yEA+C1B,CAAC;AAEH,eAAO,MAAM,wBAAwB,YAC1B,SAAS,GAAG,SAAS,SACvB,kBAAkB,KACxB,YAqFF,CAAC"}

package/dist/es6/button/lib/SecondaryButton.js

@@ -23,31 +23,16 @@ var __rest = (this && this.__rest) || function (s, e) {
 import * as React from 'react';
 import { colors } from '@workday/canvas-kit-react/tokens';
 import { useTheme, createComponent, focusRing, } from '@workday/canvas-kit-react/common';
-import { ButtonContainer, ButtonLabel, ButtonLabelData, ButtonLabelIcon } from './parts';
-// Button sizes where data labels are enabled
-var dataLabelSizes = ['medium', 'large'];
-// All disabled buttons are set to 40% opacity.
-// This will eventually live in the ButtonContainer styles, but for now we're scoping it to Primary, Secondary, and Tertiary buttons.
-var disabledButtonOpacity = {
-    '&:disabled, &:disabled:active': {
-        opacity: 0.4,
-    },
-};
+import { BaseButton, getMinWidthStyles, getPaddingStyles } from './BaseButton';
 export var SecondaryButton = createComponent('button')({
     displayName: 'SecondaryButton',
     Component: function (_a, ref, Element) {
-        var 
-        // TODO: Fix useTheme and make it a real hook
-        // eslint-disable-next-line react-hooks/rules-of-hooks
-        _b = _a.theme, 
-        // TODO: Fix useTheme and make it a real hook
-        // eslint-disable-next-line react-hooks/rules-of-hooks
-        theme = _b === void 0 ? useTheme() : _b, _c = _a.size, size = _c === void 0 ? 'medium' : _c, _d = _a.iconPosition, iconPosition = _d === void 0 ? 'left' : _d, variant = _a.variant, dataLabel = _a.dataLabel, icon = _a.icon, _e = _a.shouldMirrorIcon, shouldMirrorIcon = _e === void 0 ? false : _e, children = _a.children, elemProps = __rest(_a, ["theme", "size", "iconPosition", "variant", "dataLabel", "icon", "shouldMirrorIcon", "children"]);
-        return (React.createElement(ButtonContainer, __assign({ ref: ref, as: Element, colors: getSecondaryButtonColors(variant, theme), size: size, extraStyles: disabledButtonOpacity }, elemProps),
-            icon && iconPosition === 'left' && (React.createElement(ButtonLabelIcon, { size: size, iconPosition: iconPosition, icon: icon, shouldMirrorIcon: shouldMirrorIcon })),
-            React.createElement(ButtonLabel, null, children),
-            dataLabel && dataLabelSizes.includes(size) && React.createElement(ButtonLabelData, null, dataLabel),
-            icon && iconPosition === 'right' && (React.createElement(ButtonLabelIcon, { size: size, iconPosition: iconPosition, icon: icon, shouldMirrorIcon: shouldMirrorIcon }))));
+        var _b = _a.size, size = _b === void 0 ? 'medium' : _b, _c = _a.iconPosition, iconPosition = _c === void 0 ? 'start' : _c, variant = _a.variant, icon = _a.icon, _d = _a.shouldMirrorIcon, shouldMirrorIcon = _d === void 0 ? false : _d, children = _a.children, elemProps = __rest(_a, ["size", "iconPosition", "variant", "icon", "shouldMirrorIcon", "children"]);
+        var theme = useTheme();
+        return (React.createElement(BaseButton, __assign({ ref: ref, size: size, colors: getSecondaryButtonColors(variant, theme), padding: getPaddingStyles(children, size, icon, iconPosition), minWidth: getMinWidthStyles(children, size), as: Element }, elemProps),
+            icon && iconPosition === 'start' && (React.createElement(BaseButton.Icon, { size: size, iconPosition: iconPosition, icon: icon, shouldMirrorIcon: shouldMirrorIcon })),
+            children && React.createElement(BaseButton.Label, null, children),
+            icon && iconPosition === 'end' && (React.createElement(BaseButton.Icon, { size: size, iconPosition: iconPosition, icon: icon, shouldMirrorIcon: shouldMirrorIcon }))));
     },
 });
 export var getSecondaryButtonColors = function (variant, theme) {
@@ -61,27 +46,23 @@ export var getSecondaryButtonColors = function (variant, theme) {
                     border: colors.blackPepper400,
                     icon: colors.blackPepper400,
                     label: colors.blackPepper400,
-                    labelData: colors.blackPepper400,
                 },
                 hover: {
                     background: colors.blackPepper400,
                     border: colors.blackPepper400,
                     icon: themePrimary.contrast,
                     label: themePrimary.contrast,
-                    labelData: themePrimary.contrast,
                 },
                 active: {
                     background: colors.blackPepper500,
                     border: colors.blackPepper500,
                     icon: themePrimary.contrast,
                     label: themePrimary.contrast,
-                    labelData: themePrimary.contrast,
                 },
                 focus: {
                     border: colors.blackPepper400,
                     icon: colors.blackPepper400,
                     label: colors.blackPepper400,
-                    labelData: colors.blackPepper400,
                 },
                 // Identical to 'default' styles. ButtonContainer will set opacity to 40%
                 disabled: {
@@ -89,7 +70,6 @@ export var getSecondaryButtonColors = function (variant, theme) {
                     border: colors.blackPepper400,
                     icon: colors.blackPepper400,
                     label: colors.blackPepper400,
-                    labelData: colors.blackPepper400,
                 },
             };
         case 'inverse':
@@ -103,25 +83,23 @@ export var getSecondaryButtonColors = function (variant, theme) {
                 hover: {
                     background: colors.soap300,
                     border: colors.soap300,
-                    icon: colors.blackPepper400,
-                    label: colors.blackPepper400,
-                    labelData: colors.blackPepper400,
+                    icon: colors.blackPepper500,
+                    label: colors.blackPepper500,
                 },
                 active: {
                     background: colors.soap400,
                     border: colors.soap400,
-                    icon: colors.blackPepper400,
-                    label: colors.blackPepper400,
-                    labelData: colors.blackPepper400,
+                    icon: colors.blackPepper500,
+                    label: colors.blackPepper500,
                 },
                 focus: {
                     background: colors.frenchVanilla100,
-                    icon: colors.blackPepper400,
-                    label: colors.blackPepper400,
-                    labelData: colors.blackPepper400,
+                    icon: colors.blackPepper500,
+                    border: colors.blackPepper400,
+                    label: colors.blackPepper500,
                     focusRing: focusRing({
-                        separation: 2,
-                        innerColor: 'currentColor',
+                        separation: 1,
+                        innerColor: colors.blackPepper400,
                         outerColor: colors.frenchVanilla100,
                     }, theme),
                 },

package/dist/es6/button/lib/TertiaryButton.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { Themeable } from '@workday/canvas-kit-react/common';
 import { CanvasSystemIcon } from '@workday/design-assets-types';
-import { TertiaryButtonSizes, IconPositions } from './types';
+import { IconPositions, ButtonSizes } from './types';
 export interface TertiaryButtonProps extends Themeable {
     /**
      * The variant of the TertiaryButton.
@@ -14,7 +14,7 @@ export interface TertiaryButtonProps extends Themeable {
      *
      * @default 'medium'
      */
-    size?: TertiaryButtonSizes;
+    size?: ButtonSizes;
     /**
      * Button icon positions can either be `left` or `right`.
      * If no value is provided, it defaults to `left`.

package/dist/es6/button/lib/TertiaryButton.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TertiaryButton.d.ts","sourceRoot":"","sources":["../../../../button/lib/TertiaryButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAGL,SAAS,EAGV,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EAAC,gBAAgB,EAAC,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAe,mBAAmB,EAAE,aAAa,EAAC,MAAM,SAAS,CAAC;AAGzE,MAAM,WAAW,mBAAoB,SAAQ,SAAS;IACpD;;;OAGG;IACH,OAAO,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;IAChC;;;;;OAKG;IACH,IAAI,CAAC,EAAE,mBAAmB,CAAC;IAC3B;;;;OAIG;IACH,YAAY,CAAC,EAAE,aAAa,CAAC;IAC7B;;OAEG;IACH,IAAI,CAAC,EAAE,gBAAgB,CAAC;IACxB;;OAEG;IACH;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B;AAsGD,eAAO,MAAM,cAAc,wEA4DzB,CAAC"}
+{"version":3,"file":"TertiaryButton.d.ts","sourceRoot":"","sources":["../../../../button/lib/TertiaryButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAGL,SAAS,EAKV,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EAAC,gBAAgB,EAAC,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAe,aAAa,EAAE,WAAW,EAAC,MAAM,SAAS,CAAC;AAGjE,MAAM,WAAW,mBAAoB,SAAQ,SAAS;IACpD;;;OAGG;IACH,OAAO,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;IAChC;;;;;OAKG;IACH,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB;;;;OAIG;IACH,YAAY,CAAC,EAAE,aAAa,CAAC;IAC7B;;OAEG;IACH,IAAI,CAAC,EAAE,gBAAgB,CAAC;IACxB;;OAEG;IACH;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B;AAgJD,eAAO,MAAM,cAAc,wEAkDzB,CAAC"}