Skip to content

Commit 3f91c84

Browse files
committed
fix(AnalyticalTable): allow column reordering in tree table mode
1 parent 77df7c3 commit 3f91c84

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

packages/main/src/components/AnalyticalTable/__snapshots__/AnalyticalTable.test.tsx.snap

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1547,7 +1547,7 @@ exports[`AnalyticalTable Tree Table 1`] = `
15471547
<div
15481548
class="AnalyticalTable-th-0"
15491549
data-column-id="name"
1550-
draggable="false"
1550+
draggable="true"
15511551
id="name"
15521552
role="columnheader"
15531553
style="position: relative; width: 150px; cursor: pointer;"
@@ -1618,7 +1618,7 @@ exports[`AnalyticalTable Tree Table 1`] = `
16181618
<div
16191619
class="AnalyticalTable-th-0"
16201620
data-column-id="age"
1621-
draggable="false"
1621+
draggable="true"
16221622
id="age"
16231623
role="columnheader"
16241624
style="position: relative; width: 150px; cursor: pointer;"
@@ -1689,7 +1689,7 @@ exports[`AnalyticalTable Tree Table 1`] = `
16891689
<div
16901690
class="AnalyticalTable-th-0"
16911691
data-column-id="friend.name"
1692-
draggable="false"
1692+
draggable="true"
16931693
id="friend.name"
16941694
role="columnheader"
16951695
style="position: relative; width: 150px; cursor: pointer;"
@@ -1760,7 +1760,7 @@ exports[`AnalyticalTable Tree Table 1`] = `
17601760
<div
17611761
class="AnalyticalTable-th-0"
17621762
data-column-id="friend.age"
1763-
draggable="false"
1763+
draggable="true"
17641764
id="friend.age"
17651765
role="columnheader"
17661766
style="position: relative; width: 150px; cursor: pointer;"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ const AnalyticalTable: FC<TableProps> = forwardRef((props: TableProps, ref: Ref<
404404
onDragEnter={handleDragEnter}
405405
onDragEnd={handleOnDragEnd}
406406
dragOver={column.id === dragOver}
407-
isDraggable={!isTreeTable && column.canReorder}
407+
isDraggable={column.canReorder}
408408
>
409409
{column.render('Header')}
410410
</ColumnHeader>

packages/main/src/components/AnalyticalTable/virtualization/VirtualTableBody.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ export const VirtualTableBody = (props: VirtualTableBodyProps) => {
221221

222222
let contentToRender;
223223
if (
224-
cell.column.id == '__ui5wcr__internal_highlight_column' ||
224+
cell.column.id === '__ui5wcr__internal_highlight_column' ||
225225
cell.column.id === '__ui5wcr__internal_selection_column'
226226
) {
227227
contentToRender = 'Cell';

0 commit comments

Comments
 (0)