@vizabi/bubblechart 5.1.0 → 5.2.1

package/build/bubblechart.js

@@ -1,4 +1,4 @@
-// https://github.com/vizabi/bubblechart#readme v5.1.0 build 1743007947150 Copyright 2025 Gapminder Foundation and contributors
+// https://github.com/vizabi/bubblechart#readme v5.2.1 build 1746462563188 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) :
@@ -44082,6 +44082,7 @@ void main(void) {
               getSourcePosition: this.props.transitions?.getPosition,
               getTargetPosition: this.props.transitions?.getPosition,
               getTargetPixelOffset: this.props.transitions?.getPosition,
+              getSourceDashOffset: this.props.transitions?.getPosition
             }
             //pickable: true,
             //_dataDiff: (newData, oldData) => {
@@ -44189,6 +44190,7 @@ void main(void) {
   const KEY = Symbol.for("key");
   const TRAIL_KEY = Symbol.for("trailHeadKey");
   const OPACITY_KEY = Symbol.for("opacity");
+  const REQUIRED_KEY = Symbol.for("bubbleRequired");
 
   const marginScaleH = (marginMin, ratio = 0) => height => marginMin + height * ratio;
   const marginScaleW = (marginMin, ratio = 0) => width => marginMin + width * ratio;
@@ -44923,34 +44925,42 @@ void main(void) {
             newTrailsData.length += trailsCount;
             dataTrailChunkIndex = res.length;          
             res.length += trailsCount;
-            selectedData.set(d[TRAIL_KEY], Object.assign({}, d));
             trailChunkIndex1 = trailChunkIndex + 1;
           }
-          newTrailsData[trailChunkIndex++] = d;
-          res[dataTrailChunkIndex++] = d;
+          if (!d[REQUIRED_KEY]) {
+            newTrailsData[trailChunkIndex++] = d;
+            res[dataTrailChunkIndex++] = d;
+            if (!selectedData.has(d[TRAIL_KEY])) selectedData.set(d[TRAIL_KEY], Object.assign({}, d));
+          }
         } else {
           if (currentTrailKey) {
             trailsZ[currentTrailKey] = d.size;//d.z
             //newTrailsData[trailChunkIndex] = Object.assign({}, newTrailsData[trailChunkIndex - 1]);
-            newTrailsData.fill(d, trailChunkIndex, newTrailsData.length);
             //_newUpdateRangesLine.push({startRow: trailChunkIndex - 2, endRow: trailChunkIndex});
             //newTrailsData[trailChunkIndex - 1] = d;
-            indexOffset = trailChunkIndex == trailChunkIndex1 ? 1 : 2;
-            lastLineTrailData.push([newTrailsData[trailChunkIndex - indexOffset], newTrailsData[trailChunkIndex - indexOffset]]);
-            newLastLineTrailData.push([newTrailsData[trailChunkIndex - indexOffset], d]);
+            if(!d[REQUIRED_KEY]) {
+              newTrailsData.fill(d, trailChunkIndex, newTrailsData.length);
+              indexOffset = trailChunkIndex == trailChunkIndex1 ? 1 : 2;
+              lastLineTrailData.push([newTrailsData[trailChunkIndex - indexOffset], newTrailsData[trailChunkIndex - indexOffset]]);
+              newLastLineTrailData.push([newTrailsData[trailChunkIndex - indexOffset], d]);
+              res.fill(Object.assign({uz: -15000}, res[dataTrailChunkIndex - 1]), dataTrailChunkIndex, res.length - 1);
+              res[res.length - 1] = d;
+            } else {
+              res.fill(Object.assign({uz: -15000}, res[dataTrailChunkIndex - 1]), dataTrailChunkIndex, res.length - 1);
+              res.length--;
+            }
             trailChunkIndex = newTrailsData.length;
-            res.fill(Object.assign({uz: -15000}, res[dataTrailChunkIndex - 1]), dataTrailChunkIndex, res.length - 1);
-            res[res.length - 1] = d;
             currentTrailKey = null;
           } else {
-            res.push(d);
+            if(!d[REQUIRED_KEY]) res.push(d);
           }
         }
         return res;
 
-      }, []) : this.model.dataArray.map(d => {
+      }, []) : this.model.dataArray.filter(d => {
+        if (d[REQUIRED_KEY]) return false;
         d.r = sharedComponents.LegacyUtils.areaToRadius(this.sScale(d.size || 0));
-        return d;
+        return true;
       });
 
       this.labelZScale = d3.scaleLinear([0, selectedData.size - 1],[-0.09, -0.05]);
