Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(badge): new badge #576

Merged
merged 4 commits into from
Apr 12, 2023
Merged

refactor(badge): new badge #576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e88d9fc
refactor(badge): new badge
jarmywang Apr 9, 2023
f1c1c07
refactor(badge): demo base dot
jarmywang Apr 10, 2023
e53f70d
refactor(badge): demo finish(#576)
jarmywang Apr 11, 2023
f16fccb
refactor(badge): finish(#576)
jarmywang Apr 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions site/styles/mobile/components.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,13 @@

.badge-demo {
display: flex;
padding: 16px 0;
width: 100%;
margin-top: 28px;
margin-bottom: 24px;
margin-left: 16px;
align-items: center;

.badge-item {
width: 24%;
text-align: center;
margin-right: 48px;
}
}
}
132 changes: 108 additions & 24 deletions src/avatar/__test__/__snapshots__/demo.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3787,9 +3787,16 @@ exports[`Avatar > Avatar mobileVue demo works fine 1`] = `
class="t-badge"
>
<div
class="t-badge__inner t-badge--medium t-badge--circle"
class="t-badge__content"
>
10
<!---->
</div>
<div
class="t-badge--basic t-badge--medium t-badge--circle t-badge--count t-has-count"
>
<!--v-if-->
10
<!--v-if-->
</div>
<!---->
</div>
Expand Down Expand Up @@ -3852,9 +3859,16 @@ exports[`Avatar > Avatar mobileVue demo works fine 1`] = `
class="t-badge"
>
<div
class="t-badge__inner t-badge--medium t-badge--circle"
class="t-badge__content"
>
10
<!---->
</div>
<div
class="t-badge--basic t-badge--medium t-badge--circle t-badge--count t-has-count"
>
<!--v-if-->
10
<!--v-if-->
</div>
<!---->
</div>
Expand Down Expand Up @@ -3917,9 +3931,16 @@ exports[`Avatar > Avatar mobileVue demo works fine 1`] = `
class="t-badge"
>
<div
class="t-badge__inner t-badge--medium t-badge--dot"
class="t-badge__content"
>
<!---->
</div>
<div
class="t-badge--basic t-badge--dot t-badge--medium t-badge--circle t-has-count"
>

<!--v-if-->

<!--v-if-->
</div>
<!---->
</div>
Expand Down Expand Up @@ -3986,9 +4007,16 @@ exports[`Avatar > Avatar mobileVue demo works fine 1`] = `
class="t-badge"
>
<div
class="t-badge__inner t-badge--medium t-badge--circle"
class="t-badge__content"
>
10
<!---->
</div>
<div
class="t-badge--basic t-badge--medium t-badge--circle t-badge--count t-has-count"
>
<!--v-if-->
10
<!--v-if-->
</div>
<!---->
</div>
Expand Down Expand Up @@ -4051,9 +4079,16 @@ exports[`Avatar > Avatar mobileVue demo works fine 1`] = `
class="t-badge"
>
<div
class="t-badge__inner t-badge--medium t-badge--circle"
class="t-badge__content"
>
10
<!---->
</div>
<div
class="t-badge--basic t-badge--medium t-badge--circle t-badge--count t-has-count"
>
<!--v-if-->
10
<!--v-if-->
</div>
<!---->
</div>
Expand Down Expand Up @@ -4116,9 +4151,16 @@ exports[`Avatar > Avatar mobileVue demo works fine 1`] = `
class="t-badge"
>
<div
class="t-badge__inner t-badge--medium t-badge--dot"
class="t-badge__content"
>
<!---->
</div>
<div
class="t-badge--basic t-badge--dot t-badge--medium t-badge--circle t-has-count"
>

<!--v-if-->

<!--v-if-->
</div>
<!---->
</div>
Expand Down Expand Up @@ -4498,9 +4540,16 @@ exports[`Avatar > Avatar sizeVue demo works fine 1`] = `
class="t-badge"
>
<div
class="t-badge__inner t-badge--medium t-badge--circle"
class="t-badge__content"
>
<!---->
</div>
<div
class="t-badge--basic t-badge--medium t-badge--circle t-badge--count t-has-count"
>
10
<!--v-if-->
10
<!--v-if-->
</div>
<!---->
</div>
Expand Down Expand Up @@ -4563,9 +4612,16 @@ exports[`Avatar > Avatar sizeVue demo works fine 1`] = `
class="t-badge"
>
<div
class="t-badge__inner t-badge--medium t-badge--circle"
class="t-badge__content"
>
10
<!---->
</div>
<div
class="t-badge--basic t-badge--medium t-badge--circle t-badge--count t-has-count"
>
<!--v-if-->
10
<!--v-if-->
</div>
<!---->
</div>
Expand Down Expand Up @@ -4628,9 +4684,16 @@ exports[`Avatar > Avatar sizeVue demo works fine 1`] = `
class="t-badge"
>
<div
class="t-badge__inner t-badge--medium t-badge--dot"
class="t-badge__content"
>

<!---->
</div>
<div
class="t-badge--basic t-badge--dot t-badge--medium t-badge--circle t-has-count"
>
<!--v-if-->

<!--v-if-->
</div>
<!---->
</div>
Expand Down Expand Up @@ -4697,9 +4760,16 @@ exports[`Avatar > Avatar sizeVue demo works fine 1`] = `
class="t-badge"
>
<div
class="t-badge__inner t-badge--medium t-badge--circle"
class="t-badge__content"
>
10
<!---->
</div>
<div
class="t-badge--basic t-badge--medium t-badge--circle t-badge--count t-has-count"
>
<!--v-if-->
10
<!--v-if-->
</div>
<!---->
</div>
Expand Down Expand Up @@ -4762,9 +4832,16 @@ exports[`Avatar > Avatar sizeVue demo works fine 1`] = `
class="t-badge"
>
<div
class="t-badge__inner t-badge--medium t-badge--circle"
class="t-badge__content"
>
10
<!---->
</div>
<div
class="t-badge--basic t-badge--medium t-badge--circle t-badge--count t-has-count"
>
<!--v-if-->
10
<!--v-if-->
</div>
<!---->
</div>
Expand Down Expand Up @@ -4827,9 +4904,16 @@ exports[`Avatar > Avatar sizeVue demo works fine 1`] = `
class="t-badge"
>
<div
class="t-badge__inner t-badge--medium t-badge--dot"
class="t-badge__content"
>

<!---->
</div>
<div
class="t-badge--basic t-badge--dot t-badge--medium t-badge--circle t-has-count"
>
<!--v-if-->

<!--v-if-->
</div>
<!---->
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/avatar/__test__/index.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ describe('avatar', () => {
it(': badge', async () => {
const wrapper = mount(() => <Avatar image={IMAGE} badgeProps={{ count: 10 }}></Avatar>);
expect(wrapper.findComponent(Badge).exists()).toBeTruthy();
const badge = wrapper.find('.t-badge > .t-badge__inner');
const badge = wrapper.find('.t-badge > .t-badge--basic');
expect(badge.exists()).toBeTruthy();
expect(badge.text()).toBe('10');
});
Expand Down
Loading