Skip to content

feat: infiniteloading v15 adaption #2841

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

Merged
xiaoyatong merged 1 commit into from
Dec 23, 2024
Merged

feat: infiniteloading v15 adaption #2841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,6 +797,7 @@
"sort": 5,
"show": true,
"taro": true,
"v15": true,
"author": "swag~jun"
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/packages/infiniteloading/demos/h5/demo1.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const Demo1 = () => {
<g clipPath="url(#clip0_878_2529)">
<path
d="M23.1507 10.6435C21.8958 9.29889 21.6209 7.28491 20.8022 6.60353C19.9835 5.92216 18.7824 7.00753 18.3402 7.6467C15.896 5.92216 11.9879 6.00054 11.9879 6.00054C11.9879 6.00054 8.09759 5.92216 5.6475 7.6467C5.20528 7.00753 4.01012 5.92216 3.19143 6.60353C2.37274 7.28491 2.10383 9.29889 0.848906 10.6435C-0.0892994 11.6566 -0.166985 11.952 0.215468 12.754C0.591945 13.556 2.93447 14.2193 4.58977 12.6334C4.81088 13.4595 6.67534 18 11.9938 18C17.3123 18 19.1887 13.4595 19.4039 12.6334C21.0592 14.2193 23.4077 13.556 23.7901 12.754C24.1666 11.952 24.0889 11.6566 23.1507 10.6435Z"
fill="#818181"
fill="#E4E4E4"
/>
</g>
</svg>
Expand Down
8 changes: 4 additions & 4 deletions src/packages/infiniteloading/demos/h5/demo2.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ const Demo2 = () => {
>
<path
d="M34.7243 10.965C32.842 8.94809 32.4297 5.92727 31.2018 4.90525C29.9738 3.88324 28.1722 5.51123 27.5089 6.46993C23.8429 3.88324 17.9809 4.00082 17.9809 4.00082C17.9809 4.00082 12.1458 3.88324 8.47083 6.46993C7.80754 5.51123 6.01488 3.88324 4.78691 4.90525C3.55894 5.92727 3.15559 8.94809 1.2733 10.965C-0.133943 12.4844 -0.250465 12.9276 0.323186 14.1305C0.887874 15.3334 4.40149 16.3283 6.88432 13.9496C7.21596 15.1887 10.0125 21.9991 17.9899 21.9991C25.9672 21.9991 28.7817 15.1887 29.1043 13.9496C31.5872 16.3283 35.1098 15.3334 35.6834 14.1305C36.2481 12.9276 36.1316 12.4844 34.7243 10.965Z"
fill="#818181"
fill="#E4E4E4"
/>
</svg>
下拉刷新
Expand All @@ -83,9 +83,9 @@ const Demo2 = () => {
fill="none"
className="nut-infinite-bottom-tips-icons"
>
<circle cx="2" cy="12" r="2" fill="#818181" />
<circle cx="12" cy="12" r="2" fill="#818181" />
<circle cx="22" cy="12" r="2" fill="#818181" />
<circle cx="2" cy="12" r="2" fill="#E4E4E4" />
<circle cx="12" cy="12" r="2" fill="#E4E4E4" />
<circle cx="22" cy="12" r="2" fill="#E4E4E4" />
</svg>
加载中
</>
Expand Down
2 changes: 1 addition & 1 deletion src/packages/infiniteloading/infiniteloading.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@
justify-content: center;
width: 100%;
padding-top: 6px;
font-size: $font-size-s;
color: $infiniteloading-color;
text-align: center;

&-tips {
display: flex;
justify-content: center;
align-items: center;
font-size: $font-size-xxs;

&-icons {
margin-right: 8px;
Expand Down