Skip to content

Commit 1e1cf6e

Browse files
committed
feat(Badge): update demo
1 parent 648ee59 commit 1e1cf6e

File tree

6 files changed

+583
-186
lines changed

6 files changed

+583
-186
lines changed

src/badge/__tests__/index.test.tsx

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ describe('Badge', () => {
5353

5454
it(':count', () => {
5555
const { container } = render(<Badge count={99} />);
56-
expect(container.querySelector('.t-badge--basic').innerHTML.trim()).toBe('99');
56+
expect(container.querySelector('.t-badge--basic > .t-badge__count').innerHTML.trim()).toBe('99');
5757
const { container: container2 } = render(<Badge count={() => 33} />);
58-
expect(container2.querySelector('.t-badge--basic').innerHTML.trim()).toBe('33');
58+
expect(container2.querySelector('.t-badge--basic > .t-badge__count').innerHTML.trim()).toBe('33');
5959
const { container: container3 } = render(<Badge count={null} />);
60-
expect(container3.querySelector('.t-badge--basic')).toBe(null);
60+
expect(container3.querySelector('.t-badge--basic > .t-badge__count')).toBe(null);
6161
});
6262

6363
it(':dot', () => {
@@ -67,21 +67,19 @@ describe('Badge', () => {
6767

6868
it(':maxCount', () => {
6969
const { container } = render(<Badge count={100} maxCount={99} />);
70-
expect(container.querySelector('.t-badge--basic').innerHTML.trim()).toBe('99+');
70+
expect(container.querySelector('.t-badge--basic > .t-badge__count').innerHTML.trim()).toBe('99+');
7171
});
7272

7373
it(':offset', () => {
7474
const { container } = render(<Badge count={3} offset={[10, 10]} />);
7575
expect(container.querySelector('.t-badge--basic').getAttribute('style'))
76-
.contain('right: 10px;')
76+
.contain('left: calc(100% + 10px);')
7777
.contain('top: 10px;');
7878
const { container: container1 } = render(<Badge count={3} offset={[]} />);
79-
expect(container1.querySelector('.t-badge--basic').getAttribute('style'))
80-
.contain('right: 0px;')
81-
.contain('top: 0px;');
79+
expect(container1.querySelector('.t-badge--basic').getAttribute('style')).toBe(null);
8280
const { container: container2 } = render(<Badge count={3} offset={['10em', '10rem']} />);
8381
expect(container2.querySelector('.t-badge--basic').getAttribute('style'))
84-
.contain('right: 10em;')
82+
.contain('left: calc(100% + 10em);')
8583
.contain('top: 10rem;');
8684
});
8785

src/badge/_example/base.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ export default function BaseBadge() {
1818

1919
<div className="summary">数字徽标</div>
2020
<div className="badge-demo">
21-
<Badge count="8" content="消息" offset={[-8, 0]} className="badge-item" />
22-
<Badge count="2" offset={[-2, -2]} className="badge-item">
21+
<Badge count="8" content="消息" offset={[4, 0]} className="badge-item" />
22+
<Badge count="2" offset={[2, -2]} className="badge-item">
2323
<NotificationIcon size={24} />
2424
</Badge>
2525
<Badge count="8" offset={[2, 2]} className="badge-item">

src/badge/_example/theme.tsx

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ export default function ThemeBadge() {
77
<>
88
<div className="summary">圆形徽标</div>
99
<div className="badge-demo">
10-
<Badge count="2" offset={[-2, -2]}>
10+
<Badge count="2" offset={[2, -2]}>
1111
<NotificationIcon size={24} />
1212
</Badge>
1313
</div>
1414

1515
<div className="summary">方形徽标</div>
1616
<div className="badge-demo">
17-
<Badge count="2" shape="square" offset={[-2, -2]}>
17+
<Badge count="2" shape="square" offset={[1, -2]}>
1818
<NotificationIcon size={24} />
1919
</Badge>
2020
</div>
@@ -29,7 +29,12 @@ export default function ThemeBadge() {
2929
<div className="summary" style={{ marginBottom: '16px' }}>
3030
角标
3131
</div>
32-
<Cell title="单行标题" note={<Badge count="New" offset={[0, 0]} shape="ribbon" />}></Cell>
32+
<Cell title="单行标题" note={<Badge count="NEW" offset={[0, 0]} shape="ribbon" />}></Cell>
33+
34+
<div className="summary" style={{ marginBottom: '16px' }}>
35+
三角角标
36+
</div>
37+
<Cell title="单行标题" note={<Badge count="NEW" offset={[0, 0]} shape="triangle-right" />}></Cell>
3338
</>
3439
);
3540
}

src/tabs/_example/badge.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import { Tabs, TabPanel } from 'tdesign-mobile-react';
44
export default () => (
55
<div>
66
<Tabs defaultValue={'first'}>
7-
<TabPanel value={'first'} badgeProps={{ dot: true, offset: [-4, 1] }} label="选项"></TabPanel>
8-
<TabPanel value={'second'} badgeProps={{ count: 8, offset: [-8, 3] }} label="选项"></TabPanel>
7+
<TabPanel value={'first'} badgeProps={{ dot: true, offset: [0, 1] }} label="选项"></TabPanel>
8+
<TabPanel value={'second'} badgeProps={{ count: 8, offset: [0, 1] }} label="选项"></TabPanel>
99
<TabPanel value={'third'} label="选项"></TabPanel>
1010
</Tabs>
1111
</div>

0 commit comments

Comments
 (0)