From 1c883152c7d18c4c920c4cd0e96751b4477467cf Mon Sep 17 00:00:00 2001
From: Brian Ingles <brianingles@deephaven.io>
Date: Wed, 15 May 2024 10:01:22 -0500
Subject: [PATCH 1/5] Added comments about Spectrum components not re-exported
 (#1989)

---
 packages/components/src/spectrum/buttons.ts     | 5 +++++
 packages/components/src/spectrum/collections.ts | 4 ++++
 packages/components/src/spectrum/forms.ts       | 3 +++
 3 files changed, 12 insertions(+)

diff --git a/packages/components/src/spectrum/buttons.ts b/packages/components/src/spectrum/buttons.ts
index 0a8b8d491a..8f195abc94 100644
--- a/packages/components/src/spectrum/buttons.ts
+++ b/packages/components/src/spectrum/buttons.ts
@@ -1,6 +1,11 @@
 export {
   ActionButton,
   type SpectrumActionButtonProps as ActionButtonProps,
+  ActionGroup,
+  type SpectrumActionGroupProps as ActionGroupProps,
+  // Button - can't be re-exported as it collides with DH component
+  // ButtonGroup - can't be re-exported as it collides with DH component
+  // FileTrigger - we aren't planning to support this component
   LogicButton,
   type SpectrumLogicButtonProps as LogicButtonProps,
   ToggleButton,
diff --git a/packages/components/src/spectrum/collections.ts b/packages/components/src/spectrum/collections.ts
index c60372d216..83689ed43f 100644
--- a/packages/components/src/spectrum/collections.ts
+++ b/packages/components/src/spectrum/collections.ts
@@ -1,8 +1,12 @@
 export {
   ActionBar,
   type SpectrumActionBarProps as ActionBarProps,
+  ActionMenu,
+  type SpectrumActionMenuProps as ActionMenuProps,
+  // ListBox - we aren't planning to support this component
   MenuTrigger,
   type SpectrumMenuTriggerProps as MenuTriggerProps,
+  // TableView - we aren't planning to support this component
   TagGroup,
   type SpectrumTagGroupProps as TagGroupProps,
 } from '@adobe/react-spectrum';
diff --git a/packages/components/src/spectrum/forms.ts b/packages/components/src/spectrum/forms.ts
index 16c929b7f5..e76d5d81fe 100644
--- a/packages/components/src/spectrum/forms.ts
+++ b/packages/components/src/spectrum/forms.ts
@@ -1,10 +1,13 @@
 export {
+  // Checkbox can't be re-exported as it collides with DH component
   CheckboxGroup,
   type SpectrumCheckboxGroupProps as CheckboxGroupProps,
   Form,
   type SpectrumFormProps as FormProps,
   NumberField,
   type SpectrumNumberFieldProps as NumberFieldProps,
+  // Radio - re-export once we re-export RadioGroup
+  // RadioGroup - can't be re-exported as it collides with DH component
   RangeSlider,
   type SpectrumRangeSliderProps as RangeSliderProps,
   Slider,

From 29924352206255ac13f73f6aad6137e3b56dfc21 Mon Sep 17 00:00:00 2001
From: Brian Ingles <brianingles@deephaven.io>
Date: Thu, 9 May 2024 08:54:14 -0500
Subject: [PATCH 2/5] Renamed ButtonGroup to SplitButtonGroup (#1989)

---
 packages/components/src/BasicModal.tsx               |  6 +++---
 .../src/{ButtonGroup.tsx => SplitButtonGroup.tsx}    | 12 ++++++------
 packages/components/src/index.ts                     |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename packages/components/src/{ButtonGroup.tsx => SplitButtonGroup.tsx} (72%)

diff --git a/packages/components/src/BasicModal.tsx b/packages/components/src/BasicModal.tsx
index fa3212cead..f5580ada25 100644
--- a/packages/components/src/BasicModal.tsx
+++ b/packages/components/src/BasicModal.tsx
@@ -1,6 +1,6 @@
 import React, { useRef, useCallback } from 'react';
 import PropTypes from 'prop-types';
-import ButtonGroup from './ButtonGroup';
+import { SplitButtonGroup } from './SplitButtonGroup';
 import Button from './Button';
 import { Modal, ModalBody, ModalFooter, ModalHeader } from './modal';
 
@@ -126,7 +126,7 @@ function BasicModal(props: BasicModalProps): JSX.Element {
             {cancelButtonText}
           </Button>
         )}
-        <ButtonGroup>
+        <SplitButtonGroup>
           <Button
             kind={isConfirmDanger ? 'danger' : 'primary'}
             onClick={onConfirmClicked}
@@ -138,7 +138,7 @@ function BasicModal(props: BasicModalProps): JSX.Element {
             {confirmButtonText}
           </Button>
           {children}
-        </ButtonGroup>
+        </SplitButtonGroup>
       </ModalFooter>
     </Modal>
   );
diff --git a/packages/components/src/ButtonGroup.tsx b/packages/components/src/SplitButtonGroup.tsx
similarity index 72%
rename from packages/components/src/ButtonGroup.tsx
rename to packages/components/src/SplitButtonGroup.tsx
index be9a537729..41cae05848 100644
--- a/packages/components/src/ButtonGroup.tsx
+++ b/packages/components/src/SplitButtonGroup.tsx
@@ -2,14 +2,14 @@ import React from 'react';
 import classNames from 'classnames';
 import PropTypes from 'prop-types';
 
-interface ButtonGroupProps {
+interface SplitButtonGroupProps {
   children?: React.ReactNode;
   className?: string;
   style?: React.CSSProperties;
   'data-testid'?: string;
 }
 
-function ButtonGroup(props: ButtonGroupProps): JSX.Element {
+export function SplitButtonGroup(props: SplitButtonGroupProps): JSX.Element {
   const { children, className, style, 'data-testid': dataTestId } = props;
 
   return (
@@ -24,19 +24,19 @@ function ButtonGroup(props: ButtonGroupProps): JSX.Element {
   );
 }
 
-ButtonGroup.displayName = 'ButtonGroup';
+SplitButtonGroup.displayName = 'SplitButtonGroup';
 
-ButtonGroup.propTypes = {
+SplitButtonGroup.propTypes = {
   children: PropTypes.node.isRequired,
   className: PropTypes.string,
   style: PropTypes.object,
   'data-testid': PropTypes.string,
 };
 
-ButtonGroup.defaultProps = {
+SplitButtonGroup.defaultProps = {
   className: null,
   style: {},
   'data-testid': undefined,
 };
 
-export default ButtonGroup;
+export default SplitButtonGroup;
diff --git a/packages/components/src/index.ts b/packages/components/src/index.ts
index 00147bf7a4..e344a4e482 100644
--- a/packages/components/src/index.ts
+++ b/packages/components/src/index.ts
@@ -4,7 +4,6 @@ export { default as AutoCompleteInput } from './AutoCompleteInput';
 export { default as AutoResizeTextarea } from './AutoResizeTextarea';
 export { default as BasicModal } from './BasicModal';
 export { default as Button } from './Button';
-export { default as ButtonGroup } from './ButtonGroup';
 export { default as ButtonOld } from './ButtonOld';
 export * from './BulkActionBar';
 export { default as CardFlip } from './CardFlip';
@@ -50,6 +49,7 @@ export * from './SelectValueList';
 export * from './shortcuts';
 export { default as SocketedButton } from './SocketedButton';
 export * from './spectrum';
+export * from './SplitButtonGroup';
 export * from './TableViewEmptyState';
 export * from './TextWithTooltip';
 export * from './theme';

From ccf7dcd6e96de24aa008ccd0ebb56aa86929ae39 Mon Sep 17 00:00:00 2001
From: Brian Ingles <brianingles@deephaven.io>
Date: Tue, 14 May 2024 15:28:51 -0500
Subject: [PATCH 3/5] Updated comments (#1989)

---
 packages/components/src/spectrum/buttons.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/components/src/spectrum/buttons.ts b/packages/components/src/spectrum/buttons.ts
index 8f195abc94..19e19f5a36 100644
--- a/packages/components/src/spectrum/buttons.ts
+++ b/packages/components/src/spectrum/buttons.ts
@@ -3,8 +3,8 @@ export {
   type SpectrumActionButtonProps as ActionButtonProps,
   ActionGroup,
   type SpectrumActionGroupProps as ActionGroupProps,
-  // Button - can't be re-exported as it collides with DH component
-  // ButtonGroup - can't be re-exported as it collides with DH component
+  // Button - we want to use our own `Button` component instead of Spectrum's
+  // ButtonGroup - will re-export once our `Button` is compatible
   // FileTrigger - we aren't planning to support this component
   LogicButton,
   type SpectrumLogicButtonProps as LogicButtonProps,

From 55e9a715c531da89ce44e8cf3e67335730ba05e6 Mon Sep 17 00:00:00 2001
From: Brian Ingles <brianingles@deephaven.io>
Date: Tue, 14 May 2024 15:31:10 -0500
Subject: [PATCH 4/5] Comment (#1989)

---
 packages/components/src/spectrum/forms.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/components/src/spectrum/forms.ts b/packages/components/src/spectrum/forms.ts
index e76d5d81fe..6c70ceb9d0 100644
--- a/packages/components/src/spectrum/forms.ts
+++ b/packages/components/src/spectrum/forms.ts
@@ -1,5 +1,5 @@
 export {
-  // Checkbox can't be re-exported as it collides with DH component
+  // Checkbox - we want to use our own `Checkbox` component instead of Spectrum's
   CheckboxGroup,
   type SpectrumCheckboxGroupProps as CheckboxGroupProps,
   Form,
@@ -7,7 +7,7 @@ export {
   NumberField,
   type SpectrumNumberFieldProps as NumberFieldProps,
   // Radio - re-export once we re-export RadioGroup
-  // RadioGroup - can't be re-exported as it collides with DH component
+  // RadioGroup - we need to replace references to our DH `RadioGroup` before we can re-export
   RangeSlider,
   type SpectrumRangeSliderProps as RangeSliderProps,
   Slider,

From 3b8c3bc5761b97f5dd301b72becf282090ff58c1 Mon Sep 17 00:00:00 2001
From: Brian Ingles <brianingles@deephaven.io>
Date: Wed, 15 May 2024 10:07:01 -0500
Subject: [PATCH 5/5] Fixed bad rebase (#1989)

---
 packages/components/src/spectrum/buttons.ts     | 2 --
 packages/components/src/spectrum/collections.ts | 2 --
 2 files changed, 4 deletions(-)

diff --git a/packages/components/src/spectrum/buttons.ts b/packages/components/src/spectrum/buttons.ts
index 19e19f5a36..2f36971990 100644
--- a/packages/components/src/spectrum/buttons.ts
+++ b/packages/components/src/spectrum/buttons.ts
@@ -1,8 +1,6 @@
 export {
   ActionButton,
   type SpectrumActionButtonProps as ActionButtonProps,
-  ActionGroup,
-  type SpectrumActionGroupProps as ActionGroupProps,
   // Button - we want to use our own `Button` component instead of Spectrum's
   // ButtonGroup - will re-export once our `Button` is compatible
   // FileTrigger - we aren't planning to support this component
diff --git a/packages/components/src/spectrum/collections.ts b/packages/components/src/spectrum/collections.ts
index 83689ed43f..ee8f046742 100644
--- a/packages/components/src/spectrum/collections.ts
+++ b/packages/components/src/spectrum/collections.ts
@@ -1,8 +1,6 @@
 export {
   ActionBar,
   type SpectrumActionBarProps as ActionBarProps,
-  ActionMenu,
-  type SpectrumActionMenuProps as ActionMenuProps,
   // ListBox - we aren't planning to support this component
   MenuTrigger,
   type SpectrumMenuTriggerProps as MenuTriggerProps,