← All changes
|
classes/Visualizer/Gutenberg/src/Components/Sidebar/VerticalAxisSettings.js
+30
-10
3.1.0
→
3.4.9
View file →
| @@ -7,9 +7,9 @@ | ||
| 7 | 7 | Component, |
| 8 | 8 | Fragment |
| 9 | 9 | } = wp.element; |
| 10 | 10 | |
| 11 | -const { ColorPalette } = wp.editor; | |
| 11 | +const { ColorPalette } = wp.blockEditor || wp.editor; | |
| 12 | 12 | |
| 13 | 13 | const { |
| 14 | 14 | BaseControl, |
| 15 | 15 | ExternalLink, |
| @@ -105,9 +105,9 @@ | ||
| 105 | 105 | } } |
| 106 | 106 | /> |
| 107 | 107 | </BaseControl> |
| 108 | 108 | |
| 109 | - { ( -1 >= [ 'column' ].indexOf( type ) ) && ( | |
| 109 | + { ( -1 >= [ 'bar' ].indexOf( type ) ) && ( | |
| 110 | 110 | <Fragment> |
| 111 | 111 | |
| 112 | 112 | <TextControl |
| 113 | 113 | label={ __( 'Number Format' ) } |
| @@ -150,11 +150,15 @@ | ||
| 150 | 150 | > |
| 151 | 151 | |
| 152 | 152 | <TextControl |
| 153 | 153 | label={ __( 'Count' ) } |
| 154 | - help={ __( 'The number of Vertical gridlines inside the chart area. Minimum value is 2. Specify -1 to automatically compute the number of gridlines.' ) } | |
| 155 | - value={ settings.vAxis.gridlines.count } | |
| 154 | + help={ __( 'The approximate number of vertical 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.vAxis.gridlines ? settings.vAxis.gridlines.count : '' } | |
| 156 | 156 | onChange={ e => { |
| 157 | + if ( ! settings.vAxis.gridlines ) { | |
| 158 | + settings.vAxis.gridlines = {}; | |
| 159 | + } | |
| 160 | + | |
| 157 | 161 | settings.vAxis.gridlines.count = e; |
| 158 | 162 | this.props.edit( settings ); |
| 159 | 163 | } } |
| 160 | 164 | /> |
| @@ -162,10 +166,14 @@ | ||
| 162 | 166 | <BaseControl |
| 163 | 167 | label={ __( 'Color' ) } |
| 164 | 168 | > |
| 165 | 169 | <ColorPalette |
| 166 | - value={ settings.vAxis.gridlines.color } | |
| 170 | + value={ settings.vAxis.gridlines ? settings.vAxis.gridlines.color : '' } | |
| 167 | 171 | onChange={ e => { |
| 172 | + if ( ! settings.vAxis.gridlines ) { | |
| 173 | + settings.vAxis.gridlines = {}; | |
| 174 | + } | |
| 175 | + | |
| 168 | 176 | settings.vAxis.gridlines.color = e; |
| 169 | 177 | this.props.edit( settings ); |
| 170 | 178 | } } |
| 171 | 179 | /> |
| @@ -180,11 +188,14 @@ | ||
| 180 | 188 | > |
| 181 | 189 | |
| 182 | 190 | <TextControl |
| 183 | 191 | label={ __( 'Count' ) } |
| 184 | - help={ __( 'The number of Vertical minor gridlines between two regular gridlines.' ) } | |
| 185 | - value={ settings.vAxis.minorGridlines.count } | |
| 192 | + help={ __( 'Specify 0 to disable the minor gridlines.' ) } | |
| 193 | + value={ settings.vAxis.minorGridlines ? settings.vAxis.minorGridlines.count : '' } | |
| 186 | 194 | onChange={ e => { |
| 195 | + if ( ! settings.vAxis.minorGridlines ) { | |
| 196 | + settings.vAxis.minorGridlines = {}; | |
| 197 | + } | |
| 187 | 198 | settings.vAxis.minorGridlines.count = e; |
| 188 | 199 | this.props.edit( settings ); |
| 189 | 200 | } } |
| 190 | 201 | /> |
| @@ -192,10 +203,13 @@ | ||
| 192 | 203 | <BaseControl |
| 193 | 204 | label={ __( 'Color' ) } |
| 194 | 205 | > |
| 195 | 206 | <ColorPalette |
| 196 | - value={ settings.vAxis.minorGridlines.color } | |
| 207 | + value={ settings.vAxis.minorGridlines ? settings.vAxis.minorGridlines.color : '' } | |
| 197 | 208 | onChange={ e => { |
| 209 | + if ( ! settings.vAxis.minorGridlines ) { | |
| 210 | + settings.vAxis.minorGridlines = {}; | |
| 211 | + } | |
| 198 | 212 | settings.vAxis.minorGridlines.color = e; |
| 199 | 213 | this.props.edit( settings ); |
| 200 | 214 | } } |
| 201 | 215 | /> |
| @@ -211,10 +225,13 @@ | ||
| 211 | 225 | |
| 212 | 226 | <TextControl |
| 213 | 227 | label={ __( 'Maximun Value' ) } |
| 214 | 228 | help={ __( 'The maximum vertical data value to render.' ) } |
| 215 | - value={ settings.vAxis.viewWindow.max } | |
| 229 | + value={ settings.vAxis.viewWindow ? settings.vAxis.viewWindow.max : '' } | |
| 216 | 230 | onChange={ e => { |
| 231 | + if ( ! settings.vAxis.viewWindow ) { | |
| 232 | + settings.vAxis.viewWindow = {}; | |
| 233 | + } | |
| 217 | 234 | settings.vAxis.viewWindow.max = e; |
| 218 | 235 | this.props.edit( settings ); |
| 219 | 236 | } } |
| 220 | 237 | /> |
| @@ -221,10 +238,13 @@ | ||
| 221 | 238 | |
| 222 | 239 | <TextControl |
| 223 | 240 | label={ __( 'Minimum Value' ) } |
| 224 | 241 | help={ __( 'The minimum vertical data value to render.' ) } |
| 225 | - value={ settings.vAxis.viewWindow.min } | |
| 242 | + value={ settings.vAxis.viewWindow ? settings.vAxis.viewWindow.min : '' } | |
| 226 | 243 | onChange={ e => { |
| 244 | + if ( ! settings.vAxis.viewWindow ) { | |
| 245 | + settings.vAxis.viewWindow = {}; | |
| 246 | + } | |
| 227 | 247 | settings.vAxis.viewWindow.min = e; |
| 228 | 248 | this.props.edit( settings ); |
| 229 | 249 | } } |
| 230 | 250 | /> |