refactor(rstream-gestures): TS strictNullChecks

thi-ng · Jun 9, 2019 · bac2904 · bac2904
1 parent efca49c
commit bac2904
Showing 1 changed file with 18 additions and 20 deletions.
diff --git a/packages/rstream-gestures/src/index.ts b/packages/rstream-gestures/src/index.ts
@@ -109,26 +109,24 @@ export interface GestureStreamOpts extends IID<string> {
  */
 export const gestureStream = (
     el: HTMLElement,
-    opts?: Partial<GestureStreamOpts>
+    _opts?: Partial<GestureStreamOpts>
 ): StreamMerge<any, GestureEvent> => {
-    let isDown = false,
-        clickPos: number[];
+    let isDown = false;
+    let clickPos: number[] | null = null;
 
-    opts = Object.assign(
-        <GestureStreamOpts>{
-            id: "gestures",
-            zoom: 1,
-            absZoom: true,
-            minZoom: 0.25,
-            maxZoom: 4,
-            smooth: 1,
-            eventOpts: { capture: true },
-            preventDefault: true,
-            local: true,
-            scale: false
-        },
-        opts
-    );
+    const opts = <GestureStreamOpts>{
+        id: "gestures",
+        zoom: 1,
+        absZoom: true,
+        minZoom: 0.25,
+        maxZoom: 4,
+        smooth: 1,
+        eventOpts: { capture: true },
+        preventDefault: true,
+        local: true,
+        scale: false,
+        ..._opts
+    };
 
     let zoom = Math.min(Math.max(opts.zoom, opts.minZoom), opts.maxZoom);
     const dpr = window.devicePixelRatio || 1;
@@ -187,8 +185,8 @@ export const gestureStream = (
                     clickPos = null;
                     break;
                 case GestureType.DRAG:
-                    body.click = clickPos;
-                    body.delta = [pos[0] - clickPos[0], pos[1] - clickPos[1]];
+                    body.click = clickPos!;
+                    body.delta = [pos[0] - clickPos![0], pos[1] - clickPos![1]];
                     break;
                 case GestureType.ZOOM:
                     const zdelta = (<WheelEvent>e).deltaY * opts.smooth;