Skip to content

Commit

Permalink
fix dummy date filter
Browse files Browse the repository at this point in the history
  • Loading branch information
sgratzl committed Apr 15, 2020
1 parent 5298af3 commit 8b52a89
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions src/renderer/DateHistogramCellRenderer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ export function createDateFilter(col: IDateColumn, parent: HTMLElement, context:
let domain: [number, number] = [isFinite(filter.min) ? filter.min : 0, isFinite(filter.max) ? filter.max : 100];

let fContext = createFilterContext(col, context, domain);
const applyFilter = fContext.setFilter;
let applyFilter = fContext.setFilter;
let currentFilter = createFilterInfo(col, domain);
fContext.setFilter = (filterMissing, min, max) => {
currentFilter = {filterMissing, filterMin: min, filterMax: max};
Expand All @@ -151,7 +151,7 @@ export function createDateFilter(col: IDateColumn, parent: HTMLElement, context:
// reinit with proper domain
domain = [min ? min.getTime() : Date.now(), max ? max.getTime() : Date.now()];
fContext = createFilterContext(col, context, domain);
const applyFilter = fContext.setFilter;
applyFilter = fContext.setFilter;
currentFilter = createFilterInfo(col, domain);
fContext.setFilter = (filterMissing, min, max) => {
currentFilter = {filterMissing, filterMin: min, filterMax: max};
Expand Down Expand Up @@ -247,8 +247,8 @@ function createFilterContext(col: IDateColumn, context: {idPrefix: string, dialo
format: (v) => isNaN(v) ? '' : col.getFormatter()(new Date(v)),
setFilter: (filterMissing, minValue, maxValue) => col.setFilter({
filterMissing,
min: Math.abs(minValue - domain[0]) < 0.001 ? NaN : shiftFilterDateDay(minValue, 'min'),
max: Math.abs(maxValue - domain[1]) < 0.001 ? NaN : shiftFilterDateDay(maxValue, 'max')
min: Math.abs(minValue - domain[0]) < 0.001 ? Number.NEGATIVE_INFINITY : shiftFilterDateDay(minValue, 'min'),
max: Math.abs(maxValue - domain[1]) < 0.001 ? Number.POSITIVE_INFINITY : shiftFilterDateDay(maxValue, 'max')
}),
edit: (value, attachment, type) => {
return new Promise((resolve) => {
Expand Down
4 changes: 2 additions & 2 deletions src/renderer/HistogramCellRenderer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,8 @@ function createFilterContext(col: IMapAbleColumn, context: {idPrefix: string, di
format,
setFilter: (filterMissing, minValue, maxValue) => col.setFilter({
filterMissing,
min: minValue === domain[0] ? NaN : minValue,
max: maxValue === domain[1] ? NaN : maxValue
min: minValue === domain[0] ? Number.NEGATIVE_INFINITY : minValue,
max: maxValue === domain[1] ? Number.POSITIVE_INFINITY : maxValue
}),
edit: (value, attachment) => {
return new Promise((resolve) => {
Expand Down

0 comments on commit 8b52a89

Please sign in to comment.