@@ -44964,9 +44974,9 @@ void main(void) {
       
       //console.log("__data", this.model.dataArray, this.__data, newData, this.__trailsData, newTrailsData);
       
-      this.__newLabelData = trailsShowAndSomeSelected ? this.__selectedKeys.map(key => selectedData.get(key) || this.model.dataMap.get(key)).filter(d => d && true) 
+      this.__newLabelData = trailsShowAndSomeSelected ? this.__selectedKeys.map(key => selectedData.get(key) || this.model.dataMap.get(key)).filter(d => d && !d[REQUIRED_KEY])
         :
-        this.__selectedKeys.map(key => this.model.dataMap.get(key)).filter(d => d && true);
+        this.__selectedKeys.map(key => this.model.dataMap.get(key)).filter(d => d && !d[REQUIRED_KEY]);
 
       if (this.__selectedKeys.length > this.__newLabelData.length) {
         const labelKeys = this.__newLabelData.map(d => d[TRAIL_KEY] || d[KEY]);
@@ -45050,7 +45060,8 @@ void main(void) {
 
       this.__someHighlighted = highlightedFilter.any();
       this.__highlightedMarkers = new Map(highlightedFilter.markers);
-      this.activeObject = this.__highlightedMarkers.size == 1 ? Object.assign({}, this.model.dataMap.get(this.__highlightedMarkers.keys().next().value)) : null;
+      const activeObject = this.__highlightedMarkers.size == 1 ? Object.assign({}, this.model.dataMap.get(this.__highlightedMarkers.keys().next().value)) : null;
+      this.activeObject = activeObject?.[REQUIRED_KEY] ? null : activeObject;
       this.activeObjectData = this.activeObject ? [this.activeObject] : [];
       this.opacityUpdateTrigger++;
       this.deckBubble.setProps({layers: this.getBubbleLayers(undefined, false)});
@@ -45073,7 +45084,7 @@ void main(void) {
 
       mobx.runInAction(() => {
         if (!this.MDL.trail.show) {
-          this.__labelData = this.__selectedKeys.map(key => this.model.dataMap.get(key));
+          this.__labelData = this.__selectedKeys.map(key => this.model.dataMap.get(key)).filter(d => d && !d[REQUIRED_KEY]);
           this.opacityUpdateTrigger++;
           this.deckBubble.setProps({layers: this.getBubbleLayers(undefined, false)});
         }
@@ -45199,10 +45210,10 @@ void main(void) {
       //const trailShow = this.MDL.trail.show;
       //const trailStarts = this.MDL.trail.starts;
       //const trailGroupDim = this.MDL.trail.groupDim;
+      const d = this.activeObject;
 
-      if (highlightedFilter.markers.size === 1) {
+      if (highlightedFilter.markers.size === 1 && d && !d[REQUIRED_KEY]) {
         highlightedFilter.markers.keys().next().value;
-        const d = this.activeObject;
         //Object.assign(this.model.dataMap.get(highlightedKey));
         const selectedKey = d[TRAIL_KEY] || d[KEY];
 
@@ -45280,6 +45291,7 @@ void main(void) {
         }
         return;
       }
+
       const _this = this;
       this.superHighlightFilter = superHighlightFilter;
       this.__superHLBlink = false;
@@ -45293,7 +45305,8 @@ void main(void) {
 
           loop();
         }, SUPERHIGHLIGHT_DELAY);
-      }    
+      }
+      
     }
 
     _selectDataPoints() {
@@ -45456,7 +45469,9 @@ void main(void) {
         },
         getTooltipText: (d) => {
           if (!d) return;
-          return d[TRAIL_KEY] || this.__selectedMarkers.has(d[KEY])? this.localise(d.frame) : this.__labelWithoutFrame(d);
+          return this.ui.labels.enabled ? d[TRAIL_KEY] || this.__selectedMarkers.has(d[KEY]) ? this.localise(d.frame) : this.__labelWithoutFrame(d)
+            :
+            d[TRAIL_KEY] ? this.__labelWithFrame(d) : this.__labelWithoutFrame(d);
         },
         getLabelPosition: (d) => {
           if (!d) return;
@@ -45941,7 +45956,7 @@ void main(void) {
           getTextAnchor: 'end',
           getAlignmentBaseline: 'bottom',
           getDragged: this.props.getDragged,
-          pickable: true,
+          pickable: false,
           background: !this.ui.labels.removeLabelBox,
           backgroundPadding: [6, 4],
           getBorderWidth: 1,
@@ -46069,8 +46084,8 @@ void main(void) {
 
     __tooltipDataFilter() {
       const index = this.__selectedKeys.indexOf(this.activeObject[TRAIL_KEY] || this.activeObject[KEY]);
-      return this.MDL.trail.show ? this.activeObject.frame != this.__labelData[index]?.frame || ((this.activeObject[TRAIL_KEY] || this.activeObject[KEY]) != this.__labelData[index]?.[TRAIL_KEY]) 
-        : index == -1;
+      return !this.ui.labels.enabled || (this.MDL.trail.show ? this.activeObject.frame != this.__labelData[index]?.frame || ((this.activeObject[TRAIL_KEY] || this.activeObject[KEY]) != this.__labelData[index]?.[TRAIL_KEY]) 
+        : index == -1);
     }
 
     get zScale() {
@@ -46317,7 +46332,7 @@ void main(void) {
     }
   });
 
-  BubbleChart.versionInfo = { version: "5.1.0", build: 1743007947150, package: {"homepage":"https://github.com/vizabi/bubblechart#readme","name":"@vizabi/bubblechart","description":"Vizabi bubble chart"}, sharedComponents: sharedComponents.versionInfo};
+  BubbleChart.versionInfo = { version: "5.2.1", build: 1746462563188, package: {"homepage":"https://github.com/vizabi/bubblechart#readme","name":"@vizabi/bubblechart","description":"Vizabi bubble chart"}, sharedComponents: sharedComponents.versionInfo};
 
   exports.Base = BubbleChart;