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

Jump to bottom

[Discover] Improve numeric column text wrapping and some minor touchups #9

Merged
merged 1 commit into from
Jan 5, 2024
Merged

[Discover] Improve numeric column text wrapping and some minor touchups #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 10 additions & 15 deletions packages/kbn-unified-data-table/src/components/data_table_column_header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@
*/

import React, { useMemo } from 'react';
import { css } from '@emotion/react';
import { css, CSSObject } from '@emotion/react';
import { EuiIcon, EuiTextBlockTruncate, EuiToolTip } from '@elastic/eui';
import type { DataView, DataViewField } from '@kbn/data-views-plugin/common';
import { FieldIcon, getFieldIconProps } from '@kbn/field-utils';
import { isNestedFieldParent } from '@kbn/discover-utils';
import { i18n } from '@kbn/i18n';
import { euiThemeVars } from '@kbn/ui-theme';
import type { DataTableColumnTypes } from '../types';

interface DataTableColumnHeaderProps {
Expand Down Expand Up @@ -58,15 +59,7 @@ const DataTableColumnToken: React.FC<
);

return columnToken ? (
<span
css={css`
vertical-align: middle;
line-height: 0.8;
padding-right: 4px;
`}
>
{columnToken}
</span>
<span css={{ paddingRight: euiThemeVars.euiSizeXS }}>{columnToken}</span>
) : null;
};

Expand All @@ -76,6 +69,8 @@ const DataTableColumnTitle: React.FC<Pick<DataTableColumnHeaderProps, 'columnDis
return <span data-test-subj="unifiedDataTableColumnTitle">{columnDisplayName}</span>;
};

const fieldIconCss: CSSObject = { verticalAlign: 'bottom' };

function getRenderedToken({
dataView,
columnName,
Expand All @@ -88,18 +83,18 @@ function getRenderedToken({
// for text-based searches
if (columnTypes) {
return columnTypes[columnName] && columnTypes[columnName] !== 'unknown' ? ( // renders an icon or nothing
<FieldIcon type={columnTypes[columnName]} />
<FieldIcon type={columnTypes[columnName]} css={fieldIconCss} />
) : null;
}

const dataViewField = dataView.getFieldByName(columnName);

if (dataViewField) {
return <FieldIcon {...getFieldIconProps(dataViewField)} />;
return <FieldIcon {...getFieldIconProps(dataViewField)} css={fieldIconCss} />;
}

if (isNestedFieldParent(columnName, dataView)) {
return <FieldIcon type="nested" />;
return <FieldIcon type="nested" css={fieldIconCss} />;
}

return null;
Expand All @@ -120,9 +115,9 @@ const ColumnHeaderTruncateContainer = ({
overflow: auto;
white-space: normal;
word-break: break-all;
line-height: 16px;
line-height: ${euiThemeVars.euiSize};
.euiDataGridHeaderCell--numeric & {
text-align: right;
float: right;
}
`}
>
Expand Down
Loading