16 Commits

Author SHA1 Message Date
asantibanez
e6f04ca4c3 Merge branch 'master' of https://github.com/asantibanez/livewire-charts into nicko170/master 2022-02-14 10:58:40 -05:00
Andrés Santibáñez
327665919f Merge pull request #69 from asantibanez/update-to-laravel-9
Added support for L9. Upgraded dependencies
2022-02-14 10:42:35 -05:00
asantibanez
879734fe9c Updated CI 2022-02-14 10:33:10 -05:00
asantibanez
6754e94cde Added support for L9. Upgraded dependencies 2022-02-14 10:26:17 -05:00
nicko170
a7364ad51c compile 2021-08-27 16:14:40 +10:00
nicko170
47d0f028af adding pie chart type 2021-08-27 16:05:53 +10:00
Andrés Santibáñez
582ad340dd Updated docs 2021-02-12 00:29:24 -05:00
Andrés Santibáñez
35d8a80bb4 Updated docs 2021-02-12 00:26:33 -05:00
Andrés Santibáñez
665a3370b2 Added build 2021-02-12 00:26:10 -05:00
Andrés Santibáñez
84527ff809 Added color customization to multiline chart 2021-02-12 00:26:04 -05:00
Andrés Santibáñez
cefb5089e8 Updated docs 2021-02-12 00:22:32 -05:00
Andrés Santibáñez
bf644a5931 Updated docs 2021-02-12 00:20:11 -05:00
Andrés Santibáñez
3abe96bdb0 Added build 2021-02-12 00:17:20 -05:00
Andrés Santibáñez
171a333044 Added init method to all charts
- Added custom colors to pie chart
2021-02-12 00:17:11 -05:00
Andrés Santibáñez
372d6ffcb0 Added extra configuration options to column chart 2021-02-11 23:42:06 -05:00
asantibanez
0de38b041b Added new traits for colors and grid handling 2021-02-11 22:35:59 -05:00
23 changed files with 299 additions and 12148 deletions

View File

@@ -15,7 +15,7 @@ jobs:
- name: Setup PHP - name: Setup PHP
uses: shivammathur/setup-php@v2 uses: shivammathur/setup-php@v2
with: with:
php-version: '7.4' php-version: '8.0'
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd, exif, imagick, bcmath extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd, exif, imagick, bcmath
coverage: none coverage: none

View File

@@ -1,5 +1,23 @@
# Changelog # Changelog
## 2.3.0 - 2021-02-12
- Added `init()` method for better boot and $wire hoisting
- Added color customization for columns, multiline and pie chart
## 2.2.0 - 2020-12-16
- Added support for PHP 8
- Updated docs
- Added base tests for components and CI
## 2.1.0 - 2020-11-30
- Added stroke width customization
- Added stroke support for Area Chart
## 2.0.0 - 2020-11-30
- Added build system for JS charts code
- Added Blade directive to include assets
- Updated installation and advanced usage instructions
## 1.5.2 - 2020-11-09 ## 1.5.2 - 2020-11-09
- Fixed infinite growing charts - Fixed infinite growing charts

View File

