Skip to content

Make column reordering compatible with pinnable column #3707

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
zamoore wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −23
Draft

Make column reordering compatible with pinnable column #3707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions packages/components/src/components/hds/advanced-table/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ export interface HdsAdvancedTableSignature {
| 'didInsert'
| 'willDestroy'
| 'selectionAriaLabelSuffix'
| 'hasStickyColumn'
| 'isStickyColumnPinned'
| 'isParentRow'
| 'depth'
Expand Down Expand Up @@ -612,13 +611,6 @@ export default class HdsAdvancedTable extends Component<HdsAdvancedTableSignatur
!hasResizableColumns
);
}

if (hasReorderableColumns) {
assert(
'Cannot have both reorderable columns and a sticky first column.',
hasStickyFirstColumn === undefined
);
}
}

private _onColumnReorder: HdsAdvancedTableColumnReorderCallback = ({
Expand Down
17 changes: 2 additions & 15 deletions packages/components/src/components/hds/advanced-table/th-context-menu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,12 +168,8 @@ export default class HdsAdvancedTableThContextMenu extends Component<HdsAdvanced
}

get _options(): HdsAdvancedTableThContextMenuOption[] {
const {
hasReorderableColumns,
hasResizableColumns,
isFirstColumn,
isStickyColumn,
} = this.args;
const { hasReorderableColumns, hasResizableColumns, isStickyColumn } =
this.args;

let allGroups: HdsAdvancedTableThContextMenuOption[][] = [];

Expand All @@ -185,15 +181,6 @@ export default class HdsAdvancedTableThContextMenu extends Component<HdsAdvanced
allGroups = [...allGroups, this._reorderOptions];
}

// we don't allow pinning/unpinning of the sticky column if columns are reorderable
if (
isStickyColumn !== undefined &&
isFirstColumn &&
!hasReorderableColumns
) {
allGroups = [...allGroups, this._stickyColumnOptions];
}

return allGroups.reduce<HdsAdvancedTableThContextMenuOption[]>(
(options, group, index) => {
// Add a separator before each group except the first
Expand Down
20 changes: 20 additions & 0 deletions packages/components/src/styles/components/advanced-table.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,19 @@ $hds-advanced-table-drag-preview-background-color: rgba(204, 227, 254, 30%);
}
}

.hds-advanced-table__th--is-sticky-column ~ .hds-advanced-table__th:not(.hds-advanced-table__th--is-sticky-column) {
z-index: 0;

&:has(.hds-advanced-table__th-reorder-drop-target--is-dragging-over) {
z-index: 1;
}
}

.hds-advanced-table__th-reorder-drop-target {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
z-index: 1;
}
Expand Down Expand Up @@ -255,6 +264,17 @@ $hds-advanced-table-drag-preview-background-color: rgba(204, 227, 254, 30%);
position: sticky;
// has a higher z-index than the sticky header content
z-index: 7;

&:has(~.hds-advanced-table__th .hds-advanced-table__th-reorder-handle)::after {
position: absolute;
right: 0;
bottom: -14px;
left: 0;
height: 14px;
background-color: var(--token-color-surface-primary);
content: "";
pointer-events: none;
}
}

.hds-advanced-table__th--is-sticky-column-pinned {
Expand Down
Loading