Skip to content

Commit 7ee836a

Browse files
xiaoyatongxiaoyatong
committed
Merge branch 'feat_v3.x' into feat_v3.x_cpp
2 parents 929799b + 842c48b commit 7ee836a

File tree

35 files changed

+710
-410
lines changed

35 files changed

+710
-410
lines changed

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@
108108
},
109109
"dependencies": {
110110
"@babel/runtime": "^7.23.9",
111-
"@nutui/icons-react": "^3.0.1",
112-
"@nutui/icons-react-taro": "^3.0.1",
111+
"@nutui/icons-react": "^3.0.2-beta.5",
112+
"@nutui/icons-react-taro": "^3.0.2-beta.3",
113113
"@nutui/jdesign-icons-react-taro": "1.0.6-beta.2",
114114
"@nutui/touch-emulator": "^1.0.0",
115115
"@nutui/lottie-miniprogram": "^1.0.2",

‎pnpm-lock.yaml‎

Lines changed: 227 additions & 206 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/packages/address/__test__/__snapshots__/address.spec.tsx.snap‎

Lines changed: 7 additions & 7 deletions
Large diffs are not rendered by default.

‎src/packages/audio/__test__/__snapshots__/audio.spec.tsx.snap‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,16 @@ exports[`icon type test 1`] = `
1515
aria-labelledby="Service"
1616
class="nut-icon nut-icon-Service "
1717
role="presentation"
18-
viewBox="0 0 48 48"
18+
viewBox="0 0 1024 1024"
1919
xmlns="http://www.w3.org/2000/svg"
2020
>
2121
<path
22-
d="M2 20h1.006C3.278 8.875 12.609 0 24 0c11.39 0 20.722 8.875 20.994 20H46a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2h-.508c-.269 7.663-6.658 13.743-14.49 13.992a.488.488 0 0 1-.502-.492v-2c0-.276.224-.499.5-.51 6.27-.245 11.223-5.075 11.49-10.99H41a2 2 0 0 1-2-2v-8a2 2 0 0 1 2-2h.993C41.721 10.6 33.805 3 24 3 14.195 3 6.279 10.6 6.007 20H7a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2v-8a2 2 0 0 1 2-2m1 3v6h3v-6zm39 6h3v-6h-3zm-13.063-.858a.528.528 0 0 1 .72.011l1.413 1.415a.483.483 0 0 1-.007.698c-3.998 3.64-10.127 3.64-14.126 0a.483.483 0 0 1-.009-.698l1.415-1.415a.527.527 0 0 1 .718-.011 7.501 7.501 0 0 0 9.876 0"
22+
d="M64.21 469.33H42.67A42.67 42.67 0 0 0 0 512v170.67a42.67 42.67 0 0 0 42.67 42.66h106.66c23.68 0 42.67-18.99 42.67-42.66V512c0-23.68-18.99-42.67-42.67-42.67h-21.12C133.97 268.8 302.93 106.66 512 106.67c209.07 0 378.03 162.13 383.79 362.66h-21.12A42.67 42.67 0 0 0 832 512v170.67a42.67 42.67 0 0 0 42.67 42.66h31.78C900.9 848.21 800.64 949.12 672 959.15c-11.73.85-21.33 10.45-21.33 22.18v21.34c0 11.73 9.6 21.33 21.33 20.69 162.13-10.45 292.91-138.03 298.45-298.03h10.88a42.67 42.67 0 0 0 42.67-42.66V512a42.67 42.67 0 0 0-42.67-42.67h-21.54C954.03 231.89 754.99 42.66 512 42.67c-242.99 0-442.03 189.44-447.79 426.66m-.21 192v-128h64v128zm832-128h64v128h-64z"
23+
fill="currentColor"
24+
/>
25+
,
26+
<path
27+
d="M640.21 650.88c-8.32-8.32-21.76-8.11-31.14-1.07a160.02 160.02 0 0 1-194.14 0c-9.39-7.25-22.83-7.25-31.14 1.07l-15.15 14.93c-8.32 8.32-8.32 21.97.85 29.44 82.56 68.27 202.67 68.27 285.02 0 9.17-7.47 8.96-21.12.85-29.44z"
2328
fill="currentColor"
2429
/>
2530
</svg>

‎src/packages/backtop/__test__/__snapshots__/backtop.spec.tsx.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ exports[`backtop custom test 1`] = `
1616
aria-labelledby="Top"
1717
class="nut-icon nut-icon-Top "
1818
role="presentation"
19-
viewBox="0 0 44 44"
19+
viewBox="0 0 1024 1024"
2020
xmlns="http://www.w3.org/2000/svg"
2121
>
2222
<path
23-
d="M43.042 18.666a.6.6 0 0 1 .062.846l-1.506 1.743a.6.6 0 0 1-.846.062L23.753 6.64V42.9a.6.6 0 0 1-.6.599H20.85a.6.6 0 0 1-.6-.6V6.64L3.25 21.318a.6.6 0 0 1-.846-.062L.898 19.512a.6.6 0 0 1 .062-.846L22.001.5z"
23+
d="M111.79 471.68a21.31 21.31 0 0 1-30.08-2.35l-14.08-16.21a21.31 21.31 0 0 1 2.34-30.08L498.13 54.61a21.33 21.33 0 0 1 27.74 0l428.16 368.43c8.96 7.68 10.03 21.12 2.34 30.08l-14.08 16.21c-7.68 8.96-21.12 10.03-30.08 2.35L544 154.67V960c0 11.73-9.6 21.33-21.33 21.33h-21.34c-11.73 0-21.33-9.6-21.33-21.33V154.67zM510.93 128h2.14l-1.07-.85z"
2424
fill="currentColor"
2525
/>
2626
</svg>

‎src/packages/badge/__test__/__snapshots__/badge.spec.tsx.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ exports[`should match custom icon 1`] = `
1313
aria-labelledby="Check"
1414
class="nut-icon nut-icon-Check "
1515
role="presentation"
16-
viewBox="0 0 49 48"
16+
viewBox="0 0 1024 1024"
1717
xmlns="http://www.w3.org/2000/svg"
1818
>
1919
<path
20-
d="M45.121 16.121 47.243 14 43 9.757l-2.121 2.122L19 33.757 7.121 21.88 5 19.757.757 24l2.122 2.121L14.757 38l2.122 2.121L19 42.243l2.121-2.122L23.243 38z"
20+
d="m942.94 336.9 44.34-44.33-88.67-88.67-44.32 44.35-457.23 457.2-248.25-248.2-44.32-44.37-88.67 88.67 44.35 44.33 248.22 248.24 44.35 44.33 44.32 44.34 44.33-44.34 44.34-44.33L942.92 336.9z"
2121
fill="currentColor"
2222
/>
2323
</svg>

‎src/packages/cascader/__tests__/__snapshots__/cascader.spec.tsx.snap‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,11 @@ exports[`Cascader > visible true 1`] = `
107107
aria-labelledby="Check"
108108
class="nut-icon nut-icon-Check nut-cascader-icon-check"
109109
role="presentation"
110-
viewBox="0 0 49 48"
110+
viewBox="0 0 1024 1024"
111111
xmlns="http://www.w3.org/2000/svg"
112112
>
113113
<path
114-
d="M45.121 16.121 47.243 14 43 9.757l-2.121 2.122L19 33.757 7.121 21.88 5 19.757.757 24l2.122 2.121L14.757 38l2.122 2.121L19 42.243l2.121-2.122L23.243 38z"
114+
d="m942.94 336.9 44.34-44.33-88.67-88.67-44.32 44.35-457.23 457.2-248.25-248.2-44.32-44.37-88.67 88.67 44.35 44.33 248.22 248.24 44.35 44.33 44.32 44.34 44.33-44.34 44.34-44.33L942.92 336.9z"
115115
fill="currentColor"
116116
/>
117117
</svg>
@@ -136,11 +136,11 @@ exports[`Cascader > visible true 1`] = `
136136
aria-labelledby="Check"
137137
class="nut-icon nut-icon-Check nut-cascader-icon-check"
138138
role="presentation"
139-
viewBox="0 0 49 48"
139+
viewBox="0 0 1024 1024"
140140
xmlns="http://www.w3.org/2000/svg"
141141
>
142142
<path
143-
d="M45.121 16.121 47.243 14 43 9.757l-2.121 2.122L19 33.757 7.121 21.88 5 19.757.757 24l2.122 2.121L14.757 38l2.122 2.121L19 42.243l2.121-2.122L23.243 38z"
143+
d="m942.94 336.9 44.34-44.33-88.67-88.67-44.32 44.35-457.23 457.2-248.25-248.2-44.32-44.37-88.67 88.67 44.35 44.33 248.22 248.24 44.35 44.33 44.32 44.34 44.33-44.34 44.34-44.33L942.92 336.9z"
144144
fill="currentColor"
145145
/>
146146
</svg>
@@ -165,11 +165,11 @@ exports[`Cascader > visible true 1`] = `
165165
aria-labelledby="Check"
166166
class="nut-icon nut-icon-Check nut-cascader-icon-check"
167167
role="presentation"
168-
viewBox="0 0 49 48"
168+
viewBox="0 0 1024 1024"
169169
xmlns="http://www.w3.org/2000/svg"
170170
>
171171
<path
172-
d="M45.121 16.121 47.243 14 43 9.757l-2.121 2.122L19 33.757 7.121 21.88 5 19.757.757 24l2.122 2.121L14.757 38l2.122 2.121L19 42.243l2.121-2.122L23.243 38z"
172+
d="m942.94 336.9 44.34-44.33-88.67-88.67-44.32 44.35-457.23 457.2-248.25-248.2-44.32-44.37-88.67 88.67 44.35 44.33 248.22 248.24 44.35 44.33 44.32 44.34 44.33-44.34 44.34-44.33L942.92 336.9z"
173173
fill="currentColor"
174174
/>
175175
</svg>
@@ -206,11 +206,11 @@ exports[`Cascader > visible true 2`] = `
206206
aria-labelledby="Check"
207207
class="nut-icon nut-icon-Check nut-cascader-icon-check"
208208
role="presentation"
209-
viewBox="0 0 49 48"
209+
viewBox="0 0 1024 1024"
210210
xmlns="http://www.w3.org/2000/svg"
211211
>
212212
<path
213-
d="M45.121 16.121 47.243 14 43 9.757l-2.121 2.122L19 33.757 7.121 21.88 5 19.757.757 24l2.122 2.121L14.757 38l2.122 2.121L19 42.243l2.121-2.122L23.243 38z"
213+
d="m942.94 336.9 44.34-44.33-88.67-88.67-44.32 44.35-457.23 457.2-248.25-248.2-44.32-44.37-88.67 88.67 44.35 44.33 248.22 248.24 44.35 44.33 44.32 44.34 44.33-44.34 44.34-44.33L942.92 336.9z"
214214
fill="currentColor"
215215
/>
216216
</svg>

‎src/packages/checkbox/__test__/__snapshots__/checkbox.spec.tsx.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ exports[`should match snapshot 1`] = `
1212
aria-labelledby="Checked"
1313
class="nut-icon nut-icon-Checked nut-checkbox-icon nut-checkbox-icon-checked"
1414
role="presentation"
15-
viewBox="0 0 16 16"
15+
viewBox="0 0 1024 1024"
1616
xmlns="http://www.w3.org/2000/svg"
1717
>
1818
<path
19-
d="M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16m4.325-10.117-5.318 5.362-3.332-3.36a.25.25 0 0 1 0-.351l.701-.707a.25.25 0 0 1 .355 0L7.007 9.12l4.262-4.297a.25.25 0 0 1 .355 0l.701.707a.25.25 0 0 1 0 .352"
19+
d="M512 1024A512 512 0 1 0 512 0a512 512 0 0 0 0 1024m276.8-647.49L448.45 719.68 235.2 504.64a16 16 0 0 1 0-22.46l44.86-45.25a16 16 0 0 1 22.72 0l145.67 146.75 272.77-275.01a16 16 0 0 1 22.72 0l44.86 45.25a16 16 0 0 1 0 22.53z"
2020
fill="currentColor"
2121
/>
2222
</svg>

‎src/packages/collapse/__test__/__snapshots__/collapse.spec.tsx.snap‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ exports[`should match snapshot 1`] = `
3434
xmlns="http://www.w3.org/2000/svg"
3535
>
3636
<path
37-
d="M153.81 362.67a10.67 10.67 0 0 0-7.68 18.13L512 746.67 877.87 380.8a10.67 10.67 0 0 0-7.68-18.13h-60.38a10.03 10.03 0 0 0-7.46 3.2L512 656.21 221.65 365.87a10.88 10.88 0 0 0-7.46-3.2z"
37+
d="M187.73 351.57a21.33 21.33 0 0 0 .43 29.66l307.63 307.62c8.32 8.32 21.76 8.32 30.08 0L835.2 379.73c8.53-8.53 8.32-22.19-.43-30.5l-15.36-14.72c-8.32-8.11-21.76-7.89-29.86.21L510.93 613.55 232.96 335.57c-8.53-8.53-22.4-8.32-30.72.43z"
3838
fill="currentColor"
3939
/>
4040
</svg>
@@ -84,7 +84,7 @@ exports[`should match snapshot 1`] = `
8484
xmlns="http://www.w3.org/2000/svg"
8585
>
8686
<path
87-
d="M153.81 362.67a10.67 10.67 0 0 0-7.68 18.13L512 746.67 877.87 380.8a10.67 10.67 0 0 0-7.68-18.13h-60.38a10.03 10.03 0 0 0-7.46 3.2L512 656.21 221.65 365.87a10.88 10.88 0 0 0-7.46-3.2z"
87+
d="M187.73 351.57a21.33 21.33 0 0 0 .43 29.66l307.63 307.62c8.32 8.32 21.76 8.32 30.08 0L835.2 379.73c8.53-8.53 8.32-22.19-.43-30.5l-15.36-14.72c-8.32-8.11-21.76-7.89-29.86.21L510.93 613.55 232.96 335.57c-8.53-8.53-22.4-8.32-30.72.43z"
8888
fill="currentColor"
8989
/>
9090
</svg>
@@ -134,7 +134,7 @@ exports[`should match snapshot 1`] = `
134134
xmlns="http://www.w3.org/2000/svg"
135135
>
136136
<path
137-
d="M153.81 362.67a10.67 10.67 0 0 0-7.68 18.13L512 746.67 877.87 380.8a10.67 10.67 0 0 0-7.68-18.13h-60.38a10.03 10.03 0 0 0-7.46 3.2L512 656.21 221.65 365.87a10.88 10.88 0 0 0-7.46-3.2z"
137+
d="M187.73 351.57a21.33 21.33 0 0 0 .43 29.66l307.63 307.62c8.32 8.32 21.76 8.32 30.08 0L835.2 379.73c8.53-8.53 8.32-22.19-.43-30.5l-15.36-14.72c-8.32-8.11-21.76-7.89-29.86.21L510.93 613.55 232.96 335.57c-8.53-8.53-22.4-8.32-30.72.43z"
138138
fill="currentColor"
139139
/>
140140
</svg>

‎src/packages/ellipsis/ellipsis.taro.tsx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ import React, { FunctionComponent, useState, useRef, useEffect } from 'react'
22
import { nextTick, createSelectorQuery } from '@tarojs/taro'
33
import classNames from 'classnames'
44
import { View } from '@tarojs/components'
5-
import { getRectInMultiPlatform } from '@/utils/taro/get-rect'
5+
import {
6+
getRectInMultiPlatform,
7+
getRectInMultiPlatformWithoutCache,
8+
} from '@/utils/taro/get-rect'
69
import { ComponentDefaults } from '@/utils/typings'
710
import { useRtl } from '../configprovider/index.taro'
811
import { TaroEllipsisProps } from '@/types'
@@ -195,7 +198,7 @@ export const Ellipsis: FunctionComponent<
195198

196199
// 验证省略号
197200
const verifyEllipsis = async () => {
198-
const refe = await getRectInMultiPlatform(rootContain.current)
201+
const refe = await getRectInMultiPlatformWithoutCache(rootContain.current)
199202
if (refe && refe.height && refe.height > maxHeight.current) {
200203
if (direction === 'end') {
201204
ellipsis.current.leading = ellipsis.current?.leading?.slice(

0 commit comments

Comments
 (0)