Skip to content

Commit ab8edd5

Browse files
authored
fix(tabs): 兼容16的处理 (#3150)
* fix: popover 无法消失 * fix(tabs): 兼容react 16 * test: fixed
1 parent 5545133 commit ab8edd5

File tree

3 files changed

+16
-3
lines changed

3 files changed

+16
-3
lines changed

src/packages/tabpane/tabpane.taro.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,7 @@ export const TabPane: FunctionComponent<
3131
className
3232
)
3333

34-
return children && <View className={classes}>{!disabled && children}</View>
34+
return children ? (
35+
<View className={classes}>{!disabled && children}</View>
36+
) : null
3537
}

src/packages/tabpane/tabpane.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,7 @@ export const TabPane: FunctionComponent<
3030
className
3131
)
3232

33-
return children && <div className={classes}>{!disabled && children}</div>
33+
return children ? (
34+
<div className={classes}>{!disabled && children}</div>
35+
) : null
3436
}

src/packages/tabs/__test__/tabs.spec.tsx

+10-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ test('base other props', async () => {
6969
})
7070

7171
test('base Tabpane Props', () => {
72-
const { container } = render(
72+
const { container, rerender } = render(
7373
<Tabs value="0">
7474
<TabPane title="Tab 1" value="0">
7575
Tab 1
@@ -88,6 +88,15 @@ test('base Tabpane Props', () => {
8888
expect(el[0]).toHaveClass('nut-tabs-titles-item-active')
8989
expect(el[1]).toHaveClass('nut-tabs-titles-item-disabled')
9090
expect(el2[0]).toHaveTextContent('Tab 1')
91+
92+
rerender(
93+
<Tabs value="0">
94+
<TabPane title="Tab 1" value="0" />
95+
<TabPane title="Tab 2" value="1" disabled />
96+
<TabPane title="Tab 3" value="2" />
97+
</Tabs>
98+
)
99+
expect(container.querySelectorAll('.nut-tabpane').length).toBe(0)
91100
})
92101

93102
test('base Tabpane autoHeight Props', () => {

0 commit comments

Comments
 (0)