fix: minor types fixes (#759)

Author: dangreen

package.json

@@ -28,10 +28,11 @@
     "start": "microbundle-crl watch --no-compress --format modern,cjs",
     "dev": "microbundle-crl --no-compress --no-sourcemap watch",
     "prepublishOnly": "yarn build",
-    "test": "yarn test:unit && yarn test:lint && yarn test:build",
-    "test:build": "yarn build",
     "test:lint": "eslint 'src/**/*.{ts,tsx}' 'test/**/*.{ts,tsx}'",
     "test:unit": "jest -c jest.config.json",
+    "test:types": "tsc --skipLibCheck --noEmit",
+    "test:build": "yarn build",
+    "test": "yarn test:lint && yarn test:unit && yarn test:types && yarn test:build",
     "format": "prettier --write src",
     "predeploy": "cd example && yarn && yarn build",
     "deploy": "gh-pages -d example/build"

src/chart.tsx

@@ -6,15 +6,14 @@ import React, {
   useMemo,
   forwardRef,
 } from 'react';
-import { Props } from './types';
-
 import Chart from 'chart.js/auto';
 import type { ChartData } from 'chart.js';
-
 import merge from 'lodash/merge';
 import assign from 'lodash/assign';
 import find from 'lodash/find';
 
+import { Props } from './types';
+
 const ChartComponent = forwardRef<Chart | undefined, Props>((props, ref) => {
   const {
     id,
@@ -37,7 +36,11 @@ const ChartComponent = forwardRef<Chart | undefined, Props>((props, ref) => {
 
   const computedData = useMemo<ChartData>(() => {
     if (typeof data === 'function') {
-      return canvas.current ? data(canvas.current) : {};
+      return canvas.current
+        ? data(canvas.current)
+        : {
+            datasets: [],
+          };
     } else return merge({}, data);
   }, [data, canvas.current]);
 

src/index.tsx

@@ -1,8 +1,8 @@
 import React, { forwardRef } from 'react';
+import Chart, { defaults } from 'chart.js/auto';
+
 import { Props } from './types';
 import ChartComponent from './chart';
-import Chart from 'chart.js/auto';
-import * as chartjs from 'chart.js';
 
 export const Line = forwardRef<Chart | undefined, Omit<Props, 'type'>>(
   (props, ref) => (
@@ -92,8 +92,6 @@ export const Scatter = forwardRef<Chart | undefined, Omit<Props, 'type'>>(
   )
 );
 
-export const defaults = chartjs.defaults;
-
-export { Chart };
+export { Chart, defaults };
 
 export default ChartComponent;

src/types.ts

@@ -1,26 +1,33 @@
-import Chart from './index';
+import type { CanvasHTMLAttributes, ReactNode, MouseEvent } from 'react';
+import type {
+  ChartType,
+  ChartData,
+  ChartOptions,
+  Plugin,
+  InteractionItem,
+} from 'chart.js';
 
-export interface Props extends React.CanvasHTMLAttributes<HTMLCanvasElement> {
+export interface Props extends CanvasHTMLAttributes<HTMLCanvasElement> {
   id?: string;
   className?: string;
   height?: number;
   width?: number;
   redraw?: boolean;
-  type: Chart.ChartType;
-  data: Chart.ChartData | ((canvas: HTMLCanvasElement) => Chart.ChartData);
-  options?: Chart.ChartOptions;
-  fallbackContent?: React.ReactNode;
-  plugins?: Chart.PluginServiceRegistrationOptions[];
+  type: ChartType;
+  data: ChartData | ((canvas: HTMLCanvasElement) => ChartData);
+  options?: ChartOptions;
+  fallbackContent?: ReactNode;
+  plugins?: Plugin[];
   getDatasetAtEvent?: (
     dataset: Array<{}>,
-    event: React.MouseEvent<HTMLCanvasElement>
+    event: MouseEvent<HTMLCanvasElement>
   ) => void;
   getElementAtEvent?: (
     element: InteractionItem[],
-    event: React.MouseEvent<HTMLCanvasElement>
+    event: MouseEvent<HTMLCanvasElement>
   ) => void;
   getElementsAtEvent?: (
     elements: Array<{}>,
-    event: React.MouseEvent<HTMLCanvasElement>
+    event: MouseEvent<HTMLCanvasElement>
   ) => void;
 }

tsconfig.test.json

@@ -6543,7 +6543,7 @@ tslib@1.10.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
   integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
 
-tslib@^1.11.1, tslib@^1.8.1:
+tslib@^1.11.1, tslib@^1.8.1, tslib@^1.9.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==