@zendeskgarden/react-colorpickers 9.0.0-next.1 → 9.0.0-next.3

package/dist/index.cjs.js

@@ -18,8 +18,9 @@ var reactButtons = require('@zendeskgarden/react-buttons');
 var reactModals = require('@zendeskgarden/react-modals');
 var isEqual = require('lodash.isequal');
 var containerUtilities = require('@zendeskgarden/container-utilities');
-var reactTooltips = require('@zendeskgarden/react-tooltips');
+var reactMergeRefs = require('react-merge-refs');
 var containerGrid = require('@zendeskgarden/container-grid');
+var reactTooltips = require('@zendeskgarden/react-tooltips');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -146,22 +147,22 @@ const getThumbPosition = (x, y, rtl, container) => {
   };
 };
 
-const COMPONENT_ID$l = 'colorpickers.colorpicker';
+const COMPONENT_ID$m = 'colorpickers.colorpicker';
 const getColorPickerWidth = props => {
   return props.isOpaque ? 268 : 312;
 };
 const StyledColorPicker = styled__default.default.div.attrs({
-  'data-garden-id': COMPONENT_ID$l,
-  'data-garden-version': '9.0.0-next.1'
+  'data-garden-id': COMPONENT_ID$m,
+  'data-garden-version': '9.0.0-next.3'
 }).withConfig({
   displayName: "StyledColorPicker",
-  componentId: "sc-1donyl9-0"
-})(["width:", "px;min-width:", "px;", ";"], getColorPickerWidth, getColorPickerWidth, props => reactTheming.retrieveComponentStyles(COMPONENT_ID$l, props));
+  componentId: "sc-gspq4q-0"
+})(["width:", "px;min-width:", "px;", ";"], getColorPickerWidth, getColorPickerWidth, props => reactTheming.retrieveComponentStyles(COMPONENT_ID$m, props));
 StyledColorPicker.defaultProps = {
   theme: reactTheming.DEFAULT_THEME
 };
 
-const COMPONENT_ID$k = 'colorpickers.colorpicker_range';
+const COMPONENT_ID$l = 'colorpickers.colorpicker_range';
 const thumbStyles = function (styles) {
   let modifier = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
   return `
@@ -287,26 +288,26 @@ const sizeStyles$2 = props => {
   `;
 };
 const StyledRange = styled__default.default(reactForms.Range).attrs({
-  'data-garden-id': COMPONENT_ID$k,
-  'data-garden-version': '9.0.0-next.1',
+  'data-garden-id': COMPONENT_ID$l,
+  'data-garden-version': '9.0.0-next.3',
   hasLowerTrack: false
 }).withConfig({
   displayName: "StyledRange",
   componentId: "sc-ug3wi9-0"
 })(["", ";", " ", ";", ";"], sizeStyles$2, trackStyles(`
     border-radius: 0;
-  `), colorStyles$1, props => reactTheming.retrieveComponentStyles(COMPONENT_ID$k, props));
+  `), colorStyles$1, props => reactTheming.retrieveComponentStyles(COMPONENT_ID$l, props));
 StyledRange.defaultProps = {
   theme: reactTheming.DEFAULT_THEME
 };
 
-const COMPONENT_ID$j = 'colorpickers.colorpicker_hue';
+const COMPONENT_ID$k = 'colorpickers.colorpicker_hue';
 const StyledHueRange = styled__default.default(StyledRange).attrs({
-  'data-garden-id': COMPONENT_ID$j,
-  'data-garden-version': '9.0.0-next.1'
+  'data-garden-id': COMPONENT_ID$k,
+  'data-garden-version': '9.0.0-next.3'
 }).withConfig({
   displayName: "StyledHueRange",
-  componentId: "sc-13ly7p-0"
+  componentId: "sc-1gdhww1-0"
 })(["background:linear-gradient( to ", ",#f00 0%,#ff0 17%,#0f0 33%,#0ff 50%,#00f 67%,#f0f 83%,#f00 100% ) no-repeat;background-position:", ";background-size:100% ", "px;"], props => props.theme.rtl ? 'left' : 'right', props => !props.isOpaque && `0 ${getTrackMargin(props)}px`, props => getTrackHeight(props));
 StyledHueRange.defaultProps = {
   theme: reactTheming.DEFAULT_THEME
@@ -331,7 +332,7 @@ const checkeredBackground = function (theme, size) {
   `;
 };
 
-const COMPONENT_ID$i = 'colorpickers.colorpicker_alpha';
+const COMPONENT_ID$j = 'colorpickers.colorpicker_alpha';
 const background$3 = props => {
   const direction = `to ${props.theme.rtl ? 'left' : 'right'}`;
   const fromColor = `rgba(${props.red}, ${props.green}, ${props.blue}, 0)`;
@@ -346,17 +347,17 @@ const StyledAlphaRange = styled__default.default(StyledRange).attrs(props => ({
     backgroundSize: 'auto',
     background: background$3(props)
   },
-  'data-garden-id': COMPONENT_ID$i,
-  'data-garden-version': '9.0.0-next.1'
+  'data-garden-id': COMPONENT_ID$j,
+  'data-garden-version': '9.0.0-next.3'
 })).withConfig({
   displayName: "StyledAlphaRange",
-  componentId: "sc-kuh2xc-0"
+  componentId: "sc-1f6hp2j-0"
 })([""]);
 StyledAlphaRange.defaultProps = {
   theme: reactTheming.DEFAULT_THEME
 };
 
-const COMPONENT_ID$h = 'colorpickers.colorpicker_preview_box';
+const COMPONENT_ID$i = 'colorpickers.colorpicker_preview_box';
 const background$2 = props => {
   const alpha = props.alpha ? props.alpha / 100 : 0;
   const color = `rgba(${props.red}, ${props.green}, ${props.blue}, ${alpha})`;
@@ -370,18 +371,18 @@ const StyledPreview = styled__default.default.div.attrs(props => ({
   style: {
     background: background$2(props)
   },
-  'data-garden-id': COMPONENT_ID$h,
-  'data-garden-version': '9.0.0-next.1',
+  'data-garden-id': COMPONENT_ID$i,
+  'data-garden-version': '9.0.0-next.3',
   'data-test-id': 'preview-box'
 })).withConfig({
   displayName: "StyledPreview",
-  componentId: "sc-d70mj1-0"
-})(["flex-shrink:0;border-radius:", ";box-shadow:inset 0 0 0 ", " ", ";width:", "px;height:", "px;", ";"], props => props.theme.borderRadii.md, props => props.theme.borderWidths.sm, props => polished.rgba(props.theme.palette.black, 0.19), props => props.theme.space.base * (props.isOpaque ? 6 : 8), props => props.theme.space.base * (props.isOpaque ? 6 : 8), props => reactTheming.retrieveComponentStyles(COMPONENT_ID$h, props));
+  componentId: "sc-1z5nh7-0"
+})(["flex-shrink:0;border-radius:", ";box-shadow:inset 0 0 0 ", " ", ";width:", "px;height:", "px;", ";"], props => props.theme.borderRadii.md, props => props.theme.borderWidths.sm, props => polished.rgba(props.theme.palette.black, 0.19), props => props.theme.space.base * (props.isOpaque ? 6 : 8), props => props.theme.space.base * (props.isOpaque ? 6 : 8), props => reactTheming.retrieveComponentStyles(COMPONENT_ID$i, props));
 StyledPreview.defaultProps = {
   theme: reactTheming.DEFAULT_THEME
 };
 
