@vizabi/bubblechart 4.0.2 → 4.1.1

package/build/bubblechart.js

@@ -1,4 +1,4 @@
-// https://github.com/vizabi/bubblechart#readme v4.0.2 build 1693653872804 Copyright 2023 Gapminder Foundation and contributors
+// https://github.com/vizabi/bubblechart#readme v4.1.1 build 1701881435565 Copyright 2023 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) :
@@ -2076,6 +2076,8 @@
         y
       } = this.MDL;
       
+      this.model.encoding.y.scale.d3Scale;
+      
       const {
         graphAll,
         eventArea,
@@ -2121,20 +2123,29 @@
       this.yScale.range(this._rangeBump([height, 0]));
       this.xScale.range(this._rangeBump([0, width]));
 
+      //only applied to swimming lane sclae
+      const rankScaleModifications = y.scale.type === "rank" 
+        ? {
+          ticks: y.rollup.map(m => m.tickPosition),
+          formatter: (d) => y.rollup.find(f => f.tickPosition === d).name,
+          repositionLabels: Object.fromEntries(y.rollup.map(m => ([m.tickPosition, { x: 4 * infoElHeight, y: -infoElHeight }]))) 
+        }
+        : {};
+
       //apply scales to axes and redraw
       this.yAxis.scale(this.yScale)
         .tickSizeInner(-width)
         .tickSizeOuter(0)
         .tickPadding(6)
         .tickSizeMinor(-width, 0)
-        .labelerOptions({
+        .labelerOptions(Object.assign({
           scaleType: y.scale.type,
           toolMargin: margin,
           limitMaxTickNumber: 6,
           bump: this.profileConstants.maxRadiusPx / 2,
           viewportLength: height,
           formatter: this.localise
-        });
+        }, rankScaleModifications));
 
       this.xAxis.scale(this.xScale)
         .tickSizeInner(-height)
@@ -2282,10 +2293,7 @@
       let minArea = sharedComponents.LegacyUtils.radiusToArea(Math.max(maxRadiusPx * extent[0], minRadiusPx));
       let maxArea = sharedComponents.LegacyUtils.radiusToArea(Math.max(maxRadiusPx * extent[1], minRadiusPx));
 
-      let range = minArea === maxArea? [minArea, maxArea] :
-        d3.range(minArea, maxArea, (maxArea - minArea)/(this.sScale.domain().length - 1)).concat(maxArea);
-
-      this.sScale.range(range);
+      this.sScale.range([minArea, maxArea]);
       this.trailSizeScale.domain(this.MDL.size.scale.domain).range([minTrailThicknessPx, maxTrailThicknessPx]);
     }
 
@@ -2409,11 +2417,11 @@
             .attr("x1", this.xScale(valueX) - radius);
         }
 
-        if (this.ui.whenHovering.higlightValueX) xAxisEl.call(
+        if (this.ui.whenHovering.higlightValueX && this.MDL.x.scale.type !== "rank") xAxisEl.call(
           this.xAxis.highlightValue(valueX)
         );
 
-        if (this.ui.whenHovering.higlightValueY) yAxisEl.call(
+        if (this.ui.whenHovering.higlightValueY && this.MDL.y.scale.type !== "rank") yAxisEl.call(
           this.yAxis.highlightValue(valueY)
         );
 
@@ -2587,7 +2595,7 @@
           //console.log("trailstart", trailStart)
           // if this bubble is trail start bubble
           if (trailStart >= this.MDL.frame.value || showhide) {
-            const trailData = this.model.getDataMapByFrameValue(trailStart).getByStr(key);
+            const trailData = this.model.getDataMapByFrameValue(trailStart, "trail.addTrails").getByStr(key);
             
             cache.labelText = labelText = this.__labelWithFrame(trailData);
             cache.labelX0 = trailData[this._alias("x")];
@@ -2624,7 +2632,7 @@
         if (!this._labels.cached[key]) this._labels.cached[key] = {};
         const cache = this._labels.cached[key];
 
-        const datamap = (trail.show ? this.model.getDataMapByFrameValue(trail.starts[key]) : this.model.dataMap);
+        const datamap = (trail.show ? this.model.getDataMapByFrameValue(trail.starts[key], "trail.addTrails") : this.model.dataMap);
         if (!datamap.hasByStr(key))
           continue;
 
@@ -2846,6 +2854,7 @@
       "size": {
         scale: {
           modelType: "size",
+          allowedTypes: ["linear", "log", "genericLog", "pow", "point"],
           range: [0, 50]
         }
       },
@@ -2859,7 +2868,7 @@
         },
         scale: {
           modelType: "size",
-          allowedTypes: ["linear", "log", "genericLog", "pow", "point", "ordinal"]
+          allowedTypes: ["linear", "log", "genericLog", "pow", "point"]
         }
       },
       "repeat": {
@@ -2869,7 +2878,7 @@
     }
   });
 
-  BubbleChart.versionInfo = { version: "4.0.2", build: 1693653872804, package: {"homepage":"https://github.com/vizabi/bubblechart#readme","name":"@vizabi/bubblechart","description":"Vizabi bubble chart"}, sharedComponents: sharedComponents.versionInfo};
+  BubbleChart.versionInfo = { version: "4.1.1", build: 1701881435565, package: {"homepage":"https://github.com/vizabi/bubblechart#readme","name":"@vizabi/bubblechart","description":"Vizabi bubble chart"}, sharedComponents: sharedComponents.versionInfo};
 
   exports.Base = BubbleChart;