aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Zeleznik <zzzman@gmail.com>2020-04-20 16:37:13 -0400
committerBob Zeleznik <zzzman@gmail.com>2020-04-20 16:37:13 -0400
commit410c6a81676b77351cc8672465153d277b85dd6c (patch)
tree6c650f555c1fe429817f15a913ad6140f37f82c5
parent49ebcb56488669c1f416c583a9b8c7914e5b6d34 (diff)
fixed ctrl-enter on text box title. fixed min-width of tree view titles.
-rw-r--r--src/client/views/collections/CollectionTreeView.scss1
-rw-r--r--src/client/views/collections/CollectionTreeView.tsx13
2 files changed, 10 insertions, 4 deletions
diff --git a/src/client/views/collections/CollectionTreeView.scss b/src/client/views/collections/CollectionTreeView.scss
index 1e59c493f..a00bb6bfb 100644
--- a/src/client/views/collections/CollectionTreeView.scss
+++ b/src/client/views/collections/CollectionTreeView.scss
@@ -82,6 +82,7 @@
text-overflow: ellipsis;
white-space: pre-wrap;
overflow: hidden;
+ min-width: 10px;
// width:100%;//width: max-content;
}
diff --git a/src/client/views/collections/CollectionTreeView.tsx b/src/client/views/collections/CollectionTreeView.tsx
index d8e2c8841..f589c2c76 100644
--- a/src/client/views/collections/CollectionTreeView.tsx
+++ b/src/client/views/collections/CollectionTreeView.tsx
@@ -487,11 +487,15 @@ class TreeView extends React.Component<TreeViewProps> {
return <div className="treeViewItem-container" ref={this.createTreeDropTarget}>
<li className="collection-child">
<div className="treeViewItem-header" ref={this._header} onClick={e => {
- e.stopPropagation();
- e.preventDefault();
+ if (this.props.active(true)) {
+ e.stopPropagation();
+ e.preventDefault();
+ }
}} onPointerDown={e => {
- e.stopPropagation();
- e.preventDefault();
+ if (this.props.active(true)) {
+ e.stopPropagation();
+ e.preventDefault();
+ }
}} onPointerEnter={this.onPointerEnter} onPointerLeave={this.onPointerLeave}>
{this.renderBullet}
{this.renderTitle}
@@ -810,6 +814,7 @@ export class CollectionTreeView extends CollectionSubView<Document, Partial<coll
Doc.SetInPlace(this.dataDoc, "title", value, false);
const doc = Docs.Create.FreeformDocument([], { title: "", x: 0, y: 0, _width: 100, _height: 25, templates: new List<string>([Templates.Title.Layout]) });
EditableView.loadId = doc[Id];
+ Doc.SetInPlace(doc, "editTitle", true, false);
this.addDoc(doc, childDocs.length ? childDocs[0] : undefined, true);
})} />)}
{this.props.Document.allowClear ? this.renderClearButton : (null)}