From b42c6867041c786773b84c9bd81f88b89b99afe3 Mon Sep 17 00:00:00 2001 From: Charles Fries Date: Mon, 29 Jul 2024 11:34:45 -0700 Subject: [PATCH 1/2] Support treegraph and treemap modules --- ember-highcharts/src/components/high-charts.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/ember-highcharts/src/components/high-charts.ts b/ember-highcharts/src/components/high-charts.ts index 85897cf..7bbca45 100644 --- a/ember-highcharts/src/components/high-charts.ts +++ b/ember-highcharts/src/components/high-charts.ts @@ -243,6 +243,19 @@ export default class HighCharts extends Component { SolidGauge.default(Highcharts); } + if (this.args.chartOptions?.chart?.type === 'treegraph') { + const Treegraph = await import('highcharts/modules/treegraph'); + Treegraph.default(Highcharts); + } + + if ( + this.args.chartOptions?.chart?.type === 'treegraph' || + this.args.chartOptions?.chart?.type === 'treemap' + ) { + const Treemap = await import('highcharts/modules/treemap'); + Treemap.default(Highcharts); + } + if (this.args.chartOptions?.chart?.type === 'waterfall') { const More = await import('highcharts/highcharts-more'); More.default(Highcharts); From 6497ddc1b8507a43762f76712cfb05bc17291a8c Mon Sep 17 00:00:00 2001 From: Charles Fries Date: Thu, 3 Oct 2024 13:44:38 -0700 Subject: [PATCH 2/2] Add demo, fix import order --- .../src/components/high-charts.ts | 10 +++---- test-app/app/components/chart-treegraph.hbs | 4 +++ test-app/app/components/chart-treegraph.js | 28 +++++++++++++++++++ test-app/app/templates/index.hbs | 5 ++++ 4 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 test-app/app/components/chart-treegraph.hbs create mode 100644 test-app/app/components/chart-treegraph.js diff --git a/ember-highcharts/src/components/high-charts.ts b/ember-highcharts/src/components/high-charts.ts index 7bbca45..5f16b13 100644 --- a/ember-highcharts/src/components/high-charts.ts +++ b/ember-highcharts/src/components/high-charts.ts @@ -243,11 +243,6 @@ export default class HighCharts extends Component { SolidGauge.default(Highcharts); } - if (this.args.chartOptions?.chart?.type === 'treegraph') { - const Treegraph = await import('highcharts/modules/treegraph'); - Treegraph.default(Highcharts); - } - if ( this.args.chartOptions?.chart?.type === 'treegraph' || this.args.chartOptions?.chart?.type === 'treemap' @@ -256,6 +251,11 @@ export default class HighCharts extends Component { Treemap.default(Highcharts); } + if (this.args.chartOptions?.chart?.type === 'treegraph') { + const Treegraph = await import('highcharts/modules/treegraph'); + Treegraph.default(Highcharts); + } + if (this.args.chartOptions?.chart?.type === 'waterfall') { const More = await import('highcharts/highcharts-more'); More.default(Highcharts); diff --git a/test-app/app/components/chart-treegraph.hbs b/test-app/app/components/chart-treegraph.hbs new file mode 100644 index 0000000..0e6c14c --- /dev/null +++ b/test-app/app/components/chart-treegraph.hbs @@ -0,0 +1,4 @@ + diff --git a/test-app/app/components/chart-treegraph.js b/test-app/app/components/chart-treegraph.js new file mode 100644 index 0000000..6f33945 --- /dev/null +++ b/test-app/app/components/chart-treegraph.js @@ -0,0 +1,28 @@ +import Component from '@glimmer/component'; + +export default class Treegraph extends Component { + chartOptions = { + chart: { + type: 'treegraph', + }, + title: { + text: 'Organizational Structure', + }, + }; + + chartData = [ + { + keys: ['id', 'parent'], + data: [ + ['Alice'], + ['Bill', 'Alice'], + ['Carson', 'Bill'], + ['Edward', 'Bill'], + ['Dwayne', 'Alice'], + ], + dataLabels: { + format: '{point.id}', + }, + }, + ]; +} diff --git a/test-app/app/templates/index.hbs b/test-app/app/templates/index.hbs index 6c49d36..9f3e1ac 100644 --- a/test-app/app/templates/index.hbs +++ b/test-app/app/templates/index.hbs @@ -54,3 +54,8 @@

Scatter chart

+ +
+

Treegraph chart

+ +