-const COMPONENT_ID$g = 'colorpickers.colorpicker_colorwell';
+const COMPONENT_ID$h = 'colorpickers.colorpicker_colorwell';
 const background$1 = props => {
   const blackAlpha = polished.rgba(props.theme.palette.black, 0.9);
   const black = `linear-gradient(0deg, ${props.theme.palette.black}, ${blackAlpha} 1%, transparent 99%)`;
@@ -392,21 +393,21 @@ const background$1 = props => {
   return `${black}, ${white}, ${color}`;
 };
 const StyledColorWell = styled__default.default.div.attrs(props => ({
-  'data-garden-id': COMPONENT_ID$g,
-  'data-garden-version': '9.0.0-next.1',
+  'data-garden-id': COMPONENT_ID$h,
+  'data-garden-version': '9.0.0-next.3',
   'data-test-id': 'colorwell',
   style: {
     background: background$1(props)
   }
 })).withConfig({
   displayName: "StyledColorWell",
-  componentId: "sc-54ly7s-0"
-})(["position:relative;margin-bottom:", "px;cursor:pointer;height:208px;overflow:hidden;", ";"], props => props.theme.space.base * 2, props => reactTheming.retrieveComponentStyles(COMPONENT_ID$g, props));
+  componentId: "sc-1gg9z8m-0"
+})(["position:relative;margin-bottom:", "px;cursor:pointer;height:208px;overflow:hidden;", ";"], props => props.theme.space.base * 2, props => reactTheming.retrieveComponentStyles(COMPONENT_ID$h, props));
 StyledColorWell.defaultProps = {
   theme: reactTheming.DEFAULT_THEME
 };
 
