diff --git a/src/Container/Container.tsx b/src/Container/Container.tsx index c83d5b83..a481e3ff 100644 --- a/src/Container/Container.tsx +++ b/src/Container/Container.tsx @@ -30,10 +30,6 @@ interface ContainerTitleProps { } const ContainerTitle: FC = ({ title, subTitle }) => { - if (!title && !subTitle) { - return null; - } - return ( {title && {title}} @@ -50,14 +46,21 @@ const ContainerTitle: FC = ({ title, subTitle }) => { ); }; -const ContainerChildren: FC = ({ children }) => { +interface ContainerChildrenProps { + hasTitle: boolean; +} + +const ContainerChildren: FC = ({ + hasTitle, + children, +}) => { const hasChildrenTable = Array.isArray(children) ? children.some(isElementTable) : isElementTable(children); if (!hasChildrenTable) { return ( - + {children} ); @@ -96,10 +99,12 @@ export type ContainerProps = Omit & ContainerTitleProps; const Container: FC & { Section: typeof Section; } = ({ title, subTitle, children, ...props }) => { + const hasTitle = Boolean(title || subTitle); + return ( - - {children} + {hasTitle && } + {children} ); }; diff --git a/src/Container/__tests__/__snapshots__/Container.spec.tsx.snap b/src/Container/__tests__/__snapshots__/Container.spec.tsx.snap index 182d73c9..abfcf395 100644 --- a/src/Container/__tests__/__snapshots__/Container.spec.tsx.snap +++ b/src/Container/__tests__/__snapshots__/Container.spec.tsx.snap @@ -13,6 +13,7 @@ exports[`Container should render correctly 1`] = ` padding-left: 32px; padding-right: 32px; padding-bottom: 32px; + padding-top: 0rem; } .c1 { diff --git a/website/docs/Container.md b/website/docs/Container.md index 29d13bc7..6164161c 100644 --- a/website/docs/Container.md +++ b/website/docs/Container.md @@ -43,6 +43,14 @@ import { Container, Box } from 'tailor-ui'; ``` +### Without title + +```jsx live + + The content of container + +``` + ### With Table ```jsx live @@ -82,9 +90,10 @@ import { Container, Box } from 'tailor-ui'; ### Container -| Property | Description | Type | Default | -| -------- | ----------- | ----------- | ------- | -| `title` | | `ReactNode` | | +| Property | Description | Type | Default | +| ---------- | ----------- | ----------- | ------- | +| `title` | | `ReactNode` | | +| `subTitle` | | `ReactNode` | | ### Container.Section