diff options
| author | bobzel <zzzman@gmail.com> | 2023-06-22 10:14:26 -0400 |
|---|---|---|
| committer | bobzel <zzzman@gmail.com> | 2023-06-22 10:14:26 -0400 |
| commit | 72dad52c4fea5a2fccabacbb6a49ca1494093954 (patch) | |
| tree | ea46fdc8c4c3cffbe9ea5b494f086f09206a716a /src/client/views/collections/CollectionPileView.tsx | |
| parent | 1bc15f9b408d35639cea37ea1c29e7cdbd326301 (diff) | |
cleaned up dragging - abort presItem drags properly, fix naming for drag/dropAction, small fix undo of drag removeproperties, dragging in/out of headerBar, fixed isContentActive to avoid SnappingManager.GetIsDragging. fixed resizing videos.
Diffstat (limited to 'src/client/views/collections/CollectionPileView.tsx')
| -rw-r--r-- | src/client/views/collections/CollectionPileView.tsx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/client/views/collections/CollectionPileView.tsx b/src/client/views/collections/CollectionPileView.tsx index 57d9bbb49..15570b195 100644 --- a/src/client/views/collections/CollectionPileView.tsx +++ b/src/client/views/collections/CollectionPileView.tsx @@ -52,18 +52,21 @@ export class CollectionPileView extends CollectionSubView() { @computed get toggleIcon() { return ScriptField.MakeScript('documentView.iconify()', { documentView: 'any' }); } + @computed get contentEvents() { + const isStarburst = this.layoutEngine() === computeStarburstLayout.name; + return this.props.isContentActive() && isStarburst ? undefined : 'none'; + } // returns the contents of the pileup in a CollectionFreeFormView @computed get contents() { - const isStarburst = this.layoutEngine() === computeStarburstLayout.name; return ( - <div className="collectionPileView-innards" style={{ pointerEvents: isStarburst || SnappingManager.GetIsDragging() ? undefined : 'none' }}> + <div className="collectionPileView-innards" style={{ pointerEvents: this.contentEvents }}> <CollectionFreeFormView - {...this.props} + {...this.props} // childContentsActive={returnFalse} layoutEngine={this.layoutEngine} addDocument={this.addPileDoc} - childCanEmbedOnDrag={true} + childDragAction="move" childClickScript={this.toggleIcon} moveDocument={this.removePileDoc} /> |
