From cd0a9eb85bcba797456739f76dca6706b60ed84d Mon Sep 17 00:00:00 2001
From: Bob Zeleznik <zzzman@gmail.com>
Date: Sun, 23 Jun 2019 00:21:03 -0400
Subject: mac stuff

---
 .../views/collections/CollectionTreeView.scss      |  7 +++---
 .../views/collections/CollectionTreeView.tsx       | 29 +++++++++++-----------
 2 files changed, 17 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/client/views/collections/CollectionTreeView.scss b/src/client/views/collections/CollectionTreeView.scss
index a85604e58..14cc1e216 100644
--- a/src/client/views/collections/CollectionTreeView.scss
+++ b/src/client/views/collections/CollectionTreeView.scss
@@ -43,13 +43,12 @@
         display: inline;
     }
 
-
-    .coll-title {
-        width: max-content;
+    .editableView-input, .editableView-container-editing {
         display: block;
+        text-overflow: ellipsis;
         font-size: 24px;
+        white-space: nowrap;
     }
-
 }
 .collectionTreeView-keyHeader {
     font-style: italic;
diff --git a/src/client/views/collections/CollectionTreeView.tsx b/src/client/views/collections/CollectionTreeView.tsx
index 8d7ebb97d..d663185a1 100644
--- a/src/client/views/collections/CollectionTreeView.tsx
+++ b/src/client/views/collections/CollectionTreeView.tsx
@@ -483,25 +483,24 @@ export class CollectionTreeView extends CollectionSubView(Document) {
 
         return !this.childDocs ? (null) : (
             <div id="body" className="collectionTreeView-dropTarget"
+                style={{ overflow: dropAction ? "auto" : "hidden" }}
                 onContextMenu={this.onContextMenu}
                 onWheel={(e: React.WheelEvent) => this.props.isSelected() && e.stopPropagation()}
                 onDrop={this.onTreeDrop}
                 ref={this.createTreeDropTarget}>
-                <div className="coll-title">
-                    <EditableView
-                        contents={this.props.DataDoc.title}
-                        display={"inline"}
-                        height={72}
-                        GetValue={() => StrCast(this.props.DataDoc.title)}
-                        SetValue={(value: string) => (Doc.GetProto(this.props.DataDoc).title = value) ? true : true}
-                        OnFillDown={(value: string) => {
-                            Doc.GetProto(this.props.Document).title = value;
-                            let doc = Docs.FreeformDocument([], { title: "", x: 0, y: 0, width: 100, height: 25, templates: new List<string>([Templates.Title.Layout]) });
-                            TreeView.loadId = doc[Id];
-                            Doc.AddDocToList(this.props.Document, this.props.fieldKey, doc, this.childDocs.length ? this.childDocs[0] : undefined, true);
-                        }} />
-                </div>
-                <ul className="no-indent">
+                <EditableView
+                    contents={this.props.DataDoc.title}
+                    display={"block"}
+                    height={72}
+                    GetValue={() => StrCast(this.props.DataDoc.title)}
+                    SetValue={(value: string) => (Doc.GetProto(this.props.DataDoc).title = value) ? true : true}
+                    OnFillDown={(value: string) => {
+                        Doc.GetProto(this.props.Document).title = value;
+                        let doc = Docs.FreeformDocument([], { title: "", x: 0, y: 0, width: 100, height: 25, templates: new List<string>([Templates.Title.Layout]) });
+                        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" }} >
                     {
                         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)
-- 
cgit v1.2.3-70-g09d2