Skip to content

Commit

Permalink
add othersGroup to avoid defaultGroup
Browse files Browse the repository at this point in the history
which triggers special behavior
  • Loading branch information
sgratzl committed Feb 17, 2019
1 parent edf026b commit f4b1f47
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/model/StringColumn.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {Category, toolbar, dialogAddons} from './annotations';
import Column, {widthChanged, labelChanged, metaDataChanged, dirty, dirtyHeader, dirtyValues, rendererTypeChanged, groupRendererChanged, summaryRendererChanged, visibilityChanged, dirtyCaches} from './Column';
import {defaultGroup, IDataRow, IGroup, ECompareValueType, IValueColumnDesc} from './interfaces';
import {defaultGroup, IDataRow, IGroup, ECompareValueType, IValueColumnDesc, othersGroup} from './interfaces';
import {missingGroup, isMissingValue} from './missing';
import ValueColumn, {dataLoaded} from './ValueColumn';
import {equal, IEventListener} from '../internal';
Expand Down Expand Up @@ -182,12 +182,12 @@ export default class StringColumn extends ValueColumn<string> {
}

if (this.currentGroupCriteria.length === 0) {
return defaultGroup;
return othersGroup;
}
const value = this.getLabel(row);

if (!value) {
return defaultGroup;
return missingGroup;
}

for (const criteria of this.currentGroupCriteria) {
Expand All @@ -199,7 +199,7 @@ export default class StringColumn extends ValueColumn<string> {
color: defaultGroup.color
};
}
return defaultGroup;
return othersGroup;
}


Expand Down
5 changes: 5 additions & 0 deletions src/model/interfaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,11 @@ export const defaultGroup: IGroup = {
color: 'gray'
};

export const othersGroup: IGroup = {
name: 'Others',
color: 'gray'
};


export interface IGroupParent extends IGroup {
subGroups: (Readonly<IGroupParent> | Readonly<IGroup>)[];
Expand Down

0 comments on commit f4b1f47

Please sign in to comment.