chartkick 5.1.3 → 5.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60765472a4a878439878da816efbb07ef13ef5e8d13fa05d1b5d17cc35a86fc1
-  data.tar.gz: 895e11561ff7bc42c3171d43f7c70ac680b68e213133210ddbadd35ddb6e847d
+  metadata.gz: '0872574220622fecbfb25770afdfdf1f244df0ba36d768c8e1d49e220120a7a3'
+  data.tar.gz: 639bdb33a206445211c2496e14624090fef6a7e0e32dd0466d2a308f88dc8d0e
 SHA512:
-  metadata.gz: 3b887e7da63f59a7faa7c7746e685dddc936a349042b90873d53cb08db64b284b809e3a1c89943f5ec0068dbf0fc188ca96555a651b1863198673760f3b5808f
-  data.tar.gz: aba0da7151b351d6f4bf3ed6b7382d0bb0a2998f06230946a44c2f34d918028eecec0aadff454794565f6f125c113acf56022b081c61cbda4d18fe9528fee1bb
+  metadata.gz: 6a6d14dd85b91be1d82843ce6e241be6035bfe8b9f9d75e53ae59e4b9f83db09878c391d4bf3afaa8efca5b5ef397fa9bed27796d1c0963766cf14ac70e5d799
+  data.tar.gz: 37f5e87298510df837427db88997c99f86082887f10105ed12bf0f61fb7b30ff96ac65bace73df35048764888483edf40f3de05d5c7e249ae62afffefd79c4dd

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 5.1.5 (2025-04-15)
+
+- Updated Chart.js to 4.4.9
+
+## 5.1.4 (2025-02-19)
+
+- Updated Chart.js to 4.4.8
+
 ## 5.1.3 (2025-02-01)
 
 - Updated Chart.js to 4.4.7

data/lib/chartkick/version.rb

@@ -1,3 +1,3 @@
 module Chartkick
-  VERSION = "5.1.3"
+  VERSION = "5.1.5"
 end

data/vendor/assets/javascripts/Chart.bundle.js

