Skip to content

Commit a4ad1bd

Browse files
author
Amrit Borah
committed
fix: bulk and start icon clash
1 parent 9e8d271 commit a4ad1bd

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

src/Shared/Components/Table/TableContent.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ const TableContent = <
154154
: initialGridTemplateColumns
155155

156156
const gridTemplateColumns =
157-
isAnyRowExpandable || rowStartIconConfig
157+
(isAnyRowExpandable || rowStartIconConfig) && !isBulkSelectionConfigured
158158
? `${ACTION_GUTTER_SIZE}px ${gridTemplateColumnsWithoutExpandButton}`
159159
: gridTemplateColumnsWithoutExpandButton
160160

@@ -452,7 +452,10 @@ const TableContent = <
452452
const { className: stickyClassName = '', left: stickyLeftValue = '' } = horizontallySticky
453453
? getStickyColumnConfig(
454454
gridTemplateColumns,
455-
index + (isAnyRowExpandable || rowStartIconConfig ? 1 : 0),
455+
index +
456+
((isAnyRowExpandable || rowStartIconConfig) && !isBulkSelectionConfigured
457+
? 1
458+
: 0),
456459
)
457460
: {}
458461

@@ -573,7 +576,7 @@ const TableContent = <
573576
</div>
574577
) : null}
575578

576-
{!isAnyRowExpandable && rowStartIconConfig && <div />}
579+
{!isAnyRowExpandable && rowStartIconConfig && !isBulkSelectionConfigured && <div />}
577580

578581
{visibleColumns.map(
579582
(

0 commit comments

Comments
 (0)