From 926be9570bb66400a9770650cd5f820106b8a201 Mon Sep 17 00:00:00 2001
From: Jordan Eldredge <jordan@jordaneldredge.com>
Date: Mon, 17 Sep 2018 09:06:27 -0700
Subject: [PATCH] Type snapUtils test

---
 js/{snapUtils.test.js => snapUtils.test.ts} | 24 ++++++++++-----------
 js/snapUtils.ts                             |  8 ++++++-
 2 files changed, 19 insertions(+), 13 deletions(-)
 rename js/{snapUtils.test.js => snapUtils.test.ts} (96%)

diff --git a/js/snapUtils.test.js b/js/snapUtils.test.ts
similarity index 96%
rename from js/snapUtils.test.js
rename to js/snapUtils.test.ts
index 1e5be235..880878e5 100644
--- a/js/snapUtils.test.js
+++ b/js/snapUtils.test.ts
@@ -53,43 +53,43 @@ describe("near function", () => {
 
 describe("overlap functions", () => {
   it("overlapY detects when the boxes overlap in the Y axis", () => {
-    const a = { y: 10, height: 50 };
-    const b = { y: 40, height: 50 };
+    const a = { y: 10, height: 50, width: 100, x: 0 };
+    const b = { y: 40, height: 50, width: 100, x: 0 };
     const actual = overlapY(a, b);
     const expected = true;
     expect(actual).toEqual(expected);
   });
   it("overlapY detects when the boxes are within SNAP_DISTANCE on the Y axis", () => {
-    const a = { y: 10, height: 50 };
-    const b = { y: 70, height: 50 };
+    const a = { y: 10, height: 50, width: 100, x: 0 };
+    const b = { y: 70, height: 50, width: 100, x: 0 };
     const actual = overlapY(a, b);
     const expected = true;
     expect(actual).toEqual(expected);
   });
   it("overlapY detects when the boxes do not overlap in the Y axis", () => {
-    const a = { y: 10, height: 50 };
-    const b = { y: 90, height: 50 };
+    const a = { y: 10, height: 50, width: 100, x: 0 };
+    const b = { y: 90, height: 50, width: 100, x: 0 };
     const actual = overlapY(a, b);
     const expected = false;
     expect(actual).toEqual(expected);
   });
   it("overlapX detects when the boxes overlap in the X axis", () => {
-    const a = { x: 10, width: 50 };
-    const b = { x: 40, width: 50 };
+    const a = { x: 10, width: 50, height: 100, y: 0 };
+    const b = { x: 40, width: 50, height: 100, y: 0 };
     const actual = overlapX(a, b);
     const expected = true;
     expect(actual).toEqual(expected);
   });
   it("overlapX detects when the boxes are within SNAP_DISTANCE on the X axis", () => {
-    const a = { x: 10, width: 50 };
-    const b = { x: 70, width: 50 };
+    const a = { x: 10, width: 50, height: 100, y: 0 };
+    const b = { x: 70, width: 50, height: 100, y: 0 };
     const actual = overlapX(a, b);
     const expected = true;
     expect(actual).toEqual(expected);
   });
   it("overlapX detects when the boxes do not overlap in the X axis", () => {
-    const a = { x: 10, width: 50 };
-    const b = { x: 90, width: 50 };
+    const a = { x: 10, width: 50, height: 100, y: 0 };
+    const b = { x: 90, width: 50, height: 100, y: 0 };
     const actual = overlapX(a, b);
     const expected = false;
     expect(actual).toEqual(expected);
diff --git a/js/snapUtils.ts b/js/snapUtils.ts
index 5ee6cb91..e78147e9 100644
--- a/js/snapUtils.ts
+++ b/js/snapUtils.ts
@@ -7,6 +7,12 @@ interface Diff {
   x?: number;
   y?: number;
 }
+
+interface BoundingBox {
+  width: number;
+  height: number;
+}
+
 interface Box extends Point {
   width: number;
   height: number;
@@ -96,7 +102,7 @@ export const snapToMany = (boxA: Box, otherBoxes: Box[]): Diff => {
   return { x, y };
 };
 
-export const snapWithin = (boxA: Box, boundingBox: Box): Diff => {
+export const snapWithin = (boxA: Box, boundingBox: BoundingBox): Diff => {
   let x, y;
 
   if (boxA.x - SNAP_DISTANCE < 0) {