-const COMPONENT_ID$f = 'colorpickers.colorpicker_colorwell_thumb';
+const COMPONENT_ID$g = 'colorpickers.colorpicker_colorwell_thumb';
 const sizeStyles$1 = theme => {
   const borderWidth = polished.stripUnit(theme.borderWidths.sm) * 2;
   const size = theme.space.base * 5;
@@ -420,8 +421,8 @@ const sizeStyles$1 = theme => {
   `;
 };
 const StyledColorWellThumb = styled__default.default.div.attrs(props => ({
-  'data-garden-id': COMPONENT_ID$f,
-  'data-garden-version': '9.0.0-next.1',
+  'data-garden-id': COMPONENT_ID$g,
+  'data-garden-version': '9.0.0-next.3',
   'data-test-id': 'colorwell-thumb',
   style: {
     top: `${props.top}%`,
@@ -429,75 +430,75 @@ const StyledColorWellThumb = styled__default.default.div.attrs(props => ({
   }
 })).withConfig({
   displayName: "StyledColorWellThumb",
-  componentId: "sc-1pnz3jz-0"
-})(["position:absolute;border:solid ", ";border-radius:50%;box-shadow:", ";", ";", ";"], props => props.theme.palette.white, props => props.theme.shadows.lg(`${props.theme.space.base}px`, `${props.theme.space.base * 2}px`, reactTheming.getColor('neutralHue', 800, props.theme, 0.24)), props => sizeStyles$1(props.theme), props => reactTheming.retrieveComponentStyles(COMPONENT_ID$f, props));
+  componentId: "sc-1npyab0-0"
+})(["position:absolute;border:solid ", ";border-radius:50%;box-shadow:", ";", ";", ";"], props => props.theme.palette.white, props => props.theme.shadows.lg(`${props.theme.space.base}px`, `${props.theme.space.base * 2}px`, reactTheming.getColor('neutralHue', 800, props.theme, 0.24)), props => sizeStyles$1(props.theme), props => reactTheming.retrieveComponentStyles(COMPONENT_ID$g, props));
 StyledColorWellThumb.defaultProps = {
   theme: reactTheming.DEFAULT_THEME
 };
 
-const COMPONENT_ID$e = 'colorpickers.colorpicker_slider_group';
+const COMPONENT_ID$f = 'colorpickers.colorpicker_slider_group';
 const StyledSliderGroup = styled__default.default.div.attrs({
-  'data-garden-id': COMPONENT_ID$e,
-  'data-garden-version': '9.0.0-next.1'
+  'data-garden-id': COMPONENT_ID$f,
+  'data-garden-version': '9.0.0-next.3'
 }).withConfig({
   displayName: "StyledSliderGroup",
-  componentId: "sc-rsq0ak-0"
-})(["display:flex;justify-content:space-between;margin-bottom:", "px;", ";"], props => props.theme.space.base * 2, props => reactTheming.retrieveComponentStyles(COMPONENT_ID$e, props));
+  componentId: "sc-tigkzg-0"
+})(["display:flex;justify-content:space-between;margin-bottom:", "px;", ";"], props => props.theme.space.base * 2, props => reactTheming.retrieveComponentStyles(COMPONENT_ID$f, props));
 StyledSliderGroup.defaultProps = {
   theme: reactTheming.DEFAULT_THEME
 };
 
-const COMPONENT_ID$d = 'colorpickers.colorpicker_hex_field';
+const COMPONENT_ID$e = 'colorpickers.colorpicker_hex_field';
 const StyledHexField = styled__default.default(reactForms.Field).attrs({
-  'data-garden-id': COMPONENT_ID$d,
-  'data-garden-version': '9.0.0-next.1',
+  'data-garden-id': COMPONENT_ID$e,
+  'data-garden-version': '9.0.0-next.3',
   spellcheck: false
 }).withConfig({
   displayName: "StyledHexField",
-  componentId: "sc-1lk14t4-0"
-})(["display:flex;flex-basis:0;flex-direction:column;flex-grow:1;width:auto;text-align:center;input{direction:ltr;}", ";"], props => reactTheming.retrieveComponentStyles(COMPONENT_ID$d, props));
+  componentId: "sc-ijq1c-0"
+})(["display:flex;flex-basis:0;flex-direction:column;flex-grow:1;width:auto;text-align:center;input{direction:ltr;}", ";"], props => reactTheming.retrieveComponentStyles(COMPONENT_ID$e, props));
 StyledHexField.defaultProps = {
   theme: reactTheming.DEFAULT_THEME
 };
 
-const COMPONENT_ID$c = 'colorpickers.colorpicker_label';
+const COMPONENT_ID$d = 'colorpickers.colorpicker_label';
 const StyledLabel = styled__default.default(reactForms.Label).attrs({
-  'data-garden-id': COMPONENT_ID$c,
-  'data-garden-version': '9.0.0-next.1'
+  'data-garden-id': COMPONENT_ID$d,
+  'data-garden-version': '9.0.0-next.3'
 }).withConfig({
   displayName: "StyledLabel",
-  componentId: "sc-1klhp6m-0"
-})(["overflow:hidden;text-overflow:ellipsis;white-space:nowrap;", ";"], props => reactTheming.retrieveComponentStyles(COMPONENT_ID$c, props));
+  componentId: "sc-1vxt3m9-0"
+})(["overflow:hidden;text-overflow:ellipsis;white-space:nowrap;", ";"], props => reactTheming.retrieveComponentStyles(COMPONENT_ID$d, props));
 StyledLabel.defaultProps = {
   theme: reactTheming.DEFAULT_THEME
 };
 
-const COMPONENT_ID$b = 'colorpickers.colorpicker_input';
+const COMPONENT_ID$c = 'colorpickers.colorpicker_input';
 const StyledInput = styled__default.default(reactForms.Input).attrs({
-  'data-garden-id': COMPONENT_ID$b,
-  'data-garden-version': '9.0.0-next.1',
+  'data-garden-id': COMPONENT_ID$c,
+  'data-garden-version': '9.0.0-next.3',
   focusInset: false
 }).withConfig({
   displayName: "StyledInput",
-  componentId: "sc-1iap93p-0"
-})(["text-align:center;", ";"], props => reactTheming.retrieveComponentStyles(COMPONENT_ID$b, props));
+  componentId: "sc-1uzlutt-0"
+})(["text-align:center;", ";"], props => reactTheming.retrieveComponentStyles(COMPONENT_ID$c, props));
 StyledInput.defaultProps = {
   theme: reactTheming.DEFAULT_THEME
 };
 
-const COMPONENT_ID$a = 'colorpickers.colorpicker_input_group';
+const COMPONENT_ID$b = 'colorpickers.colorpicker_input_group';
 const StyledInputGroup = styled__default.default.div.attrs({
-  'data-garden-id': COMPONENT_ID$a,
-  'data-garden-version': '9.0.0-next.1'
+  'data-garden-id': COMPONENT_ID$b,
+  'data-garden-version': '9.0.0-next.3'
 }).withConfig({
   displayName: "StyledInputGroup",
-  componentId: "sc-mmy93w-0"
-})(["display:flex;justify-content:space-between;", ";"], props => reactTheming.retrieveComponentStyles(COMPONENT_ID$a, props));
+  componentId: "sc-1m9g2wg-0"
+})(["display:flex;justify-content:space-between;", ";"], props => reactTheming.retrieveComponentStyles(COMPONENT_ID$b, props));
 StyledInputGroup.defaultProps = {
   theme: reactTheming.DEFAULT_THEME
 };
 
-const COMPONENT_ID$9 = 'colorpickers.colorpicker_rgb_field';
+const COMPONENT_ID$a = 'colorpickers.colorpicker_rgb_field';
 const sizeStyles = theme => {
   const margin = `${theme.space.base * 1.5}px`;
   const width = `${theme.space.base * 12.75}px`;
@@ -508,42 +509,42 @@ const sizeStyles = theme => {
   `;
 };
 const StyledRGBAField = styled__default.default(reactForms.Field).attrs({
-  'data-garden-id': COMPONENT_ID$9,
-  'data-garden-version': '9.0.0-next.1'
+  'data-garden-id': COMPONENT_ID$a,
+  'data-garden-version': '9.0.0-next.3'
 }).withConfig({
   displayName: "StyledRGBAField",
-  componentId: "sc-ibo1yw-0"
-})(["display:flex;flex-direction:column;text-align:center;", ";", ";"], props => sizeStyles(props.theme), props => reactTheming.retrieveComponentStyles(COMPONENT_ID$9, props));
+  componentId: "sc-13266k8-0"
+})(["display:flex;flex-direction:column;text-align:center;", ";", ";"], props => sizeStyles(props.theme), props => reactTheming.retrieveComponentStyles(COMPONENT_ID$a, props));
 StyledRGBAField.defaultProps = {
   theme: reactTheming.DEFAULT_THEME
 };
 
-const COMPONENT_ID$8 = 'colorpickers.colorpicker_sliders';
+const COMPONENT_ID$9 = 'colorpickers.colorpicker_sliders';
 const StyledSliders = styled__default.default.div.attrs({
-  'data-garden-id': COMPONENT_ID$8,
-  'data-garden-version': '9.0.0-next.1'
+  'data-garden-id': COMPONENT_ID$9,
+  'data-garden-version': '9.0.0-next.3'
 }).withConfig({
   displayName: "StyledSliders",
-  componentId: "sc-aclca2-0"
-})(["position:relative;margin-", ":", "px;width:100%;& > *{position:absolute;width:100%;height:", "px;}& > :first-child{top:-", "px;}& > :last-child{bottom:-", "px;}", ";"], props => props.theme.rtl ? 'right' : 'left', props => props.theme.space.base * 2, props => getTrackMargin(props) * 2 + getTrackHeight(props), getTrackMargin, getTrackMargin, props => reactTheming.retrieveComponentStyles(COMPONENT_ID$8, props));
+  componentId: "sc-1lgr50m-0"
+})(["position:relative;margin-", ":", "px;width:100%;& > *{position:absolute;width:100%;height:", "px;}& > :first-child{top:-", "px;}& > :last-child{bottom:-", "px;}", ";"], props => props.theme.rtl ? 'right' : 'left', props => props.theme.space.base * 2, props => getTrackMargin(props) * 2 + getTrackHeight(props), getTrackMargin, getTrackMargin, props => reactTheming.retrieveComponentStyles(COMPONENT_ID$9, props));
 StyledSliders.defaultProps = {
   theme: reactTheming.DEFAULT_THEME
 };
 
