Skip to content
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

fix(AnalyticalTable): fix behavior of minWidth and add maxWidth support #585

Merged
merged 2 commits into from
Jul 2, 2020
Merged

fix(AnalyticalTable): fix behavior of minWidth and add maxWidth support #585

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
870ef79
fix(AnalyticalTable): fix behavior of minWidth, add maxWidth support
Lukas742 Jul 1, 2020
41414dd
minor changes
Lukas742 Jul 2, 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
43 changes: 40 additions & 3 deletions packages/main/src/components/AnalyticalTable/hooks/useDynamicColumnWidths.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,51 @@ const columns = (columns, { instance }) => {
});

const calculateDefaultTableWidth = () => {
const columnsWithFixedWidth = visibleColumns.filter(({ width }) => width ?? false).map(({ width }) => width);
const columnsWithWidthProperties = visibleColumns
.filter((column) => column.width ?? column.minWidth ?? column.maxWidth ?? false)
.map((column) => ({
accessor: column.id ?? column.accessor,
minWidth: column.minWidth,
width: column.width,
maxWidth: column.maxWidth
}));
let availableWidth = totalWidth;
let internalDefaultColumnsCount = visibleColumns.length;
const columnsWithFixedWidth = columnsWithWidthProperties
.map((column) => {
const { width, minWidth, maxWidth, accessor } = column;
if (width) {
// necessary because of default minWidth
const acceptedWidth =
accessor !== '__ui5wcr__internal_highlight_column' &&
accessor !== '__ui5wcr__internal_selection_column' &&
width < 60
? 60
: width;
availableWidth -= acceptedWidth;
internalDefaultColumnsCount--;
return acceptedWidth;
}
if (minWidth > availableWidth / defaultColumnsCount) {
availableWidth -= minWidth;
internalDefaultColumnsCount--;
return minWidth;
}
if (maxWidth < availableWidth / defaultColumnsCount) {
availableWidth -= maxWidth;
internalDefaultColumnsCount--;
return maxWidth;
}
return false;
})
.filter(Boolean);

const fixedWidth = columnsWithFixedWidth.reduce((acc, val) => acc + val, 0);

const defaultColumnsCount = visibleColumns.length - columnsWithFixedWidth.length;

// check if columns are visible and table has width
if (visibleColumns.length > 0 && totalWidth > 0) {
// set fixedWidth as defaultWidth if visible columns have fixed value
// set fixedWidth as defaultWidth if all visible columns have fixed value
if (visibleColumns.length === columnsWithFixedWidth.length) {
return fixedWidth / visibleColumns.length;
}
Expand Down