Skip to content

Commit 1b61544

Browse files
author
Administrator
committed
render badge
1 parent 5591904 commit 1b61544

File tree

5 files changed

+12
-6
lines changed

5 files changed

+12
-6
lines changed

src/TreeMenu/TreeMenu.less

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@
9393
}
9494

9595
> .content {
96-
padding: 10px;
96+
padding: var(--item-padding);//10px;
97+
min-height: var(--item-height);
9798
display: flex;
9899
flex-direction: row;
99100
align-items: center;

src/TreeMenu/TreeMenu.stories.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ type MarkerProps = {
1111

1212
const Badge : React.FC<MarkerProps> = ({ color }) => {
1313

14-
const [counter,setCounter] = React.useState(0);
14+
const [counter,setCounter] = React.useState("");
1515
useEffect(()=>{
16-
const tm = setInterval(()=>setCounter(counter+1),1000);
16+
const tm = setInterval(()=>setCounter(new Date().toLocaleTimeString()),1000);
1717
return () => {
1818
clearInterval(tm);
1919
};
@@ -41,7 +41,8 @@ const ITEMS : TreeMenuItem[] = [
4141
id:"heading",
4242
title:"Heading",
4343
info:"Tree menu sample",
44-
unselectable:true
44+
unselectable:false,
45+
badge:<Badge color="red" />
4546
},
4647
{
4748
id:"main",title:"Main Menu 1",

src/TreeMenu/TreeMenu.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ export { TreeMenuItem };
99
const Item : React.FC<ItemRenderProps> = (props) => {
1010
const {
1111
id,
12+
badge,
1213
titleClass,
1314
infoClass,
1415
enableRotate,
@@ -34,8 +35,8 @@ const Item : React.FC<ItemRenderProps> = (props) => {
3435
{info}
3536
</div>}
3637
</div>
37-
{renderBadge && <div className="marker">
38-
{renderBadge(props)}
38+
{(renderBadge || badge) && <div className="marker">
39+
{badge || renderBadge(props)}
3940
</div>}
4041
{hasChilds && renderGroupState &&
4142
<div className={clsx("folder",{ "enable-rotate":enableRotate })}>

src/TreeMenu/TreeMenu.types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export type ItemProps = {
1111
infoStyle?:React.CSSProperties;
1212
classes?:Set<string>;
1313
disabled?:boolean;
14+
badge?:string | React.ReactElement;
1415
id:string;
1516
collapsed?:boolean;
1617
unselectable?:boolean;

src/variables.less

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
.tree-menu {
44
--font-family:"Avenir Next", Helvetica, Arial, sans-serif;
5+
--item-padding:5px;
6+
--item-height:24px;
57
}
68

79
.dark-colors() {

0 commit comments

Comments
 (0)