Skip to content

Commit db7b62a

Browse files
committed
bug fix: unselect should not be displayed when selection trace is empty
1 parent dc434aa commit db7b62a

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/firefly/js/charts/ChartsCntlr.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,8 +404,9 @@ function chartSelect(action) {
404404
// avoid updating chart twice
405405
// don't update before table select
406406
if (!chartTrigger) {
407+
const hasSelected = !isEmpty(selIndexes);
407408
selected = newTraceFrom(data[activeTrace], selIndexes, SELECTED_PROPS);
408-
dispatchChartUpdate({chartId, changes: {selected, selection: undefined}});
409+
dispatchChartUpdate({chartId, changes: {hasSelected, selected, selection: undefined}});
409410
}
410411
};
411412
}

src/firefly/js/charts/ui/PlotlyToolbar.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ import {getColValidator} from './ColumnOrExpression.jsx';
1111
import {getColValStats} from '../TableStatsCntlr.js';
1212

1313
function getToolbarStates(chartId) {
14-
const {selection, selected, activeTrace=0, tablesources, layout, data=[]} = getChartData(chartId);
14+
const {selection, hasSelected, activeTrace=0, tablesources, layout, data=[]} = getChartData(chartId);
1515
const {tbl_id} = get(tablesources, [activeTrace], {});
1616
const {columns} = get(getTblById(tbl_id), ['tableData']) || {};
1717
const hasFilter = tbl_id && !isEmpty(get(getTblById(tbl_id), 'request.filters'));
1818
const hasSelection = !isEmpty(selection);
1919
const traceNames = data.map((t) => t.name).toString();
2020
const activeTraceType = get(data, `${activeTrace}.type`);
21-
return {hasSelection, hasFilter, activeTrace, activeTraceType, tbl_id, hasSelected: !!selected,
21+
return {hasSelection, hasFilter, activeTrace, activeTraceType, tbl_id, hasSelected,
2222
dragmode: get(layout, 'dragmode'), traceNames, columns};
2323
}
2424

0 commit comments

Comments
 (0)