Skip to content

Commit

Permalink
fix group name rendering in overview mode
Browse files Browse the repository at this point in the history
  • Loading branch information
sgratzl committed Mar 13, 2019
1 parent de7fb5d commit ebdc9d0
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 3 deletions.
19 changes: 16 additions & 3 deletions src/renderer/GroupCellRenderer.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
import {Column, GroupColumn, IOrderedGroup} from '../model';
import {Column, GroupColumn, IOrderedGroup, IGroup, defaultGroup, IDataRow} from '../model';
import {ICellRendererFactory} from './interfaces';
import {noRenderer} from './utils';


function isDummyGroup(group: IGroup) {
return group.parent == null && group.name === defaultGroup.name;
}

/** @internal */
export default class GroupCellRenderer implements ICellRendererFactory {
readonly title = 'Default';
Expand All @@ -11,14 +16,22 @@ export default class GroupCellRenderer implements ICellRendererFactory {
}

create() {
return noRenderer;
return {
template: `<div><div></div></div>`,
update(node: HTMLElement, _row: IDataRow, i: number, group: IOrderedGroup) {
(<HTMLElement>node.firstElementChild!).textContent = isDummyGroup(group) || i > 0 ? '' : `${group.name} (${group.order.length})`;
},
render(_ctx: CanvasRenderingContext2D, _row: IDataRow, i: number) {
return i === 0;
}
};
}

createGroup() {
return {
template: `<div><div></div></div>`,
update(node: HTMLElement, group: IOrderedGroup) {
(<HTMLElement>node.firstElementChild!).textContent = `${group.name} (${group.order.length})`;
(<HTMLElement>node.firstElementChild!).textContent = isDummyGroup(group) ? '' : `${group.name} (${group.order.length})`;
}
};
}
Expand Down
6 changes: 6 additions & 0 deletions src/styles/renderer/_aggregate.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@
}
}

.#{$lu_css_prefix}-renderer-group {
&.#{$engine_css_prefix}-td {
overflow: visible;
}
}

.#{$lu_css_prefix}-agg-level {
flex: 0 0 $lu_aggregate_level_width;
position: relative; // square bracket around
Expand Down

0 comments on commit ebdc9d0

Please sign in to comment.