fix charts

IBM · Mar 4, 2021 · 7a5317d · 7a5317d
1 parent d4d3d09
commit 7a5317d
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 23 deletions.
diff --git a/addon/components/charts/-components/axis/component.js b/addon/components/charts/-components/axis/component.js
@@ -1,4 +1,4 @@
-import Component from '@ember/component';
+import Component from '@glimmer/component';
 
 /** @documenter yuidoc */
 /**
@@ -10,9 +10,6 @@ import Component from '@ember/component';
  @public
  **/
 class ChartAxis extends Component {
-  tagName = '';
-  chart = null;
-
   args = {
     /**
      * The Axis Title

diff --git a/addon/components/charts/-components/chart/component.js b/addon/components/charts/-components/chart/component.js
@@ -1,4 +1,3 @@
-import Chart from '@carbon/charts/chart';
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { throttle } from '@ember/runloop';
@@ -17,7 +16,6 @@ import { defaultArgs } from '../../../../decorators';
  @yield {Component} api.Axis <a href='-components/axis' >ChartAxis</a>
  **/
 class CarbonChart extends Component {
-  tagName = '';
   data = {
     labels: [],
     datasets: []
@@ -65,10 +63,10 @@ class CarbonChart extends Component {
 
 
   async setData() {
-    const labels = this.componentArgs.labels;
+    const labels = this.args.labels;
     this.data.labels = Array.isArray(labels) ? labels : labels.split(',');
-    this.options.legendClickable = this.componentArgs.legendClickable;
-    this.options.containerResizable = this.componentArgs.resizable;
+    this.options.legendClickable = this.args.legendClickable;
+    this.options.containerResizable = this.args.resizable;
     if (!this.data.datasets.length) return;
     if (!this.options.axes.left) return;
     if (!this.options.axes.bottom) return;

diff --git a/addon/components/charts/-components/dataset/component.js b/addon/components/charts/-components/dataset/component.js
@@ -1,5 +1,5 @@
 import { defaultColors } from '@carbon/charts';
-import Component from '@ember/component';
+import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { argsCompat } from 'carbon-components-ember/decorators';
 
@@ -13,7 +13,6 @@ import { argsCompat } from 'carbon-components-ember/decorators';
  @public
  **/
 class CarbonChartDataSet extends Component {
-  tagName = '';
   chart = null;
   defaultColor = [defaultColors[0]];
 
@@ -34,21 +33,26 @@ class CarbonChartDataSet extends Component {
      * @argument data
      * @type number[]
      */
-    data: []
+    data: [],
+
+    /**
+     * @internal
+     */
+    chart: null
   };
 
   @action
   didUpdateArgs() {
     if (this.oldDabel && this.oldDabel !== this.args.label) {
-      this.chart.removeDataset(this.oldLabel);
+      this.args.chart.removeDataset(this.oldLabel);
       this.oldLabel = this.args.label;
     }
-    this.chart.updateDataset(this.args.label, this.args.backgroundColors || this.defaultColor, this.args.data);
+    this.args.chart.updateDataset(this.args.label, this.args.backgroundColors || this.defaultColor, this.args.data);
   }
 
   willDestroy() {
     super.willDestroy();
-    this.chart && this.chart.removeDataset(this.oldLabel);
+    this.args.chart && this.args.chart.removeDataset(this.oldLabel);
   }
 }
 

diff --git a/addon/components/charts/bar/component.js b/addon/components/charts/bar/component.js
@@ -1,5 +1,5 @@
 import { SimpleBarChart } from '@carbon/charts';
-import Component from '@ember/component';
+import Component from '@glimmer/component';
 
 /** @documenter yuidoc */
 
@@ -13,8 +13,6 @@ import Component from '@ember/component';
  @yield {Component} api.Axis <a href='-components/axis' >ChartAxis</a>
  **/
 class CarbonBarChart extends Component {
-  tagName = '';
-
   ChartClass = SimpleBarChart;
   args = {
     /**

diff --git a/addon/components/charts/line/component.js b/addon/components/charts/line/component.js
@@ -1,5 +1,5 @@
-import {LineChart} from '@carbon/charts';
-import Component from '@ember/component';
+import { LineChart } from '@carbon/charts';
+import Component from '@glimmer/component';
 
 /**
  The CarbonLineChart
@@ -11,7 +11,6 @@ import Component from '@ember/component';
  @yield {Component} api.Axis <a href='-components/axis' >ChartAxis</a>
  **/
 class CarbonLineChart extends Component {
-  tagName = '';
   ChartClass = LineChart;
   args = {
     /**

diff --git a/addon/decorators/index.js b/addon/decorators/index.js
@@ -1,4 +1,3 @@
-import { computed } from '@ember/object';
 import GlimmerComponent from '@glimmer/component';
 
 export function classPrefix(prefix) {

diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.3.16",
+  "version": "0.3.17",
   "name": "carbon-components-ember",
   "keywords": [
     "ember-addon"