Skip to content

Commit db8be9f

Browse files
committed
Merge branch 'master' into feature/Notification
2 parents 6933b35 + bc9bef3 commit db8be9f

File tree

13 files changed

+243
-235
lines changed

13 files changed

+243
-235
lines changed

packages/main/src/components/AnalyticalTable/ColumnHeader/ColumnHeaderModal.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ export interface ColumnHeaderModalProperties {
2424
onGroupBy?: (e: Event) => void;
2525
}
2626

27+
const staticStyle = { fontWeight: 'normal' };
28+
2729
export const ColumnHeaderModal: FC<ColumnHeaderModalProperties> = (props) => {
2830
const { showGroup, showSort, showFilter, column, style, openBy, onSort, onGroupBy } = props;
2931

@@ -86,7 +88,7 @@ export const ColumnHeaderModal: FC<ColumnHeaderModalProperties> = (props) => {
8688
horizontalAlign={PopoverHorizontalAlign.Left}
8789
placementType={PlacementType.Bottom}
8890
ref={popoverRef}
89-
style={{ fontWeight: 'normal' }}
91+
style={staticStyle as CSSProperties}
9092
>
9193
<List onItemClick={handleSort}>
9294
{showSort && (

packages/main/src/components/AnalyticalTable/ColumnHeader/index.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,12 @@ export const ColumnHeader: FC<ColumnHeaderProps> = (props) => {
9090

9191
return (
9292
<div className={classNames.valueOf()}>
93-
<span style={{ textOverflow: 'ellipsis', overflowX: 'hidden', whiteSpace: 'nowrap' }}>{children}</span>
93+
<span
94+
title={typeof children === 'string' ? children : null}
95+
style={{ textOverflow: 'ellipsis', overflowX: 'hidden', whiteSpace: 'nowrap' }}
96+
>
97+
{children}
98+
</span>
9499
<div className={classes.iconContainer}>
95100
{filterIcon}
96101
{sortingIcon}
@@ -119,7 +124,7 @@ export const ColumnHeader: FC<ColumnHeaderProps> = (props) => {
119124
if (!column) return null;
120125

121126
return (
122-
<div className={className} style={style}>
127+
<div className={className} style={style} role="columnheader">
123128
{groupable || sortable || filterable ? (
124129
<ColumnHeaderModal
125130
openBy={openBy}

0 commit comments

Comments
 (0)