[FE-18003] Bug fix - modifying mapping and cancelling removed mapping (…

…#680) * Safeguard against customRange being undefined, triggering a resetCustomColor call in immerse * Fix same issue for bubble chart * Update build files --------- Co-authored-by: Chris Matzenbach <[email protected]>
heavyai · Nov 18, 2024 · 1e94f12 · 1e94f12
1 parent 740f6a9
commit 1e94f12
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/dist/charting.js b/dist/charting.js
@@ -12042,7 +12042,7 @@ function colorMixin(_chart) {
    * @return {String}
    */
   _chart.getColor = function (data, index) {
-    var _customColor;
+    var _chart$customRange, _customColor;
     if (typeof data === "undefined") {
       var GREY = "#e2e2e2";
       return GREY;
@@ -12052,7 +12052,7 @@ function colorMixin(_chart) {
     var value = _colorAccessor.call(this, data, index);
     var color = typeof value === "string" ? _chart.determineColorByValue(value, range) : _colors(_colorAccessor.call(this, data, index)) || middleColor;
     var customColor = null;
-    if (_chart.customRange().length > 0) {
+    if (((_chart$customRange = _chart.customRange()) === null || _chart$customRange === void 0 ? void 0 : _chart$customRange.length) > 0) {
       var customDomain = _chart.customDomain();
       var customRange = _chart.customRange();
       if (Array.isArray(value)) {
@@ -81965,6 +81965,7 @@ function bubbleChart(parent, chartGroup) {
     return _chart;
   };
   _chart.plotData = function () {
+    var _chart$customDomain, _chart$customRange;
     if (_elasticRadius) {
       _chart.r().domain([_chart.rMin(), _chart.rMax()]);
     }
@@ -81993,8 +81994,8 @@ function bubbleChart(parent, chartGroup) {
         return __WEBPACK_IMPORTED_MODULE_0_d3___default.a.descending(radiusAccessor(a), radiusAccessor(b));
       });
     }
-    var domain = _chart.customDomain();
-    var range = _chart.customRange();
+    var domain = (_chart$customDomain = _chart.customDomain()) !== null && _chart$customDomain !== void 0 ? _chart$customDomain : [];
+    var range = (_chart$customRange = _chart.customRange()) !== null && _chart$customRange !== void 0 ? _chart$customRange : [];
     if (domain.length === 0 && range.length === 0) {
       var newDomain = data.map(function (d) {
         return d.key0;
@@ -88316,8 +88317,9 @@ function pieChart(parent, chartGroup) {
     });
   }
   function updateElements(pieData, arc) {
-    var domain = _chart.customDomain();
-    var range = _chart.customRange();
+    var _chart$customDomain, _chart$customRange;
+    var domain = (_chart$customDomain = _chart.customDomain()) !== null && _chart$customDomain !== void 0 ? _chart$customDomain : [];
+    var range = (_chart$customRange = _chart.customRange()) !== null && _chart$customRange !== void 0 ? _chart$customRange : [];
 
     // if custom domain is empty, generate it from the pieData
     if (domain.length === 0 && range.length === 0) {

diff --git a/src/charts/bubble-chart.js b/src/charts/bubble-chart.js
@@ -466,8 +466,8 @@ export default function bubbleChart(parent, chartGroup) {
       data.sort((a, b) => d3.descending(radiusAccessor(a), radiusAccessor(b)))
     }
 
-    const domain = _chart.customDomain()
-    const range = _chart.customRange()
+    const domain = _chart.customDomain() ?? []
+    const range = _chart.customRange() ?? []
 
     if (domain.length === 0 && range.length === 0) {
       const newDomain = data.map(d => d.key0)

diff --git a/src/charts/pie-chart.js b/src/charts/pie-chart.js
@@ -463,8 +463,8 @@ export default function pieChart(parent, chartGroup) {
   }
 
   function updateElements(pieData, arc) {
-    const domain = _chart.customDomain()
-    const range = _chart.customRange()
+    const domain = _chart.customDomain() ?? []
+    const range = _chart.customRange() ?? []
 
     // if custom domain is empty, generate it from the pieData
     if (domain.length === 0 && range.length === 0) {

diff --git a/src/mixins/color-mixin.js b/src/mixins/color-mixin.js
@@ -176,7 +176,7 @@ export default function colorMixin(_chart) {
         : _colors(_colorAccessor.call(this, data, index)) || middleColor
 
     let customColor = null
-    if (_chart.customRange().length > 0) {
+    if (_chart.customRange()?.length > 0) {
       const customDomain = _chart.customDomain()
       const customRange = _chart.customRange()
       if (Array.isArray(value)) {