Skip to content

fix: should not rely on z-index #125

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
merged 2 commits into from
Feb 22, 2017
Merged

fix: should not rely on z-index #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ef4b43
fix: should not rely on z-index
benjycui Feb 22, 2017
5fb55ac
test: update snapshot
benjycui Feb 22, 2017
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: 0 additions & 1 deletion assets/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@
position: absolute;
top: 0;
overflow: hidden;
z-index: 1;
table {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

z-index 很容易失控。 see: ant-design/ant-design@e289ce8#commitcomment-20987006

width: auto;
background: #fff;
Expand Down
8 changes: 4 additions & 4 deletions src/Table.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,15 +709,15 @@ export default class Table extends React.Component {
<div ref={node => (this.tableNode = node)} className={className} style={props.style}>
{this.getTitle()}
<div className={`${prefixCls}-content`}>
{this.columnManager.isAnyColumnsLeftFixed() &&
<div className={`${prefixCls}-fixed-left`}>
{this.getLeftFixedTable()}
</div>}
<div className={isTableScroll ? `${prefixCls}-scroll` : ''}>
{this.getTable({ columns: this.columnManager.groupedColumns() })}
{this.getEmptyText()}
{this.getFooter()}
</div>
{this.columnManager.isAnyColumnsLeftFixed() &&
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

调整之后的 DOM 结构也更加合理，因为 fixed 的只是附加内容，主内容应该在前面。

<div className={`${prefixCls}-fixed-left`}>
{this.getLeftFixedTable()}
</div>}
{this.columnManager.isAnyColumnsRightFixed() &&
<div className={`${prefixCls}-fixed-right`}>
{this.getRightFixedTable()}
Expand Down
292 changes: 146 additions & 146 deletions tests/__snapshots__/Table.fixedColumns.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,152 +3,6 @@ exports[`Table.fixedColumns renders correctly 1`] = `
class="rc-table rc-table-scroll-position-left">
<div
class="rc-table-content">
<div
class="rc-table-fixed-left">
<div
class="rc-table-body-outer">
<div
class="rc-table-body-inner">
<table
class="rc-table-fixed">
<colgroup>
<col
style="width:100px;min-width:100px;" />
<col
style="width:100px;min-width:100px;" />
</colgroup>
<thead
class="rc-table-thead">
<tr>
<th
class="">
title1
</th>
<th
class="">
title2
</th>
</tr>
</thead>
<tbody
class="rc-table-tbody">
<tr
class="rc-table-row rc-table-row-level-0">
<td
class="">
<span
class="rc-table-row-indent indent-level-0"
style="padding-left:0px;" />
123
</td>
<td
class="">
xxxxxxxx
</td>
</tr>
<tr
class="rc-table-row rc-table-row-level-0">
<td
class="">
<span
class="rc-table-row-indent indent-level-0"
style="padding-left:0px;" />
cdd
</td>
<td
class="">
edd12221
</td>
</tr>
<tr
class="rc-table-row rc-table-row-level-0">
<td
class="">
<span
class="rc-table-row-indent indent-level-0"
style="padding-left:0px;" />
133
</td>
<td
class="" />
</tr>
<tr
class="rc-table-row rc-table-row-level-0">
<td
class="">
<span
class="rc-table-row-indent indent-level-0"
style="padding-left:0px;" />
133
</td>
<td
class="" />
</tr>
<tr
class="rc-table-row rc-table-row-level-0">
<td
class="">
<span
class="rc-table-row-indent indent-level-0"
style="padding-left:0px;" />
133
</td>
<td
class="" />
</tr>
<tr
class="rc-table-row rc-table-row-level-0">
<td
class="">
<span
class="rc-table-row-indent indent-level-0"
style="padding-left:0px;" />
133
</td>
<td
class="" />
</tr>
<tr
class="rc-table-row rc-table-row-level-0">
<td
class="">
<span
class="rc-table-row-indent indent-level-0"
style="padding-left:0px;" />
133
</td>
<td
class="" />
</tr>
<tr
class="rc-table-row rc-table-row-level-0">
<td
class="">
<span
class="rc-table-row-indent indent-level-0"
style="padding-left:0px;" />
133
</td>
<td
class="" />
</tr>
<tr
class="rc-table-row rc-table-row-level-0">
<td
class="">
<span
class="rc-table-row-indent indent-level-0"
style="padding-left:0px;" />
133
</td>
<td
class="" />
</tr>
</tbody>
</table>
</div>
</div>
</div>
<div
class="rc-table-scroll">
<div
Expand Down Expand Up @@ -575,6 +429,152 @@ exports[`Table.fixedColumns renders correctly 1`] = `
</table>
</div>
</div>
<div
class="rc-table-fixed-left">
<div
class="rc-table-body-outer">
<div
class="rc-table-body-inner">
<table
class="rc-table-fixed">
<colgroup>
<col
style="width:100px;min-width:100px;" />
<col
style="width:100px;min-width:100px;" />
</colgroup>
<thead
class="rc-table-thead">
<tr>
<th
class="">
title1
</th>
<th
class="">
title2
</th>
</tr>
</thead>
<tbody
class="rc-table-tbody">
<tr
class="rc-table-row rc-table-row-level-0">
<td
class="">
<span
class="rc-table-row-indent indent-level-0"
style="padding-left:0px;" />
123
</td>
<td
class="">
xxxxxxxx
</td>
</tr>
<tr
class="rc-table-row rc-table-row-level-0">
<td
class="">
<span
class="rc-table-row-indent indent-level-0"
style="padding-left:0px;" />
cdd
</td>
<td
class="">
edd12221
</td>
</tr>
<tr
class="rc-table-row rc-table-row-level-0">
<td
class="">
<span
class="rc-table-row-indent indent-level-0"
style="padding-left:0px;" />
133
</td>
<td
class="" />
</tr>
<tr
class="rc-table-row rc-table-row-level-0">
<td
class="">
<span
class="rc-table-row-indent indent-level-0"
style="padding-left:0px;" />
133
</td>
<td
class="" />
</tr>
<tr
class="rc-table-row rc-table-row-level-0">
<td
class="">
<span
class="rc-table-row-indent indent-level-0"
style="padding-left:0px;" />
133
</td>
<td
class="" />
</tr>
<tr
class="rc-table-row rc-table-row-level-0">
<td
class="">
<span
class="rc-table-row-indent indent-level-0"
style="padding-left:0px;" />
133
</td>
<td
class="" />
</tr>
<tr
class="rc-table-row rc-table-row-level-0">
<td
class="">
<span
class="rc-table-row-indent indent-level-0"
style="padding-left:0px;" />
133
</td>
<td
class="" />
</tr>
<tr
class="rc-table-row rc-table-row-level-0">
<td
class="">
<span
class="rc-table-row-indent indent-level-0"
style="padding-left:0px;" />
133
</td>
<td
class="" />
</tr>
<tr
class="rc-table-row rc-table-row-level-0">
<td
class="">
<span
class="rc-table-row-indent indent-level-0"
style="padding-left:0px;" />
133
</td>
<td
class="" />
</tr>
</tbody>
</table>
</div>
</div>
</div>
<div
class="rc-table-fixed-right">
<div
Expand Down