@@ -1,7 +1,7 @@
 /*!
- * Chart.js v4.4.7
+ * Chart.js v4.4.9
  * https://www.chartjs.org
- * (c) 2024 Chart.js Contributors
+ * (c) 2025 Chart.js Contributors
  * Released under the MIT License
  *
  * @kurkle/color v0.3.2
@@ -1300,8 +1300,14 @@
     }).pop();
     return result;
   }
+  /**
+   * Verifies that attempting to coerce n to string or number won't throw a TypeError.
+   */
+  function isNonPrimitive(n) {
+    return _typeof$1(n) === 'symbol' || _typeof$1(n) === 'object' && n !== null && !(Symbol.toPrimitive in n || 'toString' in n || 'valueOf' in n);
+  }
   function isNumber(n) {
-    return !isNaN(parseFloat(n)) && isFinite(n);
+    return !isNonPrimitive(n) && !isNaN(parseFloat(n)) && isFinite(n);
   }
   function almostWhole(x, epsilon) {
     var rounded = Math.round(x);
@@ -1631,7 +1637,9 @@
     var count = pointCount;
     if (meta._sorted) {
       var iScale = meta.iScale,
+        vScale = meta.vScale,
         _parsed = meta._parsed;
+      var spanGaps = meta.dataset ? meta.dataset.options ? meta.dataset.options.spanGaps : null : null;
       var axis = iScale.axis;
       var _iScale$getUserBounds = iScale.getUserBounds(),
         min = _iScale$getUserBounds.min,
@@ -1639,18 +1647,32 @@
         minDefined = _iScale$getUserBounds.minDefined,
         maxDefined = _iScale$getUserBounds.maxDefined;
       if (minDefined) {
-        start = _limitValue(Math.min(
+        start = Math.min(
         // @ts-expect-error Need to type _parsed
         _lookupByKey(_parsed, axis, min).lo,
         // @ts-expect-error Need to fix types on _lookupByKey
-        animationsDisabled ? pointCount : _lookupByKey(points, axis, iScale.getPixelForValue(min)).lo), 0, pointCount - 1);
+        animationsDisabled ? pointCount : _lookupByKey(points, axis, iScale.getPixelForValue(min)).lo);
+        if (spanGaps) {
+          var distanceToDefinedLo = _parsed.slice(0, start + 1).reverse().findIndex(function (point) {
+            return !isNullOrUndef(point[vScale.axis]);
+          });
+          start -= Math.max(0, distanceToDefinedLo);
+        }
+        start = _limitValue(start, 0, pointCount - 1);
       }
       if (maxDefined) {
-        count = _limitValue(Math.max(
+        var end = Math.max(
         // @ts-expect-error Need to type _parsed
         _lookupByKey(_parsed, iScale.axis, max, true).hi + 1,
         // @ts-expect-error Need to fix types on _lookupByKey
-        animationsDisabled ? 0 : _lookupByKey(points, axis, iScale.getPixelForValue(max), true).hi + 1), start, pointCount) - start;
+        animationsDisabled ? 0 : _lookupByKey(points, axis, iScale.getPixelForValue(max), true).hi + 1);
+        if (spanGaps) {
+          var distanceToDefinedHi = _parsed.slice(end - 1).findIndex(function (point) {
+            return !isNullOrUndef(point[vScale.axis]);
+          });
+          end += Math.max(0, distanceToDefinedHi);
+        }
+        count = _limitValue(end, start, pointCount) - start;
       } else {
         count = pointCount - start;
       }
@@ -3360,14 +3382,8 @@
   }
 
   /**
-   * Note: typedefs are auto-exported, so use a made-up `dom` namespace where
-   * necessary to avoid duplicates with `export * from './helpers`; see
-   * https://github.com/microsoft/TypeScript/issues/46011
-   * @typedef { import('../core/core.controller.js').default } dom.Chart
-   * @typedef { import('../../types').ChartEvent } ChartEvent
-   */ /**
-      * @private
-      */
+   * @private
+   */
   function _isDomSupported() {
     return typeof window !== 'undefined' && typeof document !== 'undefined';
   }
@@ -4031,6 +4047,35 @@
     };
     return JSON.stringify(style, replacer) !== JSON.stringify(prevStyle, replacer);
   }
