chartkick 5.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e3e26d84662ff0821322864aa4481daefc1c8a33c90210cf69fa3e2641122c1
-  data.tar.gz: 65098ca753ee49fa221f93dc24cd630bc007a0bfbe81885143287c3640f1f221
+  metadata.gz: 9ac4b71bb9edbf35b307e350adf2fc5ebfed0e23618ca5e079f37e3ce548f68c
+  data.tar.gz: b5a6a2499a5e9835d3dcc7b002a881d60d85a66efc45c79931cc9897cdeca6de
 SHA512:
-  metadata.gz: 781b9376d0f979e0fee356b5f872bbe339d2975c1fd46833262bc16476f83e0e2dc0149452616915a4c5eab323022db901b416722146dc7982fdc1a71bdc7240
-  data.tar.gz: ff8d09974073e3b09555654770c6d42534d0dffd87271b5f79d6bc15b58a5cec6d9695d23541e69ac32cafb428790ddf0fb6f697f5631bf1a3dca5aa5d1da44b
+  metadata.gz: 709e242eff3d7c82c2c78dee8f0693f055819e3a0e24db1d5d58fe4d3564d1309a2477d45fc2b261685a6d60f81d6a2b6ace5a7c03dce48db1fea4cdb7bce4ae
+  data.tar.gz: c866cf49a27a03a16fdaa276b5b002b5eb36378b8f16ce062a3d2a08a56c67b47d286035f5e47cea8bf549e33174d6581a0024f4c8e96ca32849ef236c91e24d

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-## 5.0.0 (2022-01-18)
+## 5.0.1 (2023-01-19)
+
+- Updated Chartkick.js to 5.0.1
+
+## 5.0.0 (2023-01-18)
 
 - Added support for Chart.js 4
 - Changed `chart_json` to be defined on `Hash` and `Array` instead of `Enumerable`

data/README.md

@@ -22,10 +22,10 @@ gem "chartkick"
 
 Then follow the instructions for your JavaScript setup:
 
