Skip to content

Commit

Permalink
Updated version and dependencies, fixed regression issue introduced by …
Browse files Browse the repository at this point in the history 
…appreciated#119
  • Loading branch information
@appreciated
appreciated committed Nov 14, 2021
1 parent 750e0ad commit 0a81a3b
Show file tree
Hide file tree
Showing 7 changed files with 187 additions and 125 deletions.
210 changes: 133 additions & 77 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,129 +1,185 @@
{
"name": "no-name",
"license": "UNLICENSED",
"vaadin": {
"dependencies": {
"lit-element": "2.5.1",
"@polymer/polymer": "3.2.0",
"@webcomponents/webcomponentsjs": "^2.2.10",
"lit-html": "1.4.1",
"@vaadin/vaadin-grid": "5.7.13",
"@vaadin/vaadin-icons": "4.3.2",
"@vaadin/vaadin-split-layout": "4.3.0",
"@vaadin/vaadin-combo-box": "5.4.7",
"@vaadin/vaadin-core-shrinkwrap": "14.6.1",
"@vaadin/vaadin-upload": "4.4.1",
"@vaadin/vaadin-dialog": "2.5.2",
"@vaadin/vaadin-select": "2.4.0",
"@vaadin/vaadin-app-layout": "2.2.0",
"@vaadin/vaadin-item": "2.3.0",
"@vaadin/vaadin-notification": "1.6.1",
"@vaadin/vaadin-progress-bar": "1.3.0",
"@vaadin/vaadin-date-time-picker": "1.4.0",
"@vaadin/vaadin-ordered-layout": "1.4.0",
"@vaadin/vaadin-login": "1.2.0",
"@vaadin/vaadin-button": "2.4.0",
"@vaadin/vaadin-date-picker": "4.4.1",
"@vaadin/vaadin-text-field": "2.8.4",
"@vaadin/vaadin-menu-bar": "1.2.2",
"@vaadin/vaadin-custom-field": "1.3.0",
"apexcharts": "3.26.3",
"@vaadin/vaadin-form-layout": "2.3.0",
"@vaadin/vaadin-accordion": "1.2.0",
"@polymer/iron-list": "3.1.0",
"onecolor": "3.1.0",
"@vaadin/vaadin-list-box": "1.4.0",
"@vaadin/vaadin-checkbox": "2.5.0",
"@vaadin/vaadin-details": "1.2.0",
"@polymer/iron-icon": "3.0.1",
"@vaadin/vaadin-time-picker": "2.4.0",
"@vaadin/vaadin-context-menu": "4.5.0",
"@vaadin/vaadin-avatar": "1.0.4",
"@vaadin/vaadin-tabs": "3.2.0",
"@vaadin/vaadin-radio-button": "1.5.1",
"@vaadin/vaadin-lumo-styles": "1.6.0",
"@vaadin/vaadin-material-styles": "1.3.2"
},
"devDependencies": {
"compression-webpack-plugin": "4.0.1",
"raw-loader": "3.1.0",
"webpack-cli": "3.3.11",
"css-loader": "4.2.1",
"file-loader": "6.1.0",
"extra-watch-webpack-plugin": "1.0.3",
"lit-css-loader": "0.0.4",
"webpack-babel-multi-target-plugin": "2.3.3",
"copy-webpack-plugin": "5.1.2",
"construct-style-sheets-polyfill": "2.4.6",
"webpack": "4.42.0",
"ts-loader": "8.0.12",
"chokidar": "^3.5.0",
"webpack-merge": "4.2.2",
"typescript": "4.0.3",
"webpack-dev-server": "3.11.0",
"extract-loader": "5.1.0"
},
"hash": "ea4270368185cad1da86d7a79a25a5f159e69f2a6d8a6fd2b6a662fe4b076842"
},
"dependencies": {
"@polymer/iron-a11y-announcer": "3.0.2",
"@polymer/iron-a11y-keys-behavior": "3.0.1",
"@polymer/iron-fit-behavior": "3.0.2",
"@polymer/iron-flex-layout": "3.0.1",
"@polymer/iron-icon": "3.0.1",
"@polymer/iron-iconset-svg": "3.0.1",
"@polymer/iron-list": "3.1.0",
"@polymer/iron-media-query": "3.0.1",
"@polymer/iron-meta": "3.0.1",
"@polymer/iron-overlay-behavior": "3.0.3",
"@polymer/iron-resizable-behavior": "3.0.1",
"@polymer/iron-scroll-target-behavior": "3.0.1",
"@polymer/polymer": "3.2.0",
"@vaadin/vaadin-accordion": "1.2.0",
"@vaadin/vaadin-app-layout": "2.2.0",
"@vaadin/vaadin-avatar": "1.0.4",
"@vaadin/vaadin-board": "2.2.0",
"@vaadin/vaadin-button": "2.4.0",
"@vaadin/vaadin-checkbox": "2.5.0",
"@vaadin/vaadin-combo-box": "5.4.7",
"@vaadin/vaadin-charts": "6.3.3",
"@vaadin/vaadin-checkbox": "2.5.1",
"@vaadin/vaadin-combo-box": "5.4.9",
"@vaadin/vaadin-confirm-dialog": "1.3.0",
"@vaadin/vaadin-context-menu": "4.5.0",
"@vaadin/vaadin-core-shrinkwrap": "14.6.1",
"@vaadin/vaadin-custom-field": "1.3.0",
"@vaadin/vaadin-control-state-mixin": "2.2.4",
"@vaadin/vaadin-cookie-consent": "1.2.0",
"@vaadin/vaadin-core-shrinkwrap": "14.7.5",
"@vaadin/vaadin-crud": "1.3.1",
"@vaadin/vaadin-custom-field": "1.3.1",
"@vaadin/vaadin-date-picker": "4.4.1",
"@vaadin/vaadin-date-time-picker": "1.4.0",
"@vaadin/vaadin-details": "1.2.0",
"@vaadin/vaadin-development-mode-detector": "2.0.4",
"@vaadin/vaadin-dialog": "2.5.2",
"@vaadin/vaadin-element-mixin": "2.4.2",
"@vaadin/vaadin-form-layout": "2.3.0",
"@vaadin/vaadin-grid": "5.7.13",
"@vaadin/vaadin-grid": "5.8.4",
"@vaadin/vaadin-grid-pro": "2.3.0",
"@vaadin/vaadin-icons": "4.3.2",
"@vaadin/vaadin-item": "2.3.0",
"@vaadin/vaadin-list-box": "1.4.0",
"@vaadin/vaadin-list-mixin": "2.5.1",
"@vaadin/vaadin-login": "1.2.0",
"@vaadin/vaadin-lumo-styles": "1.6.0",
"@vaadin/vaadin-lumo-styles": "1.6.1",
"@vaadin/vaadin-material-styles": "1.3.2",
"@vaadin/vaadin-menu-bar": "1.2.2",
"@vaadin/vaadin-messages": "1.0.2",
"@vaadin/vaadin-notification": "1.6.1",
"@vaadin/vaadin-ordered-layout": "1.4.0",
"@vaadin/vaadin-overlay": "3.5.1",
"@vaadin/vaadin-progress-bar": "1.3.0",
"@vaadin/vaadin-radio-button": "1.5.1",
"@vaadin/vaadin-select": "2.4.0",
"@vaadin/vaadin-radio-button": "1.5.4",
"@vaadin/vaadin-rich-text-editor": "1.3.1",
"@vaadin/vaadin-select": "2.4.1",
"@vaadin/vaadin-split-layout": "4.3.0",
"@vaadin/vaadin-tabs": "3.2.0",
"@vaadin/vaadin-text-field": "2.8.4",
"@vaadin/vaadin-text-field": "2.8.6",
"@vaadin/vaadin-themable-mixin": "1.6.2",
"@vaadin/vaadin-time-picker": "2.4.0",
"@vaadin/vaadin-upload": "4.4.1",
"@vaadin/vaadin-upload": "4.4.3",
"@vaadin/vaadin-usage-statistics": "2.1.0",
"@webcomponents/shadycss": "1.8.0",
"@webcomponents/webcomponentsjs": "^2.2.10",
"apexcharts": "3.26.3",
"apexcharts": "3.30.0",
"construct-style-sheets-polyfill": "3.0.4",
"lit-element": "2.5.1",
"lit-html": "1.4.1",
"onecolor": "3.1.0"
},
"devDependencies": {
"babel-loader": "8.2.2",
"chokidar": "^3.5.0",
"compression-webpack-plugin": "4.0.1",
"construct-style-sheets-polyfill": "2.4.6",
"copy-webpack-plugin": "5.1.2",
"css-loader": "4.2.1",
"extra-watch-webpack-plugin": "1.0.3",
"extract-loader": "5.1.0",
"file-loader": "6.1.0",
"html-webpack-plugin": "4.5.2",
"lit-css-loader": "0.0.4",
"raw-loader": "3.1.0",
"ts-loader": "8.0.12",
"typescript": "4.0.3",
"webpack": "4.42.0",
"webpack-babel-multi-target-plugin": "2.3.3",
"webpack-babel-multi-target-plugin": "2.5.0",
"webpack-cli": "3.3.11",
"webpack-dev-server": "3.11.0",
"webpack-merge": "4.2.2"
},
"vaadin": {
"dependencies": {
"@polymer/iron-a11y-announcer": "3.0.2",
"@polymer/iron-a11y-keys-behavior": "3.0.1",
"@polymer/iron-fit-behavior": "3.0.2",
"@polymer/iron-flex-layout": "3.0.1",
"@polymer/iron-icon": "3.0.1",
"@polymer/iron-iconset-svg": "3.0.1",
"@polymer/iron-list": "3.1.0",
"@polymer/iron-media-query": "3.0.1",
"@polymer/iron-meta": "3.0.1",
"@polymer/iron-overlay-behavior": "3.0.3",
"@polymer/iron-resizable-behavior": "3.0.1",
"@polymer/iron-scroll-target-behavior": "3.0.1",
"@polymer/polymer": "3.2.0",
"@vaadin/vaadin-accordion": "1.2.0",
"@vaadin/vaadin-app-layout": "2.2.0",
"@vaadin/vaadin-avatar": "1.0.4",
"@vaadin/vaadin-board": "2.2.0",
"@vaadin/vaadin-button": "2.4.0",
"@vaadin/vaadin-charts": "6.3.3",
"@vaadin/vaadin-checkbox": "2.5.1",
"@vaadin/vaadin-combo-box": "5.4.9",
"@vaadin/vaadin-confirm-dialog": "1.3.0",
"@vaadin/vaadin-context-menu": "4.5.0",
"@vaadin/vaadin-control-state-mixin": "2.2.4",
"@vaadin/vaadin-cookie-consent": "1.2.0",
"@vaadin/vaadin-core-shrinkwrap": "14.7.5",
"@vaadin/vaadin-crud": "1.3.1",
"@vaadin/vaadin-custom-field": "1.3.1",
"@vaadin/vaadin-date-picker": "4.4.1",
"@vaadin/vaadin-date-time-picker": "1.4.0",
"@vaadin/vaadin-details": "1.2.0",
"@vaadin/vaadin-development-mode-detector": "2.0.4",
"@vaadin/vaadin-dialog": "2.5.2",
"@vaadin/vaadin-element-mixin": "2.4.2",
"@vaadin/vaadin-form-layout": "2.3.0",
"@vaadin/vaadin-grid": "5.8.4",
"@vaadin/vaadin-grid-pro": "2.3.0",
"@vaadin/vaadin-icons": "4.3.2",
"@vaadin/vaadin-item": "2.3.0",
"@vaadin/vaadin-list-box": "1.4.0",
"@vaadin/vaadin-list-mixin": "2.5.1",
"@vaadin/vaadin-login": "1.2.0",
"@vaadin/vaadin-lumo-styles": "1.6.1",
"@vaadin/vaadin-material-styles": "1.3.2",
"@vaadin/vaadin-menu-bar": "1.2.2",
"@vaadin/vaadin-messages": "1.0.2",
"@vaadin/vaadin-notification": "1.6.1",
"@vaadin/vaadin-ordered-layout": "1.4.0",
"@vaadin/vaadin-overlay": "3.5.1",
"@vaadin/vaadin-progress-bar": "1.3.0",
"@vaadin/vaadin-radio-button": "1.5.4",
"@vaadin/vaadin-rich-text-editor": "1.3.1",
"@vaadin/vaadin-select": "2.4.1",
"@vaadin/vaadin-split-layout": "4.3.0",
"@vaadin/vaadin-tabs": "3.2.0",
"@vaadin/vaadin-text-field": "2.8.6",
"@vaadin/vaadin-themable-mixin": "1.6.2",
"@vaadin/vaadin-time-picker": "2.4.0",
"@vaadin/vaadin-upload": "4.4.3",
"@vaadin/vaadin-usage-statistics": "2.1.0",
"@webcomponents/shadycss": "1.8.0",
"@webcomponents/webcomponentsjs": "^2.2.10",
"apexcharts": "3.30.0",
"construct-style-sheets-polyfill": "3.0.4",
"lit-element": "2.5.1",
"lit-html": "1.4.1",
"onecolor": "3.1.0"
},
"devDependencies": {
"babel-loader": "8.2.2",
"chokidar": "^3.5.0",
"compression-webpack-plugin": "4.0.1",
"copy-webpack-plugin": "5.1.2",
"css-loader": "4.2.1",
"extra-watch-webpack-plugin": "1.0.3",
"extract-loader": "5.1.0",
"file-loader": "6.1.0",
"html-webpack-plugin": "4.5.2",
"lit-css-loader": "0.0.4",
"raw-loader": "3.1.0",
"ts-loader": "8.0.12",
"typescript": "4.0.3",
"webpack": "4.42.0",
"webpack-babel-multi-target-plugin": "2.5.0",
"webpack-cli": "3.3.11",
"webpack-dev-server": "3.11.0",
"webpack-merge": "4.2.2"
},
"hash": "1818d11a1353a1cabab85f4a52fc684d8e7c9a4aba66ac166736c5045dea802e"
}
}
4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

