fix: fix types for TypeScript 3.8 (#420)

jest.config.json

@@ -21,6 +21,7 @@
 	"collectCoverage": true,
 	"collectCoverageFrom": [
 		"src/**/*.{js,jsx,ts,tsx}",
+		"!src/docs/**",
 		"!**/node_modules/**"
 	],
 	"coverageReporters": [

package.json

@@ -14,7 +14,7 @@
     "format:test": "prettier --write 'test/**/*.{js,jsx,ts,tsx}'",
     "format": "yarn format:src && yarn format:test",
     "jest": "jest -c jest.config.json",
-    "test:types": "echo 'Need to fix types' # tsc --skipLibCheck --noEmit",
+    "test:types": "tsc --skipLibCheck --noEmit",
     "test:unit": "yarn jest",
     "test": "yarn test:types && yarn test:unit",
     "prepublishOnly": "npm run build",
@@ -63,7 +63,7 @@
     "rollup-plugin-typescript2": "^0.19.3",
     "simple-git-hooks": "^2.7.0",
     "standard-version": "^9.3.2",
-    "typescript": "^3.4.5"
+    "typescript": "^3.8.0"
   },
   "gh-pages-deploy": {
     "staticpath": "demo/dist/"

src/Context.tsx

@@ -1,28 +1,28 @@
 import * as React from "react";
 import { chartDefaultProps } from "./default-props";
 
-import { ReactGoogleChartPropsWithDefaults } from "./types";
+import { ReactGoogleChartProps } from "./types";
 const { Provider, Consumer } = React.createContext(chartDefaultProps);
 
 export const ContextProvider = ({
   children,
-  value
+  value,
 }: {
   children: any;
-  value: ReactGoogleChartPropsWithDefaults;
+  value: ReactGoogleChartProps;
 }) => {
   return <Provider value={value}>{children}</Provider>;
 };
 
 export const ContextConsumer = ({
-  render
+  render,
 }: {
-  render: ((context: ReactGoogleChartPropsWithDefaults) => JSX.Element | null);
+  render: (context: ReactGoogleChartProps) => JSX.Element | null;
 }) => {
   return (
     <Consumer>
-      {context => {
-        return render(context as ReactGoogleChartPropsWithDefaults);
+      {(context) => {
+        return render(context as ReactGoogleChartProps);
       }}
     </Consumer>
   );

src/ReactGoogleCharts.tsx

@@ -4,7 +4,6 @@ import {
   GoogleViz,
   ReactGoogleChartProps,
   ReactGoogleChartState,
-  ReactGoogleChartPropsWithDefaults
 } from "./types";
 import { chartDefaultProps } from "./default-props";
 import { GoogleChartLoader } from "./components/GoogleChartLoader";
@@ -15,12 +14,11 @@ export class Chart extends React.Component<
   ReactGoogleChartProps,
   ReactGoogleChartState
 > {
-
   _isMounted = false;
 
   state = {
     loadingStatus: "loading" as ReactGoogleChartState["loadingStatus"],
-    google: null as ReactGoogleChartState["google"]
+    google: null as ReactGoogleChartState["google"],
   };
 
   static defaultProps = chartDefaultProps;
@@ -32,13 +30,13 @@ export class Chart extends React.Component<
       chartVersion,
       mapsApiKey,
       loader,
-      errorElement
+      errorElement,
     } = this.props;
     return (
-      <ContextProvider value={this.props as ReactGoogleChartPropsWithDefaults}>
+      <ContextProvider value={this.props as ReactGoogleChartProps}>
         {this.state.loadingStatus === "ready" && this.state.google !== null ? (
           <GoogleChart
-            {...this.props as ReactGoogleChartPropsWithDefaults}
+            {...(this.props as ReactGoogleChartProps)}
             google={this.state.google}
           />
         ) : this.state.loadingStatus === "errored" && errorElement ? (
@@ -69,9 +67,11 @@ export class Chart extends React.Component<
     } else {
       // IE11: window.google is not fully set, we have to wait
       const id = setInterval(() => {
-        const google = (window as Window & {
-          google?: GoogleViz;
-        }).google;
+        const google = (
+          window as Window & {
+            google?: GoogleViz;
+          }
+        ).google;
 
         if (this._isMounted) {
           if (google && this.isFullyLoaded(google)) {
@@ -81,21 +81,20 @@ export class Chart extends React.Component<
         } else {
           clearInterval(id);
         }
-
       }, 1000);
     }
   };
 
   onSuccess = (google: GoogleViz) => {
     this.setState({
       loadingStatus: "ready",
-      google
+      google,
     });
   };
 
   onError = () => {
     this.setState({
-      loadingStatus: "errored"
+      loadingStatus: "errored",
     });
   };