@workday/canvas-kit-react 5.3.0 → 5.3.4

package/common/lib/utils/index.ts

@@ -11,5 +11,4 @@ export * from './components';
 export * from './models';
 export * from './elements';
 export * from './useWindowSize';
-export * from './useResizeObserver';
 export * from './StaticStates';

package/common/lib/utils/mergeProps.ts

@@ -39,10 +39,6 @@ export function mergeProps<T extends object, S extends object>(
         typeof targetProps[key] === 'function'
       ) {
         // we don't support removing callbacks via `undefined`, so do nothing here
-      } else if (key === 'ref' && sourceProps.hasOwnProperty('ref')) {
-        // refs should never be overridden. This doesn't happen normally, but happens with hook
-        // composition
-        (returnProps as any).ref = (returnProps as any).ref || (sourceProps as any).ref;
       } else {
         // @ts-ignore TS has more object constraint complaints that aren't useful here
         returnProps[key] = sourceProps[key];

package/common/lib/utils/useUniqueId.ts

@@ -1,8 +1,7 @@
+import * as React from 'react';
 import uuid from 'uuid/v4';
 
-import {useConstant} from './useConstant';
-
-export const generateUniqueId = () => uuid().replace(/^[0-9\-]*/gi, '');
+export const generateUniqueId = () => uuid().replace(/^[0-9]*/gi, '');
 
 /**
  * Generate a unique ID if one is not provided. The generated ID will be stable across renders
@@ -10,7 +9,7 @@ export const generateUniqueId = () => uuid().replace(/^[0-9\-]*/gi, '');
  */
 export const useUniqueId = (id?: string) => {
   // https://codesandbox.io/s/react-functional-component-ids-p2ndq
-  const generatedId = useConstant(generateUniqueId);
+  const [generatedId] = React.useState(generateUniqueId);
   return id || generatedId;
 };
 

package/cookie-banner/README.md

