feat: upgrade to beta.7

sgratzl · Dec 9, 2020 · 25f5adb · 25f5adb
1 parent 6957c49
commit 25f5adb
Show file tree

Hide file tree

Showing 15 changed files with 149 additions and 198 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -23,5 +23,5 @@
   "typescript.enablePromptUseWorkspaceTsdk": true,
   "editor.detectIndentation": false,
   "editor.tabSize": 2,
-  "liveServer.settings.port": 5503
+  "liveServer.settings.port": 5504
 }
diff --git a/package.json b/package.json
@@ -52,30 +52,30 @@
     "@rollup/plugin-node-resolve": "^11.0.0",
     "@rollup/plugin-replace": "^2.3.4",
     "@rollup/plugin-typescript": "^8.0.0",
-    "@types/jest": "^26.0.15",
+    "@types/jest": "^26.0.18",
     "@types/jest-image-snapshot": "^4.1.3",
-    "@types/node": "^14.14.10",
+    "@types/node": "^14.14.11",
     "@types/seedrandom": "^2.4.28",
-    "@typescript-eslint/eslint-plugin": "^4.9.0",
-    "@typescript-eslint/parser": "^4.9.0",
+    "@typescript-eslint/eslint-plugin": "^4.9.1",
+    "@typescript-eslint/parser": "^4.9.1",
     "@yarnpkg/pnpify": "^2.4.0",
     "canvas": "^2.6.1",
-    "chart.js": "^3.0.0-beta.6",
-    "eslint": "^7.14.0",
-    "eslint-config-prettier": "^6.15.0",
+    "chart.js": "^3.0.0-beta.7",
+    "eslint": "^7.15.0",
+    "eslint-config-prettier": "^7.0.0",
     "eslint-config-react-app": "^6.0.0",
     "eslint-plugin-flowtype": "^5.2.0",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-prettier": "^3.1.4",
+    "eslint-plugin-prettier": "^3.2.0",
     "eslint-plugin-react": "^7.21.5",
     "eslint-plugin-react-hooks": "^4.2.0",
     "jest": "^26.6.3",
     "jest-image-snapshot": "^4.2.0",
     "prettier": "^2.2.1",
     "release-it": "^14.2.2",
     "rimraf": "^3.0.2",
-    "rollup": "^2.34.0",
+    "rollup": "^2.34.2",
     "rollup-plugin-cleanup": "^3.2.1",
     "rollup-plugin-dts": "^2.0.0",
     "rollup-plugin-terser": "^7.0.2",

