← All changes | classes/Visualizer/Gutenberg/src/Components/Sidebar/HorizontalAxisSettings.js +13 -35 3.10.13 → 3.2.1 View file →

		@@ -7,9 +7,9 @@
7	7	Component,
8	8	Fragment
9	9	} = wp.element;
10	10
11		-const { ColorPalette } = wp.blockEditor || wp.editor;
	11	+const { ColorPalette } = wp.editor;
12	12
13	13	const {
14	14	BaseControl,
15	15	ExternalLink,
		@@ -17,10 +17,8 @@
17	17	SelectControl,
18	18	TextControl
19	19	} = wp.components;
20	20
21		-import { getColorCode } from '../../utils.js';
22		-
23	21	class HorizontalAxisSettings extends Component {
24	22	constructor() {
25	23	super( ...arguments );
26	24	}
		@@ -86,11 +84,11 @@
86	84	<BaseControl
87	85	label={ __( 'Base Line Color' ) }
88	86	>
89	87	<ColorPalette
90		- value={ settings.vAxis.baselineColor }
	88	+ value={ settings.hAxis.baselineColor }
91	89	onChange={ e => {
92		- settings.vAxis.baselineColor = getColorCode( e );
	90	+ settings.hAxis.baselineColor = e;
93	91	this.props.edit( settings );
94	92	} }
95	93	/>
96	94	</BaseControl>
		@@ -101,9 +99,9 @@
101	99	<ColorPalette
102	100	value={ settings.hAxis.textStyle.color || settings.hAxis.textStyle }
103	101	onChange={ e => {
104	102	settings.hAxis.textStyle = {};
105		- settings.hAxis.textStyle.color = getColorCode( e );
	103	+ settings.hAxis.textStyle.color = e;
106	104	this.props.edit( settings );
107	105	} }
108	106	/>
109	107	</BaseControl>
		@@ -129,9 +127,9 @@
129	127	</p>
130	128
131	129	<p>
132	130	{ __( 'For date axis labels, this is a subset of the date formatting ' ) }
133		- <ExternalLink href="https://unicode-org.github.io/icu/userguide/format_parse/datetime/#datetime-format-syntax">
	131	+ <ExternalLink href="http://userguide.icu-project.org/formatparse/datetime#TOC-Date-Time-Format-Syntax">
134	132	{ __( 'ICU date and time format.' ) }
135	133	</ExternalLink>
136	134	</p>
137	135	</Fragment>
		@@ -150,15 +148,11 @@
150	148	>
151	149
152	150	<TextControl
153	151	label={ __( 'Count' ) }
154		- help={ __( 'The approximate number of horizontal gridlines inside the chart area. You can specify a value of -1 to automatically compute the number of gridlines, 0 or 1 to draw no gridlines, or 2 or more to only draw gridline. Any number greater than 2 will be used to compute the minSpacing between gridlines.' ) }
155		- value={ settings.hAxis.gridlines ? settings.hAxis.gridlines.count : '' }
	152	+ help={ __( 'The number of horizontal gridlines inside the chart area. Minimum value is 2. Specify -1 to automatically compute the number of gridlines.' ) }
	153	+ value={ settings.hAxis.gridlines.count }
156	154	onChange={ e => {
157		- if ( ! settings.hAxis.gridlines ) {
158		- settings.hAxis.gridlines = {};
159		- }
160		-
161	155	settings.hAxis.gridlines.count = e;
162	156	this.props.edit( settings );
163	157	} }
164	158	/>
		@@ -166,14 +160,10 @@
166	160	<BaseControl
167	161	label={ __( 'Color' ) }
168	162	>
169	163	<ColorPalette
170		- value={ settings.hAxis.gridlines ? settings.hAxis.gridlines.color : '' }
	164	+ value={ settings.hAxis.gridlines.color }
171	165	onChange={ e => {
172		- if ( ! settings.hAxis.gridlines ) {
173		- settings.hAxis.gridlines = {};
174		- }
175		-
176	166	settings.hAxis.gridlines.color = e;
177	167	this.props.edit( settings );
178	168	} }
179	169	/>
		@@ -188,14 +178,11 @@
188	178	>
189	179
190	180	<TextControl
191	181	label={ __( 'Count' ) }
192		- help={ __( 'Specify 0 to disable the minor gridlines.' ) }
193		- value={ settings.hAxis.minorGridlines ? settings.hAxis.minorGridlines.count : '' }
	182	+ help={ __( 'The number of horizontal minor gridlines between two regular gridlines.' ) }
	183	+ value={ settings.hAxis.minorGridlines.count }
194	184	onChange={ e => {
195		- if ( ! settings.hAxis.minorGridlines ) {
196		- settings.hAxis.minorGridlines = {};
197		- }
198	185	settings.hAxis.minorGridlines.count = e;
199	186	this.props.edit( settings );
200	187	} }
201	188	/>
		@@ -203,13 +190,10 @@
203	190	<BaseControl
204	191	label={ __( 'Color' ) }
205	192	>
206	193	<ColorPalette
207		- value={ settings.hAxis.minorGridlines ? settings.hAxis.minorGridlines.color : '' }
	194	+ value={ settings.hAxis.minorGridlines.color }
208	195	onChange={ e => {
209		- if ( ! settings.hAxis.minorGridlines ) {
210		- settings.hAxis.minorGridlines = {};
211		- }
212	196	settings.hAxis.minorGridlines.color = e;
213	197	this.props.edit( settings );
214	198	} }
215	199	/>
		@@ -225,13 +209,10 @@
225	209
226	210	<TextControl
227	211	label={ __( 'Maximun Value' ) }
228	212	help={ __( 'The maximum vertical data value to render.' ) }
229		- value={ settings.hAxis.viewWindow ? settings.hAxis.viewWindow.max : '' }
	213	+ value={ settings.hAxis.viewWindow.max }
230	214	onChange={ e => {
231		- if ( ! settings.hAxis.viewWindow ) {
232		- settings.hAxis.viewWindow = {};
233		- }
234	215	settings.hAxis.viewWindow.max = e;
235	216	this.props.edit( settings );
236	217	} }
237	218	/>
		@@ -238,13 +219,10 @@
238	219
239	220	<TextControl
240	221	label={ __( 'Minimum Value' ) }
241	222	help={ __( 'The minimum vertical data value to render.' ) }
242		- value={ settings.hAxis.viewWindow ? settings.hAxis.viewWindow.min : '' }
	223	+ value={ settings.hAxis.viewWindow.min }
243	224	onChange={ e => {
244		- if ( ! settings.hAxis.viewWindow ) {
245		- settings.hAxis.viewWindow = {};
246		- }
247	225	settings.hAxis.viewWindow.min = e;
248	226	this.props.edit( settings );
249	227	} }
250	228	/>