Skip to content

Commit f1f2cb0

Browse files
committed
feat(collapse): 适配鸿蒙
1 parent aa6d886 commit f1f2cb0

File tree

5 files changed

+46
-33
lines changed

5 files changed

+46
-33
lines changed

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

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,16 @@ exports[`should match snapshot 1`] = `
4242
</div>
4343
</div>
4444
<div
45-
class="nut-collapse-item-content"
45+
class="nut-collapse-item-content-wrapper nut-collapse-item-content-wrapper-tran"
4646
>
4747
<div
48-
class="nut-collapse-item-content-text"
48+
class="nut-collapse-item-content"
4949
>
50-
京东“厂直优品计划”首推“政府优品馆” 3年覆盖80%镇级政府
50+
<div
51+
class="nut-collapse-item-content-text"
52+
>
53+
京东“厂直优品计划”首推“政府优品馆” 3年覆盖80%镇级政府
54+
</div>
5155
</div>
5256
</div>
5357
</div>
@@ -88,20 +92,24 @@ exports[`should match snapshot 1`] = `
8892
</div>
8993
</div>
9094
<div
91-
class="nut-collapse-item-content"
95+
class="nut-collapse-item-content-wrapper nut-collapse-item-content-wrapper-tran"
9296
>
9397
<div
94-
class="nut-collapse-item-content-text"
98+
class="nut-collapse-item-content"
9599
>
96-
京东“厂直优品计划”首推“政府优品馆” 3年覆盖80%镇级政府
100+
<div
101+
class="nut-collapse-item-content-text"
102+
>
103+
京东“厂直优品计划”首推“政府优品馆” 3年覆盖80%镇级政府
104+
</div>
97105
</div>
98106
</div>
99107
</div>
100108
<div
101109
class="nut-collapse-item"
102110
>
103111
<div
104-
class="nut-collapse-item-header disabled"
112+
class="nut-collapse-item-header nut-collapse-item-header-disabled"
105113
>
106114
<div
107115
class="nut-collapse-item-title"
@@ -134,13 +142,16 @@ exports[`should match snapshot 1`] = `
134142
</div>
135143
</div>
136144
<div
137-
class="nut-collapse-item-content"
138-
style="height: 0px;"
145+
class="nut-collapse-item-content-wrapper nut-collapse-item-content-wrapper-tran"
139146
>
140147
<div
141-
class="nut-collapse-item-content-text"
148+
class="nut-collapse-item-content"
142149
>
143-
京东“厂直优品计划”首推“政府优品馆”
150+
<div
151+
class="nut-collapse-item-content-text"
152+
>
153+
京东“厂直优品计划”首推“政府优品馆”
154+
</div>
144155
</div>
145156
</div>
146157
</div>

src/packages/collapse/__test__/collapse.spec.tsx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,13 @@ test('prop activeName', async () => {
6363
</Collapse>
6464
</>
6565
)
66-
67-
expect(
68-
container.querySelectorAll('.nut-collapse-item-content')[2]
69-
).toHaveStyle('height:0px')
66+
waitFor(() => {
67+
expect(
68+
container.querySelectorAll('.nut-collapse-item-content-wrapper')[2]
69+
).toHaveStyle({
70+
height: '0',
71+
})
72+
})
7073
})
7174

7275
test('prop rotate', async () => {

src/packages/collapseitem/collapseitem.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
transition: transform 0.3s;
8383
}
8484

85-
&-header.disabled {
85+
&-header-disabled {
8686
color: $collapse-item-disabled-color;
8787

8888
.nut-collapse-item-title {

src/packages/collapseitem/collapseitem.taro.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,9 @@ export const CollapseItem: FunctionComponent<
115115
return (
116116
<div className={classNames(classPrefix, className)} style={style} {...rest}>
117117
<View
118-
className={classNames(`${classPrefix}-header`, { disabled })}
118+
className={classNames(`${classPrefix}-header`, {
119+
[`${classPrefix}-header-disabled`]: disabled,
120+
})}
119121
onClick={handleClick}
120122
>
121123
<View className={`${classPrefix}-title`}>{title}</View>

src/packages/collapseitem/collapseitem.tsx

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -73,24 +73,19 @@ export const CollapseItem: FunctionComponent<
7373
const [wrapperHeight, setWrapperHeight] = useState(0)
7474

7575
const updateRectHeight = async () => {
76-
setTimeout(async () => {
77-
const height = contentRef.current.offsetHeight
78-
console.log('oasis res', height)
79-
if (height) {
80-
setCurrentHeight(height)
81-
setWrapperHeight(expanded ? height : 0)
82-
setTimeout(() => {
83-
setTran(1)
84-
})
85-
}
86-
})
76+
const height = contentRef.current.offsetHeight
77+
console.log('oasis res', height)
78+
if (height) {
79+
setCurrentHeight(height)
80+
setWrapperHeight(expanded ? height : 0)
81+
setTimeout(() => {
82+
setTran(1)
83+
})
84+
}
8785
}
8886

8987
useEffect(() => {
90-
setTimeout(() => {
91-
console.log('oasis update', name)
92-
updateRectHeight()
93-
})
88+
updateRectHeight()
9489
}, [children, expanded])
9590

9691
const toggle = () => {
@@ -108,7 +103,9 @@ export const CollapseItem: FunctionComponent<
108103
return (
109104
<div className={classNames(classPrefix, className)} style={style} {...rest}>
110105
<div
111-
className={classNames(`${classPrefix}-header`, { disabled })}
106+
className={classNames(`${classPrefix}-header`, {
107+
[`${classPrefix}-header-disabled`]: disabled,
108+
})}
112109
onClick={handleClick}
113110
>
114111
<div className={`${classPrefix}-title`}>{title}</div>

0 commit comments

Comments
 (0)