Merge pull request ordazgustavo#7 from ordazgustavo/chore/enable-ts-strict-mode

ordazgustavo · web-flow · commit 3713bd1aa7b6 · 2019-02-22T23:41:52.000-05:00
chore: re enable typescript strict mode
diff --git a/src/Circle.tsx b/src/Circle.tsx
@@ -17,10 +17,9 @@ export class Circle extends React.Component<CircleProps> {
     radius: 1000,
     strokeColor: 'black',
   }
+  public context!: HEREMapContext
 
-  public context: HEREMapContext
-
-  private circle: H.map.Circle
+  private circle?: H.map.Circle
 
   public componentDidUpdate(prevProps: CircleProps) {
     if (prevProps.lat !== this.props.lat || prevProps.lng !== this.props.lng) {
@@ -43,16 +42,6 @@ export class Circle extends React.Component<CircleProps> {
     }
   }
 
-  public render() {
-    const { map } = this.context
-
-    if (map && !this.circle) {
-      this.addCircleToMap()
-    }
-
-    return null
-  }
-
   private addCircleToMap() {
     const { map } = this.context
 
@@ -79,12 +68,26 @@ export class Circle extends React.Component<CircleProps> {
     }
   }
 
-  private setCenter(point: H.geo.IPoint): void {
-    this.circle.setCenter(point)
+  private setCenter(point: H.geo.IPoint) {
+    if (this.circle) {
+      this.circle.setCenter(point)
+    }
   }
 
-  private setRadius(radius: number): void {
-    this.circle.setRadius(radius)
+  private setRadius(radius: number) {
+    if (this.circle) {
+      this.circle.setRadius(radius)
+    }
+  }
+
+  public render() {
+    const { map } = this.context
+
+    if (map && !this.circle) {
+      this.addCircleToMap()
+    }
+
+    return null
   }
 }
 
diff --git a/src/HEREMap.tsx b/src/HEREMap.tsx
@@ -31,20 +31,12 @@ export interface HEREMapProps extends H.Map.Options {
 
 export interface OwnState {}
 
-type State = OwnState & HEREMapContext
-
-export class HEREMap extends React.Component<HEREMapProps, State> {
-  public state: State = {
-    map: null,
-    behavior: null,
-    ui: null,
-  }
+export class HEREMap extends React.Component<HEREMapProps, HEREMapContext> {
   private debouncedResizeMap: any
-  public static contextType = MapContext
-  public context: HEREMapContext
+  // public static contextType = MapContext
 
-  constructor(props: HEREMapProps, context: HEREMapContext) {
-    super(props, context)
+  constructor(props: HEREMapProps) {
+    super(props)
 
     this.debouncedResizeMap = debounce(this.resizeMap, 200)
   }
@@ -114,11 +106,7 @@ export class HEREMap extends React.Component<HEREMapProps, State> {
 
     const mapElement = document.querySelector('.map-container')
 
-    const HERE: HEREMapContext = {
-      map: null,
-      behavior: null,
-      ui: null,
-    }
+    const HERE: HEREMapContext = {}
 
     let layer = defaultLayers.normal.map
     if (setLayer) {
@@ -149,22 +137,22 @@ export class HEREMap extends React.Component<HEREMapProps, State> {
 
   public setCenter(point: H.geo.IPoint): void {
     const { animateCenter } = this.props
-    const { map } = this.context
+    const { map } = this.state
     if (map) {
       map.setCenter(point, animateCenter === true)
     }
   }
 
   public setZoom(zoom: number): void {
     const { animateZoom } = this.props
-    const { map } = this.context
+    const { map } = this.state
     if (map) {
       map.setZoom(zoom, animateZoom === true)
     }
   }
 
   private resizeMap = () => {
-    const { map } = this.context
+    const { map } = this.state
     if (map) {
       map.getViewPort().resize()
     }
diff --git a/src/Marker.tsx b/src/Marker.tsx
@@ -22,7 +22,7 @@ export interface MarkerProps extends H.map.Marker.Options, H.geo.IPoint {
 
 export class Marker extends React.Component<MarkerProps> {
   public static contextType = MapContext
-  public context: HEREMapContext
+  public context!: HEREMapContext
   private marker?: H.map.DomMarker | H.map.Marker
 
   public componentDidMount() {
diff --git a/src/RouteLine.tsx b/src/RouteLine.tsx
@@ -10,11 +10,9 @@ export interface RouteLineProps extends H.map.Polyline.Options, H.geo.IPoint {
   shape: Shape
 }
 
-class RouteLine extends React.Component<RouteLineProps, object> {
+class RouteLine extends React.Component<RouteLineProps> {
   public static contextType = MapContext
-
-  public context: HEREMapContext
-
+  public context!: HEREMapContext
   private routeLine?: H.map.Polyline
 
   public componentDidUpdate(prevProps: RouteLineProps) {
diff --git a/src/utils/map-context.ts b/src/utils/map-context.ts
@@ -1,15 +1,11 @@
 import React from 'react'
 
 export interface HEREMapContext {
-  map: H.Map | null
-  behavior: H.mapevents.Behavior | null
-  ui: H.ui.UI | null
+  map?: H.Map
+  behavior?: H.mapevents.Behavior
+  ui?: H.ui.UI
 }
 
-const MapContext = React.createContext<HEREMapContext>({
-  map: null,
-  behavior: null,
-  ui: null,
-})
+const MapContext = React.createContext({} as HEREMapContext)
 
 export default MapContext
diff --git a/tsconfig.json b/tsconfig.json
@@ -8,7 +8,7 @@
     "allowJs": false,
     "jsx": "react",
     "allowSyntheticDefaultImports": true,
-    // "strict": true,
+    "strict": true,
     "declaration": true,
     "moduleResolution": "node",
     "forceConsistentCasingInFileNames": true,
