@@ -128,6 +128,7 @@ export const ChartColorInputs: FC<ChartColorInputsProps> = memo(({ chartConfig,
128128 const colorPaletteScale = chartConfig . geomOptions . colorPaletteScale ;
129129 const showColorPaletteScale = useMemo ( ( ) => showColorOption ( chartConfig , 'colorPaletteScale' ) , [ chartConfig ] ) ;
130130 const showSeriesLineStyle = isLinePlot && chartConfig . measures ?. series !== undefined ;
131+ const showAnyColorOptions = showBoxFillColor || showLineColor || showPointFillColor ;
131132
132133 const setGeomOptions = useCallback (
133134 options => {
@@ -177,37 +178,35 @@ export const ChartColorInputs: FC<ChartColorInputsProps> = memo(({ chartConfig,
177178
178179 return (
179180 < >
180- { showBoxFillColor && (
181+ { showAnyColorOptions && (
181182 < div className = "form-group row" >
182- < div className = "col-xs-12" >
183- < label > Fill Color</ label >
184- < ColorPickerInput
185- allowRemove = { isBoxPlot }
186- name = "boxFillColor"
187- onChange = { onBoxFillColorChange }
188- value = { boxFillColor }
189- />
190- </ div >
191- </ div >
192- ) }
193- { showLineColor && (
194- < div className = "form-group row" >
195- < div className = "col-xs-12" >
196- < label > Line Color</ label >
197- < ColorPickerInput name = "lineColor" onChange = { onLineColorChange } value = { lineColor } />
198- </ div >
199- </ div >
200- ) }
201- { showPointFillColor && (
202- < div className = "form-group row" >
203- < div className = "col-xs-12" >
204- < label > { isLinePlot ? '' : 'Point ' } Color</ label >
205- < ColorPickerInput
206- name = "pointFillColor"
207- onChange = { onPointFillColorChange }
208- value = { pointFillColor }
209- />
210- </ div >
183+ { showBoxFillColor && (
184+ < div className = "col-xs-4" >
185+ < label > Fill Color</ label >
186+ < ColorPickerInput
187+ allowRemove = { isBoxPlot }
188+ name = "boxFillColor"
189+ onChange = { onBoxFillColorChange }
190+ value = { boxFillColor }
191+ />
192+ </ div >
193+ ) }
194+ { showLineColor && (
195+ < div className = "col-xs-4" >
196+ < label > Line Color</ label >
197+ < ColorPickerInput name = "lineColor" onChange = { onLineColorChange } value = { lineColor } />
198+ </ div >
199+ ) }
200+ { showPointFillColor && (
201+ < div className = "col-xs-4" >
202+ < label > { isLinePlot ? '' : 'Point ' } Color</ label >
203+ < ColorPickerInput
204+ name = "pointFillColor"
205+ onChange = { onPointFillColorChange }
206+ value = { pointFillColor }
207+ />
208+ </ div >
209+ ) }
211210 </ div >
212211 ) }
213212 { showColorPaletteScale && (
@@ -363,7 +362,7 @@ export const SeriesLineStyleInput: FC<SeriesLineStyleInputProps> = memo(({ chart
363362 </ div >
364363 { selectedSeries && (
365364 < div className = "row" >
366- < div className = "col-xs-6 " >
365+ < div className = "col-xs-4 " >
367366 < div > Color</ div >
368367 < ColorPickerInput
369368 allowRemove
@@ -372,7 +371,7 @@ export const SeriesLineStyleInput: FC<SeriesLineStyleInputProps> = memo(({ chart
372371 value = { seriesOptionMap [ selectedSeries ] ?. color }
373372 />
374373 </ div >
375- < div className = "col-xs-6 " >
374+ < div className = "col-xs-8 " >
376375 < div > Shape</ div >
377376 < SelectInput
378377 clearable = { false }
0 commit comments