@workday/canvas-kit-react 7.0.0-alpha.0-next.7 → 7.0.0-alpha.100-next.25

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

@@ -41,37 +41,11 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPrimaryButtonColors = exports.PrimaryButton = void 0;
+exports.PrimaryButton = void 0;
 var React = __importStar(require("react"));
 var common_1 = require("@workday/canvas-kit-react/common");
 var tokens_1 = require("@workday/canvas-kit-react/tokens");
-var parts_1 = require("./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,
-    },
-};
-exports.PrimaryButton = common_1.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 ? common_1.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(parts_1.ButtonContainer, __assign({ ref: ref, as: Element, colors: exports.getPrimaryButtonColors(variant, theme), size: size, extraStyles: disabledButtonOpacity }, elemProps),
-            icon && iconPosition === 'left' && (React.createElement(parts_1.ButtonLabelIcon, { size: size, iconPosition: iconPosition, icon: icon, shouldMirrorIcon: shouldMirrorIcon })),
-            React.createElement(parts_1.ButtonLabel, null, children),
-            dataLabel && dataLabelSizes.includes(size) && React.createElement(parts_1.ButtonLabelData, null, dataLabel),
-            icon && iconPosition === 'right' && (React.createElement(parts_1.ButtonLabelIcon, { size: size, iconPosition: iconPosition, icon: icon, shouldMirrorIcon: shouldMirrorIcon }))));
-    },
-});
+var BaseButton_1 = require("./BaseButton");
 var getPrimaryButtonColors = function (variant, theme) {
     var themePrimary = theme.canvas.palette.primary;
     switch (variant) {
@@ -102,29 +76,25 @@ var getPrimaryButtonColors = function (variant, theme) {
                     background: tokens_1.colors.frenchVanilla100,
                     icon: tokens_1.colors.blackPepper400,
                     label: tokens_1.colors.blackPepper400,
-                    labelData: tokens_1.colors.blackPepper400,
                 },
                 hover: {
                     background: tokens_1.colors.soap300,
                     icon: tokens_1.colors.blackPepper500,
                     label: tokens_1.colors.blackPepper500,
-                    labelData: tokens_1.colors.blackPepper500,
                 },
                 active: {
-                    background: tokens_1.colors.soap300,
+                    background: tokens_1.colors.soap400,
                     icon: tokens_1.colors.blackPepper500,
                     label: tokens_1.colors.blackPepper500,
-                    labelData: tokens_1.colors.blackPepper500,
                 },
                 focus: {
                     background: tokens_1.colors.frenchVanilla100,
                     border: tokens_1.colors.blackPepper400,
                     icon: tokens_1.colors.blackPepper400,
                     label: tokens_1.colors.blackPepper400,
-                    labelData: tokens_1.colors.blackPepper400,
                     focusRing: common_1.focusRing({
                         separation: 1,
-                        innerColor: tokens_1.colors.blackPepper500,
+                        innerColor: tokens_1.colors.blackPepper400,
                         outerColor: tokens_1.colors.frenchVanilla100,
                     }, theme),
                 },
@@ -133,9 +103,18 @@ var getPrimaryButtonColors = function (variant, theme) {
                     background: tokens_1.colors.frenchVanilla100,
                     icon: tokens_1.colors.blackPepper400,
                     label: tokens_1.colors.blackPepper400,
-                    labelData: tokens_1.colors.blackPepper400,
                 },
             };
     }
 };
-exports.getPrimaryButtonColors = getPrimaryButtonColors;
+exports.PrimaryButton = common_1.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 = common_1.useTheme();
+        return (React.createElement(BaseButton_1.BaseButton, __assign({ ref: ref, size: size, colors: getPrimaryButtonColors(variant, theme), padding: BaseButton_1.getPaddingStyles(children, size, icon, iconPosition), minWidth: BaseButton_1.getMinWidthStyles(children, size), as: Element }, elemProps),
+            icon && iconPosition === 'start' && (React.createElement(BaseButton_1.BaseButton.Icon, { size: size, iconPosition: iconPosition, icon: icon, shouldMirrorIcon: shouldMirrorIcon })),
+            children && React.createElement(BaseButton_1.BaseButton.Label, null, children),
+            icon && iconPosition === 'end' && (React.createElement(BaseButton_1.BaseButton.Icon, { size: size, iconPosition: iconPosition, icon: icon, shouldMirrorIcon: shouldMirrorIcon }))));
+    },
+});

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

