From d913e2dd6f5a292cf1bc90e65280133642219949 Mon Sep 17 00:00:00 2001
From: usodhi <61431818+usodhi@users.noreply.github.com>
Date: Mon, 5 Apr 2021 01:27:06 -0400
Subject: deleted some commented code + other small stuff

---
 src/client/views/PropertiesView.scss                |  3 ++-
 src/client/views/PropertiesView.tsx                 |  4 ++--
 src/client/views/collections/CollectionTreeView.tsx |  3 +--
 src/client/views/nodes/FilterBox.scss               |  4 ++++
 src/client/views/nodes/FilterBox.tsx                | 13 +++----------
 5 files changed, 12 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/client/views/PropertiesView.scss b/src/client/views/PropertiesView.scss
index 04934d50b..7c6d507b8 100644
--- a/src/client/views/PropertiesView.scss
+++ b/src/client/views/PropertiesView.scss
@@ -191,7 +191,8 @@
             font-size: 10px;
             padding: 10px;
             margin-left: 5px;
-            max-height: 40%;overflow-y: scroll;
+            max-height: 40%;
+            overflow-y: scroll;
 
             .propertiesView-buttonContainer {
                 float: right;
diff --git a/src/client/views/PropertiesView.tsx b/src/client/views/PropertiesView.tsx
index 9fc19253e..9c1b8e593 100644
--- a/src/client/views/PropertiesView.tsx
+++ b/src/client/views/PropertiesView.tsx
@@ -965,8 +965,8 @@ export class PropertiesView extends React.Component<PropertiesViewProps> {
                             scriptContext={this.filterDoc.currentFilter as Doc}
                             focus={emptyFunction}
                             styleProvider={DefaultStyleProvider}
-                            parentActive={returnTrue}
-                            whenActiveChanged={emptyFunction}
+                            isContentActive={returnTrue}
+                            whenChildContentsActiveChanged={emptyFunction}
                             bringToFront={emptyFunction}
                             docFilters={returnEmptyFilter}
                             docRangeFilters={returnEmptyFilter}
diff --git a/src/client/views/collections/CollectionTreeView.tsx b/src/client/views/collections/CollectionTreeView.tsx
index 37600fa4d..ed0ed63b3 100644
--- a/src/client/views/collections/CollectionTreeView.tsx
+++ b/src/client/views/collections/CollectionTreeView.tsx
@@ -37,8 +37,7 @@ export type collectionTreeViewProps = {
 };
 
 @observer
-export class
-    CollectionTreeView extends CollectionSubView<Document, Partial<collectionTreeViewProps>>(Document) {
+export class CollectionTreeView extends CollectionSubView<Document, Partial<collectionTreeViewProps>>(Document) {
     private treedropDisposer?: DragManager.DragDropDisposer;
     private _mainEle?: HTMLDivElement;
     MainEle = () => this._mainEle;
diff --git a/src/client/views/nodes/FilterBox.scss b/src/client/views/nodes/FilterBox.scss
index 4fe1fa2eb..107ad2e36 100644
--- a/src/client/views/nodes/FilterBox.scss
+++ b/src/client/views/nodes/FilterBox.scss
@@ -161,6 +161,10 @@
     z-index: 1;
     background-color: #9F9F9F;
 
+    .filterBox-tree {
+        z-index: 0;
+    }
+
     .filterBox-addfacet {
         display: inline-block;
         width: 200px;
diff --git a/src/client/views/nodes/FilterBox.tsx b/src/client/views/nodes/FilterBox.tsx
index 1d3f6a7cc..af95c96fb 100644
--- a/src/client/views/nodes/FilterBox.tsx
+++ b/src/client/views/nodes/FilterBox.tsx
@@ -2,7 +2,7 @@ import React = require("react");
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { computed, observable, action, trace, reaction, runInAction } from "mobx";
 import { observer } from "mobx-react";
-import { DataSym, Doc, DocListCast, Field, Opt, DocListCastAsync } from "../../../fields/Doc";
+import { Doc, DocListCast, Field, Opt, DocListCastAsync } from "../../../fields/Doc";
 import { documentSchema } from "../../../fields/documentSchemas";
 import { List } from "../../../fields/List";
 import { RichTextField } from "../../../fields/RichTextField";
@@ -198,9 +198,6 @@ export class FilterBox extends ViewBoxBaseComponent<FieldViewProps, FilterBoxDoc
      * Responds to clicking the check box in the flyout menu
      */
     facetClick = (facetHeader: string) => {
-
-        console.log("facetClick: " + facetHeader);
-        console.log(this.props.fieldKey);
         const targetDoc = FilterBox.targetDoc;
         const found = this.activeAttributes.findIndex(doc => doc.title === facetHeader);
         if (found !== -1) {
@@ -242,8 +239,6 @@ export class FilterBox extends ViewBoxBaseComponent<FieldViewProps, FilterBoxDoc
                 newFacet._textBoxPadding = 4;
                 const scriptText = `setDocFilter(this?.target, "${facetHeader}", text, "match")`;
                 newFacet.onTextChanged = ScriptField.MakeScript(scriptText, { this: Doc.name, text: "string" });
-                // function foo (this:doc, text:string)
-                // "this" should be the item called noot (maybe) or the treeview doc itself
             } else if (facetHeader !== "tags" && nonNumbers / facetValues.strings.length < .1) {
                 newFacet = Docs.Create.SliderDocument({ title: facetHeader, _overflow: "visible", _fitWidth: true, _height: 40, _stayInCollection: true, _hideContextMenu: true, treeViewExpandedView: "layout", treeViewOpen: true });
                 const newFacetField = Doc.LayoutFieldKey(newFacet);
@@ -265,8 +260,6 @@ export class FilterBox extends ViewBoxBaseComponent<FieldViewProps, FilterBoxDoc
                 newFacet.layout = CollectionView.LayoutString("data");
                 newFacet.layoutKey = "layout";
                 newFacet.type = DocumentType.COL;
-                // const capturedVariables = { layoutDoc: targetDoc, system: true, _stayInCollection: true, _hideContextMenu: true, dataDoc: (targetDoc.data as any)[0][DataSym] };
-                // newFacet.data = ComputedField.MakeFunction(`readFacetData(layoutDoc, "${facetHeader}")`, {}, capturedVariables);
                 newFacet.target = targetDoc;
                 newFacet.data = ComputedField.MakeFunction(`readFacetData(self.target, "${facetHeader}")`);
             }
@@ -390,8 +383,8 @@ export class FilterBox extends ViewBoxBaseComponent<FieldViewProps, FilterBoxDoc
 
             <div className="filterBox-select-bool">
                 <select className="filterBox-selection" onChange={this.changeBool}>
-                    <option value="AND" key="AND" selected={(FilterBox.targetDoc.currentFilter as Doc).filterBoolean === "AND"}>AND</option>
-                    <option value="OR" key="OR" selected={(FilterBox.targetDoc.currentFilter as Doc).filterBoolean === "OR"}>OR</option>
+                    <option value="AND" key="AND" selected={(FilterBox.targetDoc.currentFilter as Doc)?.filterBoolean === "AND"}>AND</option>
+                    <option value="OR" key="OR" selected={(FilterBox.targetDoc.currentFilter as Doc)?.filterBoolean === "OR"}>OR</option>
                 </select>
                 <div className="filterBox-select-text">filters in </div>
                 <select className="filterBox-selection" onChange={this.changeScope}>
-- 
cgit v1.2.3-70-g09d2