Merge branch 'master' of https://github.com/brown-dash/Dash-Web into nathan-starter

1 files changed, 8 insertions, 24 deletions

diff --git a/src/client/views/collections/CollectionSubView.tsx b/src/client/views/collections/CollectionSubView.tsx
index e250d7a90..5d32482c3 100644
--- a/src/client/views/collections/CollectionSubView.tsx
+++ b/src/client/views/collections/CollectionSubView.tsx
@@ -22,7 +22,7 @@ import { DragManager } from '../../util/DragManager';
 import { dropActionType } from '../../util/DropActionTypes';
 import { ImageUtils } from '../../util/Import & Export/ImageUtils';
 import { SnappingManager } from '../../util/SnappingManager';
-import { UndoManager, undoBatch } from '../../util/UndoManager';
+import { UndoManager } from '../../util/UndoManager';
 import { ViewBoxBaseComponent } from '../DocComponent';
 import { FieldViewProps } from '../nodes/FieldView';
 import { DocumentView } from '../nodes/DocumentView';
@@ -45,6 +45,7 @@ export interface CollectionViewProps extends React.PropsWithChildren<FieldViewPr
     childLayoutTemplate?: () => Doc | undefined; // specify a layout Doc template to use for children of the collection
     childHideDecorationTitle?: boolean;
     childHideResizeHandles?: boolean;
+    childHideDecorations?: boolean;
     childDragAction?: dropActionType;
     childXPadding?: number;
     childYPadding?: number;
@@ -67,7 +68,7 @@ export function CollectionSubView<X>() {
         private gestureDisposer?: GestureUtils.GestureEventDisposer;
         protected _mainCont?: HTMLDivElement;
 
-        constructor(props: any) {
+        constructor(props: X & SubCollectionViewProps) {
             super(props);
             makeObservable(this);
         }
@@ -121,6 +122,9 @@ export function CollectionSubView<X>() {
                 );
             return validPairs.map(({ data, layout }) => ({ data: data as Doc, layout: layout! })); // this mapping is a bit of a hack to coerce types
         }
+        /**
+         * This is the raw, stored list of children on a collection.  If you modify this list, the database will be updated
+         */
         @computed get childDocList() {
             return Cast(this.dataField, listSpec(Doc));
         }
@@ -217,7 +221,6 @@ export function CollectionSubView<X>() {
                 if (!cursors) {
                     proto.cursors = cursors = new List<CursorField>();
                 }
-                // eslint-disable-next-line no-cond-assign
                 if (cursors.length > 0 && (ind = cursors.findIndex(entry => entry.data.metadata.id === id)) > -1) {
                     cursors[ind].setPosition(pos);
                 } else {
@@ -227,7 +230,6 @@ export function CollectionSubView<X>() {
             }
         }
 
-        @undoBatch
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         protected onGesture(e: Event, ge: GestureUtils.GestureEvent) {}
 
@@ -251,7 +253,7 @@ export function CollectionSubView<X>() {
 
         protected onInternalDrop(e: Event, de: DragManager.DropEvent): boolean {
             const { docDragData } = de.complete;
-            if (docDragData) {
+            if (docDragData && !docDragData.draggedDocuments.includes(this.Document)) {
                 let added;
                 const dropAction = docDragData.dropAction || docDragData.userDropAction;
                 const targetDocments = DocListCast(this.dataDoc[this._props.fieldKey]);
@@ -294,7 +296,6 @@ export function CollectionSubView<X>() {
             return false;
         }
 
-        @undoBatch
         protected async onExternalDrop(e: React.DragEvent, options: DocumentOptions, completed?: (docs: Doc[]) => void) {
             if (e.ctrlKey) {
                 e.stopPropagation(); // bcz: this is a hack to stop propagation when dropping an image on a text document with shift+ctrl
@@ -386,7 +387,7 @@ export function CollectionSubView<X>() {
                         addDocument(htmlDoc);
                         if (srcWeb) {
                             const iframe = DocumentView.Selected()[0].ContentDiv?.getElementsByTagName('iframe')?.[0];
-                            const focusNode = iframe?.contentDocument?.getSelection()?.focusNode as any;
+                            const focusNode = iframe?.contentDocument?.getSelection()?.focusNode;
                             if (focusNode) {
                                 const anchor = srcWeb?.ComponentView?.getAnchor?.(true);
                                 anchor && DocUtils.MakeLink(htmlDoc, anchor, {});
@@ -465,23 +466,6 @@ export function CollectionSubView<X>() {
                 if (item.kind === 'file') {
                     const file = item.getAsFile();
                     file?.type && files.push(file);
-
-                    file?.type === 'application/json' &&
-                        ClientUtils.readUploadedFileAsText(file).then(result => {
-                            const json = JSON.parse(result as string);
-                            addDocument(
-                                Docs.Create.TreeDocument(
-                                    json['rectangular-puzzle'].crossword.clues[0].clue.map((c: any) => {
-                                        const label = Docs.Create.LabelDocument({ title: c['#text'], _width: 120, _height: 20 });
-                                        const proto = Doc.GetProto(label);
-                                        proto._width = 120;
-                                        proto._height = 20;
-                                        return proto;
-                                    }),
-                                    { _width: 150, _height: 600, title: 'across', backgroundColor: 'white', _createDocOnCR: true }
-                                )
-                            );
-                        });
                 }
             }
             this.slowLoadDocuments(files, options, generatedDocuments, text, completed, addDocument).then(batch.end);