diff --git a/app/client/src/components/designSystems/appsmith/ChartComponent.tsx b/app/client/src/components/designSystems/appsmith/ChartComponent.tsx index e95c379d2d..b31777e4fd 100644 --- a/app/client/src/components/designSystems/appsmith/ChartComponent.tsx +++ b/app/client/src/components/designSystems/appsmith/ChartComponent.tsx @@ -3,13 +3,6 @@ import { ChartType, ChartData } from "widgets/ChartWidget"; import styled from "styled-components"; import { invisible } from "constants/DefaultTheme"; import _ from "lodash"; -/* -import ReactFC from "react-fusioncharts"; -import FusionCharts from "fusioncharts"; -import Column2D from "fusioncharts/fusioncharts.charts"; -import FusionTheme from "fusioncharts/themes/fusioncharts.theme.fusion"; -ReactFC.fcRoot(FusionCharts, Column2D, FusionTheme); -*/ const FusionCharts = require("fusioncharts"); const Charts = require("fusioncharts/fusioncharts.charts"); const FusionTheme = require("fusioncharts/themes/fusioncharts.theme.fusion"); @@ -22,6 +15,7 @@ export interface ChartComponentProps { xAxisName: string; yAxisName: string; chartName: string; + widgetId: string; isVisible?: boolean; } @@ -67,7 +61,7 @@ class ChartComponent extends React.Component { createGraph = () => { const chartConfig = { type: this.getChartType(this.props.chartType), - renderAt: "chart-container", + renderAt: this.props.widgetId + "chart-container", width: "100%", height: "100%", dataFormat: "json", @@ -111,7 +105,12 @@ class ChartComponent extends React.Component { } render() { - return ; + return ( + + ); } } diff --git a/app/client/src/widgets/ChartWidget.tsx b/app/client/src/widgets/ChartWidget.tsx index 449bed8c06..9b04ca5174 100644 --- a/app/client/src/widgets/ChartWidget.tsx +++ b/app/client/src/widgets/ChartWidget.tsx @@ -25,6 +25,7 @@ class ChartWidget extends BaseWidget { yAxisName={this.props.yAxisName} chartName={this.props.chartName} chartData={this.props.chartData} + widgetId={this.props.widgetId} /> ); }