Skip to content
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

EuiDataGrid column visibility & ordering #2207

Merged
merged 8 commits into from
Aug 9, 2019
+795 −288
Merged

EuiDataGrid column visibility & ordering #2207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7df25d7
Show/hide and re-order datagrid columns
chandlerprall Aug 5, 2019
70a9772
Column visability & ordering tests
chandlerprall Aug 7, 2019
8b5abb5
column styling
snide Aug 8, 2019
20d617c
column sizing and bars
snide Aug 8, 2019
18776e1
blergh
snide Aug 9, 2019
73d2744
tests
snide Aug 9, 2019
92d1d8b
feedback
snide Aug 9, 2019
25ee5fb
Fix linting
chandlerprall Aug 9, 2019
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
13 changes: 6 additions & 7 deletions src-docs/src/views/datagrid/datagrid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ import {

const columns = [
{
name: 'name',
id: 'name',
},
{
name: 'avatar_url',
id: 'avatar_url',
},
{
name: 'url',
id: 'url',
},
{
name: 'contributions',
id: 'contributions',
},
];

Expand Down Expand Up @@ -323,6 +323,7 @@ export default class DataGrid extends Component {
button={button}
isOpen={this.state.isPopoverOpen}
anchorPosition="rightUp"
zIndex={2}
closePopover={this.closePopover.bind(this)}>
<div>
<EuiFormRow label="Border">
Expand Down Expand Up @@ -395,9 +396,7 @@ export default class DataGrid extends Component {
rowHover: this.state.rowHoverSelected,
header: this.state.headerSelected,
}}
renderCellValue={({ rowIndex, columnName }) =>
data[rowIndex][columnName]
}
renderCellValue={({ rowIndex, columnId }) => data[rowIndex][columnId]}
pagination={{
...pagination,
pageSizeOptions: [5, 10, 25],
Expand Down
226 changes: 127 additions & 99 deletions src/components/datagrid/__snapshots__/data_grid.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,129 +119,157 @@ exports[`EuiDataGrid pagination renders 1`] = `
`;

exports[`EuiDataGrid rendering renders with common and div attributes 1`] = `
<div
aria-label="aria-label"
class="euiDataGrid euiDataGrid--bordersAll euiDataGrid--headerShade euiDataGrid--rowHoverHighlight testClass1 testClass2"
data-test-subj="test subject string"
role="grid"
>
Array [
<div
class="euiDataGrid__content"
class="euiDataGrid__controls"
>
<div
class="euiDataGridHeader"
data-test-subj="dataGridHeader"
class="euiPopover euiPopover--anchorDownLeft"
data-test-subj="dataGridColumnSelectorPopover"
>
<div
class="euiDataGridHeaderCell"
data-test-subj="dataGridHeaderCell"
role="columnheader"
style="width:100px"
class="euiPopover__anchor"
>
<div
class="euiDataGridColumnResizer"
data-test-subj="dataGridColumnResizer"
style="margin-right:0px"
/>
<div
class="euiDataGridHeaderCell__content"
<button
class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
type="button"
>
A
</div>
<span
class="euiButtonEmpty__content"
>
<svg
aria-hidden="true"
class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonEmpty__icon"
focusable="false"
height="16"
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
/>
<span
class="euiButtonEmpty__text"
>
Columns
</span>
</span>
</button>
</div>
</div>
</div>,
<div
aria-label="aria-label"
class="euiDataGrid euiDataGrid--bordersAll euiDataGrid--headerShade euiDataGrid--rowHoverHighlight testClass1 testClass2"
data-test-subj="test subject string"
role="grid"
>
<div
class="euiDataGrid__content"
>
<div
class="euiDataGridHeaderCell"
data-test-subj="dataGridHeaderCell"
role="columnheader"
style="width:100px"
class="euiDataGridHeader"
data-test-subj="dataGridHeader"
>
<div
class="euiDataGridColumnResizer"
data-test-subj="dataGridColumnResizer"
style="margin-right:0px"
/>
class="euiDataGridHeaderCell"
data-test-subj="dataGridHeaderCell-A"
role="columnheader"
style="width:undefinedpx"
>
<div
class="euiDataGridHeaderCell__content"
>
A
</div>
</div>
<div
class="euiDataGridHeaderCell__content"
class="euiDataGridHeaderCell"
data-test-subj="dataGridHeaderCell-B"
role="columnheader"
style="width:undefinedpx"
>
B
<div
class="euiDataGridHeaderCell__content"
>
B
</div>
</div>
</div>
</div>
<div
class="euiDataGridRow"
data-test-subj="dataGridRow"
role="row"
>
<div
class="euiDataGridRowCell"
data-test-subj="dataGridRowCell"
role="gridcell"
style="width:100px"
tabindex="0"
>
0, A
</div>
<div
class="euiDataGridRowCell"
data-test-subj="dataGridRowCell"
role="gridcell"
style="width:100px"
tabindex="-1"
class="euiDataGridRow"
data-test-subj="dataGridRow"
role="row"
>
0, B
<div
class="euiDataGridRowCell"
data-test-subj="dataGridRowCell"
role="gridcell"
style="width:undefinedpx"
tabindex="0"
>
0, A
</div>
<div
class="euiDataGridRowCell"
data-test-subj="dataGridRowCell"
role="gridcell"
style="width:undefinedpx"
tabindex="-1"
>
0, B
</div>
</div>
</div>
<div
class="euiDataGridRow"
data-test-subj="dataGridRow"
role="row"
>
<div
class="euiDataGridRowCell"
data-test-subj="dataGridRowCell"
role="gridcell"
style="width:100px"
tabindex="-1"
class="euiDataGridRow"
data-test-subj="dataGridRow"
role="row"
>
1, A
<div
class="euiDataGridRowCell"
data-test-subj="dataGridRowCell"
role="gridcell"
style="width:undefinedpx"
tabindex="-1"
>
1, A
</div>
<div
class="euiDataGridRowCell"
data-test-subj="dataGridRowCell"
role="gridcell"
style="width:undefinedpx"
tabindex="-1"
>
1, B
</div>
</div>
<div
class="euiDataGridRowCell"
data-test-subj="dataGridRowCell"
role="gridcell"
style="width:100px"
tabindex="-1"
class="euiDataGridRow"
data-test-subj="dataGridRow"
role="row"
>
1, B
<div
class="euiDataGridRowCell"
data-test-subj="dataGridRowCell"
role="gridcell"
style="width:undefinedpx"
tabindex="-1"
>
2, A
</div>
<div
class="euiDataGridRowCell"
data-test-subj="dataGridRowCell"
role="gridcell"
style="width:undefinedpx"
tabindex="-1"
>
2, B
</div>
</div>
</div>
<div
class="euiDataGridRow"
data-test-subj="dataGridRow"
role="row"
>
<div
class="euiDataGridRowCell"
data-test-subj="dataGridRowCell"
role="gridcell"
style="width:100px"
tabindex="-1"
>
2, A
</div>
<div
class="euiDataGridRowCell"
data-test-subj="dataGridRowCell"
role="gridcell"
style="width:100px"
tabindex="-1"
>
2, B
</div>
</div>
</div>
<div
class="euiSpacer euiSpacer--s"
/>
</div>
class="euiSpacer euiSpacer--s"
/>
</div>,
]
`;
12 changes: 12 additions & 0 deletions src/components/datagrid/_data_grid.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@
@include euiScrollBar;
font-feature-settings: 'tnum' 1; // Tabular numbers
overflow-x: auto;
scroll-padding: 0;
max-width: 100%;
width: 100%;
background: $euiColorLightestShade;
}

.euiDataGrid__controls {
@include euiBottomShadowSmall;

position: relative;
z-index: 2;
border-top: $euiBorderThin;
border-right: $euiBorderThin;
border-left: $euiBorderThin;
}
15 changes: 15 additions & 0 deletions src/components/datagrid/_data_grid_column_resizer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,21 @@
user-select: none;
}
}
}

