1 files changed, 59 insertions, 25 deletions

diff --git a/src/client/views/DocComponent.tsx b/src/client/views/DocComponent.tsx
index de4df1830..fd29b1ca4 100644
--- a/src/client/views/DocComponent.tsx
+++ b/src/client/views/DocComponent.tsx
@@ -1,22 +1,52 @@
 import { action, computed, makeObservable, observable } from 'mobx';
 import * as React from 'react';
-import { returnFalse } from '../../Utils';
+import { returnFalse } from '../../ClientUtils';
 import { DateField } from '../../fields/DateField';
-import { Doc, DocListCast, Field, Opt } from '../../fields/Doc';
-import { AclAdmin, AclAugment, AclEdit, AclPrivate, AclReadonly, DocData } from '../../fields/DocSymbols';
+import { Doc, DocListCast, FieldType, Opt } from '../../fields/Doc';
+import { AclAdmin, AclAugment, AclEdit, AclPrivate, AclReadonly, DocData, DocViews } from '../../fields/DocSymbols';
 import { List } from '../../fields/List';
 import { RefField } from '../../fields/RefField';
 import { GetEffectiveAcl, inheritParentAcls } from '../../fields/util';
 import { DocumentType } from '../documents/DocumentTypes';
-import { DocUtils } from '../documents/Documents';
-import { DocumentManager } from '../util/DocumentManager';
 import { DragManager } from '../util/DragManager';
 import { ObservableReactComponent } from './ObservableReactComponent';
-import { CollectionFreeFormView } from './collections/collectionFreeForm';
 import { DocumentView, OpenWhere } from './nodes/DocumentView';
 import { FieldViewProps, FocusViewOptions } from './nodes/FieldView';
-import { PinProps } from './nodes/trails';
+// import { DocUtils } from '../documents/Documents';
 