-- [Importmap](#rails-7--importmap) (Rails 7 default)
-- [esbuild, rollup.js, or Webpack](#rails-7--esbuild-rollupjs-or-webpack)
-- [Webpacker](#rails-6--webpacker) (Rails 6 default)
-- [Sprockets](#rails-5--sprockets)
+- [Importmap](#importmap) (Rails 7 default)
+- [esbuild, rollup.js, or Webpack](#esbuild-rollupjs-or-webpack)
+- [Webpacker](#webpacker) (Rails 6 default)
+- [Sprockets](#sprockets)
 
 This sets up Chartkick with [Chart.js](https://www.chartjs.org/). For other charting libraries and frameworks, see [detailed instructions](#installation).
 
@@ -588,7 +588,7 @@ Download [chartkick.js](https://raw.githubusercontent.com/ankane/chartkick/maste
 
 Then include the charting library.
 
-Chart.js - download [Chart.js](https://unpkg.com/chart.js@3/dist/chart.js) and the [date-fns adapter bundle](https://unpkg.com/chartjs-adapter-date-fns@2/dist/chartjs-adapter-date-fns.bundle.js)
+Chart.js - download [Chart.js](https://unpkg.com/chart.js@4/dist/chart.umd.js) and the [date-fns adapter bundle](https://unpkg.com/chartjs-adapter-date-fns@3/dist/chartjs-adapter-date-fns.bundle.js)
 
 ```html
 <script src="chart.js"></script>

data/lib/chartkick/version.rb

@@ -1,3 +1,3 @@
 module Chartkick
-  VERSION = "5.0.0"
+  VERSION = "5.0.1"
 end

data/vendor/assets/javascripts/chartkick.js

@@ -1,5 +1,5 @@
 /*!
- * Chartkick.js v5.0.0
+ * Chartkick.js v5.0.1
  * Create beautiful charts with one line of JavaScript
  * https://github.com/ankane/chartkick.js
  * MIT License
@@ -211,15 +211,11 @@
       return "day";
     }
 
-    var dayOfWeek = values[0].getDay();
-    var week = every(values, function (d) { return d.getDay() === dayOfWeek; });
-    if (!week) {
-      return "day";
-    }
-
     var month = every(values, function (d) { return d.getDate() === 1; });
     if (!month) {
-      return "week";
+      var dayOfWeek = values[0].getDay();
+      var week = every(values, function (d) { return d.getDay() === dayOfWeek; });
+      return (week ? "week" : "day");
     }
 
     var year = every(values, function (d) { return d.getMonth() === 0; });
@@ -499,15 +495,20 @@
   }
 
   function setFormatOptions$1(chart, options, chartType) {
-    var formatOptions = {
+    // options to apply to x and r values for scatter and bubble
+    var numericOptions = {
+      thousands: chart.options.thousands,
+      decimal: chart.options.decimal
+    };
+
+    // options to apply to y value
+    var formatOptions = merge({
       prefix: chart.options.prefix,
       suffix: chart.options.suffix,
-      thousands: chart.options.thousands,
-      decimal: chart.options.decimal,
       precision: chart.options.precision,
       round: chart.options.round,
       zeros: chart.options.zeros
-    };
+    }, numericOptions);
 
     if (chart.options.bytes) {
       var series = chart.data;
@@ -539,6 +540,12 @@
           return formatValue("", value, formatOptions, true);
         };
       }
+
+      if ((chartType === "scatter" || chartType === "bubble") && !options.scales.x.ticks.callback) {
+        options.scales.x.ticks.callback = function (value) {
+          return formatValue("", value, numericOptions, true);
+        };
+      }
     }
 
     if (!options.plugins.tooltip.callbacks.label) {
@@ -549,7 +556,8 @@
             label += ': ';
           }
 
-          return label + context.formattedValue;
+          var dataPoint = context.parsed;
+          return label + '(' + formatValue('', dataPoint.x, numericOptions) + ', ' + formatValue('', dataPoint.y, formatOptions) + ')';
         };
       } else if (chartType === "bubble") {
         options.plugins.tooltip.callbacks.label = function (context) {
@@ -558,7 +566,7 @@
             label += ': ';
           }
           var dataPoint = context.raw;
-          return label + '(' + dataPoint.x + ', ' + dataPoint.y + ', ' + dataPoint.v + ')';
+          return label + '(' + formatValue('', dataPoint.x, numericOptions) + ', ' + formatValue('', dataPoint.y, formatOptions) + ', ' + formatValue('', dataPoint.v, numericOptions) + ')';
         };
       } else if (chartType === "pie") {
         // need to use separate label for pie charts
@@ -581,6 +589,22 @@
         };
       }
     }
+
+    // avoid formatting x-axis labels
+    // by default, Chart.js applies locale
+    if ((chartType === "line" || chartType === "area") && chart.xtype === "number") {
+      if (!options.scales.x.ticks.callback) {
+        options.scales.x.ticks.callback = function (value) {
+          return toStr(value);
+        };
+      }
+
+      if (!options.plugins.tooltip.callbacks.title) {
+        options.plugins.tooltip.callbacks.title = function (context) {
+          return toStr(context[0].parsed.x);
+        };
+      }
+    }
   }
 
   function maxAbsY(series) {
@@ -881,7 +905,11 @@
         }
 
         if (!options.scales.x.time.tooltipFormat) {
-          if (isDay(timeUnit)) {
+          if (timeUnit === "year") {
+            options.scales.x.time.tooltipFormat = "yyyy";
+          } else if (timeUnit === "month") {
+            options.scales.x.time.tooltipFormat = "MMM yyyy";
+          } else if (timeUnit === "week" || timeUnit === "day") {
             options.scales.x.time.tooltipFormat = "PP";
           } else if (timeUnit === "hour") {
             options.scales.x.time.tooltipFormat = "MMM d, h a";
@@ -904,12 +932,16 @@
   };
 
   defaultExport$2.prototype.renderLineChart = function renderLineChart (chart, chartType) {
+    if (!chartType) {
+      chartType = "line";
+    }
+
     var chartOptions = {};
 
     var options = jsOptions$2(chart, merge(chartOptions, chart.options));
     setFormatOptions$1(chart, options, chartType);
 
-    var data = createDataTable(chart, options, chartType || "line");
+    var data = createDataTable(chart, options, chartType);
 
     if (chart.xtype === "number") {
       options.scales.x.type = options.scales.x.type || "linear";

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chartkick
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-18 00:00:00.000000000 Z
+date: 2023-01-19 00:00:00.000000000 Z
 dependencies: []
 description:
 email: andrew@ankane.org