switched from eliding to scrolling for treeviews. fixed small but annoying scrollbar layout issues.

3 files changed, 8 insertions, 16 deletions

diff --git a/src/client/views/Main.scss b/src/client/views/Main.scss
index 690139341..0271edcd2 100644
--- a/src/client/views/Main.scss
+++ b/src/client/views/Main.scss
@@ -20,15 +20,7 @@ div {
     -ms-user-select: none;
 }
 
-#dash-title {
-    position: absolute;
-    right: 46.5%;
-    letter-spacing: 3px;
-    top: 9px;
-    font-size: 12px;
-    color: $alt-accent;
-    z-index: 9999;
-}
+
 
 .jsx-parser {
     width: 100%;
@@ -43,8 +35,8 @@ p {
 
 ::-webkit-scrollbar {
     -webkit-appearance: none;
-    height: 10px;
-    width: 10px;
+    height: 8px;
+    width: 8px;
 }
 
 ::-webkit-scrollbar-thumb {
@@ -200,7 +192,7 @@ button:hover {
     position: absolute;
     top: 0;
     left: 0;
-    overflow: scroll;
+    overflow: auto;
     z-index: 1;
 }
 
@@ -210,6 +202,7 @@ button:hover {
     position: absolute;
     top: 0;
     left: 0;
+    overflow: hidden;
 }
 
 #add-options-content {
diff --git a/src/client/views/_nodeModuleOverrides.scss b/src/client/views/_nodeModuleOverrides.scss
index 6f97e60f8..3594ac9f4 100644
--- a/src/client/views/_nodeModuleOverrides.scss
+++ b/src/client/views/_nodeModuleOverrides.scss
@@ -3,7 +3,6 @@
 // goldenlayout stuff
 div .lm_header {
   background: $dark-color;
-  min-height: 2em;
 }
 
 .lm_tab {
diff --git a/src/client/views/collections/CollectionTreeView.tsx b/src/client/views/collections/CollectionTreeView.tsx
index d663185a1..b3f1b1c88 100644
--- a/src/client/views/collections/CollectionTreeView.tsx
+++ b/src/client/views/collections/CollectionTreeView.tsx
@@ -483,9 +483,9 @@ export class CollectionTreeView extends CollectionSubView(Document) {
 
         return !this.childDocs ? (null) : (
             <div id="body" className="collectionTreeView-dropTarget"
-                style={{ overflow: dropAction ? "auto" : "hidden" }}
+                style={{ overflow: "auto" }}
                 onContextMenu={this.onContextMenu}
-                onWheel={(e: React.WheelEvent) => this.props.isSelected() && e.stopPropagation()}
+                onWheel={(e: React.WheelEvent) => (e.target as any).scrollHeight > (e.target as any).clientHeight && e.stopPropagation()}
                 onDrop={this.onTreeDrop}
                 ref={this.createTreeDropTarget}>
                 <EditableView
@@ -500,7 +500,7 @@ export class CollectionTreeView extends CollectionSubView(Document) {
                         TreeView.loadId = doc[Id];
                         Doc.AddDocToList(this.props.Document, this.props.fieldKey, doc, this.childDocs.length ? this.childDocs[0] : undefined, true);
                     }} />
-                <ul className="no-indent" style={{ width: dropAction ? "max-content" : "undefined" }} >
+                <ul className="no-indent" style={{ width: "max-content" }} >
                     {
                         TreeView.GetChildElements(this.childDocs, this.props.Document[Id], this.props.Document, this.props.DataDoc, this.props.fieldKey, addDoc, this.remove,
                             moveDoc, dropAction, this.props.addDocTab, this.props.ScreenToLocalTransform, this.outerXf, this.props.active, this.props.PanelWidth)