Merge branch 'master' into zach-starter

1 files changed, 7 insertions, 7 deletions

diff --git a/src/client/util/BranchingTrailManager.tsx b/src/client/util/BranchingTrailManager.tsx
index 119d103c5..65336812d 100644
--- a/src/client/util/BranchingTrailManager.tsx
+++ b/src/client/util/BranchingTrailManager.tsx
@@ -15,18 +15,18 @@ export class BranchingTrailManager extends React.Component {
     public static Instance: BranchingTrailManager;
 
     // stack of the history
-    @observable private slideHistoryStack: String[] = [];
-    @observable private containsSet: Set<String> = new Set<String>();
+    @observable private slideHistoryStack: string[] = [];
+    @observable private containsSet: Set<string> = new Set<string>();
     // docId to Doc map
-    @observable private docIdToDocMap: Map<String, Doc> = new Map<String, Doc>();
+    @observable private docIdToDocMap: Map<string, Doc> = new Map<string, Doc>();
 
     // prev pres to copmare with
-    @observable private prevPresId: String | null = null;
-    @action setPrevPres = action((newId: String | null) => {
+    @observable private prevPresId: string | null = null;
+    @action setPrevPres = action((newId: string | null) => {
         this.prevPresId = newId;
     });
 
-    constructor(props: any) {
+    constructor(props: object) {
         super(props);
         makeObservable(this);
         if (!BranchingTrailManager.Instance) {
@@ -48,7 +48,7 @@ export class BranchingTrailManager extends React.Component {
         // Doc.AddToMyOverlay(hi);
     };
 
-    @action setSlideHistoryStack = action((newArr: String[]) => {
+    @action setSlideHistoryStack = action((newArr: string[]) => {
         this.slideHistoryStack = newArr;
     });