Merge pull request #121 from sgratzl/release/v3.8.1

sgratzl · web-flow · commit 97665d4bc8f1 · 2022-07-12T20:56:12.000-04:00
Release v3.8.1
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "chartjs-chart-geo",
   "description": "Chart.js module for charting maps",
-  "version": "3.8.0",
+  "version": "3.8.1",
   "author": {
     "name": "Samuel Gratzl",
     "email": "sam@sgratzl.com",
@@ -55,10 +55,10 @@
     "@rollup/plugin-typescript": "^8.3.3",
     "@types/jest": "^28.1.4",
     "@types/jest-image-snapshot": "^5.1.0",
-    "@types/node": "^18.0.1",
+    "@types/node": "^18.0.3",
     "@types/seedrandom": "^3.0.2",
-    "@typescript-eslint/eslint-plugin": "^5.30.4",
-    "@typescript-eslint/parser": "^5.30.4",
+    "@typescript-eslint/eslint-plugin": "^5.30.5",
+    "@typescript-eslint/parser": "^5.30.5",
     "@yarnpkg/pnpify": "^3.1.3",
     "@yarnpkg/sdks": "^2.6.2",
     "canvas": "^2.9.3",
diff --git a/samples/changing.html b/samples/changing.html
@@ -0,0 +1,73 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <script src="https://unpkg.com/chart.js@3.8.0/dist/chart.js"></script>
+    <script src="../build/index.umd.js"></script>
+  </head>
+
+  <body>
+    <div style="width: 75%">
+      <canvas id="canvas" style="border: 1px solid black"></canvas>
+    </div>
+    <script>
+      fetch('https://unpkg.com/us-atlas/states-10m.json')
+        .then((r) => r.json())
+        .then((us) => {
+          const nation = ChartGeo.topojson.feature(us, us.objects.nation).features[0];
+          const states = ChartGeo.topojson.feature(us, us.objects.states).features;
+
+          const chart = new Chart(document.getElementById('canvas').getContext('2d'), {
+            type: 'choropleth',
+            data: {
+              labels: states.map((d) => d.properties.name),
+              datasets: [
+                {
+                  label: 'States',
+                  outline: nation,
+                  data: states.map((d) => ({
+                    feature: d,
+                    value: Math.random() * 11,
+                  })),
+                },
+              ],
+            },
+            options: {
+              plugins: {
+                legend: {
+                  display: false,
+                },
+              },
+              scales: {
+                xy: {
+                  projection: 'albersUsa',
+                },
+                color: {
+                  quantize: 5,
+                  legend: {
+                    position: 'bottom-right',
+                    align: 'right',
+                  },
+                },
+              },
+            },
+          });
+
+          setTimeout(() => {
+            chart.options.scales.xy = {
+              projection: 'equalEarth',
+              projectionOffset: [100, 0],
+            };
+            chart.update();
+
+            setTimeout(() => {
+              chart.options.scales.xy = {
+                projection: 'albersUsa',
+                projectionOffset: [-100, 0],
+              };
+              chart.update();
+            }, 1000);
+          }, 1000);
+        });
+    </script>
+  </body>
+</html>
diff --git a/src/scales/ProjectionScale.ts b/src/scales/ProjectionScale.ts
@@ -116,6 +116,9 @@ export class ProjectionScale extends Scale<IProjectionScaleOptions> {
       this.projection = (lookup[options.projection] || lookup.albersUsa)();
     }
     this.geoPath.projection(this.projection);
+
+    this.outlineBounds = null;
+    this.oldChartBounds = null;
   }
 
   computeBounds(outline: ExtendedFeature): void;
@@ -141,6 +144,7 @@ export class ProjectionScale extends Scale<IProjectionScaleOptions> {
 
   updateBounds(): boolean {
     const area = this.chart.chartArea;
+
     const bb = this.outlineBounds;
 
     if (!bb) {
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,9 @@ export class ProjectionScale extends Scale<IProjectionScaleOptions> {`
`116`	`116`	`this.projection = (lookup[options.projection] \|\| lookup.albersUsa)();`
`117`	`117`	`}`
`118`	`118`	`this.geoPath.projection(this.projection);`
	`119`	`+`
	`120`	`+ this.outlineBounds = null;`
	`121`	`+ this.oldChartBounds = null;`
`119`	`122`	`}`
`120`	`123`
`121`	`124`	`computeBounds(outline: ExtendedFeature): void;`
`@@ -141,6 +144,7 @@ export class ProjectionScale extends Scale<IProjectionScaleOptions> {`
`141`	`144`
`142`	`145`	`updateBounds(): boolean {`
`143`	`146`	`const area = this.chart.chartArea;`
	`147`	`+`
`144`	`148`	`const bb = this.outlineBounds;`
`145`	`149`
`146`	`150`	`if (!bb) {`