fix: Re-export Spectrum components for v0.85 (#2332)

- There were a few PRs that were simply re-exporting Spectrum components
after v0.85 that are hindering Grizzly support.
- Cherry-pick of #2212  
- Cherry-pick of #2170

---------

Co-authored-by: Akshat Jawne <[email protected]>
Co-authored-by: dgodinez-dh <[email protected]>

packages/code-studio/src/styleguide/CheckboxGroups.tsx

@@ -0,0 +1,46 @@
+import React from 'react';
+import { CheckboxGroup, Flex, Text } from '@deephaven/components';
+// eslint-disable-next-line no-restricted-imports
+import { Checkbox } from '@adobe/react-spectrum';
+import SampleSection from './SampleSection';
+
+export function CheckboxGroups(): JSX.Element {
+  return (
+    <SampleSection name="checkbox-groups">
+      <h2 className="ui-title">Checkbox Groups</h2>
+      <Flex gap="size-100" gridColumn="span 3" height="100%">
+        <Flex direction="column">
+          <Text>Single Child</Text>
+          <CheckboxGroup aria-label="Single Child">
+            <Checkbox value="Aaa">Aaa</Checkbox>
+          </CheckboxGroup>
+        </Flex>
+
+        <Flex direction="column">
+          <Text>Multiple Children</Text>
+          <CheckboxGroup aria-label="Multiple Children">
+            <Checkbox value="Aaa">Aaa</Checkbox>
+            <Checkbox value="Bbb">Bbb</Checkbox>
+            <Checkbox value="Ccc">Ccc</Checkbox>
+          </CheckboxGroup>
+        </Flex>
+
+        <Flex direction="column">
+          <Text>Mixed Children Types</Text>
+          <CheckboxGroup aria-label="Mixed Children Types">
+            {/* eslint-disable react/jsx-curly-brace-presence */}
+            {'String 1'}
+            {'String 2'}
+            {444}
+            {999}
+            {true}
+            {false}
+            <Checkbox>Aaa</Checkbox>
+          </CheckboxGroup>
+        </Flex>
+      </Flex>
+    </SampleSection>
+  );
+}
+
+export default CheckboxGroups;

packages/code-studio/src/styleguide/StyleGuide.tsx

@@ -39,6 +39,7 @@ import SpectrumComparison from './SpectrumComparison';
 import Pickers from './Pickers';
 import ListViews from './ListViews';
 import ErrorViews from './ErrorViews';
+import CheckboxGroups from './CheckboxGroups';
 
 const stickyProps = {
   position: 'sticky',
@@ -117,6 +118,7 @@ function StyleGuide(): React.ReactElement {
         <ItemListInputs />
         <DraggableLists />
         <TimeSliderInputs />
+        <CheckboxGroups />
         <Dialog />
         <Modals />
         <ContextMenus />

packages/components/package.json

@@ -31,6 +31,7 @@
     "@deephaven/utils": "file:../utils",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/react-fontawesome": "^0.2.0",
+    "@internationalized/date": "^3.5.5",
     "@react-spectrum/theme-default": "^3.5.1",
     "@react-spectrum/utils": "^3.11.5",
     "@react-types/radio": "^3.8.1",

packages/components/src/spectrum/CheckboxGroup.tsx

@@ -0,0 +1,43 @@
+/* eslint-disable react/no-array-index-key */
+import { isElementOfType } from '@deephaven/react-hooks';
+import React, { type ReactNode, useMemo } from 'react';
+import {
+  Checkbox,
+  CheckboxGroup as SpectrumCheckboxGroup,
+  type SpectrumCheckboxGroupProps,
+} from '@adobe/react-spectrum';
+import { ensureArray } from '@deephaven/utils';
+
+export type CheckboxGroupProps = {
+  children: ReactNode;
+} & Omit<SpectrumCheckboxGroupProps, 'children'>;
+
+/**
+ * Augmented version of the Spectrum CheckboxGroup component that supports
+ * primitive item children.
+ */
+export function CheckboxGroup({
+  children,
+  ...props
+}: CheckboxGroupProps): JSX.Element {
+  const wrappedChildren = useMemo(
+    () =>
+      ensureArray(children).map(child =>
+        isElementOfType(child, Checkbox) ? (
+          child
+        ) : (
+          <Checkbox key={String(child)} value={String(child)}>
+            {String(child)}
+          </Checkbox>
+        )
+      ),
+    [children]
+  );
+
+  return (
+    // eslint-disable-next-line react/jsx-props-no-spreading
+    <SpectrumCheckboxGroup {...props}>{wrappedChildren}</SpectrumCheckboxGroup>
+  );
+}
+
+export default CheckboxGroup;

packages/components/src/spectrum/dateAndTime.ts

@@ -1,3 +1,9 @@
+import {
+  CalendarDate,
+  CalendarDateTime,
+  ZonedDateTime,
+} from '@internationalized/date';
+
 export {
   Calendar,
   type SpectrumCalendarProps as CalendarProps,
@@ -12,3 +18,17 @@ export {
   TimeField,
   type SpectrumTimeFieldProps as TimeFieldProps,
 } from '@adobe/react-spectrum';
+
+export type { CalendarDate, CalendarDateTime, ZonedDateTime };
+
+// This is the type for the DatePicker value
+export type DateValue = CalendarDate | CalendarDateTime | ZonedDateTime;
+
+// This is the type for DatePicker onChange
+export type MappedDateValue<T> = T extends ZonedDateTime
+  ? ZonedDateTime
+  : T extends CalendarDateTime
+  ? CalendarDateTime
+  : T extends CalendarDate
+  ? CalendarDate
+  : never;

packages/components/src/spectrum/forms.ts

@@ -1,8 +1,6 @@
 export {
   Checkbox as SpectrumCheckbox,
   type SpectrumCheckboxProps,
-  CheckboxGroup,
-  type SpectrumCheckboxGroupProps as CheckboxGroupProps,
   Form,
   type SpectrumFormProps as FormProps,
   NumberField,

packages/components/src/spectrum/index.ts

@@ -26,6 +26,7 @@ export * from './picker';
 export * from './Heading';
 export * from './Text';
 export * from './View';
+export * from './CheckboxGroup';
 
 /**
  * Custom DH spectrum utils

tests/styleguide.spec.ts

@@ -47,6 +47,7 @@ const sampleSectionIds: string[] = [
   'sample-section-spectrum-overlays',
   'sample-section-spectrum-well',
   'sample-section-error-views',
+  'sample-section-checkbox-groups',
 ];
 const buttonSectionIds: string[] = [
   'sample-section-buttons-regular',