// This is important. Because the resizer sits in the negative space to the right of the column
// it can cause the full grid to be a few pixels longer than it actually is. So for the last one
// we don't use negative positioning and the borders from the cell will match the container.
@include euiDataGridHeaderCell {
&:last-child {

.euiDataGridColumnResizer {
right: 0;

&:after {
left: auto;
right: 0;
}
}
}
}
21 changes: 21 additions & 0 deletions src/components/datagrid/_data_grid_column_selector.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// sass-lint:disable-block no-empty-rulesets
.euiDataGridColumnSelector {
// sass-lint:disable-block no-important
// background: $euiColorEmptyShade !important; // No need for droppable coloring
}

.euiDataGridColumnSelector__item {
background: $euiColorEmptyShade;
padding: $euiSizeXS;

&-isDragging {
@include euiBottomShadow;
}
}

// TODO: Find a better solution for how to deal with fix position draggables inside the transformed popover
.euiDataGridColumnSelectorPopover {
// sass-lint:disable-block no-important
transform: none !important;
margin-top: -$euiSizeS;
}
1 change: 1 addition & 0 deletions src/components/datagrid/_data_grid_data_row.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
overflow: hidden;
white-space: nowrap;
flex: 0 0 auto;
background: $euiColorEmptyShade;

&:first-of-type {
border-left: $euiBorderThin;
Expand Down
1 change: 1 addition & 0 deletions src/components/datagrid/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
@import 'data_grid_header_row';
@import 'data_grid_column_resizer';
@import 'data_grid_data_row';
@import 'data_grid_column_selector';
Loading