diff --git a/modules/charts_google/src/Charts/GoogleChartsRender.php b/modules/charts_google/src/Charts/GoogleChartsRender.php
index b4df824b8372e9b8ad648d5b69513d11ad6c8038..f0d23c5d98adb9276083ab120eb2eafd97aaea75 100644
--- a/modules/charts_google/src/Charts/GoogleChartsRender.php
+++ b/modules/charts_google/src/Charts/GoogleChartsRender.php
@@ -330,6 +330,12 @@ class GoogleChartsRender implements ChartsRenderInterface {
$googleOptions->setThreeDimensional($options['three_dimensional']);
}
+ // Determines if chart is stacked.
+ if (!empty($options['grouping'])) {
+ $options['grouping'] = TRUE;
+ $googleOptions->setStacking($options['grouping']);
+ }
+
// 'legend' can be a string (for position) or an array with legend
// properties: [position: 'top', textStyle: [color: 'blue', fontSize: 16]].
if (isset($options['legend'])) {
diff --git a/modules/charts_google/src/Plugin/chart/GoogleCharts.php b/modules/charts_google/src/Plugin/chart/GoogleCharts.php
index 15751badf9d19a38d85c2dd404572a4d48950c98..679893f86812286e34825b5431392d8548265a1d 100644
--- a/modules/charts_google/src/Plugin/chart/GoogleCharts.php
+++ b/modules/charts_google/src/Plugin/chart/GoogleCharts.php
@@ -339,6 +339,12 @@ class GoogleCharts extends AbstractChart {
$googleOptions->setThreeDimensional($options['three_dimensional']);
}
+ // Determines if chart is stacked.
+ if (!empty($options['grouping'])) {
+ $options['grouping'] = TRUE;
+ $googleOptions->setStacking($options['grouping']);
+ }
+
// 'legend' can be a string (for position) or an array with legend
// properties: [position: 'top', textStyle: [color: 'blue', fontSize: 16]].
if (isset($options['legend'])) {
diff --git a/modules/charts_google/src/Settings/Google/GoogleOptions.php b/modules/charts_google/src/Settings/Google/GoogleOptions.php
index 885affa0b973f20b8426fc00d32c0183366dc1ac..71925fe2ecc4a0757ca4ed26e6157ea93321f99e 100644
--- a/modules/charts_google/src/Settings/Google/GoogleOptions.php
+++ b/modules/charts_google/src/Settings/Google/GoogleOptions.php
@@ -107,6 +107,13 @@ class GoogleOptions implements \JsonSerializable {
*/
private $is3D;
+ /**
+ * Stacking option.
+ *
+ * @var mixed
+ */
+ private $isStacked;
+
/**
* Gets the title of the Material Chart. Only Material Charts support titles.
*
@@ -394,6 +401,26 @@ class GoogleOptions implements \JsonSerializable {
$this->is3D = $is3D;
}
+ /**
+ * Gets stacking chart option.
+ *
+ * @return mixed
+ * Stacking option.
+ */
+ public function getStacking() {
+ return $this->isStacked;
+ }
+
+ /**
+ * Sets stacking chart option.
+ *
+ * @param mixed $isStacked
+ * Stacking option.
+ */
+ public function setStacking($isStacked) {
+ $this->isStacked = $isStacked;
+ }
+
/**
* Json Serialize.
*
diff --git a/modules/charts_highcharts/src/Charts/HighchartsChartsRender.php b/modules/charts_highcharts/src/Charts/HighchartsChartsRender.php
index 2e8008f2771fc90b2318c22b5412c15d4b858434..3836d30066d8d7e391eee03db480b28d04ad4e4b 100644
--- a/modules/charts_highcharts/src/Charts/HighchartsChartsRender.php
+++ b/modules/charts_highcharts/src/Charts/HighchartsChartsRender.php
@@ -6,6 +6,7 @@ use Drupal\charts\Charts\ChartsRenderInterface;
use Drupal\charts\Util\Util;
use Drupal\charts_highcharts\Settings\Highcharts\Chart;
use Drupal\charts_highcharts\Settings\Highcharts\ChartTitle;
+use Drupal\charts_highcharts\Settings\Highcharts\ExportingOptions;
use Drupal\charts_highcharts\Settings\Highcharts\PlotOptionsStacking;
use Drupal\charts_highcharts\Settings\Highcharts\Xaxis;
use Drupal\charts_highcharts\Settings\Highcharts\XaxisTitle;
@@ -193,6 +194,8 @@ class HighchartsChartsRender implements ChartsRenderInterface {
$chartLegend->setY('0');
}
+ $exporting = new ExportingOptions($options['exporting'] ?: []);
+
$highchart = new Highcharts();
$highchart->setChart($chart);
$highchart->setTitle($chartTitle);
@@ -203,6 +206,7 @@ class HighchartsChartsRender implements ChartsRenderInterface {
$highchart->setCredits($chartCredits);
$highchart->setLegend($chartLegend);
$highchart->setSeries($seriesData);
+ $highchart->setExporting($exporting);
$variables['chart_type'] = 'highcharts';
$variables['content_attributes']['data-chart'][] = json_encode($highchart);
$variables['attributes']['id'][0] = $chartId;
diff --git a/modules/charts_highcharts/src/Plugin/chart/Highchart.php b/modules/charts_highcharts/src/Plugin/chart/Highchart.php
index 37b70b7de5e42ca84a61a738468f9f6e8e542c3e..981ff5716092531489eb2abce72b14c3c03108e4 100644
--- a/modules/charts_highcharts/src/Plugin/chart/Highchart.php
+++ b/modules/charts_highcharts/src/Plugin/chart/Highchart.php
@@ -5,6 +5,7 @@ namespace Drupal\charts_highcharts\Plugin\chart;
use Drupal\charts\Plugin\chart\AbstractChart;
use Drupal\charts_highcharts\Settings\Highcharts\Chart;
use Drupal\charts_highcharts\Settings\Highcharts\ChartTitle;
+use Drupal\charts_highcharts\Settings\Highcharts\ExportingOptions;
use Drupal\charts_highcharts\Settings\Highcharts\PlotOptionsStacking;
use Drupal\charts_highcharts\Settings\Highcharts\Xaxis;
use Drupal\charts_highcharts\Settings\Highcharts\XaxisTitle;
@@ -200,6 +201,8 @@ class Highchart extends AbstractChart {
$chartLegend->setY('0');
}
+ $exporting = new ExportingOptions($options['exporting'] ?: []);
+
$highchart = new Highcharts();
$highchart->setChart($chart);
$highchart->setTitle($chartTitle);
@@ -210,6 +213,7 @@ class Highchart extends AbstractChart {
$highchart->setCredits($chartCredits);
$highchart->setLegend($chartLegend);
$highchart->setSeries($seriesData);
+ $highchart->setExporting($exporting);
$variables['chart_type'] = 'highcharts';
$variables['content_attributes']['data-chart'][] = json_encode($highchart);
$variables['attributes']['id'][0] = $chartId;
diff --git a/modules/charts_highcharts/src/Settings/Highcharts/ExportingOptions.php b/modules/charts_highcharts/src/Settings/Highcharts/ExportingOptions.php
new file mode 100644
index 0000000000000000000000000000000000000000..dee694ec300a4696501e445e0f9f6b4bf7e7df0c
--- /dev/null
+++ b/modules/charts_highcharts/src/Settings/Highcharts/ExportingOptions.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Drupal\charts_highcharts\Settings\Highcharts;
+
+/**
+ * Class ExportingOptions.
+ */
+class ExportingOptions implements \JsonSerializable {
+
+ /**
+ * Is exporting enabled.
+ *
+ * @var bool
+ */
+ private $enabled = TRUE;
+
+ /**
+ * ExportingOptions constructor.
+ *
+ * @param array $array
+ * (optional) A keyed array defining the exporting settings.
+ */
+ public function __construct(array $array = []) {
+ foreach ($array as $key => $value) {
+ switch ($key) {
+ case 'enabled':
+ $this->setEnabled($value);
+ break;
+ }
+ }
+ }
+
+ /**
+ * Get enabled.
+ *
+ * @return bool
+ * Whether exporting is enabled.
+ */
+ public function getEnabled() {
+ return $this->enabled;
+ }
+
+ /**
+ * Set enabled.
+ *
+ * @param bool $enabled
+ * Enabled if TRUE, disabled otherwise.
+ */
+ public function setEnabled($enabled) {
+ $this->enabled = $enabled;
+ }
+
+ /**
+ * Json Serialize.
+ *
+ * @return array
+ * Json Serialize.
+ */
+ public function jsonSerialize() {
+ $vars = get_object_vars($this);
+
+ return $vars;
+ }
+
+}
\ No newline at end of file
diff --git a/modules/charts_highcharts/src/Settings/Highcharts/Highcharts.php b/modules/charts_highcharts/src/Settings/Highcharts/Highcharts.php
index 9deb147a6e5cf0843105ade5b532b4145d104c1a..a44d96be679d82ea3ebf1ee55c97ce3220eb21a5 100644
--- a/modules/charts_highcharts/src/Settings/Highcharts/Highcharts.php
+++ b/modules/charts_highcharts/src/Settings/Highcharts/Highcharts.php
@@ -17,6 +17,7 @@ class Highcharts implements \JsonSerializable {
private $credits;
private $innerSize = '%20';
private $series;
+ private $exporting;
/**
* Get Chart.
@@ -218,6 +219,26 @@ class Highcharts implements \JsonSerializable {
$this->series = $series;
}
+ /**
+ * Get exporting options.
+ *
+ * @return \Drupal\charts_highcharts\Settings\Highcharts\ExportingOptions|null
+ * The exporting options.
+ */
+ public function getExporting() {
+ return $this->exporting;
+ }
+
+ /**
+ * Set exporting options.
+ *
+ * @param \Drupal\charts_highcharts\Settings\Highcharts\ExportingOptions|null $exporting
+ * The exporting options.
+ */
+ public function setExporting($exporting = NULL) {
+ $this->exporting = $exporting;
+ }
+
/**
* Json Serialize.
*
diff --git a/src/Plugin/views/style/ChartsPluginStyleChart.php b/src/Plugin/views/style/ChartsPluginStyleChart.php
index b10c54664958105fe7e84f36516cbc6b6d4cae7e..6aa0f5efd53ab18259ffed3508e6475bfefa57e4 100644
--- a/src/Plugin/views/style/ChartsPluginStyleChart.php
+++ b/src/Plugin/views/style/ChartsPluginStyleChart.php
@@ -66,7 +66,7 @@ class ChartsPluginStyleChart extends StylePluginBase {
// Limit grouping options (we only support one grouping field).
if (isset($form['grouping'][0])) {
$form['grouping'][0]['field']['#title'] = t('Grouping field');
- $form['grouping'][0]['field']['#description'] = t('If grouping by a particular field, that field will be used to generate multiple data series on the same chart.');
+ $form['grouping'][0]['field']['#description'] = t('If grouping by a particular field, that field will be used to determine stacking of the chart. Generally this will be the same field as what you select for the "Label field" below. If you do not have more than one "Provides data" field below, there will be nothing to stack. If you want to have another series displayed, use a "Chart attachment" display, and set it to attach to this display. Stacking is still a work in progress for C3 Charts.');
$form['grouping'][0]['field']['#attributes']['class'][] = 'charts-grouping-field';
// Grouping by rendered version has no effect in charts. Hide the options.
$form['grouping'][0]['rendered']['#access'] = FALSE;