Skip to content

Commit

Permalink
Merge pull request #32 from sippy-platform/0.14
Browse files Browse the repository at this point in the history
Mellow UI 0.14
  • Loading branch information
Studio384 authored Aug 19, 2022
2 parents 7f177ef + 13080a9 commit bc4b81a
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 11 deletions.
18 changes: 9 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sippy-platform/mellow-ui",
"version": "0.13.4",
"version": "0.14.1",
"description": "React components for the Mellow Design System.",
"main": "./dist/mellow-ui.umd.js",
"module": "./dist/mellow-ui.es.js",
Expand Down Expand Up @@ -49,7 +49,7 @@
"vite-plugin-dts": "1.4.1"
},
"peerDependencies": {
"@sippy-platform/mellow-css": ">=0.11.0",
"@sippy-platform/mellow-css": ">=0.14.0",
"@sippy-platform/valkyrie": ">=0.15.0",
"react": "^17.0.0 || ^18.0.0",
"react-dom": "^17.0.0 || ^18.0.0"
Expand Down
6 changes: 6 additions & 0 deletions src/components/ListItem/ListItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ export type ListItemProps<T extends ElementType> = {
* Show a label around the list
*/
primary: string;
/**
* Show a label around the list
*/
secondary?: string;
/**
* Show the list item as active
*/
Expand Down Expand Up @@ -67,6 +71,7 @@ export type ListItemProps<T extends ElementType> = {
export function ListItem<T extends ElementType>({
active,
primary,
secondary,
className,
href,
onClick,
Expand Down Expand Up @@ -103,6 +108,7 @@ export function ListItem<T extends ElementType>({
{startAction && <span className="list-item-action-s">{startAction}</span>}
{startIcon && <span className="list-item-icon-s">{startIcon}</span>}
{primary && <span className={clsx('list-item-label', { 'text-truncate': truncate })}>{primary}</span>}
{secondary && <span className={clsx('list-item-description', { 'text-truncate': truncate })}>{secondary}</span>}
{endIcon && <span className="list-item-icon-e">{endIcon}</span>}
{endAction && <span className="list-item-action-e">{endAction}</span>}
</Component>
Expand Down
1 change: 1 addition & 0 deletions src/docs/pages/Components/ListDemo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export default function ListDemo() {
/>
<ListItem
primary="This is also list item"
secondary="This is a list item description"
endAction={<Radio value="second" />}
/>
<ListItemDivider
Expand Down

0 comments on commit bc4b81a

Please sign in to comment.