1 files changed, 81 insertions, 2 deletions

diff --git a/src/client/views/nodes/button/FontIconBox.tsx b/src/client/views/nodes/button/FontIconBox.tsx
index ca13590de..fc0cc87ca 100644
--- a/src/client/views/nodes/button/FontIconBox.tsx
+++ b/src/client/views/nodes/button/FontIconBox.tsx
@@ -5,17 +5,19 @@ import { action, computed, observable } from 'mobx';
 import { observer } from 'mobx-react';
 import * as React from 'react';
 import { ColorState, SketchPicker } from 'react-color';
-import { Doc, StrListCast } from '../../../../fields/Doc';
+import { DataSym, Doc, DocListCast, HeightSym, StrListCast, WidthSym } from '../../../../fields/Doc';
 import { InkTool } from '../../../../fields/InkField';
 import { createSchema } from '../../../../fields/Schema';
 import { ScriptField } from '../../../../fields/ScriptField';
 import { BoolCast, Cast, NumCast, ScriptCast, StrCast } from '../../../../fields/Types';
 import { WebField } from '../../../../fields/URLField';
-import { Utils } from '../../../../Utils';
+import { aggregateBounds, Utils } from '../../../../Utils';
 import { DocumentType } from '../../../documents/DocumentTypes';
+import { DocumentManager } from '../../../util/DocumentManager';
 import { ScriptingGlobals } from "../../../util/ScriptingGlobals";
 import { SelectionManager } from '../../../util/SelectionManager';
 import { undoBatch, UndoManager } from '../../../util/UndoManager';
+import { CollectionFreeFormView } from '../../collections/collectionFreeForm';
 import { CollectionViewType } from '../../collections/CollectionView';
 import { ContextMenu } from '../../ContextMenu';
 import { DocComponent } from '../../DocComponent';
@@ -701,6 +703,80 @@ ScriptingGlobals.add(function toggleItalic(checkResult?: boolean) {
  **/
 
 ScriptingGlobals.add(function setActiveInkTool(tool: string, checkResult?: boolean) {
+    // if the global collection has documents
+    // const unallocInk: Doc[] = DocListCast(Doc.UserDoc().unallocatedInkDocs)
+    // if (unallocInk.length) {
+        // get collection freeform view from the ink documents
+        // with that, we can call gesture overlay getCollection on the view
+        // use getDocumentView 
+        // You would want to call: DocumentManager.Instance.getDocumentView
+        // const docView = DocumentManager.Instance.getDocumentView(unallocInk[0])
+        // if (docView) {
+        //     docView.props.ContainingCollectionView
+        // }
+
+        // easy way without backing up to the server
+        // 
+    CollectionFreeFormView.collectionsWithUnprocessedInk.forEach(ffView => {
+        const selected = ffView.unprocessedDocs;
+        ffView._marqueeViewRef.current?.getCollection(ffView.unprocessedDocs, undefined, [], true);
+        // loop through selected an get the bound
+        const bounds: { x: number, y: number, width?: number, height?: number }[] = []
+        
+        selected.map(action(d => {
+            const x = NumCast(d.x);
+            const y = NumCast(d.y);
+            const width = d[WidthSym]();
+            const height = d[HeightSym]();
+            bounds.push({x, y, width, height});
+        }))
+
+        const aggregBounds = aggregateBounds(bounds, 0, 0);
+        const marqViewRef = ffView._marqueeViewRef.current;
+
+        // set the vals for bounds in marqueeView
+        if (marqViewRef) {
+            marqViewRef._downX = aggregBounds.x;
+            marqViewRef._downY = aggregBounds.y;
+            marqViewRef._lastX = aggregBounds.r;
+            marqViewRef._lastY = aggregBounds.b;
+        }        
+
+        selected.map(action(d => {
+            const dx = NumCast(d.x);
+            const dy = NumCast(d.y);
+            delete d.x;
+            delete d.y;
+            delete d.activeFrame;
+            delete d._timecodeToShow;  // bcz: this should be automatic somehow.. along with any other properties that were logically associated with the original collection
+            delete d._timecodeToHide;  // bcz: this should be automatic somehow.. along with any other properties that were logically associated with the original collection
+            // TODO: nda - actually calc the bounds
+            // get the bounds
+            // d.x = dx - aggregBounds.x;
+            // d.y = dy - aggregBounds.y;
+            
+            // d.x = dx - aggregBounds.x ;
+            // d.y = dy;
+            if (marqViewRef?.Bounds) {
+                d.x = dx - marqViewRef.Bounds.left - marqViewRef.Bounds?.width / 2;
+                d.y = dy - marqViewRef.Bounds.top - marqViewRef.Bounds.height / 2;
+            }
+            console.log(d[DataSym], d.x, d.y)
+            return d;
+        }));
+        ffView.props.removeDocument?.(selected);
+        // TODO: nda - this is the code to actually get a new grouped collection
+        // const newCollection = ffView._marqueeViewRef.current?.getCollection(ffView.unprocessedDocs, undefined, [], true);
+        const newCollection = marqViewRef?.getCollection(selected, undefined, [], true);
+        console.log("newcoll:", newCollection?.[DataSym]);
+
+        // nda - bug: when deleting a stroke before leaving writing mode, delete the stroke from unprocessed ink docs
+        newCollection && ffView.props.addDocument?.(newCollection);
+        ffView.unprocessedDocs = [];
+    });
+
+    CollectionFreeFormView.collectionsWithUnprocessedInk.clear();
+
     if (checkResult) {
         return ((Doc.UserDoc().activeInkTool === tool && !GestureOverlay.Instance?.InkShape) || GestureOverlay.Instance?.InkShape === tool) ?
             Colors.MEDIUM_BLUE : "transparent";
@@ -716,6 +792,9 @@ ScriptingGlobals.add(function setActiveInkTool(tool: string, checkResult?: boole
     } else if (tool) { // pen or eraser
         if (Doc.UserDoc().activeInkTool === tool && !GestureOverlay.Instance.InkShape) {
             Doc.UserDoc().activeInkTool = InkTool.None;
+        } else if (tool == "write") {
+            console.log("write mode selected - create groupDoc here!")
+            // 
         } else {
             Doc.UserDoc().activeInkTool = tool;
             GestureOverlay.Instance.InkShape = "";