diff --git a/lib/components/src/tabs/tabs.js b/lib/components/src/tabs/tabs.js index 248839f9a016..63b21e0f1b25 100644 --- a/lib/components/src/tabs/tabs.js +++ b/lib/components/src/tabs/tabs.js @@ -143,20 +143,23 @@ export const panelProps = { export const Tabs = ({ children, selected, onSelect, absolute, bordered }) => { const list = React.Children.toArray(children).map( - ({ props: { title, id, children: content } }, index) => ({ - active: selected ? id === selected : index === 0, - title, - id, - render: - typeof content === 'function' - ? content - : // eslint-disable-next-line react/prop-types - ({ active }) => ( - - {content} - - ), - }) + ({ props: { title, id, children: childrenOfChild } }, index) => { + const content = Array.isArray(childrenOfChild) ? childrenOfChild[0] : childrenOfChild; + return { + active: selected ? id === selected : index === 0, + title, + id, + render: + typeof content === 'function' + ? content + : // eslint-disable-next-line react/prop-types + ({ active }) => ( + + {content} + + ), + }; + } ); return list.length ? (