<groupId>com.github.appreciated</groupId>
<artifactId>apexcharts</artifactId>
<version>2.0.0-beta12</version>
<version>2.0.0-beta13</version>
<name>ApexCharts.js</name>
<description>Integration of ApexCharts.js for the Vaadin platform</description>

<properties>
<vaadin.version>14.6.8</vaadin.version>
<vaadin.version>14.7.5</vaadin.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/appreciated/apexcharts/ApexCharts.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import java.util.Arrays;

@Tag("apex-charts-wrapper")
@NpmPackage(value = "apexcharts", version = "3.26.3")
@NpmPackage(value = "apexcharts", version = "3.30.0")
@NpmPackage(value = "onecolor", version = "3.1.0")
@JsModule("./com/github/appreciated/apexcharts/apexcharts-wrapper.js")
@CssImport(value = "./com/github/appreciated/apexcharts/apexcharts-wrapper-styles.css", id = "apex-charts-style")
Expand Down
12 changes: 7 additions & 5 deletions ...urces/META-INF/resources/frontend/com/github/appreciated/apexcharts/apexcharts-wrapper.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,11 +279,13 @@ class ApexChartsWrapper extends PolymerElement {
}
if (this.yaxis) {
this.config.yaxis = JSON.parse(this.yaxis);
if (this.config.yaxis.labels && this.config.yaxis.labels.formatter) {
this.config.yaxis.labels.formatter = this.evalFunction(this.config.yaxis.labels.formatter);
}
if (this.config.yaxis.title && this.config.yaxis.title.formatter) {
this.config.yaxis.title.formatter = this.evalFunction(this.config.yaxis.title.formatter);
for (let i = 0; i < this.config.yaxis.length; i++) {
if (this.config.yaxis[i].labels && this.config.yaxis[i].labels.formatter) {
this.config.yaxis[i].labels.formatter = this.evalFunction(this.config.yaxis[i].labels.formatter);
}
if (this.config.yaxis[i].title && this.config.yaxis[i].title.formatter) {
this.config.yaxis[i].title.formatter = this.evalFunction(this.config.yaxis[i].title.formatter);
}
}
}
if (!this.config.chart) {
Expand Down

0 comments on commit 0a81a3b

Please sign in to comment.