Merge branch 'main' into feat/added-migration-guide-to-use-list

gravity-ui · Aug 1, 2024 · 35ef66e · 35ef66e
2 parents 77ba528 + 0e22bde
commit 35ef66e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/components/TreeSelect/TreeSelect.tsx b/src/components/TreeSelect/TreeSelect.tsx
@@ -173,8 +173,10 @@ export const TreeSelect = React.forwardRef(function TreeSelect<T>(
         <SelectControl
             {...controlProps}
             selectedOptionsContent={React.Children.toArray(
-                value.map(
-                    (itemId) => mapItemDataToContentProps(list.structure.itemsById[itemId]).title,
+                value.map((itemId) =>
+                    itemId in list.structure.itemsById
+                        ? mapItemDataToContentProps(list.structure.itemsById[itemId]).title
+                        : '',
                 ),
             ).join(', ')}
             view="normal"