@vizabi/bubblechart 4.1.6 → 4.1.8

package/build/bubblechart.js

@@ -1,4 +1,4 @@
-// https://github.com/vizabi/bubblechart#readme v4.1.6 build 1725045335558 Copyright 2024 Gapminder Foundation and contributors
+// https://github.com/vizabi/bubblechart#readme v4.1.8 build 1737499944940 Copyright 2025 Gapminder Foundation and contributors
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@vizabi/shared-components'), require('d3'), require('mobx')) :
   typeof define === 'function' && define.amd ? define(['exports', '@vizabi/shared-components', 'd3', 'mobx'], factory) :
@@ -1597,10 +1597,12 @@
       this._date.setText(this.MDL.frame.value, duration);    
     }
 
-    __getColor(key, valueC) {
-      return valueC != null && !sharedComponents.LegacyUtils.isNaN(valueC) 
-        ? (this.MDL.color.scale.isPattern ? `url(#flag-${key}-${this.id})` : this.cScale(valueC)) 
-        : COLOR_WHITEISH;
+    __getColor(d, valueC) {
+      if (valueC == null || sharedComponents.LegacyUtils.isNaN(valueC)) return COLOR_WHITEISH;
+
+      if (this.MDL.color.scale.isPattern) return `url(#flag-${this.MDL.color.data.createKeyFn()(d)}-${this.id})`;
+      
+      return this.cScale(valueC); 
     }
     __getColorForTrail(valueC, valueS) {
       if(valueC == null || sharedComponents.LegacyUtils.isNaN(valueC) || this.MDL.color.scale.isPattern) return COLOR_BLACKISH; 
@@ -1684,7 +1686,7 @@
               d.r = sharedComponents.LegacyUtils.areaToRadius(_this.sScale(valueS || 0));
               const scaledX = _this.xScale(valueX);
               const scaledY = _this.yScale(valueY);
-              const scaledC = _this.__getColor(d[Symbol.for(isTrail ? "trailHeadKey" : "key")], valueC);
+              const scaledC = _this.__getColor(d, valueC);
         
               if (!duration || !headTrail) {
                 circle
@@ -1758,7 +1760,7 @@
               //view.classed("vzb-hidden", d.hidden);
               const scaledX = _this.xScale(valueX);
               const scaledY = _this.yScale(valueY);
-              const scaledC = _this.__getColor(d[Symbol.for(isTrail ? "trailHeadKey" : "key")], valueC);
+              const scaledC = _this.__getColor(d, valueC);
         
               const group = d3.select(this);
               if (!duration || !headTrail) {
@@ -1778,6 +1780,16 @@
                 }
                   
                 const diagonalLine = group.select(".vzb-diagonal-line");
+                if (duration && isExtrapolated && diagonalLine.classed("vzb-hidden")) {
+                  const cx = +circle.attr("cx");
+                  const cy = +circle.attr("cy");
+                  const r = +circle.attr("r");
+                  diagonalLine
+                    .attr("x1", cx + r/Math.sqrt(2))
+                    .attr("y1", cy + r/Math.sqrt(2))
+                    .attr("x2", cx - r/Math.sqrt(2))
+                    .attr("y2", cy - r/Math.sqrt(2));
+                }
                 diagonalLine
                   .classed("vzb-hidden", !isExtrapolated);
                 if(isExtrapolated){
@@ -1882,7 +1894,7 @@
         d.r = sharedComponents.LegacyUtils.areaToRadius(_this.sScale(valueS || 0));
         const scaledX = _this.xScale(valueX);
         const scaledY = _this.yScale(valueY);
-        const scaledC = _this.__getColor(d[Symbol.for(isTrail ? "trailHeadKey" : "key")], valueC);
+        const scaledC = _this.__getColor(d, valueC);
 
         const group = d3.select(this);
 
@@ -2055,8 +2067,8 @@
     }
 
     _updateScales() {
-      this.yScale = this.MDL.y.scale.d3Scale.copy();
-      this.xScale = this.MDL.x.scale.d3Scale.copy();
+      this.yScale = this.MDL.y.scale.d3Scale;
+      this.xScale = this.MDL.x.scale.d3Scale;
       this._labels.setScales(this.xScale, this.yScale);
     }
 
@@ -2143,7 +2155,7 @@
           limitMaxTickNumber: 6,
           bump: this.profileConstants.maxRadiusPx / 2,
           viewportLength: height,
-          formatter: this.localise
+          formatter: this.services.locale.auto(y.data?.conceptProps?.format)
         }, rankScaleModifications));
 
       this.xAxis.scale(this.xScale)
@@ -2156,7 +2168,7 @@
           toolMargin: margin,
           bump: this.profileConstants.maxRadiusPx / 2,
           viewportLength: width,
-          formatter: this.localise
+          formatter: this.services.locale.auto(x.data?.conceptProps?.format)
         });
 
 
@@ -2459,7 +2471,7 @@
         const x = _this.xScale(d[_this._alias("x")]);
         const y = _this.yScale(d[_this._alias("y")]);
         const s = d.r;
-        const c = _this.__getColor(selectedKey, d.color);
+        const c = _this.__getColor(d, d.color);
         let entityOutOfView = false;
 
         if (x + s < 0 || x - s > this.width || y + s < 0 || y - s > this.height) {
@@ -2886,7 +2898,7 @@
     }
   });
 
-  BubbleChart.versionInfo = { version: "4.1.6", build: 1725045335558, package: {"homepage":"https://github.com/vizabi/bubblechart#readme","name":"@vizabi/bubblechart","description":"Vizabi bubble chart"}, sharedComponents: sharedComponents.versionInfo};
+  BubbleChart.versionInfo = { version: "4.1.8", build: 1737499944940, package: {"homepage":"https://github.com/vizabi/bubblechart#readme","name":"@vizabi/bubblechart","description":"Vizabi bubble chart"}, sharedComponents: sharedComponents.versionInfo};
 
   exports.Base = BubbleChart;