Skip to content

Commit

Permalink
[Lens] Table headers are aligned the same as cells (#101875)
Browse files Browse the repository at this point in the history
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
  • Loading branch information
dej611 and kibanamachine committed Jun 15, 2021
1 parent 65fec6b commit 37728f5
Show file tree
Hide file tree
Showing 3 changed files with 80 additions and 39 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ export const createGridColumns = (
visibleColumns: string[],
formatFactory: FormatFactory,
onColumnResize: (eventData: { columnId: string; width: number | undefined }) => void,
onColumnHide: (eventData: { columnId: string }) => void
onColumnHide: (eventData: { columnId: string }) => void,
alignments: Record<string, 'left' | 'right' | 'center'>
) => {
const columnsReverseLookup = table.columns.reduce<
Record<string, { name: string; index: number; meta?: DatatableColumnMeta }>
Expand Down Expand Up @@ -200,11 +201,13 @@ export const createGridColumns = (
});
}
}
const currentAlignment = alignments && alignments[field];
const alignmentClassName = `lnsTableCell--${currentAlignment}`;

const columnDefinition: EuiDataGridColumn = {
id: field,
cellActions,
display: name,
display: <div className={alignmentClassName}>{name}</div>,
displayAsText: name,
actions: {
showHide: false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,34 +180,6 @@ export const DatatableComponent = (props: DatatableRenderProps) => {
[onEditAction, setColumnConfig, columnConfig]
);

const columns: EuiDataGridColumn[] = useMemo(
() =>
createGridColumns(
bucketColumns,
firstLocalTable,
handleFilterClick,
handleTransposedColumnClick,
isReadOnlySorted,
columnConfig,
visibleColumns,
formatFactory,
onColumnResize,
onColumnHide
),
[
bucketColumns,
firstLocalTable,
handleFilterClick,
handleTransposedColumnClick,
isReadOnlySorted,
columnConfig,
visibleColumns,
formatFactory,
onColumnResize,
onColumnHide,
]
);

const isNumericMap: Record<string, boolean> = useMemo(() => {
const numericMap: Record<string, boolean> = {};
for (const column of firstLocalTable.columns) {
Expand Down Expand Up @@ -237,6 +209,36 @@ export const DatatableComponent = (props: DatatableRenderProps) => {
);
}, [firstTable, isNumericMap, columnConfig]);

const columns: EuiDataGridColumn[] = useMemo(
() =>
createGridColumns(
bucketColumns,
firstLocalTable,
handleFilterClick,
handleTransposedColumnClick,
isReadOnlySorted,
columnConfig,
visibleColumns,
formatFactory,
onColumnResize,
onColumnHide,
alignments
),
[
bucketColumns,
firstLocalTable,
handleFilterClick,
handleTransposedColumnClick,
isReadOnlySorted,
columnConfig,
visibleColumns,
formatFactory,
onColumnResize,
onColumnHide,
alignments,
]
);

const trailingControlColumns: EuiDataGridControlColumn[] = useMemo(() => {
if (!hasAtLeastOneRowClickAction || !onRowContextMenuClick) {
return [];
Expand Down

0 comments on commit 37728f5

Please sign in to comment.