@@ -15,20 +15,15 @@ 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
      */
     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;
     /**

package/dist/commonjs/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,YAoFF,CAAC"}

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

@@ -45,31 +45,16 @@ exports.getSecondaryButtonColors = exports.SecondaryButton = void 0;
 var React = __importStar(require("react"));
 var tokens_1 = require("@workday/canvas-kit-react/tokens");
 var common_1 = require("@workday/canvas-kit-react/common");
-var parts_1 = require("./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,
-    },
-};
+var BaseButton_1 = require("./BaseButton");
 exports.SecondaryButton = common_1.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 ? common_1.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(parts_1.ButtonContainer, __assign({ ref: ref, as: Element, colors: exports.getSecondaryButtonColors(variant, theme), size: size, extraStyles: disabledButtonOpacity }, elemProps),
-            icon && iconPosition === 'left' && (React.createElement(parts_1.ButtonLabelIcon, { size: size, iconPosition: iconPosition, icon: icon, shouldMirrorIcon: shouldMirrorIcon })),
-            React.createElement(parts_1.ButtonLabel, null, children),
-            dataLabel && dataLabelSizes.includes(size) && React.createElement(parts_1.ButtonLabelData, null, dataLabel),
-            icon && iconPosition === 'right' && (React.createElement(parts_1.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 = common_1.useTheme();
+        return (React.createElement(BaseButton_1.BaseButton, __assign({ ref: ref, size: size, colors: exports.getSecondaryButtonColors(variant, theme), padding: BaseButton_1.getPaddingStyles(children, size, icon, iconPosition), minWidth: BaseButton_1.getMinWidthStyles(children, size), as: Element }, elemProps),
+            icon && iconPosition === 'start' && (React.createElement(BaseButton_1.BaseButton.Icon, { size: size, iconPosition: iconPosition, icon: icon, shouldMirrorIcon: shouldMirrorIcon })),
+            children && React.createElement(BaseButton_1.BaseButton.Label, null, children),
+            icon && iconPosition === 'end' && (React.createElement(BaseButton_1.BaseButton.Icon, { size: size, iconPosition: iconPosition, icon: icon, shouldMirrorIcon: shouldMirrorIcon }))));
     },
 });
 var getSecondaryButtonColors = function (variant, theme) {
@@ -83,27 +68,23 @@ var getSecondaryButtonColors = function (variant, theme) {
                     border: tokens_1.colors.blackPepper400,
                     icon: tokens_1.colors.blackPepper400,
                     label: tokens_1.colors.blackPepper400,
-                    labelData: tokens_1.colors.blackPepper400,
                 },
                 hover: {
                     background: tokens_1.colors.blackPepper400,
                     border: tokens_1.colors.blackPepper400,
                     icon: themePrimary.contrast,
                     label: themePrimary.contrast,
-                    labelData: themePrimary.contrast,
                 },
                 active: {
                     background: tokens_1.colors.blackPepper500,
                     border: tokens_1.colors.blackPepper500,
                     icon: themePrimary.contrast,
                     label: themePrimary.contrast,
-                    labelData: themePrimary.contrast,
                 },
                 focus: {
                     border: tokens_1.colors.blackPepper400,
                     icon: tokens_1.colors.blackPepper400,
                     label: tokens_1.colors.blackPepper400,
-                    labelData: tokens_1.colors.blackPepper400,
                 },
                 // Identical to 'default' styles. ButtonContainer will set opacity to 40%
                 disabled: {
@@ -111,7 +92,6 @@ var getSecondaryButtonColors = function (variant, theme) {
                     border: tokens_1.colors.blackPepper400,
                     icon: tokens_1.colors.blackPepper400,
                     label: tokens_1.colors.blackPepper400,
-                    labelData: tokens_1.colors.blackPepper400,
                 },
             };
         case 'inverse':
@@ -125,22 +105,19 @@ var getSecondaryButtonColors = function (variant, theme) {
                 hover: {
                     background: tokens_1.colors.soap300,
                     border: tokens_1.colors.soap300,
-                    icon: tokens_1.colors.blackPepper400,
-                    label: tokens_1.colors.blackPepper400,
-                    labelData: tokens_1.colors.blackPepper400,
+                    icon: tokens_1.colors.blackPepper500,
+                    label: tokens_1.colors.blackPepper500,
                 },
                 active: {
                     background: tokens_1.colors.soap400,
                     border: tokens_1.colors.soap400,
-                    icon: tokens_1.colors.blackPepper400,
-                    label: tokens_1.colors.blackPepper400,
-                    labelData: tokens_1.colors.blackPepper400,
+                    icon: tokens_1.colors.blackPepper500,
+                    label: tokens_1.colors.blackPepper500,
                 },
                 focus: {
                     background: tokens_1.colors.frenchVanilla100,
-                    icon: tokens_1.colors.blackPepper400,
-                    label: tokens_1.colors.blackPepper400,
-                    labelData: tokens_1.colors.blackPepper400,
+                    icon: tokens_1.colors.blackPepper500,
+                    label: tokens_1.colors.blackPepper500,
                     focusRing: common_1.focusRing({
                         separation: 2,
                         innerColor: 'currentColor',

package/dist/commonjs/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,11 +14,11 @@ 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`.
-     * @default 'left'
+     * Button icon positions can either be `start` or `end`.
+     * If no value is provided, it defaults to `start`.
+     * @default 'start'
      */
     iconPosition?: IconPositions;
     /**

package/dist/commonjs/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"}

package/dist/commonjs/button/lib/TertiaryButton.js

@@ -45,8 +45,8 @@ exports.TertiaryButton = void 0;
 var React = __importStar(require("react"));
 var common_1 = require("@workday/canvas-kit-react/common");
 var tokens_1 = require("@workday/canvas-kit-react/tokens");
-var parts_1 = require("./parts");
-var getTertiaryButtonColors = function (variant, theme) {
+var BaseButton_1 = require("./BaseButton");
+var getTertiaryButtonColors = function (variant, theme, children) {
     var themePrimary = theme.canvas.palette.primary;
     if (variant === 'inverse') {
         return {
@@ -86,66 +86,94 @@ var getTertiaryButtonColors = function (variant, theme) {
     else {
         return {
             default: {
-                icon: themePrimary.main,
+                icon: children ? themePrimary.main : tokens_1.colors.blackPepper400,
                 label: themePrimary.main,
             },
             hover: {
                 background: tokens_1.colors.soap200,
-                icon: themePrimary.dark,
+                icon: children ? themePrimary.dark : tokens_1.colors.blackPepper500,
                 label: themePrimary.dark,
             },
             active: {
                 background: tokens_1.colors.soap300,
-                icon: themePrimary.dark,
+                icon: children ? themePrimary.dark : tokens_1.colors.blackPepper500,
                 label: themePrimary.dark,
             },
             focus: {
-                icon: themePrimary.dark,
-                label: themePrimary.dark,
-                focusRing: common_1.focusRing({}, theme),
+                icon: children ? themePrimary.main : tokens_1.colors.blackPepper500,
+                label: themePrimary.main,
+                focusRing: common_1.focusRing({ innerColor: tokens_1.colors.blueberry400 }, theme),
             },
             disabled: {
-                icon: themePrimary.main,
+                icon: children ? themePrimary.main : tokens_1.colors.blackPepper400,
                 label: themePrimary.main,
             },
         };
     }
 };
-var getPaddingStyles = function (icon, iconPosition) {
-    // if there is an icon on the left, add 4px extra padding to the right for visual balance
-    if (icon && iconPosition === 'left') {
-        return "0 " + tokens_1.space.xs + " 0 " + tokens_1.space.xxs;
+var StyledButtonLabel = common_1.styled(BaseButton_1.BaseButton.Label)({
+    textDecoration: 'underline',
+});
+var StyledTertiaryButtonContainer = common_1.styled(BaseButton_1.BaseButton)({
+    border: '0',
+}, function (_a) {
+    var allCaps = _a.allCaps;
+    return ({
+        textTransform: allCaps ? 'uppercase' : undefined,
+    });
+});
+var getPaddingStyles = function (icon, iconPosition, children, size) {
+    if (children) {
+        // if there is an icon on the left, add 4px extra padding to the right for visual balance
+        if (icon && iconPosition === 'start') {
+            if (size === 'extraSmall') {
+                return "0 " + tokens_1.space.xxs + " 0 " + tokens_1.space.xxxs;
+            }
+            return "0 " + tokens_1.space.xs + " 0 " + tokens_1.space.xxs;
+        }
+        // if there is an icon on the right, add 4px extra padding to the left for visual balance
+        if (icon && iconPosition === 'end') {
+            if (size === 'extraSmall') {
+                return "0 " + tokens_1.space.xxxs + " 0 " + tokens_1.space.xxs;
+            }
+            return "0 " + tokens_1.space.xxs + " 0 " + tokens_1.space.xs;
+        }
+        // if there is no icon, return the default padding
+        return "0 " + tokens_1.space.xxs;
     }
-    // if there is an icon on the right, add 4px extra padding to the left for visual balance
-    if (icon && iconPosition === 'right') {
-        return "0 " + tokens_1.space.xxs + " 0 " + tokens_1.space.xs;
+    else {
+        return '0';
     }
-    // if there is no icon, return the default padding
-    return "0 " + tokens_1.space.xxs;
 };
-// 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,
-    },
+var getMinWidthStyles = function (children, size) {
+    var minWidthNum;
+    switch (size) {
+        case 'large':
+            minWidthNum = '48px';
+            break;
+        case 'medium':
+            minWidthNum = tokens_1.space.xl;
+            break;
+        case 'small':
+            minWidthNum = tokens_1.space.l;
+            break;
+        case 'extraSmall':
+            minWidthNum = tokens_1.space.m;
+            break;
+        default:
+            minWidthNum = tokens_1.space.xl;
+            break;
+    }
+    return children ? 'auto' : minWidthNum;
 };
 exports.TertiaryButton = common_1.createComponent('button')({
     displayName: 'TertiaryButton',
     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 ? common_1.useTheme() : _b, _c = _a.size, size = _c === void 0 ? 'medium' : _c, _d = _a.iconPosition, iconPosition = _d === void 0 ? 'left' : _d, variant = _a.variant, children = _a.children, icon = _a.icon, _e = _a.shouldMirrorIcon, shouldMirrorIcon = _e === void 0 ? false : _e, allCaps = _a.allCaps, elemProps = __rest(_a, ["theme", "size", "iconPosition", "variant", "children", "icon", "shouldMirrorIcon", "allCaps"]);
-        var allContainerStyles = __assign({ borderRadius: tokens_1.borderRadius.m, border: '0', padding: getPaddingStyles(icon, iconPosition), minWidth: 'auto', textTransform: allCaps ? 'uppercase' : undefined, '.wdc-text-button-label': {
-                textDecoration: 'underline',
-            } }, disabledButtonOpacity);
-        return (React.createElement(parts_1.ButtonContainer, __assign({ ref: ref, as: Element, colors: getTertiaryButtonColors(variant, theme), size: size, extraStyles: allContainerStyles }, elemProps),
-            icon && iconPosition === 'left' && (React.createElement(parts_1.ButtonLabelIcon, { size: size, iconPosition: iconPosition, icon: icon, shouldMirrorIcon: shouldMirrorIcon })),
-            React.createElement(parts_1.ButtonLabel, { className: "wdc-text-button-label" }, children),
-            icon && iconPosition === 'right' && (React.createElement(parts_1.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, children = _a.children, icon = _a.icon, _d = _a.shouldMirrorIcon, shouldMirrorIcon = _d === void 0 ? false : _d, allCaps = _a.allCaps, elemProps = __rest(_a, ["size", "iconPosition", "variant", "children", "icon", "shouldMirrorIcon", "allCaps"]);
+        var theme = common_1.useTheme();
+        return (React.createElement(StyledTertiaryButtonContainer, __assign({ ref: ref, as: Element, allCaps: allCaps, colors: getTertiaryButtonColors(variant, theme, children), size: size, padding: getPaddingStyles(icon, iconPosition, children, size), minWidth: getMinWidthStyles(children, size), style: { borderRadius: children ? tokens_1.borderRadius.m : tokens_1.borderRadius.circle } }, elemProps),
+            icon && iconPosition === 'start' && (React.createElement(BaseButton_1.BaseButton.Icon, { size: size, iconPosition: iconPosition, icon: icon, shouldMirrorIcon: shouldMirrorIcon })),
+            children && React.createElement(StyledButtonLabel, null, children),
+            icon && iconPosition === 'end' && (React.createElement(BaseButton_1.BaseButton.Icon, { size: size, iconPosition: iconPosition, icon: icon, shouldMirrorIcon: shouldMirrorIcon }))));
     },
 });

package/dist/commonjs/button/lib/ToolbarDropdownButton.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ToolbarDropdownButton.d.ts","sourceRoot":"","sources":["../../../../button/lib/ToolbarDropdownButton.tsx"],"names":[],"mappings":"AAEA,OAAO,EAGL,SAAS,EAGV,MAAM,kCAAkC,CAAC;AAK1C,OAAO,EAAC,sBAAsB,EAAC,MAAM,qBAAqB,CAAC;AAE3D,MAAM,WAAW,0BACf,SAAQ,IAAI,CAAC,sBAAsB,EAAE,SAAS,GAAG,gBAAgB,CAAC,EAChE,SAAS;CAAG;AAwBhB,eAAO,MAAM,qBAAqB,+EAwChC,CAAC"}
+{"version":3,"file":"ToolbarDropdownButton.d.ts","sourceRoot":"","sources":["../../../../button/lib/ToolbarDropdownButton.tsx"],"names":[],"mappings":"AAEA,OAAO,EAGL,SAAS,EAKV,MAAM,kCAAkC,CAAC;AAI1C,OAAO,EAAC,sBAAsB,EAAC,MAAM,qBAAqB,CAAC;AAE3D,MAAM,WAAW,0BACf,SAAQ,IAAI,CAAC,sBAAsB,EAAE,SAAS,GAAG,gBAAgB,CAAC,EAChE,SAAS;CAAG;AAwBhB,eAAO,MAAM,qBAAqB,+EAuChC,CAAC"}

package/dist/commonjs/button/lib/ToolbarDropdownButton.js

@@ -29,10 +29,9 @@ exports.ToolbarDropdownButton = void 0;
 var react_1 = __importDefault(require("react"));
 var tokens_1 = require("@workday/canvas-kit-react/tokens");
 var common_1 = require("@workday/canvas-kit-react/common");
-var icon_1 = require("@workday/canvas-kit-react/icon");
-var parts_1 = require("./parts");
+var BaseButton_1 = require("./BaseButton");
 var canvas_system_icons_web_1 = require("@workday/canvas-system-icons-web");
-var containerStyles = {
+var StyledToolbarDropdownButton = common_1.styled(BaseButton_1.BaseButton)({
     padding: tokens_1.space.zero,
     minWidth: tokens_1.space.l,
     width: 'auto',
@@ -52,7 +51,7 @@ var containerStyles = {
         marginRight: 0,
         width: 18,
     },
-};
+});
 exports.ToolbarDropdownButton = common_1.createComponent('button')({
     displayName: 'ToolbarDropdownButton',
     Component: function (_a, ref, Element) {
@@ -63,9 +62,9 @@ exports.ToolbarDropdownButton = common_1.createComponent('button')({
         // TODO: Fix useTheme and make it a real hook
         // eslint-disable-next-line react-hooks/rules-of-hooks
         theme = _b === void 0 ? common_1.useTheme() : _b, icon = _a.icon, _c = _a.shouldMirrorIcon, shouldMirrorIcon = _c === void 0 ? false : _c, children = _a.children, elemProps = __rest(_a, ["theme", "icon", "shouldMirrorIcon", "children"]);
-        return (react_1.default.createElement(parts_1.ButtonContainer, __assign({ ref: ref, as: Element, colors: getToolbarDropdownButtonColors(theme), extraStyles: containerStyles }, elemProps),
-            icon ? (react_1.default.createElement(icon_1.SystemIcon, { className: 'wdc-toolbar-dropdown-btn-custom-icon', icon: icon, shouldMirror: shouldMirrorIcon })) : (children),
-            react_1.default.createElement(icon_1.SystemIcon, { className: 'wdc-toolbar-dropdown-btn-arrow', icon: canvas_system_icons_web_1.chevronDownSmallIcon, shouldMirror: shouldMirrorIcon })));
+        return (react_1.default.createElement(StyledToolbarDropdownButton, __assign({ ref: ref, as: Element, colors: getToolbarDropdownButtonColors(theme) }, elemProps),
+            icon ? (react_1.default.createElement(BaseButton_1.BaseButton.Icon, { className: 'wdc-toolbar-dropdown-btn-custom-icon', icon: icon, shouldMirrorIcon: shouldMirrorIcon })) : (children),
+            react_1.default.createElement(BaseButton_1.BaseButton.Icon, { className: 'wdc-toolbar-dropdown-btn-arrow', icon: canvas_system_icons_web_1.chevronDownSmallIcon, shouldMirrorIcon: shouldMirrorIcon })));
     },
 });
 var getToolbarDropdownButtonColors = function (theme) {
@@ -89,6 +88,7 @@ var getToolbarDropdownButtonColors = function (theme) {
         disabled: {
             icon: tokens_1.colors.soap600,
             background: 'transparent',
+            opacity: '1',
         },
     };
 };

package/dist/commonjs/button/lib/ToolbarIconButton.d.ts

@@ -1,6 +1,9 @@
 import { Themeable } from '@workday/canvas-kit-react/common';
-import { IconButtonProps } from './IconButton';
-export interface ToolbarIconButtonProps extends Omit<IconButtonProps, 'size' | 'variant'>, Themeable {
+import { TertiaryButtonProps } from './TertiaryButton';
+export interface ToolbarIconButtonProps extends Omit<TertiaryButtonProps, 'size' | 'variant'>, Themeable {
+    onToggleChange?: (toggled: boolean | undefined) => void;
+    toggled?: boolean;
+    shouldMirrorIcon?: boolean;
 }
 export declare const ToolbarIconButton: import("../../common").ElementComponent<"button", ToolbarIconButtonProps>;
 //# sourceMappingURL=ToolbarIconButton.d.ts.map

package/dist/commonjs/button/lib/ToolbarIconButton.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ToolbarIconButton.d.ts","sourceRoot":"","sources":["../../../../button/lib/ToolbarIconButton.tsx"],"names":[],"mappings":"AAEA,OAAO,EAGL,SAAS,EAGV,MAAM,kCAAkC,CAAC;AAI1C,OAAO,EAAC,eAAe,EAAC,MAAM,cAAc,CAAC;AAE7C,MAAM,WAAW,sBACf,SAAQ,IAAI,CAAC,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC,EAC/C,SAAS;CAAG;AAgBhB,eAAO,MAAM,iBAAiB,2EA6C5B,CAAC"}
+{"version":3,"file":"ToolbarIconButton.d.ts","sourceRoot":"","sources":["../../../../button/lib/ToolbarIconButton.tsx"],"names":[],"mappings":"AAEA,OAAO,EAGL,SAAS,EAKV,MAAM,kCAAkC,CAAC;AAG1C,OAAO,EAAC,mBAAmB,EAAC,MAAM,kBAAkB,CAAC;AAErD,MAAM,WAAW,sBACf,SAAQ,IAAI,CAAC,mBAAmB,EAAE,MAAM,GAAG,SAAS,CAAC,EACnD,SAAS;IACX,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,KAAK,IAAI,CAAC;IACxD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAWD,eAAO,MAAM,iBAAiB,2EAiD5B,CAAC"}

package/dist/commonjs/button/lib/ToolbarIconButton.js

@@ -46,22 +46,15 @@ exports.ToolbarIconButton = void 0;
 var React = __importStar(require("react"));
 var tokens_1 = require("@workday/canvas-kit-react/tokens");
 var common_1 = require("@workday/canvas-kit-react/common");
-var icon_1 = require("@workday/canvas-kit-react/icon");
-var parts_1 = require("./parts");
-var containerStyles = (_a = {
-        padding: 0,
-        minWidth: tokens_1.space.l,
-        width: tokens_1.space.l,
-        height: tokens_1.space.l,
-        borderRadius: tokens_1.borderRadius.m
-    },
+var BaseButton_1 = require("./BaseButton");
+var StyledToolbarIconButton = common_1.styled(BaseButton_1.BaseButton)((_a = {},
     _a['& .wd-icon'] = {
         display: 'inline-block',
         verticalAlign: 'middle',
         width: 20,
         height: 20,
     },
-    _a);
+    _a));
 exports.ToolbarIconButton = common_1.createComponent('button')({
     displayName: 'ToolbarIconButton',
     Component: function (_a, ref, Element) {
@@ -84,7 +77,7 @@ exports.ToolbarIconButton = common_1.createComponent('button')({
                 }
             }
         }, [toggled, onToggleChange]);
-        return (React.createElement(parts_1.ButtonContainer, __assign({ ref: ref, as: Element, colors: getToolbarIconButtonColors(theme, toggled), size: 'small', fillIcon: toggled, extraStyles: containerStyles, "aria-pressed": toggled }, elemProps), icon ? React.createElement(icon_1.SystemIcon, { icon: icon, shouldMirror: shouldMirrorIcon }) : children));
+        return (React.createElement(StyledToolbarIconButton, __assign({ ref: ref, as: Element, colors: getToolbarIconButtonColors(theme, toggled), size: 'small', fillIcon: toggled, "aria-pressed": toggled, padding: "zero", minWidth: tokens_1.space.l, width: tokens_1.space.l, height: tokens_1.space.l, borderRadius: tokens_1.borderRadius.m }, elemProps), icon ? React.createElement(BaseButton_1.BaseButton.Icon, { icon: icon, shouldMirrorIcon: shouldMirrorIcon }) : children));
     },
 });
 var getToolbarIconButtonColors = function (theme, toggled) {
@@ -110,6 +103,7 @@ var getToolbarIconButtonColors = function (theme, toggled) {
         disabled: {
             icon: toggled ? themePrimary.light : tokens_1.colors.soap600,
             background: toggled ? themePrimary.lightest : 'transparent',
+            opacity: '1',
         },
     };
 };

package/dist/commonjs/button/lib/parts/ButtonLabel.d.ts

@@ -1,5 +1,5 @@
-export declare const ButtonLabel: import("@emotion/styled").StyledComponent<{
-    theme?: import("@emotion/react").Theme | undefined;
-    as?: "symbol" | "object" | "s" | "big" | "link" | "small" | "sub" | "sup" | "circle" | "stop" | "path" | "style" | "map" | "filter" | "a" | "abbr" | "address" | "area" | "article" | "aside" | "audio" | "b" | "base" | "bdi" | "bdo" | "blockquote" | "body" | "br" | "button" | "canvas" | "caption" | "cite" | "code" | "col" | "colgroup" | "data" | "datalist" | "dd" | "del" | "details" | "dfn" | "dialog" | "div" | "dl" | "dt" | "em" | "embed" | "fieldset" | "figcaption" | "figure" | "footer" | "form" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "head" | "header" | "hgroup" | "hr" | "html" | "i" | "iframe" | "img" | "input" | "ins" | "kbd" | "keygen" | "label" | "legend" | "li" | "main" | "mark" | "menu" | "menuitem" | "meta" | "meter" | "nav" | "noindex" | "noscript" | "ol" | "optgroup" | "option" | "output" | "p" | "param" | "picture" | "pre" | "progress" | "q" | "rp" | "rt" | "ruby" | "samp" | "slot" | "script" | "section" | "select" | "source" | "span" | "strong" | "summary" | "table" | "template" | "tbody" | "td" | "textarea" | "tfoot" | "th" | "thead" | "time" | "title" | "tr" | "track" | "u" | "ul" | "var" | "video" | "wbr" | "webview" | "svg" | "animate" | "animateMotion" | "animateTransform" | "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" | "foreignObject" | "g" | "image" | "line" | "linearGradient" | "marker" | "mask" | "metadata" | "mpath" | "pattern" | "polygon" | "polyline" | "radialGradient" | "rect" | "switch" | "text" | "textPath" | "tspan" | "use" | "view" | import("react").ComponentClass<any, any> | import("react").FunctionComponent<any> | undefined;
-}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLSpanElement>, HTMLSpanElement>, {}>;
+import { BoxProps } from '@workday/canvas-kit-react/layout';
+export interface ButtonLabelProps extends BoxProps {
+}
+export declare const ButtonLabel: import("../../../common").ElementComponent<"span", ButtonLabelProps>;
 //# sourceMappingURL=ButtonLabel.d.ts.map

package/dist/commonjs/button/lib/parts/ButtonLabel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ButtonLabel.d.ts","sourceRoot":"","sources":["../../../../../button/lib/parts/ButtonLabel.tsx"],"names":[],"mappings":"AAEA,eAAO,MAAM,WAAW;;;2GAKtB,CAAC"}
+{"version":3,"file":"ButtonLabel.d.ts","sourceRoot":"","sources":["../../../../../button/lib/parts/ButtonLabel.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAM,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAE/D,MAAM,WAAW,gBAAiB,SAAQ,QAAQ;CAAG;AASrD,eAAO,MAAM,WAAW,sEAStB,CAAC"}

package/dist/commonjs/button/lib/parts/ButtonLabel.js

@@ -1,10 +1,44 @@
 "use strict";
+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;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ButtonLabel = void 0;
+var react_1 = __importDefault(require("react"));
 var common_1 = require("@workday/canvas-kit-react/common");
-exports.ButtonLabel = common_1.styled('span')({
+var layout_1 = require("@workday/canvas-kit-react/layout");
+var StyledButtonLabel = common_1.styled(layout_1.Box.as('span'))({
     position: 'relative',
     textOverflow: 'ellipsis',
     overflow: 'hidden',
     whiteSpace: 'nowrap',
 });
+exports.ButtonLabel = common_1.createComponent('span')({
+    displayName: 'ButtonLabel',
+    Component: function (_a, ref, Element) {
+        var children = _a.children, elemProps = __rest(_a, ["children"]);
+        return (react_1.default.createElement(StyledButtonLabel, __assign({ as: Element, ref: ref }, elemProps), children));
+    },
+});

package/dist/commonjs/button/lib/parts/ButtonLabelIcon.d.ts

@@ -1,6 +1,7 @@
 import { CanvasSystemIcon } from '@workday/design-assets-types';
 import { ButtonSizes, IconPositions } from '../types';
-export interface ButtonLabelIconProps {
+import { BoxProps } from '@workday/canvas-kit-react/layout';
+export interface ButtonLabelIconProps extends BoxProps {
     /**
      * There are four button sizes: `extraSmall`, `small`, `medium`, and `large`.
      *
@@ -15,7 +16,7 @@ export interface ButtonLabelIconProps {
     /**
      * Button icon positions can either be `left` or `right`.
      * If no value is provided, it defaults to `left`.
-     * @default 'left'
+     * @default 'start'
      */
     iconPosition?: IconPositions;
     /**
@@ -24,5 +25,5 @@ export interface ButtonLabelIconProps {
      */
     shouldMirrorIcon?: boolean;
 }
