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.

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

OnColumnResize DataGrid #2963

Merged
merged 3 commits into from
Mar 12, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
- Exported `dateFormatAliases` as a part of the public API ([#3043](https://github.com/elastic/eui/pull/3043))
- Exported `EuiTextProps` type definition ([#3039](https://github.com/elastic/eui/pull/3039))
- Removed `role` attribute from `EuiImage`([#3036](https://github.com/elastic/eui/pull/3036))
- Added `prepend` and `append` ability to `EuiComboBox` single selection only ([#3003](https://github.com/elastic/eui/pull/3003))
- Added `prepend` and `append` ability to `EuiComboBox` single selection only ([#3003](https://github.com/elastic/eui/pull/3003))
- Added `onColumnResize` prop to `EuiDataGrid` of type `EuiDataGridOnColumnResizeHandler` that gets called when column changes it's size ([#2963](https://github.com/elastic/eui/pull/2963))

**Bug Fixes**

Expand Down
3 changes: 3 additions & 0 deletions src-docs/src/views/datagrid/datagrid.js
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,9 @@ export default () => {
onChangeItemsPerPage: onChangeItemsPerPage,
onChangePage: onChangePage,
}}
onColumnResize={eventData => {
console.log(eventData);
}}
/>
);
};
30 changes: 30 additions & 0 deletions src/components/datagrid/data_grid.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1245,6 +1245,36 @@ Array [
});
});

it('should listen for column resize', () => {
const onColumnResizeCallback = jest.fn();
const component = mount(
<EuiDataGrid
aria-labelledby="#test"
columns={[{ id: 'Column 1' }, { id: 'Column 2', initialWidth: 75 }]}
columnVisibility={{
visibleColumns: ['Column 1', 'Column 2'],
setVisibleColumns: () => {},
}}
rowCount={3}
renderCellValue={() => 'value'}
onColumnResize={args => onColumnResizeCallback(args)}
/>
);

resizeColumn(component, 'Column 1', 150);
resizeColumn(component, 'Column 2', 100);

expect(onColumnResizeCallback.mock.calls.length).toBe(2);
expect(onColumnResizeCallback.mock.calls[0][0]).toEqual({
columnId: 'Column 1',
width: 150,
});
expect(onColumnResizeCallback.mock.calls[1][0]).toEqual({
columnId: 'Column 2',
width: 100,
});
});

it('is prevented by isResizable:false', () => {
const component = mount(
<EuiDataGrid
Expand Down
18 changes: 16 additions & 2 deletions src/components/datagrid/data_grid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import {
EuiDataGridColumnVisibility,
EuiDataGridToolBarVisibilityOptions,
EuiDataGridFocusedCell,
EuiDataGridOnColumnResizeHandler,
} from './data_grid_types';
import { EuiDataGridCellProps } from './data_grid_cell';
import { EuiButtonEmpty } from '../button';
Expand Down Expand Up @@ -115,6 +116,10 @@ type CommonGridProps = CommonProps &
* A #EuiDataGridSorting oject that provides the sorted columns along with their direction. Omit to disable, but you'll likely want to also turn off the user sorting controls through the `toolbarVisibility` prop.
*/
sorting?: EuiDataGridSorting;
/**
* A callback for when a column's size changes. Callback receives `{ columnId: string, width: number }`.
*/
onColumnResize?: EuiDataGridOnColumnResizeHandler;
};

// This structure forces either aria-label or aria-labelledby to be defined
Expand Down Expand Up @@ -270,7 +275,8 @@ function doesColumnHaveAnInitialWidth(
}

function useColumnWidths(
columns: EuiDataGridColumn[]
columns: EuiDataGridColumn[],
onColumnResize?: EuiDataGridOnColumnResizeHandler
): [EuiDataGridColumnWidths, (columnId: string, width: number) => void] {
const [columnWidths, setColumnWidths] = useState<EuiDataGridColumnWidths>({});

Expand All @@ -289,6 +295,10 @@ function useColumnWidths(

const setColumnWidth = (columnId: string, width: number) => {
setColumnWidths({ ...columnWidths, [columnId]: width });

if (onColumnResize) {
onColumnResize({ columnId, width });
}
};

return [columnWidths, setColumnWidth];
Expand Down Expand Up @@ -570,10 +580,14 @@ export const EuiDataGrid: FunctionComponent<EuiDataGridProps> = props => {
sorting,
inMemory,
popoverContents,
onColumnResize,
...rest
} = props;

const [columnWidths, setColumnWidth] = useColumnWidths(columns);
const [columnWidths, setColumnWidth] = useColumnWidths(
columns,
onColumnResize
);

// apply style props on top of defaults
const gridStyleWithDefaults = { ...startingStyles, ...gridStyle };
Expand Down
9 changes: 9 additions & 0 deletions src/components/datagrid/data_grid_types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -204,3 +204,12 @@ export type EuiDataGridPopoverContent = ComponentType<
export interface EuiDataGridPopoverContents {
[key: string]: EuiDataGridPopoverContent;
}

export interface EuiDataGridOnColumnResizeData {
columnId: string;
width: number;
}

export type EuiDataGridOnColumnResizeHandler = (
data: EuiDataGridOnColumnResizeData
) => void;