Merge branch 'restoringEslint' into sarah-ai-visualization

1 files changed, 53 insertions, 44 deletions

diff --git a/src/client/util/UndoManager.ts b/src/client/util/UndoManager.ts
index 857ca852f..534ffd2c8 100644
--- a/src/client/util/UndoManager.ts
+++ b/src/client/util/UndoManager.ts
@@ -1,7 +1,9 @@
-import { observable, action, runInAction } from 'mobx';
-import { Doc, Field } from '../../fields/Doc';
-import { RichTextField } from '../../fields/RichTextField';
+/* eslint-disable prefer-spread */
+/* eslint-disable no-use-before-define */
+import { action, observable, runInAction } from 'mobx';
 import { Without } from '../../Utils';
+import { RichTextField } from '../../fields/RichTextField';
+import { SnappingManager } from './SnappingManager';
 
 function getBatchName(target: any, key: string | symbol): string {
     const keyName = key.toString();
@@ -37,10 +39,11 @@ function propertyDecorator(target: any, key: string | symbol) {
 }
 
 export function undoable(fn: (...args: any[]) => any, batchName: string): (...args: any[]) => any {
-    return function () {
+    return function (...fargs) {
         const batch = UndoManager.StartBatch(batchName);
         try {
-            return fn.apply(undefined, arguments as any);
+            // eslint-disable-next-line prefer-rest-params
+            return fn.apply(undefined, fargs);
         } finally {
             batch.end();
         }
@@ -48,13 +51,15 @@ export function undoable(fn: (...args: any[]) => any, batchName: string): (...ar
 }
 
 export function undoBatch(target: any, key: string | symbol, descriptor?: TypedPropertyDescriptor<any>): any;
+// eslint-disable-next-line no-redeclare
 export function undoBatch(fn: (...args: any[]) => any): (...args: any[]) => any;
+// eslint-disable-next-line no-redeclare
 export function undoBatch(target: any, key?: string | symbol, descriptor?: TypedPropertyDescriptor<any>): any {
     if (!key) {
-        return function () {
+        return function (...fargs: any[]) {
             const batch = UndoManager.StartBatch('');
             try {
-                return target.apply(undefined, arguments);
+                return target.apply(undefined, fargs);
             } finally {
                 batch.end();
             }
@@ -62,7 +67,7 @@ export function undoBatch(target: any, key?: string | symbol, descriptor?: Typed
     }
     if (!descriptor) {
         propertyDecorator(target, key);
-        return;
+        return undefined;
     }
     const oldFunction = descriptor.value;
 
@@ -86,24 +91,28 @@ export namespace UndoManager {
     }
     type UndoBatch = UndoEvent[];
 
-    export let undoStackNames: string[] = observable([]);
-    export let redoStackNames: string[] = observable([]);
-    export let undoStack: UndoBatch[] = observable([]);
-    export let redoStack: UndoBatch[] = observable([]);
     let currentBatch: UndoBatch | undefined;
-    export let batchCounter = observable.box(0);
     let undoing = false;
-    export let tempEvents: UndoEvent[] | undefined = undefined;
+    let tempEvents: UndoEvent[] | undefined;
+    export const undoStackNames: string[] = observable([]);
+    export const redoStackNames: string[] = observable([]);
+    export const undoStack: UndoBatch[] = observable([]);
+    export const redoStack: UndoBatch[] = observable([]);
+    export const batchCounter = observable.box(0);
+    let _fieldPrinter: (val: any) => string = val => val?.toString();
+    export function SetFieldPrinter(printer: (val: any) => string) {
+        _fieldPrinter = printer;
+    }
 
     export function AddEvent(event: UndoEvent, value?: any): void {
         if (currentBatch && batchCounter.get() && !undoing) {
-            Doc.MyDockedBtns.linearView_IsOpen &&
+            SnappingManager.PrintToConsole &&
                 console.log(
                     '                         '.slice(0, batchCounter.get()) +
                         'UndoEvent : ' +
                         event.prop +
-                        ' = ' +
-                        (value instanceof RichTextField ? value.Text : value instanceof Array ? value.map(val => Field.toJavascriptString(val)).join(',') : Field.toJavascriptString(value))
+                        ' = ' + // prettier-ignore
+                        (value instanceof RichTextField ? value.Text : value instanceof Array ? value.map(_fieldPrinter).join(',') : _fieldPrinter(value))
                 );
             currentBatch.push(event);
             tempEvents?.push(event);
@@ -129,21 +138,22 @@ export namespace UndoManager {
     }
     export function FilterBatches(fieldTypes: string[]) {
         const fieldCounts: { [key: string]: number } = {};
-        const lastStack = UndoManager.undoStack.slice(-1)[0]; //.lastElement();
+        const lastStack = UndoManager.undoStack.slice(-1)[0]; // .lastElement();
         if (lastStack) {
-            lastStack.forEach(ev => fieldTypes.includes(ev.prop) && (fieldCounts[ev.prop] = (fieldCounts[ev.prop] || 0) + 1));
+            lastStack.forEach(ev => {
+                fieldTypes.includes(ev.prop) && (fieldCounts[ev.prop] = (fieldCounts[ev.prop] || 0) + 1);
+            });
             const fieldCount2: { [key: string]: number } = {};
-            runInAction(
-                () =>
-                    (UndoManager.undoStack[UndoManager.undoStack.length - 1] = lastStack.filter(ev => {
-                        if (fieldTypes.includes(ev.prop)) {
-                            fieldCount2[ev.prop] = (fieldCount2[ev.prop] || 0) + 1;
-                            if (fieldCount2[ev.prop] === 1 || fieldCount2[ev.prop] === fieldCounts[ev.prop]) return true;
-                            return false;
-                        }
-                        return true;
-                    }))
-            );
+            runInAction(() => {
+                UndoManager.undoStack[UndoManager.undoStack.length - 1] = lastStack.filter(ev => {
+                    if (fieldTypes.includes(ev.prop)) {
+                        fieldCount2[ev.prop] = (fieldCount2[ev.prop] || 0) + 1;
+                        if (fieldCount2[ev.prop] === 1 || fieldCount2[ev.prop] === fieldCounts[ev.prop]) return true;
+                        return false;
+                    }
+                    return true;
+                });
+            });
         }
     }
     export function TraceOpenBatches() {
@@ -160,11 +170,10 @@ export namespace UndoManager {
             if (this.disposed) {
                 console.log('WARNING: undo batch already disposed');
                 return false;
-            } else {
-                this.disposed = true;
-                openBatches.splice(openBatches.indexOf(this));
-                return EndBatch(this.batchName, cancel);
             }
+            this.disposed = true;
+            openBatches.splice(openBatches.indexOf(this));
+            return EndBatch(this.batchName, cancel);
         };
 
         end = () => this.dispose(false);
@@ -172,7 +181,7 @@ export namespace UndoManager {
     }
 
     export function StartBatch(batchName: string): Batch {
-        Doc.MyDockedBtns.linearView_IsOpen && console.log('                          '.slice(0, batchCounter.get()) + 'Start ' + batchCounter + ' ' + batchName);
+        SnappingManager.PrintToConsole && console.log('                          '.slice(0, batchCounter.get()) + 'Start ' + batchCounter + ' ' + batchName);
         runInAction(() => batchCounter.set(batchCounter.get() + 1));
         if (currentBatch === undefined) {
             currentBatch = [];
@@ -182,7 +191,7 @@ export namespace UndoManager {
 
     const EndBatch = action((batchName: string, cancel: boolean = false) => {
         runInAction(() => batchCounter.set(batchCounter.get() - 1));
-        Doc.MyDockedBtns.linearView_IsOpen && console.log('                          '.slice(0, batchCounter.get()) + 'End ' + batchName + ' (' + currentBatch?.length + ')');
+        SnappingManager.PrintToConsole && console.log('                          '.slice(0, batchCounter.get()) + 'End ' + batchName + ' (' + (currentBatch?.length ?? 0) + ')');
         if (batchCounter.get() === 0 && currentBatch?.length) {
             if (!cancel) {
                 undoStack.push(currentBatch);
@@ -199,10 +208,10 @@ export namespace UndoManager {
     export function StartTempBatch() {
         tempEvents = [];
     }
-    export function EndTempBatch<T>(success: boolean) {
+    export function EndTempBatch(success: boolean) {
         UndoManager.UndoTempBatch(success);
     }
-    //TODO Make this return the return value
+    // TODO Make this return the return value
     export function RunInBatch<T>(fn: () => T, batchName: string) {
         const batch = StartBatch(batchName);
         try {
@@ -234,9 +243,11 @@ export namespace UndoManager {
         }
 
         undoing = true;
-        for (let i = commands.length - 1; i >= 0; i--) {
-            commands[i].undo();
-        }
+        // eslint-disable-next-line prettier/prettier
+        commands
+            .slice()
+            .reverse()
+            .forEach(command => command.undo());
         undoing = false;
 
         redoStackNames.push(names ?? '???');
@@ -255,9 +266,7 @@ export namespace UndoManager {
         }
 
         undoing = true;
-        for (const command of commands) {
-            command.redo();
-        }
+        commands.forEach(command => command.redo());
         undoing = false;
 
         undoStackNames.push(names ?? '???');