-export declare const ButtonLabelIcon: ({ icon, size, iconPosition, shouldMirrorIcon, ...elemProps }: ButtonLabelIconProps) => JSX.Element | null;
+export declare const ButtonLabelIcon: import("../../../common").ElementComponent<"span", ButtonLabelIconProps>;
 //# sourceMappingURL=ButtonLabelIcon.d.ts.map

package/dist/commonjs/button/lib/parts/ButtonLabelIcon.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ButtonLabelIcon.d.ts","sourceRoot":"","sources":["../../../../../button/lib/parts/ButtonLabelIcon.tsx"],"names":[],"mappings":"AACA,OAAO,EAAC,gBAAgB,EAAC,MAAM,8BAA8B,CAAC;AAM9D,OAAO,EAAC,WAAW,EAAE,aAAa,EAAC,MAAM,UAAU,CAAC;AACpD,MAAM,WAAW,oBAAoB;IACnC;;;;OAIG;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;CAC5B;AAuCD,eAAO,MAAM,eAAe,iEAMzB,oBAAoB,uBAYtB,CAAC"}
+{"version":3,"file":"ButtonLabelIcon.d.ts","sourceRoot":"","sources":["../../../../../button/lib/parts/ButtonLabelIcon.tsx"],"names":[],"mappings":"AACA,OAAO,EAAC,gBAAgB,EAAC,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAC,WAAW,EAAE,aAAa,EAAC,MAAM,UAAU,CAAC;AAGpD,OAAO,EAAC,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAE1D,MAAM,WAAW,oBAAqB,SAAQ,QAAQ;IACpD;;;;OAIG;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;CAC5B;AASD,eAAO,MAAM,eAAe,0EAyB1B,CAAC"}