Skip to content

Commit 455acc1

Browse files
authored
fix(AnalyticalTable): don't wrap custom header content in Text component (#6022)
1 parent dba28ce commit 455acc1

File tree

2 files changed

+25
-15
lines changed

2 files changed

+25
-15
lines changed

packages/main/src/components/AnalyticalTable/ColumnHeader/ColumnHeader.module.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
}
3333

3434
.text {
35+
cursor: pointer;
3536
color: inherit;
3637
font-family: inherit;
3738
width: 100%;

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

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,12 @@ export const ColumnHeader = (props: ColumnHeaderProps) => {
9494
const [popoverOpen, setPopoverOpen] = useState(false);
9595
const columnHeaderRef = useRef<HTMLDivElement>(null);
9696

97+
const childIsString = typeof children === 'string';
9798
const tooltip = (() => {
9899
if (headerTooltip) {
99100
return headerTooltip;
100101
}
101-
if (typeof children === 'string') {
102+
if (childIsString) {
102103
return children;
103104
}
104105
return null;
@@ -163,7 +164,7 @@ export const ColumnHeader = (props: ColumnHeaderProps) => {
163164
className={clsx(classNames.thContainer, showVerticalEndBorder && classNames.verticalEndBorder)}
164165
style={{
165166
position: 'absolute',
166-
top: 0,
167+
insetBlockStart: 0,
167168
width: `${virtualColumn.size}px`,
168169
...directionStyles
169170
}}
@@ -197,19 +198,27 @@ export const ColumnHeader = (props: ColumnHeaderProps) => {
197198
aria-sort={ariaSort}
198199
title={title}
199200
>
200-
<div className={classNames.header} data-h-align={column.hAlign}>
201-
<Text
202-
title={tooltip}
203-
maxLines={1}
204-
style={textStyle}
205-
className={clsx(
206-
classNames.text,
207-
columnId === '__ui5wcr__internal_selection_column' && classNames.selectAllCheckBoxContainer
208-
)}
209-
data-component-name={`AnalyticalTableHeaderHeaderContentContainer-${columnId}`}
210-
>
211-
{children}
212-
</Text>
201+
<div
202+
className={clsx(
203+
classNames.header,
204+
columnId === '__ui5wcr__internal_selection_column' && classNames.selectAllCheckBoxContainer
205+
)}
206+
data-h-align={column.hAlign}
207+
data-component-name={`AnalyticalTableHeaderContentContainer-${columnId}`}
208+
>
209+
{childIsString ? (
210+
<Text
211+
title={tooltip}
212+
maxLines={1}
213+
style={textStyle}
214+
className={classNames.text}
215+
data-component-name={`AnalyticalTableHeaderTextContentContainer-${columnId}`}
216+
>
217+
{children}
218+
</Text>
219+
) : (
220+
children
221+
)}
213222
<div
214223
className={classNames.iconContainer}
215224
data-component-name={`AnalyticalTableHeaderIconsContainer-${columnId}`}

0 commit comments

Comments
 (0)