@@ -22,6 +22,10 @@ Next, you must export the package public scripts. To do this run `php artisan ve
and export `livewire-charts:public`. This command will export a `vendor/livewire-charts` folder under the and export `livewire-charts:public`. This command will export a `vendor/livewire-charts` folder under the
`public` directory of your app. `public` directory of your app.
```bash
php artisan vendor:publish --tag=livewire-charts:public
```
## Requirements ## Requirements
This package requires the following packages/libraries to work: This package requires the following packages/libraries to work:
@@ -164,6 +168,8 @@ for each type of chart.
| withoutDataLabels() | Disables data labels | | withoutDataLabels() | Disables data labels |
| withLegend() | Shows legends | | withLegend() | Shows legends |
| withoutLegend() | Hides legends | | withoutLegend() | Hides legends |
| setColors(array $colors) | Set colors for chart |
| addColors(string $color) | Append $color to $colors set |
| setXAxisCategories(array $categories) | Enables custom categories for chart X Axis | | setXAxisCategories(array $categories) | Enables custom categories for chart X Axis |
| sparklined() | Enables Apex Charts sparkline feature | | sparklined() | Enables Apex Charts sparkline feature |
| setSparklineEnabled(boolean $isEnabled) | Enables/Disables Apex Charts sparkline feature | | setSparklineEnabled(boolean $isEnabled) | Enables/Disables Apex Charts sparkline feature |
@@ -184,6 +190,8 @@ for each type of chart.
| Method | Description | | Method | Description |
|--------|-------------| |--------|-------------|
| setOpacity(int $opacity) | Sets columns' opacity | | setOpacity(int $opacity) | Sets columns' opacity |
| setColumnWidth(int $columnWidth) | Sets columns' width |
| setHorizontal(boolean $value) | Sets columns or bars |
| multiColumn() | Sets chart to display multiple column series | | multiColumn() | Sets chart to display multiple column series |
| singleColumn() | Sets chart to display a single column series | | singleColumn() | Sets chart to display a single column series |
| stacked() | Sets chart to display column series stacked | | stacked() | Sets chart to display column series stacked |

View File

@@ -17,11 +17,11 @@
], ],
"require": { "require": {
"php": "^7.2|^7.3|^7.4|^8.0", "php": "^7.2|^7.3|^7.4|^8.0",
"illuminate/support": "^7.0|^8.0", "illuminate/support": "^7.0|^8.0|^9.0",
"livewire/livewire": "^2.3" "livewire/livewire": "^2.3"
}, },
"require-dev": { "require-dev": {
"orchestra/testbench": "^4.0|^5.0", "orchestra/testbench": "^5.0|^6.0|^7.0",
"phpunit/phpunit": "^8.0" "phpunit/phpunit": "^8.0"
}, },
"autoload": { "autoload": {

12136
package-lock.json generated

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@@ -3,6 +3,12 @@ const areaChart = () => {
return { return {
chart: null, chart: null,
init() {
setTimeout(() => {
this.drawChart(this.$wire)
}, 0)
},
drawChart(component) { drawChart(component) {
if (this.chart) { if (this.chart) {
this.chart.destroy() this.chart.destroy()

View File

@@ -3,6 +3,12 @@ const columnChart = () => {
return { return {
chart: null, chart: null,
init() {
setTimeout(() => {
this.drawChart(this.$wire)
}, 0)
},
drawChart(component) { drawChart(component) {
if (this.chart) { if (this.chart) {
this.chart.destroy() this.chart.destroy()
@@ -11,11 +17,17 @@ const columnChart = () => {
const animated = component.get('columnChartModel.animated') || false; const animated = component.get('columnChartModel.animated') || false;
const onColumnClickEventName = component.get('columnChartModel.onColumnClickEventName') const onColumnClickEventName = component.get('columnChartModel.onColumnClickEventName')
const dataLabels = component.get('columnChartModel.dataLabels') || {}; const dataLabels = component.get('columnChartModel.dataLabels') || {};
const data = component.get('columnChartModel.data');
const sparkline = component.get('columnChartModel.sparkline'); const sparkline = component.get('columnChartModel.sparkline');
const legend = component.get('columnChartModel.legend')
const grid = component.get('columnChartModel.grid');
const columnWidth = component.get('columnChartModel.columnWidth');
const horizontal = component.get('columnChartModel.horizontal');
const data = component.get('columnChartModel.data');
const series = [{ data: data.map(item => item.value)}]
const options = { const options = {
series: [{ data: data.map(item => item.value)}], series: series,
chart: { chart: {
type: 'bar', type: 'bar',
@@ -48,12 +60,14 @@ const columnChart = () => {
}, },
}, },
legend: component.get('columnChartModel.legend') || {}, legend: legend,
grid: grid,
plotOptions: { plotOptions: {
bar: { bar: {
horizontal: false, horizontal: horizontal,
columnWidth: '40%', columnWidth: `${columnWidth}%`,
distributed: true, distributed: true,
}, },
}, },
@@ -75,6 +89,12 @@ const columnChart = () => {
}, },
}; };
const colors = component.get('columnChartModel.colors');
if (colors && colors.length > 0) {
options['colors'] = colors
}
this.chart = new ApexCharts(this.$refs.container, options); this.chart = new ApexCharts(this.$refs.container, options);
this.chart.render(); this.chart.render();
} }

View File

@@ -3,6 +3,12 @@ const lineChart = () => {
return { return {
chart: null, chart: null,
init() {
setTimeout(() => {
this.drawChart(this.$wire)
}, 0)
},
drawChart(component) { drawChart(component) {
if (this.chart) { if (this.chart) {
this.chart.destroy() this.chart.destroy()

View File

@@ -3,6 +3,12 @@ const multiColumnChart = () => {
return { return {
chart: null, chart: null,
init() {
setTimeout(() => {
this.drawChart(this.$wire)
}, 0)
},
drawChart(component) { drawChart(component) {
if (this.chart) { if (this.chart) {
this.chart.destroy() this.chart.destroy()
@@ -12,9 +18,13 @@ const multiColumnChart = () => {
const animated = component.get('columnChartModel.animated'); const animated = component.get('columnChartModel.animated');
const onColumnClickEventName = component.get('columnChartModel.onColumnClickEventName') const onColumnClickEventName = component.get('columnChartModel.onColumnClickEventName')
const dataLabels = component.get('columnChartModel.dataLabels'); const dataLabels = component.get('columnChartModel.dataLabels');
const data = component.get('columnChartModel.data');
const sparkline = component.get('columnChartModel.sparkline'); const sparkline = component.get('columnChartModel.sparkline');
const legend = component.get('columnChartModel.legend')
const grid = component.get('columnChartModel.grid');
const columnWidth = component.get('columnChartModel.columnWidth');
const horizontal = component.get('columnChartModel.horizontal');
const data = component.get('columnChartModel.data');
const series = Object.keys(data) const series = Object.keys(data)
.map(seriesName => ({ .map(seriesName => ({
name: seriesName, name: seriesName,
@@ -23,7 +33,7 @@ const multiColumnChart = () => {
const categories = component.get('columnChartModel.xAxis.categories').length > 0 const categories = component.get('columnChartModel.xAxis.categories').length > 0
? component.get('columnChartModel.xAxis.categories') ? component.get('columnChartModel.xAxis.categories')
: data[series[0].name].map(item => item.title) : []
; ;
const options = { const options = {
@@ -52,12 +62,14 @@ const multiColumnChart = () => {
} }
}, },
legend: component.get('columnChartModel.legend'), legend: legend,
grid: grid,
plotOptions: { plotOptions: {
bar: { bar: {
horizontal: false, horizontal: horizontal,
columnWidth: '50%', columnWidth: `${columnWidth}%`,
}, },
}, },
@@ -78,6 +90,12 @@ const multiColumnChart = () => {
}, },
}; };
const colors = component.get('columnChartModel.colors');
if (colors && colors.length > 0) {
options['colors'] = colors
}
this.chart = new ApexCharts(this.$refs.container, options); this.chart = new ApexCharts(this.$refs.container, options);
this.chart.render(); this.chart.render();
} }

View File

@@ -3,6 +3,12 @@ const multiLineChart = () => {
return { return {
chart: null, chart: null,
init() {
setTimeout(() => {
this.drawChart(this.$wire)
}, 0)
},
drawChart(component) { drawChart(component) {
if (this.chart) { if (this.chart) {
this.chart.destroy() this.chart.destroy()
@@ -70,6 +76,12 @@ const multiLineChart = () => {
yaxis: component.get('lineChartModel.yAxis') || {}, yaxis: component.get('lineChartModel.yAxis') || {},
}; };
const colors = component.get('lineChartModel.colors');
if (colors && colors.length > 0) {
options['colors'] = colors
}
this.chart = new ApexCharts(this.$refs.container, options); this.chart = new ApexCharts(this.$refs.container, options);
this.chart.render(); this.chart.render();
} }

View File

@@ -3,6 +3,12 @@ const pieChart = () => {
return { return {
chart: null, chart: null,
init() {
setTimeout(() => {
this.drawChart(this.$wire)
}, 0)
},
drawChart(component) { drawChart(component) {
if (this.chart) { if (this.chart) {
this.chart.destroy() this.chart.destroy()
@@ -14,13 +20,14 @@ const pieChart = () => {
const onSliceClickEventName = component.get('pieChartModel.onSliceClickEventName') const onSliceClickEventName = component.get('pieChartModel.onSliceClickEventName')
const data = component.get('pieChartModel.data') const data = component.get('pieChartModel.data')
const sparkline = component.get('pieChartModel.sparkline') const sparkline = component.get('pieChartModel.sparkline')
const type = component.get('pieChartModel.type')
const options = { const options = {
series: data.map(item => item.value), series: data.map(item => item.value),
chart: { chart: {
height: '100%', height: '100%',
type: 'pie', type: type,
...sparkline, ...sparkline,
@@ -68,6 +75,12 @@ const pieChart = () => {
legend: component.get('pieChartModel.legend') || {}, legend: component.get('pieChartModel.legend') || {},
}; };
const colors = component.get('pieChartModel.colors');
if (colors && colors.length > 0) {
options['colors'] = colors
}
this.chart = new ApexCharts(this.$refs.container, options); this.chart = new ApexCharts(this.$refs.container, options);
this.chart.render(); this.chart.render();
} }

View File

@@ -1,7 +1,7 @@
<div <div
style="width: 100%; height: 100%;" style="width: 100%; height: 100%;"
x-data="{ ...livewireChartsAreaChart() }" x-data="{ ...livewireChartsAreaChart() }"
x-init="drawChart(@this)" x-init="init()"
> >
<div wire:ignore x-ref="container"></div> <div wire:ignore x-ref="container"></div>
</div> </div>

View File

@@ -1,7 +1,7 @@
<div <div
style="width: 100%; height: 100%;" style="width: 100%; height: 100%;"
x-data="{ ...livewireChartsColumnChart() }" x-data="{ ...livewireChartsColumnChart() }"
x-init="drawChart(@this)" x-init="init()"
> >
<div wire:ignore x-ref="container"></div> <div wire:ignore x-ref="container"></div>
</div> </div>

View File

@@ -1,7 +1,7 @@
<div <div
style="width: 100%; height: 100%;" style="width: 100%; height: 100%;"
x-data="{ ...livewireChartsLineChart() }" x-data="{ ...livewireChartsLineChart() }"
x-init="drawChart(@this)" x-init="init()"
> >
<div wire:ignore x-ref="container"></div> <div wire:ignore x-ref="container"></div>
</div> </div>

View File

@@ -1,7 +1,7 @@
<div <div
style="width: 100%; height: 100%;" style="width: 100%; height: 100%;"
x-data="{ ...livewireChartsMultiColumnChart() }" x-data="{ ...livewireChartsMultiColumnChart() }"
x-init="drawChart(@this)" x-init="init()"
> >
<div wire:ignore x-ref="container"></div> <div wire:ignore x-ref="container"></div>
</div> </div>

View File

@@ -1,7 +1,7 @@
<div <div
style="width: 100%; height: 100%;" style="width: 100%; height: 100%;"
x-data="{ ...livewireChartsMultiLineChart() }" x-data="{ ...livewireChartsMultiLineChart() }"
x-init="drawChart(@this)" x-init="init()"
> >
<div wire:ignore x-ref="container"></div> <div wire:ignore x-ref="container"></div>
</div> </div>

View File

@@ -1,7 +1,7 @@
<div <div
style="width: 100%; height: 100%;" style="width: 100%; height: 100%;"
x-data="{ ...livewireChartsPieChart() }" x-data="{ ...livewireChartsPieChart() }"
x-init="drawChart(@this)" x-init="init()"
> >
<div wire:ignore x-ref="container"></div> <div wire:ignore x-ref="container"></div>
</div> </div>

View File

@@ -16,6 +16,8 @@ class BaseChartModel
use HasLegend; use HasLegend;
use HasDataLabels; use HasDataLabels;
use HasSparkline; use HasSparkline;
use HasGrid;
use HasColors;
public function __construct() public function __construct()
{ {
@@ -26,6 +28,8 @@ class BaseChartModel
$this->initLegend(); $this->initLegend();
$this->initDataLabels(); $this->initDataLabels();
$this->initSparkline(); $this->initSparkline();
$this->initGrid();
$this->initColors();
} }
public function reactiveKey() public function reactiveKey()
@@ -42,7 +46,9 @@ class BaseChartModel
$this->strokeToArray(), $this->strokeToArray(),
$this->legendToArray(), $this->legendToArray(),
$this->dataLabelsToArray(), $this->dataLabelsToArray(),
$this->sparklineToArray() $this->sparklineToArray(),
$this->gridToArray(),
$this->colorsToArray()
); );
} }
@@ -55,5 +61,7 @@ class BaseChartModel
$this->legendFromArray($array); $this->legendFromArray($array);
$this->dataLabelsFromArray($array); $this->dataLabelsFromArray($array);
$this->sparklineFromArray($array); $this->sparklineFromArray($array);
$this->gridFromArray($array);
$this->colorsFromArray($array);
} }
} }

View File

@@ -13,6 +13,10 @@ class ColumnChartModel extends BaseChartModel
{ {
public $opacity; public $opacity;
public $columnWidth;
public $horizontal;
public $isMultiColumn; public $isMultiColumn;
public $isStacked; public $isStacked;
@@ -27,7 +31,11 @@ class ColumnChartModel extends BaseChartModel
$this->onColumnClickEventName = null; $this->onColumnClickEventName = null;
$this->opacity = 0.5; $this->opacity = 0.75;
$this->columnWidth = 70;
$this->horizontal = false;
$this->isMultiColumn = false; $this->isMultiColumn = false;
@@ -57,6 +65,20 @@ class ColumnChartModel extends BaseChartModel
return $this; return $this;
} }
public function setHorizontal($value)
{
$this->horizontal = $value;
return $this;
}
public function setColumnWidth($value)
{
$this->columnWidth = $value;
return $this;
}
public function setOpacity($opacity) public function setOpacity($opacity)
{ {
$this->opacity = $opacity; $this->opacity = $opacity;
@@ -104,6 +126,8 @@ class ColumnChartModel extends BaseChartModel
return array_merge(parent::toArray(), [ return array_merge(parent::toArray(), [
'onColumnClickEventName' => $this->onColumnClickEventName, 'onColumnClickEventName' => $this->onColumnClickEventName,
'opacity' => $this->opacity, 'opacity' => $this->opacity,
'horizontal' => $this->horizontal,
'columnWidth' => $this->columnWidth,
'isMultiColumn' => $this->isMultiColumn, 'isMultiColumn' => $this->isMultiColumn,
'isStacked' => $this->isStacked, 'isStacked' => $this->isStacked,
'data' => $this->data->toArray(), 'data' => $this->data->toArray(),
@@ -118,6 +142,10 @@ class ColumnChartModel extends BaseChartModel
$this->opacity = data_get($array, 'opacity', 0.5); $this->opacity = data_get($array, 'opacity', 0.5);
$this->columnWidth = data_get($array, 'columnWidth', 70);
$this->horizontal = data_get($array, 'horizontal', false);
$this->isMultiColumn = data_get($array, 'isMultiColumn', false); $this->isMultiColumn = data_get($array, 'isMultiColumn', false);
$this->isStacked = data_get($array, 'isStacked', false); $this->isStacked = data_get($array, 'isStacked', false);

46
src/Models/HasColors.php Normal file
View File

@@ -0,0 +1,46 @@
<?php
namespace Asantibanez\LivewireCharts\Models;
trait HasColors
{
private $colors;
public function setColors($colors)
{
$this->colors = $colors;
return $this;
}
public function addColor($color)
{
$this->colors[] = $color;
return $this;
}
protected function initColors()
{
$this->colors = $this->defaultColors();
}
private function defaultColors()
{
return [];
}
protected function colorsFromArray($array)
{
$this->colors = data_get($array, 'colors', $this->defaultColors());
}
protected function colorsToArray()
{
return [
'colors' => $this->colors,
];
}
}

66
src/Models/HasGrid.php Normal file
View File

@@ -0,0 +1,66 @@
<?php
namespace Asantibanez\LivewireCharts\Models;
trait HasGrid
{
private $grid;
public function setGridVisible($visible)
{
data_set($this->grid, 'show', $visible);
return $this;
}
public function withGrid()
{
data_set($this->grid, 'show', true);
return $this;
}
public function withoutGrid()
{
data_set($this->grid, 'show', false);
return $this;
}
protected function initGrid()
{
$this->grid = $this->defaultGrid();
}
private function defaultGrid()
{
return [
'show' => false,
'position' => 'back',
'xaxis' => [
'lines' => [
'show' => true,
],
],
'yaxis' => [
'lines' => [
'show' => true,
],
],
];
}
protected function gridFromArray($array)
{
$this->grid = data_get($array, 'grid', $this->defaultGrid());
}
protected function gridToArray()
{
return [
'grid' => $this->grid,
];
}
}

View File

@@ -13,6 +13,8 @@ class PieChartModel extends BaseChartModel
public $opacity; public $opacity;
public $type;
public $data; public $data;
public function __construct() public function __construct()
@@ -23,6 +25,8 @@ class PieChartModel extends BaseChartModel
$this->opacity = 0.75; $this->opacity = 0.75;
$this->type = 'pie';
$this->data = collect(); $this->data = collect();
} }
@@ -33,6 +37,13 @@ class PieChartModel extends BaseChartModel
return $this; return $this;
} }
public function setType($type)
{
$this->type = $type;
return $this;
}
public function withOnSliceClickEvent($onSliceClickEventName) public function withOnSliceClickEvent($onSliceClickEventName)
{ {
$this->onSliceClickEventName = $onSliceClickEventName; $this->onSliceClickEventName = $onSliceClickEventName;
@@ -57,6 +68,7 @@ class PieChartModel extends BaseChartModel
return array_merge(parent::toArray(), [ return array_merge(parent::toArray(), [
'onSliceClickEventName' => $this->onSliceClickEventName, 'onSliceClickEventName' => $this->onSliceClickEventName,
'opacity' => $this->opacity, 'opacity' => $this->opacity,
'type' => $this->type,
'data' => $this->data->toArray(), 'data' => $this->data->toArray(),
]); ]);
} }
@@ -69,6 +81,8 @@ class PieChartModel extends BaseChartModel
$this->opacity = data_get($array, 'opacity', 0.75); $this->opacity = data_get($array, 'opacity', 0.75);
$this->type = data_get($array, 'type', 'pie');
$this->data = collect(data_get($array, 'data', [])); $this->data = collect(data_get($array, 'data', []));
} }
} }