From f3f93e61f3914bd9fd6e8098a99e552f7860bc5f Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Sat, 12 Dec 2020 16:56:14 -0500
Subject: fixed displaying items (images,et) in treeViews to indent properly. 
 Fixed bounds of contentfittingviews in treeViews to be correct.

---
 .../views/collections/CollectionTreeView.scss      |  4 ++
 src/client/views/collections/TreeView.scss         |  9 ----
 src/client/views/collections/TreeView.tsx          | 60 ++++++++++------------
 src/client/views/pdf/PDFViewer.tsx                 |  4 +-
 4 files changed, 33 insertions(+), 44 deletions(-)

(limited to 'src')

diff --git a/src/client/views/collections/CollectionTreeView.scss b/src/client/views/collections/CollectionTreeView.scss
index c5add7cfb..650fb019d 100644
--- a/src/client/views/collections/CollectionTreeView.scss
+++ b/src/client/views/collections/CollectionTreeView.scss
@@ -23,6 +23,10 @@
         list-style: none;
         padding-left: 20px;
         margin-bottom: 1px; // otherwise vertical scrollbars may pop up for no apparent reason....
+        .contentFittingDocumentView  {
+            width: unset;
+            height: unset;
+        }
     }
 
 
diff --git a/src/client/views/collections/TreeView.scss b/src/client/views/collections/TreeView.scss
index cc6267f45..816dc0ffa 100644
--- a/src/client/views/collections/TreeView.scss
+++ b/src/client/views/collections/TreeView.scss
@@ -65,15 +65,6 @@
     cursor: pointer;
 }
 
-.treeView-borderoutline {
-    ul {
-        .contentFittingDocumentView  {
-            width: unset;
-            height: unset;
-        }
-    }
-}
-
 .treeView-borderoutline,
 .treeView-border {
     display: flex;
diff --git a/src/client/views/collections/TreeView.tsx b/src/client/views/collections/TreeView.tsx
index 5982934ff..843bec6de 100644
--- a/src/client/views/collections/TreeView.tsx
+++ b/src/client/views/collections/TreeView.tsx
@@ -409,12 +409,13 @@ export class TreeView extends React.Component<TreeViewProps> {
                         [...this.props.renderedIds, this.doc[Id]], this.props.onCheckedClick, this.props.onChildClick, this.props.skipFields, false, this.props.whenActiveChanged, this.props.dontRegisterView)}
             </ul >;
         } else if (this.treeViewExpandedView === "fields") {
-            return <ul key={this.doc[Id] + this.doc.title}><div style={{ display: "inline-block" }} >
-                {this.expandedField}
-            </div></ul>;
-        } else {
-            return this.renderEmbeddedDocument(false);
+            return <ul key={this.doc[Id] + this.doc.title}>
+                <div style={{ display: "inline-block" }} >
+                    {this.expandedField}
+                </div>
+            </ul>;
         }
+        return <ul>{this.renderEmbeddedDocument(false)}</ul>;
     }
 
     get onCheckedClick() { return this.doc.type === DocumentType.COL ? undefined : this.props.onCheckedClick?.() ?? ScriptCast(this.doc.onCheckedClick); }
@@ -583,15 +584,18 @@ export class TreeView extends React.Component<TreeViewProps> {
     }
 
     renderBulletHeader = (contents: JSX.Element) => {
-        return <div className={`treeView-header` + (this._editMaxWidth ? "-editing" : "")} key="titleheader"
-            ref={this._header}
-            style={{ maxWidth: this._editMaxWidth }}
-            onClick={this.ignoreEvent}
-            onPointerDown={this.ignoreEvent}
-            onPointerEnter={this.onPointerEnter}
-            onPointerLeave={this.onPointerLeave}>
-            {contents}
-        </div>;
+        return <>
+            <div className={`treeView-header` + (this._editMaxWidth ? "-editing" : "")} key="titleheader"
+                ref={this._header}
+                style={{ maxWidth: this._editMaxWidth }}
+                onClick={this.ignoreEvent}
+                onPointerDown={this.ignoreEvent}
+                onPointerEnter={this.onPointerEnter}
+                onPointerLeave={this.onPointerLeave}>
+                {contents}
+            </div>
+            {this.renderBorder}
+        </>;
     }
 
     // renders the text version of a document as the header (e.g., useful for Slide views where the "")
