Skip to content

Enable options on annotations to apply automatically when hovered #840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/annotation.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {Chart} from 'chart.js';
import {clipArea, unclipArea, isObject, isArray} from 'chart.js/helpers';
import {handleEvent, eventHooks, updateListeners} from './events';
import {handleActiveElements} from './hover';
import {invokeHook, elementHooks, updateHooks} from './hooks';
import {adjustScaleRange, verifyScaleOptions} from './scale';
import {updateElements, resolveType} from './elements';
@@ -38,7 +39,8 @@ export default {
moveListened: false,
hooks: {},
hooked: false,
hovered: []
hovered: [],
activeElements: []
});
},

@@ -92,7 +94,8 @@ export default {

beforeEvent(chart, args, options) {
const state = chartStates.get(chart);
if (handleEvent(state, args.event, options)) {
const hovered = handleActiveElements(chart, state, args.event, options);
if (handleEvent(state, args.event, options) || hovered) {
args.changed = true;
}
},
@@ -118,6 +121,12 @@ export default {
axis: undefined,
intersect: undefined
},
hover: {
enabled: true,
mode: undefined,
axis: undefined,
intersect: undefined
},
common: {
drawTime: 'afterDatasetsDraw',
label: {
@@ -135,6 +144,9 @@ export default {
interaction: {
_fallback: true
},
hover: {
_fallback: 'interaction'
},
common: {
label: {
_fallback: true
65 changes: 43 additions & 22 deletions src/elements.js
Original file line number Diff line number Diff line change
@@ -9,11 +9,13 @@ const directUpdater = {
};

const hooks = eventHooks.concat(elementHooks);
const getPrefixes = (el) => el.active ? ['hover', ''] : [''];

/**
* @typedef { import("chart.js").Chart } Chart
* @typedef { import("chart.js").UpdateMode } UpdateMode
* @typedef { import('../../types/options').AnnotationPluginOptions } AnnotationPluginOptions
* @typedef { import('../../types/element').AnnotationElement } AnnotationElement
*/

/**
@@ -29,6 +31,21 @@ export function resolveType(type = 'line') {
return 'line';
}

/**
* @param {Chart} chart
* @param {Object} state
* @param {AnnotationPluginOptions} options
* @param {AnnotationElement[]} elements
*/
export function updateActiveElements(chart, state, options, elements) {
const animations = resolveAnimations(chart, options.animations, 'active');

elements.forEach(function(el) {
const index = state.elements.indexOf(el);
updateElement(chart, el, state.annotations[index], animations);
});
}

/**
* @param {Chart} chart
* @param {Object} state
@@ -44,30 +61,34 @@ export function updateElements(chart, state, options, mode) {
for (let i = 0; i < annotations.length; i++) {
const annotationOptions = annotations[i];
const element = getOrCreateElement(elements, i, annotationOptions.type);
const resolver = annotationOptions.setContext(getContext(chart, element, annotationOptions));
const properties = element.resolveElementProperties(chart, resolver);

properties.skip = toSkip(properties);
updateElement(chart, element, annotationOptions, animations);
}
}

if ('elements' in properties) {
updateSubElements(element, properties, resolver, animations);
// Remove the sub-element definitions from properties, so the actual elements
// are not overwritten by their definitions
delete properties.elements;
}
function updateElement(chart, element, options, animations) {
const resolver = options.setContext(getContext(chart, element, options), getPrefixes(element));
const properties = element.resolveElementProperties(chart, resolver);

if (!defined(element.x)) {
// If the element is newly created, assing the properties directly - to
// make them readily awailable to any scriptable options. If we do not do this,
// the properties retruned by `resolveElementProperties` are available only
// after options resolution.
Object.assign(element, properties);
}
properties.skip = toSkip(properties);

properties.options = resolveAnnotationOptions(resolver);
if ('elements' in properties) {
updateSubElements(element, properties, resolver, animations);
// Remove the sub-element definitions from properties, so the actual elements
// are not overwritten by their definitions
delete properties.elements;
}

animations.update(element, properties);
if (!defined(element.x)) {
// If the element is newly created, assing the properties directly - to
// make them readily awailable to any scriptable options. If we do not do this,
// the properties retruned by `resolveElementProperties` are available only
// after options resolution.
Object.assign(element, properties);
}

properties.options = resolveAnnotationOptions(resolver);

animations.update(element, properties);
}

function toSkip(properties) {
@@ -88,7 +109,7 @@ function updateSubElements(mainElement, {elements, initProperties}, resolver, an
const definition = elements[i];
const properties = definition.properties;
const subElement = getOrCreateElement(subElements, i, definition.type, initProperties);
const subResolver = resolver[definition.optionScope].override(definition);
const subResolver = resolver[definition.optionScope].override(definition, getPrefixes(mainElement));
properties.options = resolveAnnotationOptions(subResolver);
animations.update(subElement, properties);
}
@@ -121,12 +142,12 @@ function resolveAnnotationOptions(resolver) {
return result;
}

function resolveObj(resolver, defs) {
function resolveObj(resolver, defs, active) {
const result = {};
for (const prop of Object.keys(defs)) {
const optDefs = defs[prop];
const value = resolver[prop];
result[prop] = isObject(optDefs) ? resolveObj(value, optDefs) : value;
result[prop] = isObject(optDefs) ? resolveObj(value, optDefs, active) : value;
}
return result;
}
62 changes: 62 additions & 0 deletions src/hover.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import {getElements} from './interaction';
import {updateActiveElements} from './elements';

/**
* @typedef { import("chart.js").Chart } Chart
* @typedef { import('../../types/options').AnnotationPluginOptions } AnnotationPluginOptions
*/

/**
* @param {Chart} chart
* @param {Object} state
* @param {ChartEvent} event
* @param {AnnotationPluginOptions} options
* @return {boolean|undefined}
*/
export function handleActiveElements(chart, state, event, options) {
if (options.hover.enabled) {
switch (event.type) {
case 'mousemove':
case 'mouseout':
return handleMoveEvents(chart, state, event, options);
default:
}
}
}

function handleMoveEvents(chart, state, event, options) {
let elements;

if (event.type === 'mousemove') {
elements = getElements(state, event, options.hover);
} else {
elements = [];
}

if (empty(state.activeElements, elements)) {
return false;
}

const unhovered = state.activeElements.filter((el) => !elements.includes(el));
setActive(unhovered, false);
state.activeElements = elements;
const newHovered = elements.filter((el) => !el.active);
if (empty(unhovered, newHovered)) {
return false;
}
setActive(newHovered, true);
updateActiveElements(chart, state, options, unhovered.concat(newHovered));
return true;
}

function empty(arr1, arr2) {
return !arr1.length && !arr2.length;
}

function setActive(elements, active) {
const result = active ? elements.filter((el) => !el.active) : elements;
result.forEach(function(el) {
el.active = active;
});
return result;
}
3 changes: 3 additions & 0 deletions test/utils.js
Original file line number Diff line number Diff line change
@@ -56,6 +56,9 @@ export function scatterChart(xMax, yMax, annotations) {
plugins: {
legend: false,
annotation: {
hover: {
enabled: false
},
annotations
}
}