diff options
| author | Lionel Han <47760119+IGoByJoe@users.noreply.github.com> | 2020-09-04 18:03:15 -0700 |
|---|---|---|
| committer | Lionel Han <47760119+IGoByJoe@users.noreply.github.com> | 2020-09-04 18:03:15 -0700 |
| commit | e641fd8c6f5a84800af173db02bd012eecb04b7a (patch) | |
| tree | 9b1b224674d091a16076a0abc20f3d8e0774f4a8 | |
| parent | d9deafd2f368137a01a424f898edf0dc4acd2eae (diff) | |
fixed autoScroll bug and fixed dragging in picture bug
| -rw-r--r-- | src/client/documents/Documents.ts | 2 | ||||
| -rw-r--r-- | src/client/views/collections/CollectionPileView.tsx | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts index 8d1f8a04e..0362c6074 100644 --- a/src/client/documents/Documents.ts +++ b/src/client/documents/Documents.ts @@ -761,7 +761,7 @@ export namespace Docs { } export function PileDocument(documents: Array<Doc>, options: DocumentOptions, id?: string) { - return InstanceFromProto(Prototypes.get(DocumentType.COL), new List(documents), { _chromeStatus: "collapsed", backgroundColor: "black", forceActive: true, ...options, _viewType: CollectionViewType.Pile }, id); + return InstanceFromProto(Prototypes.get(DocumentType.COL), new List(documents), { _chromeStatus: "collapsed", backgroundColor: "black", forceActive: true, _noAutoscroll: true, ...options, _viewType: CollectionViewType.Pile }, id); } export function LinearDocument(documents: Array<Doc>, options: DocumentOptions, id?: string) { diff --git a/src/client/views/collections/CollectionPileView.tsx b/src/client/views/collections/CollectionPileView.tsx index 499f68bd2..e85aac2e3 100644 --- a/src/client/views/collections/CollectionPileView.tsx +++ b/src/client/views/collections/CollectionPileView.tsx @@ -36,7 +36,8 @@ export class CollectionPileView extends CollectionSubView(doc => doc) { layoutEngine = () => StrCast(this.Document._pileLayoutEngine); @computed get contents() { - return <div className="collectionPileView-innards" style={{ pointerEvents: this.layoutEngine() === "starburst" ? undefined : "none", zIndex: this.layoutEngine() === "starburst" && !SnappingManager.GetIsDragging() ? -10 : "auto" }} > + const draggingSelf = this.props.isSelected(); + return <div className="collectionPileView-innards" style={{ pointerEvents: this.layoutEngine() === "starburst" || (SnappingManager.GetIsDragging() && !draggingSelf) ? undefined : "none", zIndex: this.layoutEngine() === "starburst" && !SnappingManager.GetIsDragging() ? -10 : "auto" }} > <CollectionFreeFormView {...this.props} layoutEngine={this.layoutEngine} addDocument={(doc: Doc | Doc[]) => { (doc instanceof Doc ? [doc] : doc).map((d) => DocUtils.iconify(d)); |