From 6763fc89d2ba9782d88a7677661dbe5ae27ee097 Mon Sep 17 00:00:00 2001
From: Bob Zeleznik <zzzman@gmail.com>
Date: Sat, 15 Jun 2019 21:41:29 -0400
Subject: several fixes to tree view

---
 .../views/collections/CollectionTreeView.scss      | 30 ++++++++--------------
 1 file changed, 11 insertions(+), 19 deletions(-)

(limited to 'src/client/views/collections/CollectionTreeView.scss')

diff --git a/src/client/views/collections/CollectionTreeView.scss b/src/client/views/collections/CollectionTreeView.scss
index 2dc4b2e80..2568bf182 100644
--- a/src/client/views/collections/CollectionTreeView.scss
+++ b/src/client/views/collections/CollectionTreeView.scss
@@ -25,12 +25,10 @@
     }
 
     .bullet {
-        float: left;
         position: relative;
         width: 15px;
-        display: block;
         color: $intermediate-color;
-        margin-top: 8px;
+        margin-top: 4px;
         transform: scale(1.3, 1.3);
     }
     .editableView-container {
@@ -46,13 +44,6 @@
     }
 
 
-    .docContainer:hover {
-        .delete-button {
-            display: inline;
-            // width: auto;
-        }
-    }
-
     .coll-title {
         width: max-content;
         display: block;
@@ -66,23 +57,23 @@
 }
 
 .docContainer {
-    margin-left: 10px;
-    display: block;
+    position: relative;
+    text-overflow: ellipsis;
+    white-space: pre-wrap;
+    overflow: hidden;
     // width:100%;//width: max-content;
 
-    .treeViewItem-openRight {
-        margin-left: 5px;
-        display: none;
-    }
 }
-#docContainer-data {
-    margin-top: 5px;
+.treeViewItem-openRight {
+    display: none;
 }
 
-.docContainer:hover {
+.treeViewItem-header:hover {
     .treeViewItem-openRight {
         display: inline-block;
         height:13px;
+        margin-top:2px;
+        margin-left: 5px;
         // display: inline;
         svg {
             display:block;
@@ -94,6 +85,7 @@
 
 .treeViewItem-header {
     border: transparent 1px solid;
+    display:flex;
 }
 .treeViewItem-header-above {
     border: transparent 1px solid;
-- 
cgit v1.2.3-70-g09d2


From c3b1877b4d17715416267ff3601cc982ca3b1535 Mon Sep 17 00:00:00 2001
From: Bob Zeleznik <zzzman@gmail.com>
Date: Sat, 15 Jun 2019 22:46:40 -0400
Subject: partial fix for dragging tree view items

---
 src/client/views/collections/CollectionTreeView.scss | 3 ---
 src/client/views/collections/CollectionTreeView.tsx  | 7 ++++---
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/client/views/collections/CollectionTreeView.scss')

diff --git a/src/client/views/collections/CollectionTreeView.scss b/src/client/views/collections/CollectionTreeView.scss
index 2568bf182..f6df96d92 100644
--- a/src/client/views/collections/CollectionTreeView.scss
+++ b/src/client/views/collections/CollectionTreeView.scss
@@ -88,14 +88,11 @@
     display:flex;
 }
 .treeViewItem-header-above {
-    border: transparent 1px solid;
     border-top: black 1px solid;
 }
 .treeViewItem-header-below {
-    border: transparent 1px solid;
     border-bottom: black 1px solid;
 }
 .treeViewItem-header-inside {
-    border: transparent 1px solid;
     border: black 1px solid;
 }
\ No newline at end of file
diff --git a/src/client/views/collections/CollectionTreeView.tsx b/src/client/views/collections/CollectionTreeView.tsx
index 65b364c47..809b2af2b 100644
--- a/src/client/views/collections/CollectionTreeView.tsx
+++ b/src/client/views/collections/CollectionTreeView.tsx
@@ -71,6 +71,7 @@ class TreeView extends React.Component<TreeViewProps> {
     @action onMouseLeave = () => { this._isOver = false; }
 
     onPointerEnter = (e: React.PointerEvent): void => {
+        console.log("ENTER =  " + this.props.document.title);
         this.props.active() && (this.props.document.libraryBrush = true);
         if (e.buttons === 1) {
             this._header!.current!.className = "treeViewItem-header";
@@ -90,9 +91,9 @@ class TreeView extends React.Component<TreeViewProps> {
         let before = x[1] < bounds[1];
         let inside = x[0] > bounds[0] + 75 || (!before && this._bulletType === BulletType.Collapsible);
         this._header!.current!.className = "treeViewItem-header"
-        if (inside && this._bulletType != BulletType.List) this._header!.current!.className = "treeViewItem-header-inside";
-        else if (before) this._header!.current!.className = "treeViewItem-header-above";
-        else if (!before) this._header!.current!.className = "treeViewItem-header-below";
+        if (inside && this._bulletType != BulletType.List) this._header!.current!.className += " treeViewItem-header-inside";
+        else if (before) this._header!.current!.className += " treeViewItem-header-above";
+        else if (!before) this._header!.current!.className += " treeViewItem-header-below";
         e.stopPropagation();
     }
     onPointerDown = (e: React.PointerEvent) => {
-- 
cgit v1.2.3-70-g09d2