@atlaskit/color-picker 3.2.10 → 3.2.12

package/dist/cjs/components/ColorCard.js

@@ -63,34 +63,7 @@ var ColorCard = function ColorCard(props) {
       };
     }
   }, []);
-  return (0, _platformFeatureFlags.getBooleanFF)('platform.design-tokens-color-picker-portfolio-plan-wizard_w8rcl') ? (0, _react2.jsx)(_tooltip.default, {
-    content: label
-  }, (0, _react2.jsx)("div", (0, _extends2.default)({
-    css: [sharedColorContainerStylesNew, (isTabbing === undefined || isTabbing) && colorCardOptionTabbingStyles, focused && !isTabbing && colorCardOptionFocusedStyles],
-    onClick: handleClick,
-    onMouseDown: handleMouseDown,
-    onKeyDown: handleKeyDown,
-    role: "radio",
-    "aria-checked": selected
-  }, !(0, _platformFeatureFlags.getBooleanFF)('platform.jca11y-1559-dashboard-view-dashboard-remove-duplicate-aria-label_g5i3i') && {
-    'aria-label': label
-  }, {
-    tabIndex: 0
-  }, (0, _platformFeatureFlags.getBooleanFF)('platform.color-picker-radio-button-functionality_6hkcy') && {
-    ref: ref
-  }), (0, _react2.jsx)("div", {
-    css: colorCardWrapperStylesNew
-  }, (0, _react2.jsx)("div", {
-    css: colorCardContentStylesNew,
-    style: {
-      background: value || 'transparent'
-    }
-  }, selected && (0, _react2.jsx)("div", {
-    css: colorCardContentCheckMarkStyles
-  }, (0, _react2.jsx)(_done.default, {
-    primaryColor: checkMarkColor,
-    label: ""
-  })))))) : (0, _react2.jsx)(_tooltip.default, {
+  return (0, _react2.jsx)(_tooltip.default, {
     content: label
   }, (0, _react2.jsx)("div", (0, _extends2.default)({
     css: [sharedColorContainerStyles, (isTabbing === undefined || isTabbing) && colorCardOptionTabbingStyles, focused && !isTabbing && colorCardOptionFocusedStyles],
@@ -98,14 +71,13 @@ var ColorCard = function ColorCard(props) {
     onMouseDown: handleMouseDown,
     onKeyDown: handleKeyDown,
     role: "radio",
-    "aria-checked": selected
-  }, !(0, _platformFeatureFlags.getBooleanFF)('platform.jca11y-1559-dashboard-view-dashboard-remove-duplicate-aria-label_g5i3i') && {
-    'aria-label': label
-  }, {
+    "aria-checked": selected,
     tabIndex: 0
   }, (0, _platformFeatureFlags.getBooleanFF)('platform.color-picker-radio-button-functionality_6hkcy') && {
     ref: ref
   }), (0, _react2.jsx)("div", {
+    css: colorCardWrapperStyles
+  }, (0, _react2.jsx)("div", {
     css: colorCardContentStyles,
     style: {
       background: value || 'transparent'
@@ -115,24 +87,9 @@ var ColorCard = function ColorCard(props) {
   }, (0, _react2.jsx)(_done.default, {
     primaryColor: checkMarkColor,
     label: ""
-  })))));
+  }))))));
 };
 var _default = exports.default = ColorCard;
