Skip to content

Commit

Permalink
Merge pull request #340 from pxblue/dev
Browse files Browse the repository at this point in the history
Publish 5.3.3
  • Loading branch information
huayunh authored Dec 6, 2021
2 parents 4a6fec9 + a4d2daf commit cb90d02
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 14 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog
## v5.3.3 (December 6, 2021)

### Fixed

- Avoid rendering of HTML elements in DOM when `subtitle` or `info` prop is not available.
## v5.3.2 (November 11, 2021)

### Changed
Expand Down
2 changes: 1 addition & 1 deletion components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@brightlayer-ui/react-components",
"version": "5.3.2",
"version": "5.3.3",
"description": "React components for Brightlayer UI applications",
"scripts": {
"test": "jest src",
Expand Down
32 changes: 19 additions & 13 deletions components/src/core/InfoListItem/InfoListItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -207,19 +207,25 @@ const InfoListItemRender: React.ForwardRefRenderFunction<unknown, InfoListItemPr
primary={title}
className={combine('listItemText')}
secondary={
<>
<Typography
variant={'subtitle2'}
component={'p'}
noWrap={!wrapSubtitle}
className={combine('subtitle')}
>
{getSubtitle()}
</Typography>
<Typography variant={'body2'} noWrap={!wrapInfo} className={combine('info')}>
{getInfo()}
</Typography>
</>
subtitle || info ? (
<>
{subtitle ? (
<Typography
variant={'subtitle2'}
component={'p'}
noWrap={!wrapSubtitle}
className={combine('subtitle')}
>
{getSubtitle()}
</Typography>
) : undefined}
{info ? (
<Typography variant={'body2'} noWrap={!wrapInfo} className={combine('info')}>
{getInfo()}
</Typography>
) : undefined}
</>
) : undefined
}
primaryTypographyProps={{
noWrap: !wrapTitle,
Expand Down

0 comments on commit cb90d02

Please sign in to comment.