updateIconState of more dialogs

lineupjs · Mar 30, 2020 · dc7b6e4 · dc7b6e4
1 parent ab25efe
commit dc7b6e4
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 31 deletions.
diff --git a/src/ui/dialogs/BooleanFilterDialog.ts b/src/ui/dialogs/BooleanFilterDialog.ts
@@ -1,6 +1,5 @@
 import {BooleanColumn} from '../../model';
 import ADialog, {IDialogContext} from './ADialog';
-import {updateFilterState} from './utils';
 import {cssClass} from '../../styles';
 
 /** @internal */
@@ -25,7 +24,6 @@ export default class BooleanFilterDialog extends ADialog {
   }
 
   private updateFilter(filter: boolean | null) {
-    updateFilterState(this.attachment, this.column, filter != null);
     this.column.setFilter(filter);
   }
 

diff --git a/src/ui/dialogs/CategoricalFilterDialog.ts b/src/ui/dialogs/CategoricalFilterDialog.ts
@@ -1,7 +1,7 @@
 import {SetColumn, CategoricalColumn, ICategoricalFilter} from '../../model';
 import {filterMissingMarkup, findFilterMissing} from '../missing';
 import ADialog, {IDialogContext} from './ADialog';
-import {updateFilterState, forEach} from './utils';
+import {forEach} from './utils';
 import {cssClass} from '../../styles';
 import {isCategoryIncluded} from '../../model/internalCategorical';
 
@@ -46,7 +46,6 @@ export default class CategoricalFilterDialog extends ADialog {
 
   private updateFilter(filter: string[] | null | RegExp | string, filterMissing: boolean) {
     const noFilter = filter == null && filterMissing === false;
-    updateFilterState(this.attachment, this.column, !noFilter);
     this.column.setFilter(noFilter ? null : {filter: filter!, filterMissing});
   }
 

diff --git a/src/ui/dialogs/CategoricalMappingFilterDialog.ts b/src/ui/dialogs/CategoricalMappingFilterDialog.ts
@@ -3,7 +3,7 @@ import {OrdinalColumn, ICategoricalFilter} from '../../model';
 import {isCategoryIncluded} from '../../model/internalCategorical';
 import {filterMissingMarkup, findFilterMissing} from '../missing';
 import ADialog, {IDialogContext} from './ADialog';
-import {updateFilterState, forEach} from './utils';
+import {forEach} from './utils';
 import {cssClass} from '../../styles';
 
 /** @internal */
@@ -60,7 +60,6 @@ export default class CategoricalMappingFilterDialog extends ADialog {
 
   private updateFilter(filter: string[] | null | string | RegExp, filterMissing: boolean) {
     const noFilter = filter == null && filterMissing === false;
-    updateFilterState(this.attachment, this.column, !noFilter);
     this.column.setFilter(noFilter ? null : {filter: filter!, filterMissing});
   }
 

diff --git a/src/ui/dialogs/DateFilterDialog.ts b/src/ui/dialogs/DateFilterDialog.ts
@@ -1,8 +1,8 @@
 import {filterMissingMarkup, findFilterMissing} from '../missing';
 import ADialog, {IDialogContext} from './ADialog';
-import {updateFilterState, uniqueId} from './utils';
+import {uniqueId} from './utils';
 import {DateColumn, IDateFilter} from '../../model';
-import {isDummyDateFilter, noDateFilter, shiftFilterDateDay} from '../../model/internalDate';
+import {noDateFilter, shiftFilterDateDay} from '../../model/internalDate';
 import {timeFormat} from 'd3-time-format';
 
 /** @internal */
@@ -18,7 +18,6 @@ export default class DateFilterDialog extends ADialog {
   }
 
   private updateFilter(filter: IDateFilter | null) {
-    updateFilterState(this.attachment, this.column, filter != null && !isDummyDateFilter(filter));
     this.column.setFilter(filter);
   }
 

diff --git a/src/ui/dialogs/MoreColumnOptionsDialog.ts b/src/ui/dialogs/MoreColumnOptionsDialog.ts
@@ -14,6 +14,7 @@ export default class MoreColumnOptionsDialog extends APopup {
 
   protected build(node: HTMLElement) {
     node.classList.add(cssClass('more-options'));
+    node.dataset.colId = this.column.id;
     createToolbarMenuItems(node, this.dialog.level + 1, this.column, this.ctx);
 
     updateIconState(node, this.column);

diff --git a/src/ui/dialogs/StringFilterDialog.ts b/src/ui/dialogs/StringFilterDialog.ts
@@ -1,7 +1,6 @@
 import {StringColumn, IStringFilter} from '../../model';
 import {filterMissingMarkup, findFilterMissing} from '../missing';
 import ADialog, {IDialogContext} from './ADialog';
-import {updateFilterState} from './utils';
 import {cssClass} from '../../styles';
 import {debounce} from '../../internal';
 
@@ -29,7 +28,6 @@ export default class StringFilterDialog extends ADialog {
   }
 
   private updateFilter(filter: string | RegExp | null, filterMissing: boolean) {
-    updateFilterState(this.attachment, this.column, filterMissing || filter != null);
     if (filter == null && !filterMissing) {
       this.column.setFilter(null);
     } else {

diff --git a/src/ui/dialogs/utils.ts b/src/ui/dialogs/utils.ts
@@ -1,28 +1,8 @@
-import {Column} from '../../model';
 import {forEach} from '../../renderer/utils';
 import {cssClass} from '../../styles';
 import {getSortLabel} from '../../internal';
 import {IToolbarDialogAddonHandler} from '../interfaces';
 
-/** @internal */
-export function updateFilterState(attachment: HTMLElement, column: Column, filtered: boolean) {
-  const toggle = (e: Element) => {
-    const n = <HTMLElement>e;
-    if (filtered) {
-      n.dataset.active = '';
-    } else {
-      delete n.dataset.active;
-    }
-  };
-
-  toggle(attachment);
-  const root = attachment.closest(`.${cssClass()}`);
-  if (!root) {
-    return;
-  }
-  Array.from(root.querySelectorAll(`[data-col-id="${column.id}"] i[title^=Filter]`)).forEach(toggle);
-}
-
 /** @internal */
 export function sortMethods(node: HTMLElement, column: {setSortMethod(v: string): void, getSortMethod(): string}, methods: string[]): IToolbarDialogAddonHandler {
   const bak = column.getSortMethod();

diff --git a/src/ui/header.ts b/src/ui/header.ts
@@ -85,6 +85,20 @@ export function updateHeader(node: HTMLElement, col: Column, minWidth = MIN_LABE
   label.dataset.typeCat = categoryOf(col).name;
 
   updateIconState(node, col);
+
+  updateMoreDialogIcons(node, col);
+}
+
+function updateMoreDialogIcons(node: HTMLElement, col: Column) {
+  const root = node.closest(`.${cssClass()}`);
+  if (!root) {
+    return;
+  }
+  const dialog = root.querySelector<HTMLElement>(`.${cssClass('more-options')}[data-col-id="${col.id}"]`);
+  if (!dialog) {
+    return;
+  }
+  updateIconState(dialog, col);
 }