Skip to content

Commit f689ede

Browse files
committed
The collapse trigger of Sider should be fixed and upon menus
close #7161
1 parent 30e4fa8 commit f689ede

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

components/layout/Sider.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ export default class Sider extends React.Component<SiderProps, any> {
161161
const triggerDom = (
162162
trigger !== null ?
163163
zeroWidthTrigger || (
164-
<div className={`${prefixCls}-trigger`} onClick={this.toggle}>
164+
<div className={`${prefixCls}-trigger`} onClick={this.toggle} style={{ width: siderWidth }}>
165165
{trigger || defaultTrigger}
166166
</div>
167167
) : null

components/layout/__tests__/__snapshots__/demo.test.js.snap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -785,6 +785,7 @@ exports[`renders ./components/layout/demo/side.md correctly 1`] = `
785785
</div>
786786
<div
787787
class="ant-layout-sider-trigger"
788+
style="width:200px;"
788789
>
789790
<i
790791
class="anticon anticon-left"

components/layout/demo/side.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
order: 3
3+
iframe: 360
34
title:
45
zh-CN: 侧边布局
56
en-US: Sider
@@ -65,7 +66,7 @@ class SiderDemo extends React.Component {
6566
<Menu.Item key="6">Team 1</Menu.Item>
6667
<Menu.Item key="8">Team 2</Menu.Item>
6768
</SubMenu>
68-
<Menu.Item key="8">
69+
<Menu.Item key="9">
6970
<Icon type="file" />
7071
<span>File</span>
7172
</Menu.Item>

components/layout/style/index.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@
5656
}
5757

5858
&-trigger {
59-
position: absolute;
59+
position: fixed;
6060
text-align: center;
61-
width: 100%;
6261
bottom: 0;
6362
cursor: pointer;
6463
height: @layout-trigger-height;
6564
line-height: @layout-trigger-height;
66-
background: @layout-trigger-background;
6765
color: @layout-trigger-color;
66+
background: fade(@layout-trigger-background, 100);
67+
z-index: 1;
6868
}
6969

7070
&-zero-width {

0 commit comments

Comments
 (0)