fix: Crash when ListBox, Select or ComboBox has null children (#545)

pluralsh · Nov 30, 2023 · 44603f9 · 44603f9
1 parent 2228bb4
commit 44603f9
Showing 1 changed file with 21 additions and 18 deletions.
diff --git a/src/components/ListBox.tsx b/src/components/ListBox.tsx
@@ -89,11 +89,12 @@ const ScrollContainer = styled.div<ScrollContainerProps>(
   })
 )
 
-function propsToTextValue({
-  textValue,
-  children,
-  label,
-}: Record<string, unknown>) {
+function propsToTextValue(props: Record<string, unknown> | null | undefined) {
+  if (!props) {
+    return ''
+  }
+  const { textValue, children, label } = props
+
   return typeof textValue === 'string' && textValue
     ? textValue
     : typeof label === 'string' && label
@@ -126,20 +127,22 @@ function useItemWrappedChildren(
       )
     }
     Children.forEach(children, (child) => {
-      const { textValue: _, ...childProps } = child.props
-
-      if (child) {
-        const item = (
-          <Item
-            key={child.key}
-            textValue={propsToTextValue(child.props)}
-          >
-            {cloneElement(child, childProps)}
-          </Item>
-        )
-
-        wrapped.push(item)
+      if (!child) {
+        return
       }
+
+      const { textValue: _, ...passThruProps } = child.props || {}
+
+      const item = (
+        <Item
+          key={child.key}
+          textValue={propsToTextValue(child.props)}
+        >
+          {cloneElement(child, passThruProps)}
+        </Item>
+      )
+
+      wrapped.push(item)
     })
 
     if (footer) {