merged with master

1 files changed, 24 insertions, 6 deletions

diff --git a/src/client/views/search/IconBar.tsx b/src/client/views/search/IconBar.tsx
index cff397407..9b7cf2fc6 100644
--- a/src/client/views/search/IconBar.tsx
+++ b/src/client/views/search/IconBar.tsx
@@ -9,7 +9,8 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { library } from '@fortawesome/fontawesome-svg-core';
 import * as _ from "lodash";
 import { IconButton } from './IconButton';
-import { FilterBox } from './FilterBox';
+import { DocumentType } from "../../documents/DocumentTypes";
+
 
 library.add(faSearch);
 library.add(faObjectGroup);
@@ -23,8 +24,16 @@ library.add(faChartBar);
 library.add(faGlobeAsia);
 library.add(faBan);
 
+export interface IconBarProps {
+    setIcons: (icons: string[]) => void;
+}
+
+
 @observer
-export class IconBar extends React.Component {
+export class IconBar extends React.Component<IconBarProps> {
+    public _allIcons: string[] = [DocumentType.AUDIO, DocumentType.COL, DocumentType.IMG, DocumentType.LINK, DocumentType.PDF, DocumentType.RTF, DocumentType.VID, DocumentType.WEB];
+
+    @observable private _icons: string[] = this._allIcons;
 
     static Instance: IconBar;
 
@@ -33,16 +42,25 @@ export class IconBar extends React.Component {
     @observable public _reset: number = 0;
     @observable public _select: number = 0;
 
+    @action.bound
+    updateIcon(newArray: string[]) {
+        this._icons = newArray;
+        this.props.setIcons?.(this._icons);
+    }
+
+    @action.bound
+    getIcons(): string[] { return this._icons; }
+
     constructor(props: any) {
         super(props);
         IconBar.Instance = this;
     }
 
     @action.bound
-    getList(): string[] { return FilterBox.Instance.getIcons(); }
+    getList(): string[] { return this.getIcons(); }
 
     @action.bound
-    updateList(newList: string[]) { FilterBox.Instance.updateIcon(newList); }
+    updateList(newList: string[]) { this.updateIcon(newList); }
 
     @action.bound
     resetSelf = () => {
@@ -53,13 +71,13 @@ export class IconBar extends React.Component {
     @action.bound
     selectAll = () => {
         this._selectAllClicked = true;
-        this.updateList(FilterBox.Instance._allIcons);
+        this.updateList(this._allIcons);
     }
 
     render() {
         return (
             <div className="icon-bar">
-                {FilterBox.Instance._allIcons.map((type: string) =>
+                {this._allIcons.map((type: string) =>
                     <IconButton key={type.toString()} type={type} />
                 )}
             </div>