|
1 | 1 | import type { VirtualItem, Virtualizer } from '@tanstack/react-virtual';
|
| 2 | +import IconDesign from '@ui5/webcomponents/dist/types/IconDesign.js'; |
2 | 3 | import iconFilter from '@ui5/webcomponents-icons/dist/filter.js';
|
3 | 4 | import iconGroup from '@ui5/webcomponents-icons/dist/group-2.js';
|
4 | 5 | import iconSortAscending from '@ui5/webcomponents-icons/dist/sort-ascending.js';
|
@@ -108,16 +109,16 @@ export const ColumnHeader = (props: ColumnHeaderProps) => {
|
108 | 109 | style.textAlign = column.hAlign.toLowerCase();
|
109 | 110 | }
|
110 | 111 |
|
111 |
| - if (column.isSorted) margin++; |
112 |
| - if (column.isGrouped) margin++; |
113 |
| - if (isFiltered) margin++; |
| 112 | + if (column.isSorted) margin += 0.8125; |
| 113 | + if (column.isGrouped) margin += 0.8125; |
| 114 | + if (isFiltered) margin += 0.8125; |
114 | 115 |
|
115 | 116 | if (margin === 0) {
|
116 | 117 | return style;
|
117 | 118 | }
|
118 | 119 |
|
119 | 120 | if (margin > 0) {
|
120 |
| - margin += 0.625; |
| 121 | + margin += 0.75; |
121 | 122 | }
|
122 | 123 |
|
123 | 124 | style.marginInlineEnd = `${margin}rem`;
|
@@ -234,11 +235,20 @@ export const ColumnHeader = (props: ColumnHeaderProps) => {
|
234 | 235 | className={classNames.iconContainer}
|
235 | 236 | data-component-name={`AnalyticalTableHeaderIconsContainer-${columnId}`}
|
236 | 237 | >
|
237 |
| - {isFiltered && <Icon name={iconFilter} aria-hidden />} |
| 238 | + {isFiltered && ( |
| 239 | + <Icon design={IconDesign.NonInteractive} name={iconFilter} aria-hidden className={classNames.icon} /> |
| 240 | + )} |
238 | 241 | {column.isSorted && (
|
239 |
| - <Icon name={column.isSortedDesc ? iconSortDescending : iconSortAscending} aria-hidden /> |
| 242 | + <Icon |
| 243 | + design={IconDesign.NonInteractive} |
| 244 | + name={column.isSortedDesc ? iconSortDescending : iconSortAscending} |
| 245 | + aria-hidden |
| 246 | + className={classNames.icon} |
| 247 | + /> |
| 248 | + )} |
| 249 | + {column.isGrouped && ( |
| 250 | + <Icon design={IconDesign.NonInteractive} name={iconGroup} aria-hidden className={classNames.icon} /> |
240 | 251 | )}
|
241 |
| - {column.isGrouped && <Icon name={iconGroup} aria-hidden />} |
242 | 252 | </div>
|
243 | 253 | </div>
|
244 | 254 | {hasPopover &&
|
|
0 commit comments