+  function getSizeForArea(scale, chartArea, field) {
+    return scale.options.clip ? scale[field] : chartArea[field];
+  }
+  function getDatasetArea(meta, chartArea) {
+    var xScale = meta.xScale,
+      yScale = meta.yScale;
+    if (xScale && yScale) {
+      return {
+        left: getSizeForArea(xScale, chartArea, 'left'),
+        right: getSizeForArea(xScale, chartArea, 'right'),
+        top: getSizeForArea(yScale, chartArea, 'top'),
+        bottom: getSizeForArea(yScale, chartArea, 'bottom')
+      };
+    }
+    return chartArea;
+  }
+  function getDatasetClipArea(chart, meta) {
+    var clip = meta._clip;
+    if (clip.disabled) {
+      return false;
+    }
+    var area = getDatasetArea(meta, chart.chartArea);
+    return {
+      left: clip.left === false ? 0 : area.left - (clip.left === true ? 0 : clip.left),
+      right: clip.right === false ? chart.width : area.right + (clip.right === true ? 0 : clip.right),
+      top: clip.top === false ? 0 : area.top - (clip.top === true ? 0 : clip.top),
+      bottom: clip.bottom === false ? chart.height : area.bottom + (clip.bottom === true ? 0 : clip.bottom)
+    };
+  }
 
   var Animator = /*#__PURE__*/function () {
     function Animator() {
@@ -7081,10 +7126,24 @@
       data = metaset.data,
       _sorted = metaset._sorted;
     var iScale = controller._cachedMeta.iScale;
+    var spanGaps = metaset.dataset ? metaset.dataset.options ? metaset.dataset.options.spanGaps : null : null;
     if (iScale && axis === iScale.axis && axis !== 'r' && _sorted && data.length) {
       var lookupMethod = iScale._reversePixels ? _rlookupByKey : _lookupByKey;
       if (!intersect) {
-        return lookupMethod(data, axis, value);
+        var result = lookupMethod(data, axis, value);
+        if (spanGaps) {
+          var vScale = controller._cachedMeta.vScale;
+          var _parsed = metaset._parsed;
+          var distanceToDefinedLo = _parsed.slice(0, result.lo + 1).reverse().findIndex(function (point) {
+            return !isNullOrUndef(point[vScale.axis]);
+          });
+          result.lo -= Math.max(0, distanceToDefinedLo);
+          var distanceToDefinedHi = _parsed.slice(result.hi).findIndex(function (point) {
+            return !isNullOrUndef(point[vScale.axis]);
+          });
+          result.hi += Math.max(0, distanceToDefinedHi);
+        }
+        return result;
       } else if (controller._sharedOptions) {
         var el = data[0];
         var range = typeof el.getRange === 'function' && el.getRange(axis);
@@ -10402,7 +10461,7 @@
     }
     return false;
   }
-  var version = "4.4.7";
+  var version = "4.4.9";
   var KNOWN_POSITIONS = ['top', 'bottom', 'left', 'right', 'chartArea'];
   function positionIsHorizontal(position, axis) {
     return position === 'top' || position === 'bottom' || KNOWN_POSITIONS.indexOf(position) === -1 && axis === 'x';
@@ -10464,22 +10523,6 @@
     }
     return e;
   }
-  function getSizeForArea(scale, chartArea, field) {
-    return scale.options.clip ? scale[field] : chartArea[field];
-  }
-  function getDatasetArea(meta, chartArea) {
-    var xScale = meta.xScale,
-      yScale = meta.yScale;
-    if (xScale && yScale) {
-      return {
-        left: getSizeForArea(xScale, chartArea, 'left'),
-        right: getSizeForArea(xScale, chartArea, 'right'),
-        top: getSizeForArea(yScale, chartArea, 'top'),
-        bottom: getSizeForArea(yScale, chartArea, 'bottom')
-      };
-    }
-    return chartArea;
-  }
   var Chart = /*#__PURE__*/function () {
     function Chart(item, userConfig) {
       var _this12 = this;
@@ -11069,27 +11112,20 @@
       key: "_drawDataset",
       value: function _drawDataset(meta) {
         var ctx = this.ctx;
-        var clip = meta._clip;
-        var useClip = !clip.disabled;
-        var area = getDatasetArea(meta, this.chartArea);
         var args = {
           meta: meta,
           index: meta.index,
           cancelable: true
         };
+        var clip = getDatasetClipArea(this, meta);
         if (this.notifyPlugins('beforeDatasetDraw', args) === false) {
           return;
         }
-        if (useClip) {
-          clipArea(ctx, {
-            left: clip.left === false ? 0 : area.left - clip.left,
-            right: clip.right === false ? this.width : area.right + clip.right,
-            top: clip.top === false ? 0 : area.top - clip.top,
-            bottom: clip.bottom === false ? this.height : area.bottom + clip.bottom
-          });
+        if (clip) {
+          clipArea(ctx, clip);
         }
         meta.controller.draw();
-        if (useClip) {
+        if (clip) {
           unclipArea(ctx);
         }
         args.cancelable = false;
@@ -13211,7 +13247,9 @@
   }
   function _drawfill(ctx, source, area) {
     var target = _getTarget(source);
-    var line = source.line,
+    var chart = source.chart,
+      index = source.index,
+      line = source.line,
       scale = source.scale,
       axis = source.axis;
     var lineOpts = line.options;
@@ -13222,6 +13260,8 @@
       above = _ref9$above === void 0 ? color : _ref9$above,
       _ref9$below = _ref9.below,
       below = _ref9$below === void 0 ? color : _ref9$below;
+    var meta = chart.getDatasetMeta(index);
+    var clip = getDatasetClipArea(chart, meta);
     if (target && line.points.length) {
       clipArea(ctx, area);
       doFill(ctx, {
@@ -13231,7 +13271,8 @@
         below: below,
         area: area,
         scale: scale,
-        axis: axis
+        axis: axis,
+        clip: clip
       });
       unclipArea(ctx);
     }
@@ -13242,7 +13283,8 @@
       above = cfg.above,
       below = cfg.below,
       area = cfg.area,
-      scale = cfg.scale;
+      scale = cfg.scale,
+      clip = cfg.clip;
     var property = line._loop ? 'angle' : cfg.axis;
     ctx.save();
     if (property === 'x' && below !== above) {
@@ -13252,7 +13294,8 @@
         target: target,
         color: above,
         scale: scale,
-        property: property
+        property: property,
+        clip: clip
       });
       ctx.restore();
       ctx.save();
@@ -13263,7 +13306,8 @@
       target: target,
       color: below,
       scale: scale,
-      property: property
+      property: property,
+      clip: clip
     });
     ctx.restore();
   }
@@ -13312,7 +13356,8 @@
       target = cfg.target,
       property = cfg.property,
       color = cfg.color,
-      scale = cfg.scale;
+      scale = cfg.scale,
+      clip = cfg.clip;
     var segments = _segments(line, target, property);
     var _iterator22 = _createForOfIteratorHelper$1(segments),
       _step22;
@@ -13330,7 +13375,7 @@
         var notShape = target !== true;
         ctx.save();
         ctx.fillStyle = backgroundColor;
-        clipBounds(ctx, scale, notShape && _getBounds(property, start, end));
+        clipBounds(ctx, scale, clip, notShape && _getBounds(property, start, end));
         ctx.beginPath();
         var lineLoop = !!line.pathSegment(ctx, src);
         var loop = void 0;
@@ -13359,17 +13404,33 @@
       _iterator22.f();
     }
   }