diff --git a/samples/default_esm.html b/samples/default_esm.html
@@ -11,8 +11,8 @@
     <script type="importmap-shim">
       {
         "imports": {
-          "chart.js": "https://unpkg.com/chart.js@3.0.0-beta.6?module",
-          "chart.js/helpers": "https://unpkg.com/chart.js@3.0.0-beta.6/helpers/helpers.esm.js?module",
+          "chart.js": "https://unpkg.com/chart.js@3.0.0-beta.7?module",
+          "chart.js/helpers": "https://unpkg.com/chart.js@3.0.0-beta.7/helpers/helpers.esm.js?module",
           "chartjs-chart-graph": "../build/index.esm.js",
           "d3-force": "https://unpkg.com/d3-force?module",
           "d3-hierarchy": "https://unpkg.com/d3-hierarchy?module"

diff --git a/samples/directed.html b/samples/directed.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="https://unpkg.com/chart.js@3.0.0-beta.6/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.0.0-beta.7/dist/chart.js"></script>
     <script src="../build/index.umd.js"></script>
   </head>
 

diff --git a/samples/forceDirectedGraph.html b/samples/forceDirectedGraph.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="https://unpkg.com/chart.js@3.0.0-beta.6/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.0.0-beta.7/dist/chart.js"></script>
     <script src="../build/index.umd.js"></script>
   </head>
 

diff --git a/samples/graphChange.html b/samples/graphChange.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="https://unpkg.com/chart.js@3.0.0-beta.6/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.0.0-beta.7/dist/chart.js"></script>
     <script src="../build/index.umd.js"></script>
   </head>
 

diff --git a/samples/radial.html b/samples/radial.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="https://unpkg.com/chart.js@3.0.0-beta.6/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.0.0-beta.7/dist/chart.js"></script>
     <script src="../build/index.umd.js"></script>
   </head>
 

diff --git a/samples/radiallabel.html b/samples/radiallabel.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="https://unpkg.com/chart.js@3.0.0-beta.6/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.0.0-beta.7/dist/chart.js"></script>
     <!-- <script src="https://unpkg.com/chartjs-plugin-datalabels"></script> -->
     <script src="../build/index.umd.js"></script>
   </head>

diff --git a/samples/tree.html b/samples/tree.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="https://unpkg.com/chart.js@3.0.0-beta.6/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.0.0-beta.7/dist/chart.js"></script>
     <script src="../build/index.umd.js"></script>
   </head>
 

diff --git a/samples/treelabel.html b/samples/treelabel.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="https://unpkg.com/chart.js@3.0.0-beta.6/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.0.0-beta.7/dist/chart.js"></script>
     <!-- <script src="https://unpkg.com/chartjs-plugin-datalabels"></script>
     <script src="https://unpkg.com/chartjs-plugin-dragdata"></script> -->
     <script src="../build/index.umd.js"></script>

diff --git a/src/__tests__/createChart.ts b/src/__tests__/createChart.ts
@@ -35,11 +35,13 @@ export default function createChart<
     {
       responsive: false,
       animation: false,
-      legend: {
-        display: false,
-      },
-      title: {
-        display: false,
+      plugins: {
+        legend: {
+          display: false,
+        },
+        title: {
+          display: false,
+        },
       },
     },
     config.options || {}

diff --git a/src/controllers/forceDirected.spec.ts b/src/controllers/forceDirected.spec.ts
@@ -28,11 +28,6 @@ describe('dendogram', () => {
           },
         ],
       },
-      options: {
-        legend: {
-          display: false,
-        },
-      },
     }).toMatchImageSnapshot();
   });
 });
diff --git a/src/controllers/graph.ts b/src/controllers/graph.ts
@@ -88,9 +88,8 @@ export class GraphController extends ScatterController {
   initialize() {
     const type = this._type;
     const defaultConfig = defaults.get(`controllers.${type}`);
-    console.log('type', type, defaultConfig, (this as any)._config);
     this.edgeElementOptions = defaultConfig.edgeElementOptions;
-    this.edgeElementType = registry.getElement(defaultConfig.edgeElementType);
+    this.edgeElementType = registry.getElement(defaultConfig.edgeElementType as string);
     super.initialize();
     this.enableOptionSharing = true;
     this._scheduleResyncLayout();

diff --git a/src/controllers/tree.spec.ts b/src/controllers/tree.spec.ts
@@ -24,11 +24,6 @@ describe('dendogram', () => {
           },
         ],
       },
-      options: {
-        legend: {
-          display: false,
-        },
-      },
     }).toMatchImageSnapshot();
   });
   test('vertical', () => {
@@ -48,11 +43,6 @@ describe('dendogram', () => {
           },
         ],
       },
-      options: {
-        legend: {
-          display: false,
-        },
-      },
     }).toMatchImageSnapshot();
   });
   test('radial', () => {
@@ -72,11 +62,6 @@ describe('dendogram', () => {
           },
         ],
       },
-      options: {
-        legend: {
-          display: false,
-        },
-      },
     }).toMatchImageSnapshot();
   });
 
@@ -97,11 +82,6 @@ describe('dendogram', () => {
           },
         ],
       },
-      options: {
-        legend: {
-          display: false,
-        },
-      },
     }).toMatchImageSnapshot();
   });
   test('vertical tree', () => {
@@ -122,11 +102,6 @@ describe('dendogram', () => {
           },
         ],
       },
-      options: {
-        legend: {
-          display: false,
-        },
-      },
     }).toMatchImageSnapshot();
   });
   test('radial tree', () => {
@@ -147,11 +122,6 @@ describe('dendogram', () => {
           },
         ],
       },
-      options: {
-        legend: {
-          display: false,
-        },
-      },
     }).toMatchImageSnapshot();
   });
   test('directed', () => {
@@ -169,11 +139,6 @@ describe('dendogram', () => {
           },
         ],
       },
-      options: {
-        legend: {
-          display: false,
-        },
-      },
     }).toMatchImageSnapshot();
   });
 });