-var sharedColorContainerStyles = (0, _react2.css)({
-  display: 'inline-block',
-  position: 'relative',
-  width: "".concat(_constants.COLOR_CARD_SIZE, "px"),
-  height: "".concat(_constants.COLOR_CARD_SIZE, "px"),
-  border: '2px solid transparent',
-  boxSizing: 'border-box',
-  borderRadius: '6px',
-  transition: 'border-color 0.15s cubic-bezier(0.47, 0.03, 0.49, 1.38)',
-  backgroundColor: "var(--ds-background-neutral-subtle, ".concat(_colors.N0, ")"),
-  borderColor: "var(--ds-background-neutral-subtle, ".concat(_colors.N0, ")"),
-  padding: "var(--ds-space-0, 0px)",
-  cursor: 'pointer',
-  outline: 'none'
-});
 var colorCardOptionTabbingStyles = (0, _react2.css)({
   ':hover, :focus': {
     borderColor: "var(--ds-border-focused, ".concat(_colors.B75, ")")
@@ -141,20 +98,11 @@ var colorCardOptionTabbingStyles = (0, _react2.css)({
 var colorCardOptionFocusedStyles = (0, _react2.css)({
   borderColor: "var(--ds-border-focused, ".concat(_colors.B75, ")")
 });
-var colorCardContentStyles = (0, _react2.css)({
-  position: 'absolute',
-  top: '1px',
-  left: '1px',
-  width: "var(--ds-space-300, 24px)",
-  height: "var(--ds-space-300, 24px)",
-  borderRadius: "var(--ds-border-radius-100, 3px)",
-  boxShadow: "inset 0px 0px 0px 1px ".concat("var(--ds-background-inverse-subtle, ".concat(_colors.DN600A, ")"))
-});
 var colorCardContentCheckMarkStyles = (0, _react2.css)({
   // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
   margin: '1px'
 });
-var sharedColorContainerStylesNew = (0, _react2.css)({
+var sharedColorContainerStyles = (0, _react2.css)({
   display: 'inline-block',
   position: 'relative',
   width: "var(--ds-space-400, 32px)",
@@ -169,14 +117,14 @@ var sharedColorContainerStylesNew = (0, _react2.css)({
   cursor: 'pointer',
   outline: 'none'
 });
-var colorCardWrapperStylesNew = (0, _react2.css)({
+var colorCardWrapperStyles = (0, _react2.css)({
   width: '100%',
   height: '100%',
   display: 'flex',
   alignItems: 'center',
   justifyContent: 'center'
 });
-var colorCardContentStylesNew = (0, _react2.css)({
+var colorCardContentStyles = (0, _react2.css)({
   width: "var(--ds-space-300, 24px)",
   height: "var(--ds-space-300, 24px)",
   borderRadius: "var(--ds-border-radius-100, 3px)",

package/dist/cjs/components/ColorPaletteMenu.js

@@ -10,9 +10,7 @@ var _analyticsNext = require("@atlaskit/analytics-next");
 var _ColorCard = _interopRequireDefault(require("./ColorCard"));
 var _utils = require("../utils");
 var _react = require("@emotion/react");
-var _constants = require("../constants");
 var _colors = require("@atlaskit/theme/colors");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 /** @jsx jsx */
 
 var ColorPaletteMenuWithoutAnalytics = exports.ColorPaletteMenuWithoutAnalytics = function ColorPaletteMenuWithoutAnalytics(_ref) {
@@ -36,7 +34,7 @@ var ColorPaletteMenuWithoutAnalytics = exports.ColorPaletteMenuWithoutAnalytics
         attributes: {
           componentName: 'color-picker',
           packageName: "@atlaskit/color-picker",
-          packageVersion: "3.2.10"
+          packageVersion: "3.2.12"
         }
       })(createAnalyticsEvent);
     }
@@ -62,7 +60,7 @@ var ColorPaletteMenuWithoutAnalytics = exports.ColorPaletteMenuWithoutAnalytics
     var label = _ref2.label,
       value = _ref2.value;
     return (0, _react.jsx)("div", {
-      css: (0, _platformFeatureFlags.getBooleanFF)('platform.design-tokens-color-picker-portfolio-plan-wizard_w8rcl') ? colorCardWrapperStyles : colorCardWrapperStylesOld,
+      css: colorCardWrapperStyles,
       key: value
     }, (0, _react.jsx)(_ColorCard.default, {
       label: label,
@@ -78,13 +76,8 @@ var ColorPaletteMenuWithoutAnalytics = exports.ColorPaletteMenuWithoutAnalytics
 var _default = exports.default = (0, _analyticsNext.withAnalyticsContext)({
   componentName: 'color-picker',
   packageName: "@atlaskit/color-picker",
-  packageVersion: "3.2.10"
+  packageVersion: "3.2.12"
 })((0, _analyticsNext.withAnalyticsEvents)()(ColorPaletteMenuWithoutAnalytics));
-var colorCardWrapperStylesOld = (0, _react.css)({
-  display: 'flex',
-  margin: "var(--ds-space-025, 2px)",
-  height: "".concat(_constants.COLOR_CARD_SIZE, "px")
-});
 var colorCardWrapperStyles = (0, _react.css)({
   display: 'flex',
   margin: "var(--ds-space-025, 2px)",

package/dist/cjs/components/ColorPicker.js

@@ -40,7 +40,7 @@ var defaultPopperProps = {
   placement: 'bottom-start'
 };
 var packageName = "@atlaskit/color-picker";
-var packageVersion = "3.2.10";
+var packageVersion = "3.2.12";
 var ColorPickerWithoutAnalyticsBase = /*#__PURE__*/function (_React$Component) {
   (0, _inherits2.default)(ColorPickerWithoutAnalyticsBase, _React$Component);
   var _super = _createSuper(ColorPickerWithoutAnalyticsBase);

package/dist/cjs/components/Trigger.js

@@ -9,7 +9,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _react = require("react");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 var _react2 = require("@emotion/react");
-var _constants = require("../constants");
 var _colors = require("@atlaskit/theme/colors");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 /** @jsx jsx */
@@ -32,31 +31,7 @@ var ColorCard = function ColorCard(_ref) {
       onClick();
     }
   }, [onClick]);
-  return (0, _platformFeatureFlags.getBooleanFF)('platform.design-tokens-color-picker-portfolio-plan-wizard_w8rcl') ? (0, _react2.jsx)(_tooltip.default, {
-    content: label
-  }, (0, _react2.jsx)("button", (0, _extends2.default)({}, (0, _platformFeatureFlags.getBooleanFF)('platform.color-picker-radio-button-functionality_6hkcy') ? {
-    css: [sharedColorContainerStyles, swatchSize === 'small' ? smallColorContainerSizeNew : defaultColorContainerSizeNew, colorCardButtonStyles, expanded && colorCardButtonFocusedStyles],
-    disabled: isDisabled
-  } : {
-    css: [sharedColorContainerStyles, defaultColorContainerSizeNew, colorCardButtonStyles, expanded && colorCardButtonFocusedStyles]
-  }, {
-    onClick: handleClick,
-    onMouseDown: handleMouseDown,
-    "aria-label": label,
-    "aria-expanded": expanded,
-    "aria-haspopup": true,
-    type: "button"
-  }), (0, _react2.jsx)("span", {
-    css: colorCardWrapperStylesNew
-  }, (0, _react2.jsx)("span", (0, _extends2.default)({}, (0, _platformFeatureFlags.getBooleanFF)('platform.color-picker-radio-button-functionality_6hkcy') ? {
-    css: [colorCardContentStylesNew, swatchSize === 'small' ? smallColorCardContentSize : defaultColorCardContentSize]
-  } : {
-    css: [colorCardContentStylesNew, defaultColorCardContentSize]
-  }, {
-    style: {
-      background: value || 'transparent'
-    }
-  }))))) : (0, _react2.jsx)(_tooltip.default, {
+  return (0, _react2.jsx)(_tooltip.default, {
     content: label
   }, (0, _react2.jsx)("button", (0, _extends2.default)({}, (0, _platformFeatureFlags.getBooleanFF)('platform.color-picker-radio-button-functionality_6hkcy') ? {
     css: [sharedColorContainerStyles, swatchSize === 'small' ? smallColorContainerSize : defaultColorContainerSize, colorCardButtonStyles, expanded && colorCardButtonFocusedStyles],
@@ -70,7 +45,9 @@ var ColorCard = function ColorCard(_ref) {
     "aria-expanded": expanded,
     "aria-haspopup": true,
     type: "button"
-  }), (0, _react2.jsx)("span", (0, _extends2.default)({}, (0, _platformFeatureFlags.getBooleanFF)('platform.color-picker-radio-button-functionality_6hkcy') ? {
+  }), (0, _react2.jsx)("span", {
+    css: colorCardWrapperStyles
+  }, (0, _react2.jsx)("span", (0, _extends2.default)({}, (0, _platformFeatureFlags.getBooleanFF)('platform.color-picker-radio-button-functionality_6hkcy') ? {
     css: [colorCardContentStyles, swatchSize === 'small' ? smallColorCardContentSize : defaultColorCardContentSize]
   } : {
     css: [colorCardContentStyles, defaultColorCardContentSize]
@@ -78,7 +55,7 @@ var ColorCard = function ColorCard(_ref) {
     style: {
       background: value || 'transparent'
     }
-  }))));
+  })))));
 };
 var _default = exports.default = ColorCard;
 var sharedColorContainerStyles = (0, _react2.css)({
@@ -95,20 +72,11 @@ var sharedColorContainerStyles = (0, _react2.css)({
   outline: 'none'
 });
 var smallColorContainerSize = (0, _react2.css)({
-  width: '22px',
-  height: '22px',
-  top: "var(--ds-space-negative-025, -2px)"
-});
-var smallColorContainerSizeNew = (0, _react2.css)({
   width: "var(--ds-space-300, 24px)",
   height: "var(--ds-space-300, 24px)",
   top: "var(--ds-space-negative-025, -2px)"
 });
 var defaultColorContainerSize = (0, _react2.css)({
-  width: "".concat(_constants.COLOR_CARD_SIZE, "px"),
-  height: "".concat(_constants.COLOR_CARD_SIZE, "px")
-});
-var defaultColorContainerSizeNew = (0, _react2.css)({
   width: "var(--ds-space-400, 32px)",
   height: "var(--ds-space-400, 32px)"
 });
@@ -125,21 +93,14 @@ var colorCardButtonFocusedStyles = (0, _react2.css)({
   borderColor: "var(--ds-border-focused, ".concat(_colors.B100, ")"),
   outline: 'none'
 });
-var colorCardContentStyles = (0, _react2.css)({
-  position: 'absolute',
-  top: '1px',
-  left: '1px',
-  borderRadius: "var(--ds-border-radius-100, 3px)",
-  boxShadow: "inset 0px 0px 0px 1px ".concat("var(--ds-background-inverse-subtle, ".concat(_colors.DN600A, ")"))
-});
-var colorCardWrapperStylesNew = (0, _react2.css)({
+var colorCardWrapperStyles = (0, _react2.css)({
   width: '100%',
   height: '100%',
   display: 'flex',
   alignItems: 'center',
   justifyContent: 'center'
 });
-var colorCardContentStylesNew = (0, _react2.css)({
+var colorCardContentStyles = (0, _react2.css)({
   borderRadius: "var(--ds-border-radius-100, 3px)",
   boxShadow: "inset 0px 0px 0px 1px ".concat("var(--ds-background-inverse-subtle, ".concat(_colors.DN600A, ")"))
 });

package/dist/cjs/components/components.js

@@ -8,9 +8,7 @@ exports.Placeholder = exports.Option = exports.MenuList = exports.DropdownIndica
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _ColorCard = _interopRequireDefault(require("./ColorCard"));
 var _utils = require("../utils");
-var _constants = require("../constants");
 var _react = require("@emotion/react");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 /** @jsx jsx */
 
 var MenuList = exports.MenuList = function MenuList(props) {
@@ -38,7 +36,7 @@ var Option = exports.Option = function Option(props) {
     isSelected = props.isSelected,
     innerProps = props.innerProps;
   return (0, _react.jsx)("div", (0, _extends2.default)({
-    css: (0, _platformFeatureFlags.getBooleanFF)('platform.design-tokens-color-picker-portfolio-plan-wizard_w8rcl') ? colorCardWrapperStyles : colorCardWrapperStylesOld
+    css: colorCardWrapperStyles
   }, innerProps), (0, _react.jsx)(_ColorCard.default, {
     label: label,
     value: value,
@@ -58,11 +56,6 @@ var DropdownIndicator = exports.DropdownIndicator = function DropdownIndicator()
 var Placeholder = exports.Placeholder = function Placeholder() {
   return null;
 };
-var colorCardWrapperStylesOld = (0, _react.css)({
-  display: 'flex',
-  margin: "var(--ds-space-025, 2px)",
-  height: "".concat(_constants.COLOR_CARD_SIZE, "px")
-});
 var colorCardWrapperStyles = (0, _react.css)({
   display: 'flex',
   margin: "var(--ds-space-025, 2px)",

package/dist/cjs/constants.js

@@ -3,9 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.KEY_TAB = exports.KEY_SPACE = exports.KEY_ENTER = exports.KEY_ARROW_UP = exports.KEY_ARROW_DOWN = exports.COLOR_CARD_SIZE_NEW = exports.COLOR_CARD_SIZE = void 0;
-var COLOR_CARD_SIZE = exports.COLOR_CARD_SIZE = 30;
-var COLOR_CARD_SIZE_NEW = exports.COLOR_CARD_SIZE_NEW = 32;
+exports.KEY_TAB = exports.KEY_SPACE = exports.KEY_ENTER = exports.KEY_ARROW_UP = exports.KEY_ARROW_DOWN = exports.COLOR_CARD_SIZE = void 0;
+var COLOR_CARD_SIZE = exports.COLOR_CARD_SIZE = 32;
 var KEY_SPACE = exports.KEY_SPACE = ' ';
 var KEY_ENTER = exports.KEY_ENTER = 'Enter';
 var KEY_ARROW_UP = exports.KEY_ARROW_UP = 'ArrowDown';

package/dist/cjs/utils.js

@@ -14,7 +14,7 @@ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 // eslint-disable-next-line @atlassian/tangerine/import/entry-points
 
 var getWidth = exports.getWidth = function getWidth(cols, mode) {
-  var width = cols * (((0, _platformFeatureFlags.getBooleanFF)('platform.design-tokens-color-picker-portfolio-plan-wizard_w8rcl') ? _constants.COLOR_CARD_SIZE_NEW : _constants.COLOR_CARD_SIZE) + (0, _theme.gridSize)() / 2);
+  var width = cols * (_constants.COLOR_CARD_SIZE + (0, _theme.gridSize)() / 2);
   return mode === _types.Mode.Standard ? width + (0, _theme.gridSize)() : width;
 };
 var getOptions = exports.getOptions = (0, _memoizeOne.default)(function (palette, selectedColor, showDefaultSwatchColor) {

package/dist/es2019/components/ColorCard.js

@@ -3,7 +3,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import React, { useCallback, useEffect, useRef } from 'react';
 import EditorDoneIcon from '@atlaskit/icon/glyph/editor/done';
 import Tooltip from '@atlaskit/tooltip';
-import { COLOR_CARD_SIZE, KEY_ENTER, KEY_SPACE } from '../constants';
+import { KEY_ENTER, KEY_SPACE } from '../constants';
 import { css, jsx } from '@emotion/react';
 import { N0, DN600A, B75 } from '@atlaskit/theme/colors';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
@@ -13,7 +13,6 @@ const ColorCard = props => {
     label,
     selected,
     focused,
-    // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
     checkMarkColor = N0,
     isTabbing,
     onClick,
@@ -56,34 +55,7 @@ const ColorCard = props => {
       };
     }
   }, []);
-  return getBooleanFF('platform.design-tokens-color-picker-portfolio-plan-wizard_w8rcl') ? jsx(Tooltip, {
-    content: label
-  }, jsx("div", _extends({
-    css: [sharedColorContainerStylesNew, (isTabbing === undefined || isTabbing) && colorCardOptionTabbingStyles, focused && !isTabbing && colorCardOptionFocusedStyles],
-    onClick: handleClick,
-    onMouseDown: handleMouseDown,
-    onKeyDown: handleKeyDown,
-    role: "radio",
-    "aria-checked": selected
-  }, !getBooleanFF('platform.jca11y-1559-dashboard-view-dashboard-remove-duplicate-aria-label_g5i3i') && {
-    'aria-label': label
-  }, {
-    tabIndex: 0
-  }, getBooleanFF('platform.color-picker-radio-button-functionality_6hkcy') && {
-    ref: ref
-  }), jsx("div", {
-    css: colorCardWrapperStylesNew
-  }, jsx("div", {
-    css: colorCardContentStylesNew,
-    style: {
-      background: value || 'transparent'
-    }
-  }, selected && jsx("div", {
-    css: colorCardContentCheckMarkStyles
-  }, jsx(EditorDoneIcon, {
-    primaryColor: checkMarkColor,
-    label: ""
-  })))))) : jsx(Tooltip, {
+  return jsx(Tooltip, {
     content: label
   }, jsx("div", _extends({
     css: [sharedColorContainerStyles, (isTabbing === undefined || isTabbing) && colorCardOptionTabbingStyles, focused && !isTabbing && colorCardOptionFocusedStyles],
@@ -91,14 +63,13 @@ const ColorCard = props => {
     onMouseDown: handleMouseDown,
     onKeyDown: handleKeyDown,
     role: "radio",
-    "aria-checked": selected
-  }, !getBooleanFF('platform.jca11y-1559-dashboard-view-dashboard-remove-duplicate-aria-label_g5i3i') && {
-    'aria-label': label
-  }, {
+    "aria-checked": selected,
     tabIndex: 0
   }, getBooleanFF('platform.color-picker-radio-button-functionality_6hkcy') && {
     ref: ref
   }), jsx("div", {
+    css: colorCardWrapperStyles
+  }, jsx("div", {
     css: colorCardContentStyles,
     style: {
       background: value || 'transparent'
@@ -108,24 +79,9 @@ const ColorCard = props => {
   }, jsx(EditorDoneIcon, {
     primaryColor: checkMarkColor,
     label: ""
-  })))));
+  }))))));
 };
 export default ColorCard;
-const sharedColorContainerStyles = css({
-  display: 'inline-block',
-  position: 'relative',
-  width: `${COLOR_CARD_SIZE}px`,
-  height: `${COLOR_CARD_SIZE}px`,
-  border: '2px solid transparent',
-  boxSizing: 'border-box',
-  borderRadius: '6px',
-  transition: 'border-color 0.15s cubic-bezier(0.47, 0.03, 0.49, 1.38)',
-  backgroundColor: `var(--ds-background-neutral-subtle, ${N0})`,
-  borderColor: `var(--ds-background-neutral-subtle, ${N0})`,
-  padding: "var(--ds-space-0, 0px)",
-  cursor: 'pointer',
-  outline: 'none'
-});
 const colorCardOptionTabbingStyles = css({
   ':hover, :focus': {
     borderColor: `var(--ds-border-focused, ${B75})`
@@ -134,20 +90,11 @@ const colorCardOptionTabbingStyles = css({
 const colorCardOptionFocusedStyles = css({
   borderColor: `var(--ds-border-focused, ${B75})`
 });
-const colorCardContentStyles = css({
-  position: 'absolute',
-  top: '1px',
-  left: '1px',
-  width: "var(--ds-space-300, 24px)",
-  height: "var(--ds-space-300, 24px)",
-  borderRadius: "var(--ds-border-radius-100, 3px)",
-  boxShadow: `inset 0px 0px 0px 1px ${`var(--ds-background-inverse-subtle, ${DN600A})`}`
-});
 const colorCardContentCheckMarkStyles = css({
   // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
   margin: '1px'
 });
-const sharedColorContainerStylesNew = css({
+const sharedColorContainerStyles = css({
   display: 'inline-block',
   position: 'relative',
   width: "var(--ds-space-400, 32px)",
@@ -162,14 +109,14 @@ const sharedColorContainerStylesNew = css({
   cursor: 'pointer',
   outline: 'none'
 });
-const colorCardWrapperStylesNew = css({
+const colorCardWrapperStyles = css({
   width: '100%',
   height: '100%',
   display: 'flex',
   alignItems: 'center',
   justifyContent: 'center'
 });
-const colorCardContentStylesNew = css({
+const colorCardContentStyles = css({
   width: "var(--ds-space-300, 24px)",
   height: "var(--ds-space-300, 24px)",
   borderRadius: "var(--ds-border-radius-100, 3px)",

package/dist/es2019/components/ColorPaletteMenu.js

@@ -4,9 +4,7 @@ import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@
 import ColorCard from './ColorCard';
 import { getOptions, getWidth } from '../utils';
 import { css, jsx } from '@emotion/react';
-import { COLOR_CARD_SIZE } from '../constants';
 import { N0, N40 } from '@atlaskit/theme/colors';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 export const ColorPaletteMenuWithoutAnalytics = ({
   createAnalyticsEvent,
   onChange,
@@ -26,7 +24,7 @@ export const ColorPaletteMenuWithoutAnalytics = ({
         attributes: {
           componentName: 'color-picker',
           packageName: "@atlaskit/color-picker",
-          packageVersion: "3.2.10"
+          packageVersion: "3.2.12"
         }
       })(createAnalyticsEvent);
     }
@@ -53,7 +51,7 @@ export const ColorPaletteMenuWithoutAnalytics = ({
     label,
     value
   }) => jsx("div", {
-    css: getBooleanFF('platform.design-tokens-color-picker-portfolio-plan-wizard_w8rcl') ? colorCardWrapperStyles : colorCardWrapperStylesOld,
+    css: colorCardWrapperStyles,
     key: value
   }, jsx(ColorCard, {
     label: label,
@@ -68,13 +66,8 @@ export const ColorPaletteMenuWithoutAnalytics = ({
 export default withAnalyticsContext({
   componentName: 'color-picker',
   packageName: "@atlaskit/color-picker",
-  packageVersion: "3.2.10"
+  packageVersion: "3.2.12"
 })(withAnalyticsEvents()(ColorPaletteMenuWithoutAnalytics));
-const colorCardWrapperStylesOld = css({
-  display: 'flex',
-  margin: "var(--ds-space-025, 2px)",
-  height: `${COLOR_CARD_SIZE}px`
-});
 const colorCardWrapperStyles = css({
   display: 'flex',
   margin: "var(--ds-space-025, 2px)",

package/dist/es2019/components/ColorPicker.js

@@ -23,7 +23,7 @@ const defaultPopperProps = {
   placement: 'bottom-start'
 };
 const packageName = "@atlaskit/color-picker";
-const packageVersion = "3.2.10";
+const packageVersion = "3.2.12";
 class ColorPickerWithoutAnalyticsBase extends React.Component {
   constructor(...args) {
     super(...args);

package/dist/es2019/components/Trigger.js

@@ -3,7 +3,6 @@ import _extends from "@babel/runtime/helpers/extends";
 import { useCallback } from 'react';
 import Tooltip from '@atlaskit/tooltip';
 import { css, jsx } from '@emotion/react';
-import { COLOR_CARD_SIZE } from '../constants';
 import { B100, DN600A, N0 } from '@atlaskit/theme/colors';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 const ColorCard = ({
@@ -24,31 +23,7 @@ const ColorCard = ({
       onClick();
     }
   }, [onClick]);
-  return getBooleanFF('platform.design-tokens-color-picker-portfolio-plan-wizard_w8rcl') ? jsx(Tooltip, {
-    content: label
-  }, jsx("button", _extends({}, getBooleanFF('platform.color-picker-radio-button-functionality_6hkcy') ? {
-    css: [sharedColorContainerStyles, swatchSize === 'small' ? smallColorContainerSizeNew : defaultColorContainerSizeNew, colorCardButtonStyles, expanded && colorCardButtonFocusedStyles],
-    disabled: isDisabled
-  } : {
-    css: [sharedColorContainerStyles, defaultColorContainerSizeNew, colorCardButtonStyles, expanded && colorCardButtonFocusedStyles]
-  }, {
-    onClick: handleClick,
-    onMouseDown: handleMouseDown,
-    "aria-label": label,
-    "aria-expanded": expanded,
-    "aria-haspopup": true,
-    type: "button"
-  }), jsx("span", {
-    css: colorCardWrapperStylesNew
-  }, jsx("span", _extends({}, getBooleanFF('platform.color-picker-radio-button-functionality_6hkcy') ? {
-    css: [colorCardContentStylesNew, swatchSize === 'small' ? smallColorCardContentSize : defaultColorCardContentSize]
-  } : {
-    css: [colorCardContentStylesNew, defaultColorCardContentSize]
-  }, {
-    style: {
-      background: value || 'transparent'
-    }
-  }))))) : jsx(Tooltip, {
+  return jsx(Tooltip, {
     content: label
   }, jsx("button", _extends({}, getBooleanFF('platform.color-picker-radio-button-functionality_6hkcy') ? {
     css: [sharedColorContainerStyles, swatchSize === 'small' ? smallColorContainerSize : defaultColorContainerSize, colorCardButtonStyles, expanded && colorCardButtonFocusedStyles],
@@ -62,7 +37,9 @@ const ColorCard = ({
     "aria-expanded": expanded,
     "aria-haspopup": true,
     type: "button"
-  }), jsx("span", _extends({}, getBooleanFF('platform.color-picker-radio-button-functionality_6hkcy') ? {
+  }), jsx("span", {
+    css: colorCardWrapperStyles
+  }, jsx("span", _extends({}, getBooleanFF('platform.color-picker-radio-button-functionality_6hkcy') ? {
     css: [colorCardContentStyles, swatchSize === 'small' ? smallColorCardContentSize : defaultColorCardContentSize]
   } : {
     css: [colorCardContentStyles, defaultColorCardContentSize]
@@ -70,7 +47,7 @@ const ColorCard = ({
     style: {
       background: value || 'transparent'
     }
-  }))));
+  })))));
 };
 export default ColorCard;
 const sharedColorContainerStyles = css({
@@ -87,20 +64,11 @@ const sharedColorContainerStyles = css({
   outline: 'none'
 });
 const smallColorContainerSize = css({
-  width: '22px',
-  height: '22px',
-  top: "var(--ds-space-negative-025, -2px)"
-});
-const smallColorContainerSizeNew = css({
   width: "var(--ds-space-300, 24px)",
   height: "var(--ds-space-300, 24px)",
   top: "var(--ds-space-negative-025, -2px)"
 });
 const defaultColorContainerSize = css({
-  width: `${COLOR_CARD_SIZE}px`,
-  height: `${COLOR_CARD_SIZE}px`
-});
-const defaultColorContainerSizeNew = css({
   width: "var(--ds-space-400, 32px)",
   height: "var(--ds-space-400, 32px)"
 });
@@ -117,21 +85,14 @@ const colorCardButtonFocusedStyles = css({
   borderColor: `var(--ds-border-focused, ${B100})`,
   outline: 'none'
 });
-const colorCardContentStyles = css({
-  position: 'absolute',
-  top: '1px',
-  left: '1px',
-  borderRadius: "var(--ds-border-radius-100, 3px)",
-  boxShadow: `inset 0px 0px 0px 1px ${`var(--ds-background-inverse-subtle, ${DN600A})`}`
-});
-const colorCardWrapperStylesNew = css({
+const colorCardWrapperStyles = css({
   width: '100%',
   height: '100%',
   display: 'flex',
   alignItems: 'center',
   justifyContent: 'center'
 });
-const colorCardContentStylesNew = css({
+const colorCardContentStyles = css({
   borderRadius: "var(--ds-border-radius-100, 3px)",
   boxShadow: `inset 0px 0px 0px 1px ${`var(--ds-background-inverse-subtle, ${DN600A})`}`
 });

package/dist/es2019/components/components.js

@@ -3,9 +3,7 @@ import _extends from "@babel/runtime/helpers/extends";
 
 import ColorCard from './ColorCard';
 import { getWidth } from '../utils';
-import { COLOR_CARD_SIZE } from '../constants';
 import { css, jsx } from '@emotion/react';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 export const MenuList = props => {
   const {
     selectProps: {
@@ -39,7 +37,7 @@ export const Option = props => {
     innerProps
   } = props;
   return jsx("div", _extends({
-    css: getBooleanFF('platform.design-tokens-color-picker-portfolio-plan-wizard_w8rcl') ? colorCardWrapperStyles : colorCardWrapperStylesOld
+    css: colorCardWrapperStyles
   }, innerProps), jsx(ColorCard, {
     label: label,
     value: value,
@@ -53,11 +51,6 @@ export const Option = props => {
 };
 export const DropdownIndicator = () => null;
 export const Placeholder = () => null;
-const colorCardWrapperStylesOld = css({
-  display: 'flex',
-  margin: "var(--ds-space-025, 2px)",
-  height: `${COLOR_CARD_SIZE}px`
-});
 const colorCardWrapperStyles = css({
   display: 'flex',
   margin: "var(--ds-space-025, 2px)",

package/dist/es2019/constants.js

@@ -1,5 +1,4 @@
-export const COLOR_CARD_SIZE = 30;
-export const COLOR_CARD_SIZE_NEW = 32;
+export const COLOR_CARD_SIZE = 32;
 export const KEY_SPACE = ' ';
 export const KEY_ENTER = 'Enter';
 export const KEY_ARROW_UP = 'ArrowDown';