Skip to content

Commit

Permalink
Merge pull request #1081 from Codeinwp/fix/geo-chart
Browse files Browse the repository at this point in the history
Load necessary google charts packages in Gutenberg
  • Loading branch information
Soare-Robert-Daniel authored Feb 20, 2024
2 parents cb4c99a + d31a486 commit 7d6225c
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 5 deletions.
4 changes: 2 additions & 2 deletions classes/Visualizer/Gutenberg/build/block.js

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion classes/Visualizer/Gutenberg/src/Components/ChartRender.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import DataTable from './DataTable.js';

import merge from 'merge';

import { compact, formatDate, isValidJSON, formatData } from '../utils.js';
import { compact, formatDate, isValidJSON, formatData, googleChartPackages } from '../utils.js';

/**
* WordPress dependencies
Expand Down Expand Up @@ -108,6 +108,7 @@ class ChartRender extends Component {
}
height="500px"
formatters={ formatData( data ) }
chartPackages={ googleChartPackages }
/>
) : (
<Chart
Expand All @@ -122,6 +123,7 @@ class ChartRender extends Component {
}
height="500px"
formatters={ formatData( data ) }
chartPackages={ googleChartPackages }
/>
) ) }

Expand Down
4 changes: 3 additions & 1 deletion classes/Visualizer/Gutenberg/src/Components/ChartSelect.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import PanelButton from './PanelButton.js';

import merge from 'merge';

import { compact, formatDate, isValidJSON, formatData } from '../utils.js';
import { compact, formatDate, isValidJSON, formatData, googleChartPackages } from '../utils.js';

/**
* WordPress dependencies
Expand Down Expand Up @@ -172,6 +172,7 @@ class ChartSelect extends Component {
}
height="500px"
formatters={ formatData( data ) }
chartPackages={ googleChartPackages }
/>
) : (
<Chart
Expand All @@ -186,6 +187,7 @@ class ChartSelect extends Component {
}
height="500px"
formatters={ formatData( data ) }
chartPackages={ googleChartPackages }
/>
)
) }
Expand Down
4 changes: 3 additions & 1 deletion classes/Visualizer/Gutenberg/src/Components/Charts.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Chart } from 'react-google-charts';

import DataTable from './DataTable.js';

import { formatDate, filterCharts, formatData } from '../utils.js';
import { formatDate, filterCharts, formatData, googleChartPackages } from '../utils.js';

/**
* WordPress dependencies
Expand Down Expand Up @@ -156,6 +156,7 @@ class Charts extends Component {
columns={ data['visualizer-series'] }
options={ filterCharts( data['visualizer-settings']) }
formatters={ formatData( data ) }
chartPackages={ googleChartPackages }
/>
) : (
<Chart
Expand All @@ -165,6 +166,7 @@ class Charts extends Component {
columns={ data['visualizer-series'] }
options={ filterCharts( data['visualizer-settings']) }
formatters={ formatData( data ) }
chartPackages={ googleChartPackages }
/>
) ) }

Expand Down
3 changes: 3 additions & 0 deletions classes/Visualizer/Gutenberg/src/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -189,3 +189,6 @@ export const getColorCode = ( color ) => {
}
return color;
};

// Google Chart Packages
export const googleChartPackages = [ 'corechart', 'geochart', 'gauge', 'table', 'timeline', 'controls' ];

0 comments on commit 7d6225c

Please sign in to comment.