@@ -1,9 +1,4 @@
-# Canvas Kit Cookie Banner (Deprecated)
-
-> Note: As of Canvas Kit v6, CookieBanner is being soft-deprecated. It will be hard-deprecated
-> (completely removed) in v7. Please see the
-> [migration guide](https://workday.github.io/canvas-kit/?path=/story/welcome-migration-guides-v6-0--page)
-> for more information.
+# Canvas Kit Cookie Banner
 
 Cookie banner component.
 
@@ -20,28 +15,28 @@ Fixes a cookie banner to the bottom of the web page.
 Can be configured with a "Cookie Settings" element and a custom notice.
 
 ```tsx
-import DeprecatedCookieBanner from '@workday/canvas-kit-react/cookie-banner'
+import CookieBanner from '@workday/canvas-kit-react/cookie-banner'
 
-<DeprecatedCookieBanner
+<CookieBanner
   onAccept={this.onAccept}
   isClosed={this.state.acceptedCookies}
 />
 
-<DeprecatedCookieBanner
+<CookieBanner
   onAccept={this.onAccept}
   isClosed={this.state.acceptedCookies}
   onClickSettings={this.openSettings}
   notice="Custom notice"
 />
 
-<DeprecatedCookieBanner
+<CookieBanner
   onAccept={this.onAccept}
   isClosed={this.state.acceptedCookies}
   onClickSettings={this.openSettings}
-  notice={`${DeprecatedCookieBanner.DefaultNotice} This is appended.`}
+  notice={`${CookieBanner.DefaultNotice} This is appended.`}
 />
 
-<DeprecatedCookieBanner
+<CookieBanner
   onAccept={this.onAccept}
   isClosed={this.state.acceptedCookies}
   notice={<Component />}
@@ -56,11 +51,11 @@ import DeprecatedCookieBanner from '@workday/canvas-kit-react/cookie-banner'
 > without changing your settings, we’ll assume that you are willing to receive cookies.
 
 ```tsx
-<DeprecatedCookieBanner
+<CookieBanner
   onAccept={this.onAccept}
   isClosed={this.state.acceptedCookies}
   onClickSettings={this.openSettings}
-  notice={`${DeprecatedCookieBanner.DefaultNotice} This is appended.`}
+  notice={`${CookieBanner.DefaultNotice} This is appended.`}
 />
 ```
 
@@ -95,7 +90,7 @@ Default: `undefined`
 
 > Custom cookie notice text or element to display.
 
-Default: `DeprecatedCookieBanner.DefaultNotice`
+Default: `CookieBanner.DefaultNotice`
 
 #### `settingsLabel: string`
 

package/cookie-banner/index.ts

@@ -1,5 +1,5 @@
-import DeprecatedCookieBanner from './lib/CookieBanner';
+import CookieBanner from './lib/CookieBanner';
 
-export default DeprecatedCookieBanner;
-export {DeprecatedCookieBanner};
+export default CookieBanner;
+export {CookieBanner};
 export * from './lib/CookieBanner';

package/cookie-banner/lib/CookieBanner.tsx

@@ -5,15 +5,7 @@ import styled from '@emotion/styled';
 import {colors, commonColors, type, space} from '@workday/canvas-kit-react/tokens';
 import {Hyperlink, HyperlinkProps, PrimaryButton} from '@workday/canvas-kit-react/button';
 
-/**
- * ### Deprecated Cookie Banner Props
- *
- * As of Canvas Kit v6, CookieBanner is being soft-deprecated.
- * It will be hard-deprecated (completely removed) in v7. Please see the
- * [migration guide](https://workday.github.io/canvas-kit/?path=/story/welcome-migration-guides-v6-0--page)
- * for more information.
- */
-export interface DeprecatedCookieBannerProps {
+export interface CookieBannerProps {
   /**
    * If true, set the CookieBanner to the closed state.
    * @default false
@@ -65,7 +57,7 @@ const Banner = styled('div')(
       padding: `${space.s} 0`,
     },
   },
-  ({isClosed}: Pick<DeprecatedCookieBannerProps, 'isClosed'>) =>
+  ({isClosed}: Pick<CookieBannerProps, 'isClosed'>) =>
     isClosed ? {transform: 'translateY(100%)'} : null
 );
 
@@ -103,30 +95,13 @@ const CookieSettings = (props: CookieSettingsProps) => {
   return <Hyperlink as="button" css={cookieSettingsStyles} {...props} />;
 };
 
-/**
- * ### Deprecated Cookie Banner
- *
- * As of Canvas Kit v6, this component is being soft-deprecated.
- * It will be hard-deprecated (completely removed) in v7. Please see the
- * [migration guide](https://workday.github.io/canvas-kit/?path=/story/welcome-migration-guides-v6-0--page)
- * for more information.
- */
-export default class DeprecatedCookieBanner extends React.Component<DeprecatedCookieBannerProps> {
-  componentDidMount() {
-    console.warn(
-      `This component is being deprecated and will be removed in Canvas Kit V7.\n
-      For more information, please see the V6 migration guide:\n
-      https://workday.github.io/canvas-kit/?path=/story/welcome-migration-guides-v6-0--page
-      `
-    );
-  }
-
+export default class CookieBanner extends React.Component<CookieBannerProps> {
   public static DefaultNotice =
     'We use cookies to ensure that we give you the best experience on our website. If you continue without changing your settings, we’ll assume that you are willing to receive cookies.';
 
   public render(): React.ReactNode {
     const {
-      notice = DeprecatedCookieBanner.DefaultNotice,
+      notice = CookieBanner.DefaultNotice,
       settingsLabel = 'Cookie Settings',
       isClosed,
       onAccept,

package/dist/commonjs/action-bar/lib/ActionBar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ActionBar.d.ts","sourceRoot":"","sources":["../../../../action-bar/lib/ActionBar.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,MAAM,WAAW,cAAe,SAAQ,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC;IAC1E;;;OAGG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAuDD,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC;IAC7D,MAAM;CASd"}
+{"version":3,"file":"ActionBar.d.ts","sourceRoot":"","sources":["../../../../action-bar/lib/ActionBar.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,MAAM,WAAW,cAAe,SAAQ,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC;IAC1E;;;OAGG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AA0CD,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC;IAC7D,MAAM;CASd"}

package/dist/commonjs/action-bar/lib/ActionBar.js

@@ -41,57 +41,49 @@ var __importStar = (this && this.__importStar) || function (mod) {
     result["default"] = mod;
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 var React = __importStar(require("react"));
-var common_1 = require("@workday/canvas-kit-react/common");
+var styled_1 = __importDefault(require("@emotion/styled"));
 var tokens_1 = require("@workday/canvas-kit-react/tokens");
-function getFixedStyles(fixed) {
-    if (fixed === void 0) { fixed = false; }
-    return fixed
-        ? {
-            position: 'fixed',
-            left: 0,
-            bottom: 0,
-            right: 0,
-        }
-        : {};
-}
-var ActionBarContainer = common_1.styled('div')({
+var ActionBarContainer = styled_1.default('div')({
     borderTop: "solid 1px " + tokens_1.colors.soap400,
     background: tokens_1.commonColors.background,
     padding: tokens_1.space.s,
     boxShadow: '0 -2px 4px rgba(0, 0, 0, 0.08)',
-}, function (_a) {
-    var _b;
-    var fixed = _a.fixed, theme = _a.theme;
-    return __assign(__assign({}, getFixedStyles(fixed)), (_b = {}, _b[theme.canvas.breakpoints.down('s')] = {
+    '@media (max-width: 575px)': {
         padding: tokens_1.space.xxs,
-    }, _b));
+    },
+}, function (_a) {
+    var fixed = _a.fixed;
+    return fixed && {
+        position: 'fixed',
+        left: 0,
+        bottom: 0,
+        right: 0,
+    };
 });
-var ChildrenContainer = common_1.styled('div')({
+var ChildrenContainer = styled_1.default('div')({
     display: 'inline-block',
     padding: "0 " + tokens_1.space.m,
     '*:not(:first-of-type)': {
         marginLeft: tokens_1.space.s,
     },
-}, function (_a) {
-    var _b;
-    var theme = _a.theme;
-    return (_b = {},
-        _b[theme.canvas.breakpoints.down('s')] = {
-            display: 'flex',
-            padding: tokens_1.space.xxs,
-            justifyContent: 'center',
-            flexDirection: 'row-reverse',
-            '> *': {
-                flex: 1,
-                '&:not(:first-of-type)': {
-                    marginRight: tokens_1.space.s,
-                    marginLeft: 0,
-                },
+    '@media (max-width: 575px)': {
+        display: 'flex',
+        padding: tokens_1.space.xxs,
+        justifyContent: 'center',
+        flexDirection: 'row-reverse',
+        '> *': {
+            flex: 1,
+            '&:not(:first-of-type)': {
+                marginRight: tokens_1.space.s,
+                marginLeft: 0,
             },
         },
-        _b);
+    },
 });
 var ActionBar = /** @class */ (function (_super) {
     __extends(ActionBar, _super);

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

@@ -1,20 +1,13 @@
 import * as React from 'react';
 import { GrowthBehavior, Themeable, EmotionCanvasTheme } from '@workday/canvas-kit-react/common';
 import { CanvasSystemIcon } from '@workday/design-assets-types';
-import { ButtonSizes, IconPositions } from './types';
+import { ButtonColors } from './types';
 export interface PrimaryButtonProps extends Themeable, GrowthBehavior {
     /**
-     * The variant of the PrimaryButton.
-     * @default undefined
-     */
-    variant?: 'inverse';
-    /**
-     * There are four button sizes: `extraSmall`, `small`, `medium`, and `large`.
-     * If no size is provided, it will default to `medium`.
-     *
+     * The size of the Button.
      * @default 'medium'
      */
-    size?: ButtonSizes;
+    size?: 'small' | 'medium' | 'large';
     /**
      * The data label of the Button.
      * Note: not displayed at `small` size
@@ -26,11 +19,10 @@ export interface PrimaryButtonProps extends Themeable, GrowthBehavior {
      */
     icon?: CanvasSystemIcon;
     /**
-     * Button icon positions can either be `left` or `right`.
-     * If no value is provided, it defaults to `left`.
+     * The position of the TertiaryButton icon.
      * @default 'left'
      */
-    iconPosition?: IconPositions;
+    iconPosition?: 'left' | 'right';
     /**
      * If set to `true`, transform the icon's x-axis to mirror the graphic
      * @default false
@@ -39,71 +31,5 @@ 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/serialize").CSSObject;
-    };
-    disabled: {
-        background: string;
-        icon: string;
-        label: string;
-        labelData: string;
-    };
-};
+export declare const getPrimaryButtonColors: ({ canvas: { palette: { primary: themePrimary }, }, }: EmotionCanvasTheme) => ButtonColors;
 //# sourceMappingURL=PrimaryButton.d.ts.map

package/dist/commonjs/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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6ElC,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,EACT,kBAAkB,EAEnB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAC,gBAAgB,EAAC,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAC,YAAY,EAAC,MAAM,SAAS,CAAC;AAGrC,MAAM,WAAW,kBAAmB,SAAQ,SAAS,EAAE,cAAc;IACnE;;;OAGG;IACH,IAAI,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC;IACpC;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,IAAI,CAAC,EAAE,gBAAgB,CAAC;IACxB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAChC;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B;AAED,eAAO,MAAM,aAAa,uEA6CxB,CAAC;AAEH,eAAO,MAAM,sBAAsB,4FAsBjC,CAAC"}

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

@@ -31,17 +31,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 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) {
@@ -51,77 +41,33 @@ exports.PrimaryButton = common_1.createComponent('button')({
         _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 })),
+        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, dataLabel = _a.dataLabel, icon = _a.icon, _e = _a.shouldMirrorIcon, shouldMirrorIcon = _e === void 0 ? false : _e, children = _a.children, elemProps = __rest(_a, ["theme", "size", "iconPosition", "dataLabel", "icon", "shouldMirrorIcon", "children"]);
+        return (React.createElement(parts_1.ButtonContainer, __assign({ ref: ref, as: Element, colors: exports.getPrimaryButtonColors(theme), size: size }, elemProps),
+            icon && size !== 'small' && 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 }))));
+            dataLabel && size !== 'small' && React.createElement(parts_1.ButtonLabelData, null, dataLabel),
+            icon && size !== 'small' && iconPosition === 'right' && (React.createElement(parts_1.ButtonLabelIcon, { size: size, iconPosition: iconPosition, icon: icon, shouldMirrorIcon: shouldMirrorIcon }))));
     },
 });
-exports.getPrimaryButtonColors = function (variant, theme) {
-    var themePrimary = theme.canvas.palette.primary;
-    switch (variant) {
-        case undefined:
-        default:
-            return {
-                default: {
-                    background: themePrimary.main,
-                    icon: themePrimary.contrast,
-                    label: themePrimary.contrast,
-                },
-                hover: {
-                    background: themePrimary.dark,
-                },
-                active: {
-                    background: themePrimary.darkest,
-                },
-                focus: {
-                    background: themePrimary.main,
-                },
-                disabled: {
-                    background: themePrimary.main,
-                },
-            };
-        case 'inverse':
-            return {
-                default: {
-                    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,
-                    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,
-                        outerColor: tokens_1.colors.frenchVanilla100,
-                    }, theme),
-                },
-                // Identical to inverse 'default' styles. ButtonContainer will set opacity to 40%
-                disabled: {
-                    background: tokens_1.colors.frenchVanilla100,
-                    icon: tokens_1.colors.blackPepper400,
-                    label: tokens_1.colors.blackPepper400,
-                    labelData: tokens_1.colors.blackPepper400,
-                },
-            };
-    }
+exports.getPrimaryButtonColors = function (_a) {
+    var themePrimary = _a.canvas.palette.primary;
+    return ({
+        default: {
+            background: themePrimary.main,
+            icon: themePrimary.contrast,
+            label: themePrimary.contrast,
+        },
+        hover: {
+            background: themePrimary.dark,
+        },
+        active: {
+            background: themePrimary.darkest,
+        },
+        focus: {
+            background: themePrimary.main,
+        },
+        disabled: {
+            background: themePrimary.light,
+        },
+    });
 };

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

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { GrowthBehavior, Themeable, EmotionCanvasTheme } from '@workday/canvas-kit-react/common';
 import { CanvasSystemIcon } from '@workday/design-assets-types';
-import { ButtonColors, ButtonSizes, IconPositions } from './types';
+import { ButtonColors } from './types';
 export interface SecondaryButtonProps extends Themeable, GrowthBehavior {
     /**
      * The variant of the SecondaryButton.
@@ -9,12 +9,10 @@ export interface SecondaryButtonProps extends Themeable, GrowthBehavior {
      */
     variant?: 'inverse' | undefined;
     /**
-     * There are four button sizes: `extraSmall`, `small`, `medium`, and `large`.
-     * If no size is provided, it will default to `medium`.
-     *
+     * The size of the Button.
      * @default 'medium'
      */
-    size?: ButtonSizes;
+    size?: 'small' | 'medium' | 'large';
     /**
      * The data label of the Button.
      * Note: not displayed at `small` size
@@ -26,11 +24,10 @@ export interface SecondaryButtonProps extends Themeable, GrowthBehavior {
      */
     icon?: CanvasSystemIcon;
     /**
-     * Button icon positions can either be `left` or `right`.
-     * If no value is provided, it defaults to `left`.
+     * The position of the TertiaryButton icon.
      * @default 'left'
      */
-    iconPosition?: IconPositions;
+    iconPosition?: 'left' | 'right';
     /**
      * If set to `true`, transform the icon's x-axis to mirror the graphic
      * @default false

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,6EA+FpC,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,EAAC,MAAM,SAAS,CAAC;AAGrC,MAAM,WAAW,oBAAqB,SAAQ,SAAS,EAAE,cAAc;IACrE;;;OAGG;IACH,OAAO,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;IAChC;;;OAGG;IACH,IAAI,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC;IACpC;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,IAAI,CAAC,EAAE,gBAAgB,CAAC;IACxB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAChC;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B;AAED,eAAO,MAAM,eAAe,yEA8C1B,CAAC;AAEH,eAAO,MAAM,wBAAwB,6EA8FpC,CAAC"}

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

@@ -33,15 +33,6 @@ 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,
-    },
-};
 exports.SecondaryButton = common_1.createComponent('button')({
     displayName: 'SecondaryButton',
     Component: function (_a, ref, Element) {
@@ -52,11 +43,11 @@ exports.SecondaryButton = 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, _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 })),
+        return (React.createElement(parts_1.ButtonContainer, __assign({ ref: ref, as: Element, colors: exports.getSecondaryButtonColors(variant, theme), size: size }, elemProps),
+            icon && size !== 'small' && 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 }))));
+            dataLabel && size !== 'small' && React.createElement(parts_1.ButtonLabelData, null, dataLabel),
+            icon && size !== 'small' && iconPosition === 'right' && (React.createElement(parts_1.ButtonLabelIcon, { size: size, iconPosition: iconPosition, icon: icon, shouldMirrorIcon: shouldMirrorIcon }))));
     },
 });
 exports.getSecondaryButtonColors = function (variant, theme) {
@@ -92,13 +83,12 @@ exports.getSecondaryButtonColors = function (variant, theme) {
                     label: tokens_1.colors.blackPepper400,
                     labelData: tokens_1.colors.blackPepper400,
                 },
-                // Identical to 'default' styles. ButtonContainer will set opacity to 40%
                 disabled: {
                     background: 'transparent',
-                    border: tokens_1.colors.blackPepper400,
-                    icon: tokens_1.colors.blackPepper400,
-                    label: tokens_1.colors.blackPepper400,
-                    labelData: tokens_1.colors.blackPepper400,
+                    border: 'rgba(30, 30, 30, 0.4)',
+                    icon: 'rgba(30, 30, 30, 0.4)',
+                    label: 'rgba(30, 30, 30, 0.4)',
+                    labelData: 'rgba(30, 30, 30, 0.4)',
                 },
             };
         case 'inverse':
@@ -134,12 +124,12 @@ exports.getSecondaryButtonColors = function (variant, theme) {
                         outerColor: tokens_1.colors.frenchVanilla100,
                     }, theme),
                 },
-                // Identical to inverse 'default' styles. ButtonContainer will set opacity to 40%
                 disabled: {
                     background: 'transparent',
-                    border: tokens_1.colors.frenchVanilla100,
-                    icon: tokens_1.colors.frenchVanilla100,
-                    label: tokens_1.colors.frenchVanilla100,
+                    border: 'rgba(255, 255, 255, 0.4)',
+                    icon: 'rgba(255, 255, 255, 0.4)',
+                    label: 'rgba(255, 255, 255, 0.4)',
+                    labelData: 'rgba(255, 255, 255, 0.4)',
                 },
             };
     }

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

@@ -1,7 +1,6 @@
 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';
 export interface TertiaryButtonProps extends Themeable {
     /**
      * The variant of the TertiaryButton.
@@ -9,18 +8,15 @@ export interface TertiaryButtonProps extends Themeable {
      */
     variant?: 'inverse' | undefined;
     /**
-     * There are three button sizes: `extraSmall`, `small`, and `medium`.
-     * If no size is provided, it will default to `medium`.
-     *
+     * The size of the TertiaryButton.
      * @default 'medium'
      */
-    size?: TertiaryButtonSizes;
+    size?: 'small' | 'medium';
     /**
-     * Button icon positions can either be `left` or `right`.
-     * If no value is provided, it defaults to `left`.
+     * The position of the TertiaryButton icon.
      * @default 'left'
      */
-    iconPosition?: IconPositions;
+    iconPosition?: 'left' | 'right';
     /**
      * The icon of the TertiaryButton.
      */