+export interface pinDataTypes {
+    scrollable?: boolean;
+    dataviz?: number[];
+    pannable?: boolean;
+    type_collection?: boolean;
+    inkable?: boolean;
+    filters?: boolean;
+    pivot?: boolean;
+    temporal?: boolean;
+    clippable?: boolean;
+    datarange?: boolean;
+    dataview?: boolean;
+    poslayoutview?: boolean;
+    dataannos?: boolean;
+    map?: boolean;
+}
+
+export interface MarqueeViewBounds {
+    left: number;
+    top: number;
+    width: number;
+    height: number;
+}
+export interface PinProps {
+    audioRange?: boolean;
+    activeFrame?: number;
+    currentFrame?: number;
+    hidePresBox?: boolean;
+    pinViewport?: MarqueeViewBounds; // pin a specific viewport on a freeform view (use MarqueeView.CurViewBounds to compute if no region has been selected)
+    pinDocLayout?: boolean; // pin layout info (width/height/x/y)
+    pinAudioPlay?: boolean; // pin audio annotation
+    pinData?: pinDataTypes;
+}
 /**
  * Shared interface among all viewBox'es (ie, react classes that render the contents of a Doc)
  * Many of these methods only make sense for specific viewBox'es, but they should be written to
@@ -25,6 +55,7 @@ import { PinProps } from './nodes/trails';
 export interface ViewBoxInterface {
     fieldKey?: string;
     annotationKey?: string;
+    promoteCollection?: () => void; // moves contents of collection to parent
     updateIcon?: () => void; // updates the icon representation of the document
     getAnchor?: (addAsAnnotation: boolean, pinData?: PinProps) => Doc; // returns an Anchor Doc that represents the current state of the doc's componentview (e.g., the current playhead location of a an audio/video box)
     restoreView?: (viewSpec: Doc) => boolean;
@@ -46,7 +77,7 @@ export interface ViewBoxInterface {
     IsPlaying?: () => boolean; // is a media document playing
     TogglePause?: (keep?: boolean) => void; // toggle media document playing state
     setFocus?: () => void; // sets input focus to the componentView
-    setData?: (data: Field | Promise<RefField | undefined>) => boolean;
+    setData?: (data: FieldType | Promise<RefField | undefined>) => boolean;
     componentUI?: (boundsLeft: number, boundsTop: number) => JSX.Element | null;
     dragStarting?: (snapToDraggedDoc: boolean, showGroupDragTarget: boolean, visited: Set<Doc>) => void;
     dragConfig?: (dragData: DragManager.DocumentDragData) => void; // function to setup dragData in custom way (see TreeViews which add a tree view flag)
@@ -218,7 +249,7 @@ export function ViewBoxAnnotatableComponent<P extends FieldViewProps>() {
         removeDocument(doc: Doc | Doc[], annotationKey?: string, leavePushpin?: boolean, dontAddToRemoved?: boolean): boolean {
             const effectiveAcl = GetEffectiveAcl(this.dataDoc);
             const indocs = doc instanceof Doc ? [doc] : doc;
-            const docs = indocs.filter(doc => [AclEdit, AclAdmin].includes(effectiveAcl) || GetEffectiveAcl(doc) === AclAdmin);
+            const docs = indocs.filter(fdoc => [AclEdit, AclAdmin].includes(effectiveAcl) || GetEffectiveAcl(fdoc) === AclAdmin);
 
             // docs.forEach(doc => doc.annotationOn === this.Document && Doc.SetInPlace(doc, 'annotationOn', undefined, true));
             const targetDataDoc = this.Document[DocData]; // this.dataDoc;  // we want to write to the template, not the actual data doc
@@ -227,17 +258,17 @@ export function ViewBoxAnnotatableComponent<P extends FieldViewProps>() {
 
             if (toRemove.length !== 0) {
                 const recentlyClosed = this.Document !== Doc.MyRecentlyClosed ? Doc.MyRecentlyClosed : undefined;
-                toRemove.forEach(doc => {
-                    leavePushpin && DocUtils.LeavePushpin(doc, annotationKey ?? this.annotationKey);
-                    Doc.RemoveDocFromList(targetDataDoc, annotationKey ?? this.annotationKey, doc, true);
-                    doc.embedContainer = undefined;
-                    if (recentlyClosed && !dontAddToRemoved && doc.type !== DocumentType.LOADING) {
-                        Doc.AddDocToList(recentlyClosed, 'data', doc, undefined, true, true);
-                        Doc.RemoveEmbedding(doc, doc);
+                toRemove.forEach(rdoc => {
+                    // leavePushpin && DocUtils.LeavePushpin(doc, annotationKey ?? this.annotationKey);
+                    Doc.RemoveDocFromList(targetDataDoc, annotationKey ?? this.annotationKey, rdoc, true);
+                    rdoc.embedContainer = undefined;
+                    if (recentlyClosed && !dontAddToRemoved && rdoc.type !== DocumentType.LOADING) {
+                        Doc.AddDocToList(recentlyClosed, 'data', rdoc, undefined, true, true);
+                        Doc.RemoveEmbedding(rdoc, rdoc);
                     }
                 });
                 if (targetDataDoc.isGroup && DocListCast(targetDataDoc[annotationKey ?? this.annotationKey]).length < 2) {
-                    (DocumentManager.Instance.getFirstDocumentView(targetDataDoc)?.ComponentView as CollectionFreeFormView)?.promoteCollection();
+                    Array.from(targetDataDoc[DocViews])[0]?.ComponentView?.promoteCollection?.();
                 } else {
                     this.isAnyChildContentActive() && this._props.select(false);
                 }
@@ -264,7 +295,7 @@ export function ViewBoxAnnotatableComponent<P extends FieldViewProps>() {
         @action.bound
         addDocument = (doc: Doc | Doc[], annotationKey?: string): boolean => {
             const docs = doc instanceof Doc ? [doc] : doc;
-            if (this._props.filterAddDocument?.(docs) === false || docs.find(doc => Doc.AreProtosEqual(doc, this.Document) && Doc.LayoutField(doc) === Doc.LayoutField(this.Document))) {
+            if (this._props.filterAddDocument?.(docs) === false || docs.find(fdoc => Doc.AreProtosEqual(fdoc, this.Document) && Doc.LayoutField(fdoc) === Doc.LayoutField(this.Document))) {
                 return false;
             }
             const targetDataDoc = this.Document[DocData]; // this.dataDoc;  // we want to write to the template, not the actual data doc
@@ -276,12 +307,12 @@ export function ViewBoxAnnotatableComponent<P extends FieldViewProps>() {
             const added = docs;
             if (added.length) {
                 if ([AclAugment, AclEdit, AclAdmin].includes(effectiveAcl)) {
-                    added.forEach(doc => {
-                        doc._dragOnlyWithinContainer = undefined;
-                        if (annotationKey ?? this._annotationKeySuffix()) doc[DocData].annotationOn = this.Document;
-                        else doc[DocData].annotationOn = undefined;
-                        Doc.SetContainer(doc, this.Document);
-                        inheritParentAcls(targetDataDoc, doc, true);
+                    added.forEach(adoc => {
+                        adoc._dragOnlyWithinContainer = undefined;
+                        if (annotationKey ?? this._annotationKeySuffix()) adoc[DocData].annotationOn = this.Document;
+                        else adoc[DocData].annotationOn = undefined;
+                        Doc.SetContainer(adoc, this.Document);
+                        inheritParentAcls(targetDataDoc, adoc, true);
                     });
 
                     const annoDocs = Doc.Get(targetDataDoc, annotationKey ?? this.annotationKey, true) as List<Doc>; // get the dataDoc directly ... when using templates there may be some default items already there, but we can't change them, so we copy them below (should really be some kind of inheritance since the template contents could change)
@@ -295,7 +326,10 @@ export function ViewBoxAnnotatableComponent<P extends FieldViewProps>() {
 
         isAnyChildContentActive = () => this._isAnyChildContentActive;
 
-        whenChildContentsActiveChanged = action((isActive: boolean) => this._props.whenChildContentsActiveChanged((this._isAnyChildContentActive = isActive)));
+        whenChildContentsActiveChanged = action((isActive: boolean) => {
+            this._isAnyChildContentActive = isActive;
+            this._props.whenChildContentsActiveChanged(isActive);
+        });
     }
     return Component;
 }