Handle a couple extra undefined cases

deephaven · Nov 27, 2024 · 2868ee5 · 2868ee5
1 parent ca2f18d
commit 2868ee5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/packages/components/src/spectrum/utils/itemUtils.ts b/packages/components/src/spectrum/utils/itemUtils.ts
@@ -257,7 +257,10 @@ export function isNormalizedItemsWithKeysList<
   }
 
   return (
-    !isItemOrSection(node[0]) && typeof node[0] === 'object' && 'key' in node[0]
+    !isItemOrSection(node[0]) &&
+    node[0] != null &&
+    typeof node[0] === 'object' &&
+    'key' in node[0]
   );
 }
 

diff --git a/packages/react-hooks/src/SelectionUtils.ts b/packages/react-hooks/src/SelectionUtils.ts
@@ -74,7 +74,7 @@ export function isSelectionMaybeInvertedEqual<T>(
  */
 export function mapSelection<TItem, TMap>(
   selectedItemKeys: Selection,
-  getItem: (key: React.Key) => KeyedItem<TItem>,
+  getItem: (key: React.Key) => KeyedItem<TItem> | undefined,
   mapItem: (item: KeyedItem<TItem>) => TMap
 ): SelectionT<TMap> {
   if (selectedItemKeys === 'all') {
@@ -83,7 +83,15 @@ export function mapSelection<TItem, TMap>(
 
   const keys = [...selectedItemKeys.keys()];
 
-  return new Set(keys.map(key => mapItem(getItem(key))));
+  return new Set(
+    keys.map(key => {
+      const item = getItem(key);
+      if (item === undefined) {
+        throw new Error(`Could not find item with key ${key}`);
+      }
+      return mapItem(item);
+    })
+  );
 }
 
 /**