|
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'; |
@@ -112,15 +113,17 @@ export const ColumnHeader = (props: ColumnHeaderProps) => { |
112 | 113 | style.textAlign = column.hAlign.toLowerCase() as any; |
113 | 114 | } |
114 | 115 |
|
115 | | - if (column.isSorted) margin++; |
116 | | - if (column.isGrouped) margin++; |
117 | | - if (isFiltered) margin++; |
| 116 | + if (column.isSorted) margin += 0.8125; |
| 117 | + if (column.isGrouped) margin += 0.8125; |
| 118 | + if (isFiltered) margin += 0.8125; |
118 | 119 |
|
119 | 120 | if (margin === 0) { |
120 | 121 | return style; |
121 | 122 | } |
122 | 123 |
|
123 | | - if (margin > 0) margin += 0.5; |
| 124 | + if (margin > 0) { |
| 125 | + margin += 0.75; |
| 126 | + } |
124 | 127 |
|
125 | 128 | style.marginInlineEnd = `${margin}rem`; |
126 | 129 |
|
@@ -218,11 +221,20 @@ export const ColumnHeader = (props: ColumnHeaderProps) => { |
218 | 221 | className={classNames.iconContainer} |
219 | 222 | data-component-name={`AnalyticalTableHeaderIconsContainer-${columnId}`} |
220 | 223 | > |
221 | | - {isFiltered && <Icon name={iconFilter} aria-hidden />} |
| 224 | + {isFiltered && ( |
| 225 | + <Icon design={IconDesign.NonInteractive} name={iconFilter} aria-hidden className={classNames.icon} /> |
| 226 | + )} |
222 | 227 | {column.isSorted && ( |
223 | | - <Icon name={column.isSortedDesc ? iconSortDescending : iconSortAscending} aria-hidden /> |
| 228 | + <Icon |
| 229 | + design={IconDesign.NonInteractive} |
| 230 | + name={column.isSortedDesc ? iconSortDescending : iconSortAscending} |
| 231 | + aria-hidden |
| 232 | + className={classNames.icon} |
| 233 | + /> |
| 234 | + )} |
| 235 | + {column.isGrouped && ( |
| 236 | + <Icon design={IconDesign.NonInteractive} name={iconGroup} aria-hidden className={classNames.icon} /> |
224 | 237 | )} |
225 | | - {column.isGrouped && <Icon name={iconGroup} aria-hidden />} |
226 | 238 | </div> |
227 | 239 | </div> |
228 | 240 | {hasPopover && popoverOpen && ( |
|
0 commit comments