1 files changed, 40 insertions, 37 deletions
diff --git a/src/client/util/DropConverter.ts b/src/client/util/DropConverter.ts
index ed5749d06..0314af06b 100644
--- a/src/client/util/DropConverter.ts
+++ b/src/client/util/DropConverter.ts
@@ -1,10 +1,9 @@
-import { Doc, DocListCast, Opt } from '../../fields/Doc';
+import { Doc, DocListCast, StrListCast } from '../../fields/Doc';
 import { DocData } from '../../fields/DocSymbols';
 import { ObjectField } from '../../fields/ObjectField';
 import { RichTextField } from '../../fields/RichTextField';
-import { listSpec } from '../../fields/Schema';
 import { ComputedField, ScriptField } from '../../fields/ScriptField';
-import { Cast, StrCast } from '../../fields/Types';
+import { StrCast } from '../../fields/Types';
 import { ImageField } from '../../fields/URLField';
 import { Docs } from '../documents/Documents';
 import { DocumentType } from '../documents/DocumentTypes';
@@ -13,21 +12,6 @@ import { DragManager } from './DragManager';
 import { ScriptingGlobals } from './ScriptingGlobals';
 
 /**
- * Converts a Doc to a render template that can be applied to other Docs to customize how they render while
- * still using the other Doc as the backing data store (ie, dataDoc). During rendering, if a layout Doc is provided
- * with 'isTemplateDoc' set, then the layout Doc is treated as a template for the rendered Doc.  The template Doc is
- * "expanded" to create an template instance for the rendered Doc.
- *
- *
- * @param doc the doc to convert to a template
- * @returns 'doc'
- */
-export function MakeTemplate(doc: Doc) {
-    doc.isTemplateDoc = makeTemplate(doc, true);
-    return doc;
-}
-
-/**
  *
  * Recursively converts 'doc' into a template that can be used to render other documents.
  *
@@ -63,26 +47,22 @@ function makeTemplate(doc: Doc, first: boolean = true): boolean {
     }
     return isTemplate;
 }
-export function convertDropDataToButtons(data: DragManager.DocumentDragData) {
-    data?.draggedDocuments.map((doc, i) => {
-        let dbox = doc;
-        // bcz: isButtonBar is intended to allow a collection of linear buttons to be dropped and nested into another collection of buttons... it's not being used yet, and isn't very elegant
-        if (doc.type === DocumentType.FONTICON || StrCast(Doc.Layout(doc).layout).includes(FontIconBox.name)) {
-            if (data.dropPropertiesToRemove || dbox.dropPropertiesToRemove) {
-                //dbox = Doc.MakeEmbedding(doc);  // don't need to do anything if dropping an icon doc onto an icon bar since there should be no layout data for an icon
-                dbox = Doc.MakeEmbedding(dbox);
-                const dragProps = Cast(dbox.dropPropertiesToRemove, listSpec('string'), []);
-                const remProps = (data.dropPropertiesToRemove || []).concat(Array.from(dragProps));
-                remProps.map(prop => (dbox[prop] = undefined));
-            }
-        } else if (!doc.onDragStart && !doc.isButtonBar) {
-            dbox = makeUserTemplateButton(doc);
-        } else if (doc.isButtonBar) {
-            dbox.ignoreClick = true;
-        }
-        data.droppedDocuments[i] = dbox;
-    });
+
+/**
+ * Converts a Doc to a render template that can be applied to other Docs to customize how they render while
+ * still using the other Doc as the backing data store (ie, dataDoc). During rendering, if a layout Doc is provided
+ * with 'isTemplateDoc' set, then the layout Doc is treated as a template for the rendered Doc.  The template Doc is
+ * "expanded" to create an template instance for the rendered Doc.
+ *
+ *
+ * @param doc the doc to convert to a template
+ * @returns 'doc'
+ */
+export function MakeTemplate(doc: Doc) {
+    doc.isTemplateDoc = makeTemplate(doc, true);
+    return doc;
 }
+
 export function makeUserTemplateButton(doc: Doc) {
     const layoutDoc = doc; // doc.layout instanceof Doc && doc.layout.isTemplateForField ? doc.layout : doc;
     if (layoutDoc.type !== DocumentType.FONTICON) {
@@ -106,7 +86,30 @@ export function makeUserTemplateButton(doc: Doc) {
     dbox.onDragStart = ScriptField.MakeFunction('getCopy(this.dragFactory)');
     return dbox;
 }
+export function convertDropDataToButtons(data: DragManager.DocumentDragData) {
+    data?.draggedDocuments.forEach((doc, i) => {
+        let dbox = doc;
+        // bcz: isButtonBar is intended to allow a collection of linear buttons to be dropped and nested into another collection of buttons... it's not being used yet, and isn't very elegant
+        if (doc.type === DocumentType.FONTICON || StrCast(Doc.Layout(doc).layout).includes(FontIconBox.name)) {
+            if (data.dropPropertiesToRemove || dbox.dropPropertiesToRemove) {
+                // dbox = Doc.MakeEmbedding(doc);  // don't need to do anything if dropping an icon doc onto an icon bar since there should be no layout data for an icon
+                dbox = Doc.MakeEmbedding(dbox);
+                const dragProps = StrListCast(dbox.dropPropertiesToRemove);
+                const remProps = (data.dropPropertiesToRemove || []).concat(Array.from(dragProps));
+                remProps.forEach(prop => {
+                    dbox[prop] = undefined;
+                });
+            }
+        } else if (!doc.onDragStart && !doc.isButtonBar) {
+            dbox = makeUserTemplateButton(doc);
+        } else if (doc.isButtonBar) {
+            dbox.ignoreClick = true;
+        }
+        data.droppedDocuments[i] = dbox;
+    });
+}
 ScriptingGlobals.add(
+    // eslint-disable-next-line prefer-arrow-callback
     function convertToButtons(dragData: any) {
         convertDropDataToButtons(dragData as DragManager.DocumentDragData);
     },