@@ -668,24 +672,16 @@ export class TreeView extends React.Component<TreeViewProps> {
         else this._editMaxWidth = "";
 
         const hideTitle = this.doc.treeViewHideHeader || this.outlineMode;
-        return hideTitle && !StrCast(Doc.LayoutField(this.doc)).includes("CollectionView") ?
-            this.renderContent
-            :
-            <div className={`treeView-container${this._dref?.docView?.contentsActive() ? "-active" : ""}`}
-                ref={this.createTreeDropTarget}
-                onPointerDown={e => this.props.active(true) && SelectionManager.DeselectAll()}
-                onKeyDown={this.onKeyDown}>
-                {hideTitle ?
-                    <li className="collection-child">
-                        {this.renderBulletHeader(this.renderDocumentAsHeader)}
-                        {this.renderBorder}
-                    </li> :
-                    <li className="collection-child">
-                        {this.renderBulletHeader(this.renderTitleAsHeader)}
-                        {this.renderBorder}
-                    </li>
-                }
-            </div>;
+        return <div className={`treeView-container${this._dref?.docView?.contentsActive() ? "-active" : ""}`}
+            ref={this.createTreeDropTarget}
+            onPointerDown={e => this.props.active(true) && SelectionManager.DeselectAll()}
+            onKeyDown={this.onKeyDown}>
+            <li className="collection-child">
+                {hideTitle && this.doc.type !== DocumentType.RTF ?
+                    this.renderEmbeddedDocument(false) :
+                    this.renderBulletHeader(hideTitle ? this.renderDocumentAsHeader : this.renderTitleAsHeader)}
+            </li>
+        </div>;
     }
 
     public static sortDocs(childDocs: Doc[], criterion: string | undefined) {
diff --git a/src/client/views/pdf/PDFViewer.tsx b/src/client/views/pdf/PDFViewer.tsx
index 199b77408..6b7a93747 100644
--- a/src/client/views/pdf/PDFViewer.tsx
+++ b/src/client/views/pdf/PDFViewer.tsx
@@ -23,11 +23,10 @@ import { CompiledScript, CompileScript } from "../../util/Scripting";
 import { SelectionManager } from "../../util/SelectionManager";
 import { SharingManager } from "../../util/SharingManager";
 import { SnappingManager } from "../../util/SnappingManager";
-import { Transform } from "../../util/Transform";
 import { undoBatch } from "../../util/UndoManager";
 import { CollectionFreeFormView } from "../collections/collectionFreeForm/CollectionFreeFormView";
-import { CollectionView } from "../collections/CollectionView";
 import { ViewBoxAnnotatableComponent } from "../DocComponent";
+import { FieldViewProps } from "../nodes/FieldView";
 import { FormattedTextBox } from "../nodes/formattedText/FormattedTextBox";
 import { FormattedTextBoxComment } from "../nodes/formattedText/FormattedTextBoxComment";
 import { LinkDocPreview } from "../nodes/LinkDocPreview";
@@ -36,7 +35,6 @@ import { PDFMenu } from "./PDFMenu";
 import "./PDFViewer.scss";
 const pdfjs = require('pdfjs-dist/es5/build/pdf.js');
 import React = require("react");
-import { FieldViewProps } from "../nodes/FieldView";
 const PDFJSViewer = require("pdfjs-dist/web/pdf_viewer");
 const pdfjsLib = require("pdfjs-dist");
 const _global = (window /* browser */ || global /* node */) as any;
-- 
cgit v1.2.3-70-g09d2