-const COMPONENT_ID$7 = 'colorpickers.colordialog_button';
+const COMPONENT_ID$8 = 'colorpickers.colordialog_button';
 const StyledButton = styled__default.default(reactButtons.Button).attrs({
   isNeutral: true,
-  'data-garden-id': COMPONENT_ID$7,
-  'data-garden-version': '9.0.0-next.1'
+  'data-garden-id': COMPONENT_ID$8,
+  'data-garden-version': '9.0.0-next.3'
 }).withConfig({
   displayName: "StyledButton",
-  componentId: "sc-101xjve-0"
-})(["padding:0;width:", "px;max-width:", "px;&:last-of-type:not(:first-child){border-top-", "-radius:", " !important;border-bottom-", "-radius:", " !important;}", ";"], props => props.theme.space.base * 17, props => props.theme.space.base * 17, props => props.theme.rtl ? 'left' : 'right', props => props.theme.borderRadii.md, props => props.theme.rtl ? 'left' : 'right', props => props.theme.borderRadii.md, props => reactTheming.retrieveComponentStyles(COMPONENT_ID$7, props));
+  componentId: "sc-1dlijfv-0"
+})(["padding:0;width:", "px;max-width:", "px;&:last-of-type:not(:first-child){border-top-", "-radius:", " !important;border-bottom-", "-radius:", " !important;}", ";"], props => props.theme.space.base * 17, props => props.theme.space.base * 17, props => props.theme.rtl ? 'left' : 'right', props => props.theme.borderRadii.md, props => props.theme.rtl ? 'left' : 'right', props => props.theme.borderRadii.md, props => reactTheming.retrieveComponentStyles(COMPONENT_ID$8, props));
 StyledButton.defaultProps = {
   theme: reactTheming.DEFAULT_THEME
 };
 
-const COMPONENT_ID$6 = 'colorpickers.colordialog_preview';
+const COMPONENT_ID$7 = 'colorpickers.colordialog_preview';
 const background = props => {
   const {
     backgroundColor
@@ -568,102 +569,123 @@ const StyledButtonPreview = styled__default.default.span.attrs(props => ({
   style: {
     background: `${background(props)}, ${checkeredBackground(props.theme, 8)}`
   },
-  'data-garden-id': COMPONENT_ID$6,
-  'data-garden-version': '9.0.0-next.1',
+  'data-garden-id': COMPONENT_ID$7,
+  'data-garden-version': '9.0.0-next.3',
   'data-test-id': 'dialog-preview'
 })).withConfig({
   displayName: "StyledButtonPreview",
-  componentId: "sc-1jzysg3-0"
-})(["display:inline-block;bottom:", "px;border-radius:", ";box-shadow:inset 0 0 0 ", " ", ";width:", "px;height:", "px;", ";"], props => props.theme.space.base, props => props.theme.borderRadii.sm, props => props.theme.borderWidths.sm, props => polished.rgba(props.theme.palette.black, 0.19), props => props.theme.space.base * 5, props => props.theme.space.base * 5, props => reactTheming.retrieveComponentStyles(COMPONENT_ID$6, props));
+  componentId: "sc-yxis8h-0"
+})(["display:inline-block;bottom:", "px;border-radius:", ";box-shadow:inset 0 0 0 ", " ", ";width:", "px;height:", "px;", ";"], props => props.theme.space.base, props => props.theme.borderRadii.sm, props => props.theme.borderWidths.sm, props => polished.rgba(props.theme.palette.black, 0.19), props => props.theme.space.base * 5, props => props.theme.space.base * 5, props => reactTheming.retrieveComponentStyles(COMPONENT_ID$7, props));
 StyledButtonPreview.defaultProps = {
   theme: reactTheming.DEFAULT_THEME
 };
 
-const COMPONENT_ID$5 = 'colorpickers.colordialog_tooltipmodal';
+const COMPONENT_ID$6 = 'colorpickers.colordialog_tooltipmodal';
 const StyledTooltipModal = styled__default.default(reactModals.TooltipModal).attrs({
-  'data-garden-id': COMPONENT_ID$5,
-  'data-garden-version': '9.0.0-next.1'
+  'data-garden-id': COMPONENT_ID$6,
+  'data-garden-version': '9.0.0-next.3'
 }).withConfig({
   displayName: "StyledTooltipModal",
-  componentId: "sc-o022s8-0"
-})(["width:auto !important;", ";"], props => reactTheming.retrieveComponentStyles(COMPONENT_ID$5, props));
+  componentId: "sc-gykkrw-0"
+})(["width:auto !important;", ";"], props => reactTheming.retrieveComponentStyles(COMPONENT_ID$6, props));
 StyledTooltipModal.defaultProps = {
   theme: reactTheming.DEFAULT_THEME
 };
 
-const COMPONENT_ID$4 = 'colorpickers.colordialog_tooltipmodal_body';
+const COMPONENT_ID$5 = 'colorpickers.colordialog_tooltipmodal_body';
 const StyledTooltipBody = styled__default.default(reactModals.TooltipModal.Body).attrs({
-  'data-garden-id': COMPONENT_ID$4,
-  'data-garden-version': '9.0.0-next.1'
+  'data-garden-id': COMPONENT_ID$5,
+  'data-garden-version': '9.0.0-next.3'
 }).withConfig({
   displayName: "StyledTooltipBody",
-  componentId: "sc-6gsgsy-0"
-})(["padding:0;", ";"], props => reactTheming.retrieveComponentStyles(COMPONENT_ID$4, props));
+  componentId: "sc-1ueddpo-0"
+})(["padding:0;", ";"], props => reactTheming.retrieveComponentStyles(COMPONENT_ID$5, props));
 StyledTooltipBody.defaultProps = {
   theme: reactTheming.DEFAULT_THEME
 };
 
-const COMPONENT_ID$3 = 'colorpickers.swatch_button';
-const StyledSwatchButton = styled__default.default(StyledButtonPreview).attrs(props => ({
-  as: 'button',
-  'data-garden-id': COMPONENT_ID$3,
-  'data-test-id': props.backgroundColor,
-  'data-garden-version': '9.0.0-next.1'
-})).withConfig({
-  displayName: "StyledSwatchButton",
-  componentId: "sc-edpwpp-0"
-})(["transition:box-shadow 0.1s ease-in-out;outline:none;border:none;border-radius:", ";cursor:pointer;padding:0;", " ", ";"], props => props.theme.borderRadii.md, props => reactTheming.focusStyles({
-  theme: props.theme
-}), props => reactTheming.retrieveComponentStyles(COMPONENT_ID$3, props));
-StyledSwatchButton.defaultProps = {
-  theme: reactTheming.DEFAULT_THEME
-};
-
-const COMPONENT_ID$2 = 'colorpickers.color_swatch';
+const COMPONENT_ID$4 = 'colorpickers.color_swatch';
 const StyledColorSwatch = styled__default.default.table.attrs({
-  'data-garden-id': COMPONENT_ID$2,
-  'data-garden-version': '9.0.0-next.1',
-  role: 'grid'
+  'data-garden-id': COMPONENT_ID$4,
+  'data-garden-version': '9.0.0-next.3'
 }).withConfig({
   displayName: "StyledColorSwatch",
   componentId: "sc-ajx440-0"
-})(["border-collapse:collapse;line-height:normal;", ";"], props => reactTheming.retrieveComponentStyles(COMPONENT_ID$2, props));
+})(["border-collapse:collapse;line-height:normal;", ";"], props => reactTheming.retrieveComponentStyles(COMPONENT_ID$4, props));
 StyledColorSwatch.defaultProps = {
   theme: reactTheming.DEFAULT_THEME
 };
 