-  function clipBounds(ctx, scale, bounds) {
-    var _scale$chart$chartAre = scale.chart.chartArea,
-      top = _scale$chart$chartAre.top,
-      bottom = _scale$chart$chartAre.bottom;
+  function clipBounds(ctx, scale, clip, bounds) {
+    var chartArea = scale.chart.chartArea;
     var _ref10 = bounds || {},
       property = _ref10.property,
       start = _ref10.start,
       end = _ref10.end;
-    if (property === 'x') {
+    if (property === 'x' || property === 'y') {
+      var left, top, right, bottom;
+      if (property === 'x') {
+        left = start;
+        top = chartArea.top;
+        right = end;
+        bottom = chartArea.bottom;
+      } else {
+        left = chartArea.left;
+        top = start;
+        right = chartArea.right;
+        bottom = end;
+      }
       ctx.beginPath();
-      ctx.rect(start, top, end - start, bottom - top);
+      if (clip) {
+        left = Math.max(left, clip.left);
+        right = Math.min(right, clip.right);
+        top = Math.max(top, clip.top);
+        bottom = Math.min(bottom, clip.bottom);
+      }
+      ctx.rect(left, top, right - left, bottom - top);
       ctx.clip();
     }
   }
@@ -17314,6 +17375,7 @@
     fontString: fontString,
     formatNumber: formatNumber,
     getAngleFromPoint: getAngleFromPoint,
+    getDatasetClipArea: getDatasetClipArea,
     getHoverColor: getHoverColor,
     getMaximumSize: getMaximumSize,
     getRelativePosition: getRelativePosition,

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: chartkick
 version: !ruby/object:Gem::Version
-  version: 5.1.3
+  version: 5.1.5
 platform: ruby
 authors:
 - Andrew Kane
 bindir: bin
 cert_chain: []
-date: 2025-02-01 00:00:00.000000000 Z
+date: 2025-04-15 00:00:00.000000000 Z
 dependencies: []
 email: andrew@ankane.org
 executables: []