Fixed wrappeditems error (deephaven#1890)

bmingles · Apr 29, 2024 · 6c1a83f · 6c1a83f
1 parent b450090
commit 6c1a83f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/packages/components/src/spectrum/picker/Picker.tsx b/packages/components/src/spectrum/picker/Picker.tsx
@@ -97,10 +97,10 @@ export function Picker({
   const [uncontrolledSelectedKey, setUncontrolledSelectedKey] =
     useState(defaultSelectedKey);
 
-  const wrappedItems = useMemo(
-    () => wrapItemChildren(children, tooltipOptions),
-    [children, tooltipOptions]
-  );
+  const wrappedItems = useMemo(() => {
+    const wrapped = wrapItemChildren(children, tooltipOptions);
+    return Array.isArray(wrapped) ? wrapped : [wrapped];
+  }, [children, tooltipOptions]);
 
   // Item descriptions and Section elements introduce variable item heights.
   // This throws off scroll position calculations, so we disable auto scrolling

diff --git a/packages/components/src/spectrum/utils/itemUtils.ts b/packages/components/src/spectrum/utils/itemUtils.ts
@@ -26,10 +26,7 @@ export const ITEM_EMPTY_STRING_TEXT_VALUE = 'Empty';
  * an incoming prop.
  */
 type SectionPropsNoItemRenderer<T> = Omit<SectionProps<T>, 'children'> & {
-  children:
-    | Exclude<SectionProps<T>['children'], ItemRenderer<T>>
-    | ItemElementOrPrimitive<T>
-    | ItemElementOrPrimitive<T>[];
+  children: Exclude<SectionProps<T>['children'], ItemRenderer<T>>;
 };
 
 export type ItemElement<T = unknown> = ReactElement<ItemProps<T>>;