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

1 files changed, 12 insertions, 12 deletions

diff --git a/src/client/util/TrackMovements.ts b/src/client/util/TrackMovements.ts
index f9c2d522f..25a3c9ad8 100644
--- a/src/client/util/TrackMovements.ts
+++ b/src/client/util/TrackMovements.ts
@@ -1,8 +1,7 @@
-import { IReactionDisposer, makeObservable, observable, observe, reaction } from 'mobx';
+import { IReactionDisposer, makeObservable, observable, reaction } from 'mobx';
 import { NumCast } from '../../fields/Types';
 import { Doc, DocListCast } from '../../fields/Doc';
 import { CollectionDockingView } from '../views/collections/CollectionDockingView';
-import { Id } from '../../fields/FieldSymbols';
 import { CollectionViewType } from '../documents/DocumentTypes';
 
 export type Movement = {
@@ -33,6 +32,7 @@ export class TrackMovements {
     private tabChangeDisposeFunc: IReactionDisposer | null;
 
     // create static instance and getter for global use
+    // eslint-disable-next-line no-use-before-define
     @observable static _instance: TrackMovements;
     static get Instance(): TrackMovements {
         return TrackMovements._instance;
@@ -92,12 +92,13 @@ export class TrackMovements {
         // so that the size comparisons are correct, we must filter to only the FFViews
         const isFFView = (doc: Doc) => doc && doc._type_collection === CollectionViewType.Freeform;
         const tabbedFFViews = new Set<Doc>();
-        for (const DashDoc of tabbedDocs) {
+        tabbedDocs.forEach(DashDoc => {
             if (isFFView(DashDoc)) tabbedFFViews.add(DashDoc);
-        }
+        });
 
         // new tab was added - need to add it
         if (tabbedFFViews.size > this.recordingFFViews.size) {
+            // eslint-disable-next-line no-restricted-syntax
             for (const DashDoc of tabbedDocs) {
                 if (!this.recordingFFViews.has(DashDoc)) {
                     if (isFFView(DashDoc)) {
@@ -111,6 +112,7 @@ export class TrackMovements {
         }
         // tab was removed - need to remove it from recordingFFViews
         else if (tabbedFFViews.size < this.recordingFFViews.size) {
+            // eslint-disable-next-line no-restricted-syntax
             for (const [doc] of this.recordingFFViews) {
                 if (!tabbedFFViews.has(doc)) {
                     this.removeRecordingFFView(doc);
@@ -208,11 +210,11 @@ export class TrackMovements {
             return;
         }
 
-        for (const [id, disposeFunc] of this.recordingFFViews) {
+        Array.from(this.recordingFFViews).forEach(([id, disposeFunc]) => {
             // console.info('calling dispose func : docId', id);
             disposeFunc();
-            this.recordingFFViews.delete(id);
-        }
+            this.recordingFFViews?.delete(id);
+        });
     };
 
     private trackMovement = (panX: number, panY: number, doc: Doc, scale: number = 0) => {
@@ -241,9 +243,9 @@ export class TrackMovements {
     // method that concatenates an array of presentatations into one
     public concatPresentations = (presentations: Presentation[]): Presentation => {
         // these three will lead to the combined presentation
-        let combinedMovements: Movement[] = [];
+        const combinedMovements: Movement[] = [];
         let sumTime = 0;
-        let combinedMetas: any[] = [];
+        const combinedMetas: any[] = [];
 
         presentations.forEach(presentation => {
             const { movements, totalTime, meta } = presentation;
@@ -251,9 +253,7 @@ export class TrackMovements {
             // update movements if they had one
             if (movements) {
                 // add the summed time to the movements
-                const addedTimeMovements = movements.map(move => {
-                    return { ...move, time: move.time + sumTime };
-                });
+                const addedTimeMovements = movements.map(move => ({ ...move, time: move.time + sumTime }));
                 // concat the movements already in the combined presentation with these new ones
                 combinedMovements.push(...addedTimeMovements);
             }