Merge branch 'master' into collaboration-sarah

3 files changed, 10 insertions, 9 deletions

diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts
index 85bbc9fed..06ff95df0 100644
--- a/src/client/documents/Documents.ts
+++ b/src/client/documents/Documents.ts
@@ -172,6 +172,7 @@ export class DocumentOptions {
     'acl-Public'?: string; // public permissions
     '_acl-Public'?: string; // public permissions
     type?: DTYPEt = new DTypeInfo('type of document', true);
+    type_collection?: COLLt = new CTypeInfo('how collection is rendered'); // sub type of a collection
     _type_collection?: COLLt = new CTypeInfo('how collection is rendered'); // sub type of a collection
     title?: STRt = new StrInfo('title of document');
     caption?: RichTextField;
@@ -1157,7 +1158,7 @@ export namespace Docs {
         }
 
         export function DockDocument(documents: Array<Doc>, config: string, options: DocumentOptions, id?: string) {
-            return InstanceFromProto(Prototypes.get(DocumentType.COL), new List(documents), { treeViewFreezeChildren: 'remove|add', ...options, _type_collection: CollectionViewType.Docking, dockingConfig: config }, id);
+            return InstanceFromProto(Prototypes.get(DocumentType.COL), new List(documents), { treeViewFreezeChildren: 'remove|add', ...options, type_collection: CollectionViewType.Docking, dockingConfig: config }, id);
         }
 
         export function DirectoryImportDocument(options: DocumentOptions = {}) {
diff --git a/src/client/views/collections/CollectionSubView.tsx b/src/client/views/collections/CollectionSubView.tsx
index 78789247f..c189ef126 100644
--- a/src/client/views/collections/CollectionSubView.tsx
+++ b/src/client/views/collections/CollectionSubView.tsx
@@ -230,7 +230,6 @@ export function CollectionSubView<X>(moreProps?: X) {
                 added === true && e.stopPropagation();
                 return added ? true : false;
             } else if (de.complete.annoDragData) {
-                e.stopPropagation();
                 const dropCreator = de.complete.annoDragData.dropDocCreator;
                 de.complete.annoDragData.dropDocCreator = () => {
                     const dropped = dropCreator(this.props.isAnnotationOverlay ? this.rootDoc : undefined);
diff --git a/src/client/views/nodes/DataVizBox/DataVizBox.tsx b/src/client/views/nodes/DataVizBox/DataVizBox.tsx
index 0fe24fe8d..d548ab9f1 100644
--- a/src/client/views/nodes/DataVizBox/DataVizBox.tsx
+++ b/src/client/views/nodes/DataVizBox/DataVizBox.tsx
@@ -71,13 +71,14 @@ export class DataVizBox extends ViewBoxAnnotatableComponent<FieldViewProps>() {
     };
 
     getAnchor = (addAsAnnotation?: boolean, pinProps?: PinProps) => {
-        const anchor =
-            this._chartRenderer?.getAnchor(pinProps) ??
-            Docs.Create.ConfigDocument({
-                // when we clear selection -> we should have it so chartBox getAnchor returns undefined
-                // this is for when we want the whole doc (so when the chartBox getAnchor returns without a marker)
-                /*put in some options*/
-            });
+        const anchor = !pinProps
+            ? this.rootDoc
+            : this._chartRenderer?.getAnchor(pinProps) ??
+              Docs.Create.ConfigDocument({
+                  // when we clear selection -> we should have it so chartBox getAnchor returns undefined
+                  // this is for when we want the whole doc (so when the chartBox getAnchor returns without a marker)
+                  /*put in some options*/
+              });
 
         anchor.presDataVizView = this.dataVizView;
         anchor.presDataVizAxes = this.axes.length ? new List<string>(this.axes) : undefined;