-const COMPONENT_ID$1 = 'colorpickers.colorswatch_check';
+const COMPONENT_ID$3 = 'colorpickers.color_swatch_input';
+const StyledColorSwatchInput = styled__default.default.input.attrs({
+  'data-garden-id': COMPONENT_ID$3,
+  'data-garden-version': '9.0.0-next.3'
+}).withConfig({
+  displayName: "StyledColorSwatchInput",
+  componentId: "sc-em45h0-0"
+})(["position:absolute;opacity:0;z-index:1;margin:0;cursor:pointer;width:100%;height:100%;", ";"], props => reactTheming.retrieveComponentStyles(COMPONENT_ID$3, props));
+StyledColorSwatchInput.defaultProps = {
+  theme: reactTheming.DEFAULT_THEME
+};
+
+const COMPONENT_ID$2 = 'colorpickers.color_swatch_label';
 const colorStyles = props => {
-  const {
-    theme,
-    color
-  } = props;
   const {
     alpha
-  } = polished.parseToRgb(color);
-  let checkColor = polished.readableColor(color, theme.colors.foreground, theme.colors.background);
-  if (alpha !== undefined && alpha < 0.4) {
-    checkColor = theme.colors.foreground;
+  } = polished.parseToRgb(props.backgroundColor);
+  let foregroundColor;
+  if (alpha && alpha < 0.4) {
+    foregroundColor = props.theme.colors.foreground;
+  } else {
+    foregroundColor = polished.readableColor(props.backgroundColor, props.theme.colors.foreground, props.theme.colors.background);
   }
   return `
-    color: ${checkColor}
+    color: ${foregroundColor};
   `;
 };
-const StyledIcon = styled__default.default(_ref => {
-  let {
-    children,
-    color,
-    theme,
-    ...props
-  } = _ref;
-  return React__namespace.default.cloneElement(React.Children.only(children), props);
-}).attrs({
+const StyledColorSwatchLabel = styled__default.default(StyledButtonPreview).attrs({
+  as: 'label',
+  'data-garden-id': COMPONENT_ID$2,
+  'data-garden-version': '9.0.0-next.3'
+}).withConfig({
+  displayName: "StyledColorSwatchLabel",
+  componentId: "sc-1aghocg-0"
+})(["position:relative;top:0;border-radius:", ";", ";", " ", ";"], props => props.theme.borderRadii.md, colorStyles, props => reactTheming.focusStyles({
+  theme: props.theme,
+  selector: '&:has(:focus-visible)'
+}), props => reactTheming.retrieveComponentStyles(COMPONENT_ID$2, props));
+StyledColorSwatchLabel.defaultProps = {
+  theme: reactTheming.DEFAULT_THEME
+};
+
+var _path$1;
+function _extends$1() { _extends$1 = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$1.apply(this, arguments); }
+var SvgCheckSmFill = function SvgCheckSmFill(props) {
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends$1({
+    xmlns: "http://www.w3.org/2000/svg",
+    width: 12,
+    height: 12,
+    focusable: "false",
+    viewBox: "0 0 12 12",
+    "aria-hidden": "true"
+  }, props), _path$1 || (_path$1 = /*#__PURE__*/React__namespace.createElement("path", {
+    fill: "none",
+    stroke: "currentColor",
+    strokeLinecap: "round",
+    strokeLinejoin: "round",
+    strokeWidth: 2,
+    d: "M3 6l2 2 4-4"
+  })));
+};
+
+const COMPONENT_ID$1 = 'colorpickers.colorswatch_check';
+const StyledIcon = styled__default.default(SvgCheckSmFill).attrs({
   'data-garden-id': COMPONENT_ID$1,
-  'data-garden-version': '9.0.0-next.1'
+  'data-garden-version': '9.0.0-next.3'
 }).withConfig({
   displayName: "StyledIcon",
   componentId: "sc-8oigif-0"
-})(["transition:opacity 0.2s ease-in-out;opacity:", ";width:", "px;height:", "px;", " ", ";"], props => props.selected ? 1 : 0, props => props.theme.space.base * 5, props => props.theme.space.base * 5, colorStyles, props => reactTheming.retrieveComponentStyles(COMPONENT_ID$1, props));
+})(["position:absolute;top:0;left:0;transition:opacity 0.2s ease-in-out;opacity:0;width:100%;height:100%;", ":checked ~ &{opacity:1;}", ";"], StyledColorSwatchInput, props => reactTheming.retrieveComponentStyles(COMPONENT_ID$1, props));
 StyledIcon.defaultProps = {
   theme: reactTheming.DEFAULT_THEME
 };
