From d562d41dea60cefdc915ae799ee3d6244b7f7345 Mon Sep 17 00:00:00 2001
From: Jordan Eldredge <jordan@jordaneldredge.com>
Date: Fri, 20 Sep 2019 06:22:44 -0700
Subject: [PATCH] Fix types for more Maki objects

---
 modern/src/runtime/List.ts       | 5 +++--
 modern/src/runtime/MouseRedir.ts | 8 +++++---
 tsconfig.json                    | 3 ++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/modern/src/runtime/List.ts b/modern/src/runtime/List.ts
index c938c11a..fa5804e7 100644
--- a/modern/src/runtime/List.ts
+++ b/modern/src/runtime/List.ts
@@ -1,10 +1,11 @@
 import MakiObject from "./MakiObject";
+import { XmlNode } from "../types";
 
 class List extends MakiObject {
   _list: Array<any>;
 
-  constructor(node, parent, annotations, store) {
-    super(node, parent, annotations, store);
+  constructor(node: XmlNode, parent: MakiObject, annotations: Object = {}) {
+    super(node, parent, annotations);
     this._list = [];
   }
 
diff --git a/modern/src/runtime/MouseRedir.ts b/modern/src/runtime/MouseRedir.ts
index 79fc1a36..b904c2e9 100644
--- a/modern/src/runtime/MouseRedir.ts
+++ b/modern/src/runtime/MouseRedir.ts
@@ -1,5 +1,7 @@
 import GuiObject from "./GuiObject";
 import { unimplementedWarning } from "../utils";
+import MakiMap from "./Map";
+import Region from "./Region";
 
 class MouseRedir extends GuiObject {
   /**
@@ -12,7 +14,7 @@ class MouseRedir extends GuiObject {
     return "MouseRedir";
   }
 
-  setredirection(o) {
+  setredirection(o: GuiObject) {
     unimplementedWarning("setredirection");
     return;
   }
@@ -22,12 +24,12 @@ class MouseRedir extends GuiObject {
     return;
   }
 
-  setregionfrommap(regionmap, threshold: number, reverse: boolean) {
+  setregionfrommap(regionmap: MakiMap, threshold: number, reverse: boolean) {
     unimplementedWarning("setregionfrommap");
     return;
   }
 
-  setregion(reg) {
+  setregion(reg: Region) {
     unimplementedWarning("setregion");
     return;
   }
diff --git a/tsconfig.json b/tsconfig.json
index 93499143..d1b62ba8 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -39,7 +39,8 @@
     "modern/src/runtime/Config.ts",
     "modern/src/runtime/GroupList.ts",
     "modern/src/runtime/GuiList.ts",
-    "modern/src/runtime/GuiTree.ts"
+    "modern/src/runtime/List.ts",
+    "modern/src/runtime/MouseRedir.ts"
   ],
   "exclude": ["node_modules", "**/*.spec.ts", "demo/built"]
 }