Skip to content

fix(AnalyticalTable): prevent horizontal overflow if last column is resizable #612

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

Merged
merged 3 commits into from
Jul 23, 2020
Merged

fix(AnalyticalTable): prevent horizontal overflow if last column is resizable #612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
127aafa
fix(AnalyticalTable): prevent horizontal overflow if last column is r…
Lukas742 Jul 20, 2020
f74e6d3
Merge branch 'master' into fix/analytical-table-horizontal-scrollbar
Lukas742 Jul 23, 2020
77710b1
Merge branch 'master' into fix/analytical-table-horizontal-scrollbar
Lukas742 Jul 23, 2020
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
6 changes: 4 additions & 2 deletions packages/main/src/components/AnalyticalTable/ColumnHeader/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ export interface ColumnHeaderProps {
isResizing: boolean;
isDraggable: boolean;
role: string;
isLastColumn: boolean;
}

const styles = {
Expand Down Expand Up @@ -118,7 +119,8 @@ export const ColumnHeader: FC<ColumnHeaderProps> = (props: ColumnHeaderProps) =>
onDragEnd,
isDraggable,
dragOver,
role
role,
isLastColumn
} = props;

const isFiltered = column.filterValue && column.filterValue.length > 0;
Expand Down Expand Up @@ -203,7 +205,7 @@ export const ColumnHeader: FC<ColumnHeaderProps> = (props: ColumnHeaderProps) =>
{...column.getResizerProps()}
data-resizer
className={classes.resizer}
style={{ left: `${column.totalLeft + column.totalFlexWidth}px` }}
style={{ left: `${column.totalLeft + column.totalFlexWidth - (isLastColumn ? 3 : 0)}px` }}
/>
)}
</>
Expand Down
24 changes: 12 additions & 12 deletions packages/main/src/components/AnalyticalTable/__snapshots__/AnalyticalTable.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ exports[`AnalyticalTable Alternate Row Color 1`] = `
data-resizer="true"
draggable="false"
role="separator"
style="left: 600px;"
style="left: 597px;"
/>
</header>
<div
Expand Down Expand Up @@ -758,7 +758,7 @@ exports[`AnalyticalTable Loading - Loader 1`] = `
data-resizer="true"
draggable="false"
role="separator"
style="left: 600px;"
style="left: 597px;"
/>
</header>
<div
Expand Down Expand Up @@ -1261,7 +1261,7 @@ exports[`AnalyticalTable Loading - Placeholder 1`] = `
data-resizer="true"
draggable="false"
role="separator"
style="left: 600px;"
style="left: 597px;"
/>
</header>
<svg
Expand Down Expand Up @@ -1827,7 +1827,7 @@ exports[`AnalyticalTable Tree Table 1`] = `
data-resizer="true"
draggable="false"
role="separator"
style="left: 647px;"
style="left: 644px;"
/>
</header>
<div
Expand Down Expand Up @@ -2401,7 +2401,7 @@ exports[`AnalyticalTable custom row height 1`] = `
data-resizer="true"
draggable="false"
role="separator"
style="left: 600px;"
style="left: 597px;"
/>
</header>
<div
Expand Down Expand Up @@ -2904,7 +2904,7 @@ exports[`AnalyticalTable render without data 1`] = `
data-resizer="true"
draggable="false"
role="separator"
style="left: 600px;"
style="left: 597px;"
/>
</header>
<div
Expand Down Expand Up @@ -3172,7 +3172,7 @@ exports[`AnalyticalTable test Asc desc 1`] = `
data-resizer="true"
draggable="false"
role="separator"
style="left: 600px;"
style="left: 597px;"
/>
</header>
<div
Expand Down Expand Up @@ -3675,7 +3675,7 @@ exports[`AnalyticalTable test Asc desc 2`] = `
data-resizer="true"
draggable="false"
role="separator"
style="left: 600px;"
style="left: 597px;"
/>
</header>
<div
Expand Down Expand Up @@ -4178,7 +4178,7 @@ exports[`AnalyticalTable test Asc desc 3`] = `
data-resizer="true"
draggable="false"
role="separator"
style="left: 600px;"
style="left: 597px;"
/>
</header>
<div
Expand Down Expand Up @@ -4681,7 +4681,7 @@ exports[`AnalyticalTable test drag and drop of a draggable column 1`] = `
data-resizer="true"
draggable="false"
role="separator"
style="left: 600px;"
style="left: 597px;"
/>
</header>
<div
Expand Down Expand Up @@ -5226,7 +5226,7 @@ exports[`AnalyticalTable with highlight row 1`] = `
data-resizer="true"
draggable="false"
role="separator"
style="left: 653px;"
style="left: 650px;"
/>
</header>
<div
Expand Down Expand Up @@ -5813,7 +5813,7 @@ exports[`AnalyticalTable without selection Column 1`] = `
data-resizer="true"
draggable="false"
role="separator"
style="left: 600px;"
style="left: 597px;"
/>
</header>
<div
Expand Down
38 changes: 21 additions & 17 deletions packages/main/src/components/AnalyticalTable/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,23 +379,27 @@ const AnalyticalTable: FC<TableProps> = forwardRef((props: TableProps, ref: Ref<
return (
// eslint-disable-next-line react/jsx-key
<header {...headerProps} role="rowgroup">
{headerGroup.headers.map((column) => (
// eslint-disable-next-line react/jsx-key
<ColumnHeader
{...column.getHeaderProps()}
onSort={onSort}
onGroupBy={onGroupByChanged}
onDragStart={handleDragStart}
onDragOver={handleDragOver}
onDrop={handleOnDrop}
onDragEnter={handleDragEnter}
onDragEnd={handleOnDragEnd}
dragOver={column.id === dragOver}
isDraggable={!isTreeTable && column.canReorder}
>
{column.render('Header')}
</ColumnHeader>
))}
{headerGroup.headers.map((column, index) => {
const isLastColumn = !column.disableResizing && index + 1 === headerGroup.headers.length;
return (
// eslint-disable-next-line react/jsx-key
<ColumnHeader
{...column.getHeaderProps()}
isLastColumn={isLastColumn}
onSort={onSort}
onGroupBy={onGroupByChanged}
onDragStart={handleDragStart}
onDragOver={handleDragOver}
onDrop={handleOnDrop}
onDragEnter={handleDragEnter}
onDragEnd={handleOnDragEnd}
dragOver={column.id === dragOver}
isDraggable={!isTreeTable && column.canReorder}
>
{column.render('Header')}
</ColumnHeader>
);
})}
</header>
);
})}
Expand Down