diff options
| author | bobzel <zzzman@gmail.com> | 2019-06-23 10:16:12 -0400 |
|---|---|---|
| committer | bobzel <zzzman@gmail.com> | 2019-06-23 10:16:12 -0400 |
| commit | a4b62a15d429ed8d44c6c4d083c8db7232b0b023 (patch) | |
| tree | a42796addb8df0fd3b4fa3141efa0bbfe88bf3d5 /src/client/views/collections/CollectionTreeView.tsx | |
| parent | cd0a9eb85bcba797456739f76dca6706b60ed84d (diff) | |
switched from eliding to scrolling for treeviews. fixed small but annoying scrollbar layout issues.
Diffstat (limited to 'src/client/views/collections/CollectionTreeView.tsx')
| -rw-r--r-- | src/client/views/collections/CollectionTreeView.tsx | 6 |
1 files changed, 3 insertions, 3 deletions
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) |