@@ -671,7 +693,7 @@ StyledIcon.defaultProps = {
 const COMPONENT_ID = 'colorpickers.swatch_cell';
 const StyledCell = styled__default.default.td.attrs({
   'data-garden-id': COMPONENT_ID,
-  'data-garden-version': '9.0.0-next.1'
+  'data-garden-version': '9.0.0-next.3'
 }).withConfig({
   displayName: "StyledCell",
   componentId: "sc-qr3oit-0"
@@ -1023,7 +1045,7 @@ const reducer = (state, action) => {
   }
 };
 
-const Colorpicker = React.forwardRef((_ref, ref) => {
+const ColorPicker = React.forwardRef((_ref, ref) => {
   let {
     color,
     defaultColor,
@@ -1213,11 +1235,11 @@ const Colorpicker = React.forwardRef((_ref, ref) => {
     onChange: handleAlphaChange
   }))));
 });
-Colorpicker.defaultProps = {
+ColorPicker.defaultProps = {
   defaultColor: '#fff'
 };
-Colorpicker.displayName = 'Colorpicker';
-Colorpicker.propTypes = {
+ColorPicker.displayName = 'ColorPicker';
+ColorPicker.propTypes = {
   color: PropTypes__default.default.oneOfType([PropTypes__default.default.object, PropTypes__default.default.string]),
   isOpaque: PropTypes__default.default.bool,
   onChange: PropTypes__default.default.func,
@@ -1225,23 +1247,23 @@ Colorpicker.propTypes = {
   defaultColor: PropTypes__default.default.oneOfType([PropTypes__default.default.object, PropTypes__default.default.string])
 };
 
-var _path$1;
-function _extends$1() { _extends$1 = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends$1.apply(this, arguments); }
+var _path;
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 var SvgChevronDownStroke = function SvgChevronDownStroke(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends$1({
+  return /*#__PURE__*/React__namespace.createElement("svg", _extends({
     xmlns: "http://www.w3.org/2000/svg",
     width: 16,
     height: 16,
     focusable: "false",
     viewBox: "0 0 16 16",
     "aria-hidden": "true"
-  }, props), _path$1 || (_path$1 = /*#__PURE__*/React__namespace.createElement("path", {
+  }, props), _path || (_path = /*#__PURE__*/React__namespace.createElement("path", {
     fill: "currentColor",
     d: "M12.688 5.61a.5.5 0 01.69.718l-.066.062-5 4a.5.5 0 01-.542.054l-.082-.054-5-4a.5.5 0 01.55-.83l.074.05L8 9.359l4.688-3.75z"
   })));
 };
 
-const ColorpickerDialog = React.forwardRef((_ref, ref) => {
+const ColorPickerDialog = React.forwardRef((_ref, ref) => {
   let {
     color,
     defaultColor,
@@ -1253,7 +1275,6 @@ const ColorpickerDialog = React.forwardRef((_ref, ref) => {
     isAnimated,
     isOpaque,
     isOpen,
-    popperModifiers,
     zIndex,
     focusInset,
     disabled,
@@ -1269,7 +1290,7 @@ const ColorpickerDialog = React.forwardRef((_ref, ref) => {
   const colorPickerRef = React.useRef(null);
   const [referenceElement, setReferenceElement] = React.useState();
   const [uncontrolledColor, setUncontrolledColor] = React.useState(defaultColor);
-  const ariaLabelText = reactTheming.useText(ColorpickerDialog, {
+  const ariaLabelText = reactTheming.useText(ColorPickerDialog, {
     'aria-label': ariaLabel
   }, 'aria-label', 'Color picker');
   const openDialog = () => {
@@ -1315,7 +1336,6 @@ const ColorpickerDialog = React.forwardRef((_ref, ref) => {
   }, React__namespace.default.createElement(SvgChevronDownStroke, null))), React__namespace.default.createElement(StyledTooltipModal, _extends$2({
     ref: ref,
     hasArrow: hasArrow,
-    popperModifiers: popperModifiers,
     zIndex: zIndex,
     isAnimated: isAnimated,
     isOpaque: isOpaque,
@@ -1327,7 +1347,7 @@ const ColorpickerDialog = React.forwardRef((_ref, ref) => {
       onClose && onClose(isControlled ? color : uncontrolledColor);
     },
     "aria-label": ariaLabelText
-  }, props), React__namespace.default.createElement(StyledTooltipBody, null, React__namespace.default.createElement(Colorpicker, {
+  }, props), React__namespace.default.createElement(StyledTooltipBody, null, React__namespace.default.createElement(ColorPicker, {
     autofocus: true,
     color: color,
     isOpaque: isOpaque,
@@ -1337,132 +1357,156 @@ const ColorpickerDialog = React.forwardRef((_ref, ref) => {
     onChange: isControlled ? onChange : setUncontrolledColor
   }))));
 });
-ColorpickerDialog.propTypes = {
-  ...Colorpicker.propTypes,
+ColorPickerDialog.propTypes = {
+  ...ColorPicker.propTypes,
   placement: PropTypes__default.default.oneOf(reactModals.PLACEMENT),
   onClose: PropTypes__default.default.func,
   onDialogChange: PropTypes__default.default.func,
   disabled: PropTypes__default.default.bool,
   labels: PropTypes__default.default.object,
   buttonProps: PropTypes__default.default.object,
-  popperModifiers: PropTypes__default.default.any,
   zIndex: PropTypes__default.default.number,
   hasArrow: PropTypes__default.default.bool,
   isAnimated: PropTypes__default.default.bool,
   isOpen: PropTypes__default.default.bool,
   focusInset: PropTypes__default.default.bool
 };
-ColorpickerDialog.defaultProps = {
+ColorPickerDialog.defaultProps = {
   placement: 'bottom-start',
   isAnimated: true,
   zIndex: 1000,
   hasArrow: false
 };
-ColorpickerDialog.displayName = 'ColorpickerDialog';
-
-var _path;
-function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-var SvgCheckSmFill = function SvgCheckSmFill(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends({
-    xmlns: "http://www.w3.org/2000/svg",
-    width: 12,
-    height: 12,
-    focusable: "false",
-    viewBox: "0 0 12 12",
-    "aria-hidden": "true"
-  }, props), _path || (_path = /*#__PURE__*/React__namespace.createElement("path", {
-    fill: "none",
-    stroke: "currentColor",
-    strokeLinecap: "round",
-    strokeLinejoin: "round",
-    strokeWidth: 2,
-    d: "M3 6l2 2 4-4"
-  })));
-};
+ColorPickerDialog.displayName = 'ColorPickerDialog';
 
 const ColorSwatch = React.forwardRef((_ref, ref) => {
   let {
+    name,
     colors,
+    isCheckboxGroup,
+    defaultSelectedColIndex,
+    defaultSelectedRowIndex,
+    selectedColIndex,
+    selectedRowIndex,
+    onSelect,
     ...props
   } = _ref;
-  const {
-    rtl
-  } = React.useContext(styled.ThemeContext);
+  const theme = React.useContext(styled.ThemeContext) || reactTheming.DEFAULT_THEME;
+  const environment = reactTheming.useDocument(theme);
+  const gridRef = React.useRef();
+  const [rowIndex, setRowIndex] = React.useState(selectedRowIndex === null ? undefined : selectedRowIndex);
+  const [colIndex, setColIndex] = React.useState(selectedColIndex === null ? undefined : selectedColIndex);
+  const isControlled = selectedColIndex !== undefined && selectedRowIndex !== undefined;
   const {
     getGridCellProps
   } = containerGrid.useGrid({
-    rtl,
+    environment,
+    rtl: theme.rtl,
     matrix: colors,
-    selection: true,
     wrap: true,
     idPrefix: containerUtilities.useId(undefined),
-    ...props
+    defaultRowIndex: defaultSelectedRowIndex,
+    defaultColIndex: defaultSelectedColIndex,
+    rowIndex,
+    colIndex,
+    onChange: (row, col) => {
+      setRowIndex(row);
+      setColIndex(col);
+    }
   });
-  return React__namespace.default.createElement(StyledColorSwatch, {
-    ref: ref
-  }, React__namespace.default.createElement("tbody", null, colors.map((row, rowIdx) => React__namespace.default.createElement("tr", {
+  return React__namespace.default.createElement(StyledColorSwatch, _extends$2({
+    role: "grid",
+    ref: reactMergeRefs.mergeRefs([gridRef, ref])
+  }, props), React__namespace.default.createElement("tbody", null, colors.map((row, _rowIndex) => React__namespace.default.createElement("tr", {
     key: row[0].value
-  }, row.map((color, colIdx) => {
+  }, row.map((color, _colIndex) => {
     const {
       label,
       value
     } = color;
     const {
-      'aria-selected': ariaSelected,
-      ...other
+      role,
+      onFocus,
+      ...gridCellProps
     } = getGridCellProps({
-      colIdx,
-      rowIdx,
-      type: 'button',
-      role: undefined
+      colIndex: _colIndex,
+      rowIndex: _rowIndex
     });
+    const checked = isControlled ? selectedRowIndex === _rowIndex && selectedColIndex === _colIndex : undefined;
+    const defaultChecked = isControlled ? undefined : defaultSelectedRowIndex === _rowIndex && defaultSelectedColIndex === _colIndex;
+    const handleChange = event => {
+      if (onSelect) {
+        if (event.target.checked) {
+          onSelect(_rowIndex, _colIndex);
+        } else {
+          onSelect(null, null);
+        }
+      }
+      if (isCheckboxGroup && event.target.checked) {
+        const inputs = gridRef.current?.querySelectorAll('input');
+        inputs?.forEach(input => {
+          if (input !== event.target) {
+            input.checked = false;
+          }
+        });
+      }
+    };
+    const handleBlur = event => {
+      event.target.parentElement?.removeAttribute('data-garden-focus-visible');
+      if (!(isCheckboxGroup || gridRef.current?.contains(event.relatedTarget))) {
+        const selectedInput = gridRef.current?.querySelector(`input[name='${event.target.name}']:checked`);
+        if (selectedInput !== null) {
+          const inputs = gridRef.current?.querySelectorAll('input');
+          inputs?.forEach(input => input.setAttribute('tabIndex', input.checked ? '0' : '-1'));
+        }
+      }
+    };
+    const handleFocus = containerUtilities.composeEventHandlers(onFocus, event => event.target.parentElement?.setAttribute('data-garden-focus-visible', 'true'));
     return React__namespace.default.createElement(StyledCell, {
       key: value,
-      "aria-selected": ariaSelected
+      role: role
+    }, React__namespace.default.createElement(StyledColorSwatchLabel, {
+      backgroundColor: value
     }, React__namespace.default.createElement(reactTooltips.Tooltip, {
       content: label
-    }, React__namespace.default.createElement(StyledSwatchButton, _extends$2({
-      backgroundColor: value,
-      "aria-pressed": ariaSelected,
-      "aria-label": label
-    }, other), React__namespace.default.createElement(StyledIcon, {
-      color: value,
-      selected: ariaSelected
-    }, React__namespace.default.createElement(SvgCheckSmFill, null)))));
+    }, React__namespace.default.createElement(StyledColorSwatchInput, _extends$2({
+      "aria-label": label,
+      name: name,
+      type: isCheckboxGroup ? 'checkbox' : 'radio',
+      value: value,
+      defaultChecked: defaultChecked,
+      checked: checked,
+      onFocus: handleFocus,
+      onBlur: handleBlur,
+      onChange: handleChange
+    }, gridCellProps))), React__namespace.default.createElement(StyledIcon, null)));
   })))));
 });
 ColorSwatch.displayName = 'ColorSwatch';
 ColorSwatch.propTypes = {
+  name: PropTypes__default.default.string.isRequired,
   colors: PropTypes__default.default.arrayOf(PropTypes__default.default.any).isRequired,
-  rowIndex: PropTypes__default.default.number,
-  colIndex: PropTypes__default.default.number,
+  isCheckboxGroup: PropTypes__default.default.bool,
   selectedRowIndex: PropTypes__default.default.number,
   selectedColIndex: PropTypes__default.default.number,
-  defaultRowIndex: PropTypes__default.default.number,
-  defaultColIndex: PropTypes__default.default.number,
   defaultSelectedRowIndex: PropTypes__default.default.number,
   defaultSelectedColIndex: PropTypes__default.default.number,
-  onChange: PropTypes__default.default.func,
   onSelect: PropTypes__default.default.func
 };
 
 const ColorSwatchDialog = React.forwardRef((_ref, ref) => {
   let {
+    name,
     colors,
-    rowIndex,
-    colIndex,
+    isCheckboxGroup,
     selectedRowIndex,
     selectedColIndex,
-    defaultRowIndex,
-    defaultColIndex,
     defaultSelectedRowIndex,
     defaultSelectedColIndex,
     placement,
-    onChange,
     onSelect,
     hasArrow,
     isAnimated,
-    popperModifiers,
     zIndex,
     isOpen,
     focusInset,
@@ -1473,17 +1517,21 @@ const ColorSwatchDialog = React.forwardRef((_ref, ref) => {
     'aria-label': ariaLabel,
     ...props
   } = _ref;
-  const controlledFocus = rowIndex !== null && colIndex !== null && rowIndex !== undefined && colIndex !== undefined;
-  const controlledSelect = selectedRowIndex !== null && selectedColIndex !== null && selectedRowIndex !== undefined && selectedColIndex !== undefined;
-  const isControlled = controlledFocus || controlledSelect;
+  const isControlled = selectedRowIndex !== undefined && selectedColIndex !== undefined;
   const isDialogControlled = isOpen !== undefined && isOpen !== null;
   const buttonRef = React.useRef(null);
   const colorSwatchRef = React.useRef(null);
-  const [referenceElement, setReferenceElement] = React.useState();
-  const [uncontrolledSelectedRowIndex, setUncontrolledSelectedRowIndex] = React.useState(defaultSelectedRowIndex || 0);
-  const [uncontrolledSelectedColIndex, setUncontrolledSelectedColIndex] = React.useState(defaultSelectedColIndex || 0);
-  const [uncontrolledRowIndex, setUncontrolledRowIndex] = React.useState(defaultRowIndex || 0);
-  const [uncontrolledColIndex, setUncontrolledColIndex] = React.useState(defaultColIndex || 0);
+  const [referenceElement, setReferenceElement] = React.useState(null);
+  const [rowIndex, setRowIndex] = React.useState(defaultSelectedRowIndex);
+  const [colIndex, setColIndex] = React.useState(defaultSelectedColIndex);
+  let backgroundColor;
+  if (isControlled) {
+    if (selectedRowIndex !== null && selectedColIndex !== null) {
+      backgroundColor = colors[selectedRowIndex][selectedColIndex].value;
+    }
+  } else if (rowIndex !== undefined && colIndex !== undefined) {
+    backgroundColor = colors[rowIndex][colIndex].value;
+  }
   const ariaLabelText = reactTheming.useText(ColorSwatchDialog, {
     'aria-label': ariaLabel
   }, 'aria-label', 'Color swatch');
@@ -1496,14 +1544,6 @@ const ColorSwatchDialog = React.forwardRef((_ref, ref) => {
       }
     }
   }, [isOpen, isDialogControlled]);
-  let uncontrolledSelectedColor;
-  let controlledSelectedColor;
-  if (uncontrolledSelectedRowIndex > -1 && uncontrolledSelectedColIndex > -1) {
-    uncontrolledSelectedColor = colors[uncontrolledSelectedRowIndex][uncontrolledSelectedColIndex];
-  }
-  if (selectedRowIndex !== undefined && selectedColIndex !== undefined && selectedRowIndex > -1 && selectedColIndex > -1) {
-    controlledSelectedColor = colors[selectedRowIndex][selectedColIndex];
-  }
   const openDialog = () => {
     setReferenceElement(buttonRef.current);
     onDialogChange && onDialogChange({
@@ -1511,8 +1551,6 @@ const ColorSwatchDialog = React.forwardRef((_ref, ref) => {
     });
   };
   const closeDialog = () => {
-    setUncontrolledRowIndex(uncontrolledSelectedRowIndex);
-    setUncontrolledColIndex(uncontrolledSelectedColIndex);
     setReferenceElement(null);
     onDialogChange && onDialogChange({
       isOpen: false
@@ -1527,15 +1565,22 @@ const ColorSwatchDialog = React.forwardRef((_ref, ref) => {
   });
   React.useEffect(() => {
     if (referenceElement && colorSwatchRef.current) {
-      const focusableButton = colorSwatchRef.current.querySelector('[tabindex="0"]');
-      const selectedCell = colorSwatchRef.current.querySelector('[aria-selected="true"]');
-      if (selectedCell) {
-        selectedCell.children[0].focus();
+      const input = colorSwatchRef.current.querySelector('[tabindex="0"]');
+      input?.focus();
+    }
+  }, [referenceElement]);
+  const handleSelect = (row, col) => {
+    if (isControlled === false) {
+      if (row === null || col === null) {
+        setRowIndex(undefined);
+        setColIndex(undefined);
       } else {
-        focusableButton?.focus();
+        setRowIndex(row);
+        setColIndex(col);
       }
     }
-  }, [referenceElement]);
+    onSelect && onSelect(row, col);
+  };
   return React__namespace.default.createElement(React__namespace.default.Fragment, null, children ? ( React.cloneElement(React.Children.only(children), {
     onClick,
     ref: buttonRef
@@ -1545,9 +1590,9 @@ const ColorSwatchDialog = React.forwardRef((_ref, ref) => {
     ref: buttonRef,
     onClick: onClick
   }, buttonProps), React__namespace.default.createElement(StyledButtonPreview, {
-    backgroundColor: isControlled ? controlledSelectedColor?.value : uncontrolledSelectedColor?.value
+    backgroundColor: backgroundColor
   }), React__namespace.default.createElement(reactButtons.Button.EndIcon, {
-    isRotated: referenceElement != null
+    isRotated: referenceElement !== null
   }, React__namespace.default.createElement(SvgChevronDownStroke, null))), React__namespace.default.createElement(StyledTooltipModal, _extends$2({
     ref: ref,
     zIndex: zIndex,
@@ -1555,35 +1600,19 @@ const ColorSwatchDialog = React.forwardRef((_ref, ref) => {
     focusOnMount: false,
     placement: placement,
     isAnimated: isAnimated,
-    popperModifiers: popperModifiers,
     referenceElement: referenceElement,
     onClose: closeDialog,
     "aria-label": ariaLabelText
   }, props), React__namespace.default.createElement(StyledTooltipBody, null, React__namespace.default.createElement(ColorSwatch, {
+    name: name,
     colors: colors,
     ref: colorSwatchRef,
-    rowIndex: rowIndex,
-    colIndex: colIndex,
+    isCheckboxGroup: isCheckboxGroup,
     selectedRowIndex: selectedRowIndex,
     selectedColIndex: selectedColIndex,
-    defaultRowIndex: uncontrolledRowIndex,
-    defaultColIndex: uncontrolledColIndex,
-    defaultSelectedRowIndex: uncontrolledSelectedRowIndex,
-    defaultSelectedColIndex: uncontrolledSelectedColIndex,
-    onChange: (rowIdx, colIdx) => {
-      if (isControlled === false) {
-        setUncontrolledRowIndex(rowIdx);
-        setUncontrolledColIndex(colIdx);
-      }
-      onChange && onChange(rowIdx, colIdx);
-    },
-    onSelect: (rowIdx, colIdx) => {
-      if (isControlled === false) {
-        setUncontrolledSelectedRowIndex(rowIdx);
-        setUncontrolledSelectedColIndex(colIdx);
-      }
-      onSelect && onSelect(rowIdx, colIdx);
-    }
+    defaultSelectedRowIndex: rowIndex,
+    defaultSelectedColIndex: colIndex,
+    onSelect: handleSelect
   }))));
 });
 ColorSwatchDialog.propTypes = {
@@ -1592,7 +1621,6 @@ ColorSwatchDialog.propTypes = {
   onDialogChange: PropTypes__default.default.func,
   disabled: PropTypes__default.default.bool,
   buttonProps: PropTypes__default.default.object,
-  popperModifiers: PropTypes__default.default.any,
   zIndex: PropTypes__default.default.number,
   hasArrow: PropTypes__default.default.bool,
   isAnimated: PropTypes__default.default.bool,
@@ -1607,7 +1635,7 @@ ColorSwatchDialog.defaultProps = {
 };
 ColorSwatchDialog.displayName = 'ColorSwatchDialog';
 
+exports.ColorPicker = ColorPicker;
+exports.ColorPickerDialog = ColorPickerDialog;
 exports.ColorSwatch = ColorSwatch;
 exports.ColorSwatchDialog = ColorSwatchDialog;
-exports.Colorpicker = Colorpicker;
-exports.ColorpickerDialog = ColorpickerDialog;