Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 14 additions & 4 deletions lib/public/components/common/table/table.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ const parseColumnsConfiguration = (columns, currentProfile) => {
* @property {boolean} verticallScrollEnabled if true, enable vertical (table internal) scroll in case of overflow,
* whole page vertical scroll otherwise. Note that for this option to work,
* all predecesors of the node returned by this function must have display property column-flex and height: 100%
* @property {boolean} singleWrapper have effect only when some scroll is enabled.
* If true all divs wrapping table element are merged to single on.
*/

/**
Expand Down Expand Up @@ -134,6 +136,7 @@ export const table = (
horizontalScrollEnabled = false,
freezeFirstColumn = false,
verticalScrollEnabled = false,
singleWrapper = false,
} = tableConfiguration || {};
const { idKey, displayedColumns } = parseColumnsConfiguration(columns, currentProfile);

Expand All @@ -147,12 +150,14 @@ export const table = (
}

const scrollEnabled = horizontalScrollEnabled || verticalScrollEnabled;
const wrapperClassesExpression = scrollEnabled ? '.sticky-table-wrapper.scroll-auto' : '';

const optionalTableClassesExpression = freezeFirstColumn && horizontalScrollEnabled ? '.freeze-first-column' : '';

const wrappedTableNode = h(
wrapperClassesExpression,
const firstLevelWrapperClasses =
(verticalScrollEnabled ? '.sticky-table-wrapper' : '') +
(singleWrapper && scrollEnabled ? '.scroll-auto' : '');

let wrappedTableNode = h(
firstLevelWrapperClasses,
h(
`table.table.table-hover.shadow-level1${optionalTableClassesExpression}`,
{
Expand All @@ -168,6 +173,11 @@ export const table = (
],
),
);

if (scrollEnabled && !singleWrapper) {
wrappedTableNode = h('.scroll-auto', wrappedTableNode);
}

return scrollEnabled && !verticalScrollEnabled
? h('', wrappedTableNode) // Disable y-scroll
: wrappedTableNode;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ export const RunsPerLhcPeriodOverviewPage = ({ runs: { perLhcPeriodOverviewModel
{
profile: 'runsPerLhcPeriod',
...displayOptions,
singleWrapper: true,
},
{ sort: sortModel },
);
Expand Down Expand Up @@ -130,7 +131,7 @@ export const RunsPerLhcPeriodOverviewPage = ({ runs: { perLhcPeriodOverviewModel
)),
},
{
panelClass: ['p2', 'scroll-auto'],
panelClass: ['scroll-auto'],
},
),
paginationComponent(perLhcPeriodOverviewModel.pagination),
Expand Down
Loading