Skip to content

Commit 79c9f3f

Browse files
fix(AnalyticalTable): header should respect hAlign as well (#438)
1 parent 018337f commit 79c9f3f

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import '@ui5/webcomponents-icons/dist/icons/sort-descending';
55
import { createComponentStyles } from '@ui5/webcomponents-react-base/lib/createComponentStyles';
66
import { ThemingParameters } from '@ui5/webcomponents-react-base/lib/ThemingParameters';
77
import { Icon } from '@ui5/webcomponents-react/lib/Icon';
8+
import { TextAlign } from '@ui5/webcomponents-react/lib/TextAlign';
89
import React, {
910
CSSProperties,
1011
DragEventHandler,
@@ -136,6 +137,13 @@ export const ColumnHeader: FC<ColumnHeaderProps> = (props: ColumnHeaderProps) =>
136137
if (column.id === '__ui5wcr__internal_highlight_column' || column.id === '__ui5wcr__internal_selection_column') {
137138
modifiedStyles.padding = 0;
138139
}
140+
if (column.hAlign === TextAlign.End) {
141+
modifiedStyles.justifyContent = 'flex-end';
142+
modifiedStyles.maxWidth = '';
143+
if (isLastColumn) {
144+
modifiedStyles.paddingRight = `calc(${ThemingParameters.sapScrollBar_Dimension} + 1rem)`;
145+
}
146+
}
139147
return modifiedStyles;
140148
}, [isResizable, dragOver, hasPopover]);
141149

packages/main/src/components/AnalyticalTable/types/ColumnType.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@ export interface ColumnType extends Column {
2020
disableGrouping: boolean;
2121
getResizerProps: () => any;
2222
isResizing: boolean;
23+
hAlign: string;
2324
}

0 commit comments

Comments
 (0)