Skip to content

Commit

Permalink
Feature/active elements on top (#9920)
Browse files Browse the repository at this point in the history
* add flag to draw active items on top

* add documentation and types

* remove redundent check

* added test

* resolve linting errors

* increase tollerance

* remove axes for better test, hope no tolerance needed
  • Loading branch information
LeeLenaleee committed Dec 5, 2021
1 parent cd9d528 commit 6d3a1c5
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 1 deletion.
2 changes: 2 additions & 0 deletions docs/charts/bubble.md
Expand Up @@ -63,6 +63,7 @@ The bubble chart allows a number of properties to be specified for each dataset.
| [`pointStyle`](#styling) | [`pointStyle`](../configuration/elements.md#types) | Yes | Yes | `'circle'`
| [`rotation`](#styling) | `number` | Yes | Yes | `0`
| [`radius`](#styling) | `number` | Yes | Yes | `3`
| [`drawActiveElementsOnTop`](#styling) | `boolean` | Yes | Yes | `true`

All these values, if `undefined`, fallback to the scopes described in [option resolution](../general/options)

Expand All @@ -86,6 +87,7 @@ The style of each bubble can be controlled with the following properties:
| `pointStyle` | bubble [shape style](../configuration/elements.md#point-styles).
| `rotation` | bubble rotation (in degrees).
| `radius` | bubble radius (in pixels).
| `drawActiveElementsOnTop` | Draw the active bubbles of a dataset over the other bubbles of the dataset

All these values, if `undefined`, fallback to the associated [`elements.point.*`](../configuration/elements.md#point-configuration) options.

Expand Down
2 changes: 2 additions & 0 deletions docs/charts/line.md
Expand Up @@ -84,6 +84,7 @@ The line chart allows a number of properties to be specified for each dataset. T
| [`tension`](#line-styling) | `number` | - | - | `0`
| [`xAxisID`](#general) | `string` | - | - | first x axis
| [`yAxisID`](#general) | `string` | - | - | first y axis
| [`drawActiveElementsOnTop`](#point-styling) | `boolean` | Yes | Yes | `true`

All these values, if `undefined`, fallback to the scopes described in [option resolution](../general/options)

Expand Down Expand Up @@ -112,6 +113,7 @@ The style of each point can be controlled with the following properties:
| `pointRadius` | The radius of the point shape. If set to 0, the point is not rendered.
| `pointRotation` | The rotation of the point in degrees.
| `pointStyle` | Style of the point. [more...](../configuration/elements.md#point-styles)
| `drawActiveElementsOnTop` | Draw the active points of a dataset over the other points of the dataset

All these values, if `undefined`, fallback first to the dataset options then to the associated [`elements.point.*`](../configuration/elements.md#point-configuration) options.

Expand Down
3 changes: 2 additions & 1 deletion src/core/core.datasetController.js
Expand Up @@ -678,6 +678,7 @@ export default class DatasetController {
const active = [];
const start = this._drawStart || 0;
const count = this._drawCount || (elements.length - start);
const drawActiveElementsOnTop = this.options.drawActiveElementsOnTop;
let i;

if (meta.dataset) {
Expand All @@ -689,7 +690,7 @@ export default class DatasetController {
if (element.hidden) {
continue;
}
if (element.active) {
if (element.active && drawActiveElementsOnTop) {
active.push(element);
} else {
element.draw(ctx, area);
Expand Down
1 change: 1 addition & 0 deletions src/core/core.defaults.js
Expand Up @@ -73,6 +73,7 @@ export class Defaults {
this.scale = undefined;
this.scales = {};
this.showLine = true;
this.drawActiveElementsOnTop = true;

this.describe(_descriptors);
}
Expand Down
41 changes: 41 additions & 0 deletions test/fixtures/core.interaction/drawActiveElementsOnTop-false.js
@@ -0,0 +1,41 @@
module.exports = {
config: {
type: 'bubble',
data: {
datasets: [{
data: [
{x: 1, y: 1, r: 80},
{x: 1, y: 1, r: 20}
],
drawActiveElementsOnTop: false,
backgroundColor: (ctx) => (ctx.dataIndex === 1 ? 'red' : 'blue'),
hoverBackgroundColor: 'yellow',
hoverRadius: 0,
}]
},
options: {
scales: {
x: {
display: false
},
y: {
display: false
},
},
plugins: {
tooltip: false,
legend: false
},
}
},
options: {
canvas: {
width: 256,
height: 256
},
async run(chart) {
const point = chart.getDatasetMeta(0).data[0];
await jasmine.triggerMouseEvent(chart, 'click', {y: point.y, x: point.x + 25});
}
}
};
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions types/index.esm.d.ts
Expand Up @@ -1845,6 +1845,11 @@ export interface PointOptions extends CommonElementOptions {
* @default 0
*/
rotation: number;
/**
* Draw the active elements over the other elements of the dataset,
* @default true
*/
drawActiveElementsOnTop: boolean;
}

export interface PointHoverOptions extends CommonHoverOptions {
Expand Down

0 comments on commit 6d3a1c5

Please sign in to comment.