Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Enable options on annotations to apply automatically when hovered #840

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft

Enable options on annotations to apply automatically when hovered #840

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e3a7d75
Enable options on annotations to apply automatically when hovered
stockiNail Jan 30, 2023
12ab472
apply active to sub-elements
stockiNail Jan 30, 2023
65bba50
sets prefixes
stockiNail Jan 31, 2023
528c45e
renames active elements
stockiNail Jan 31, 2023
c35006e
changes fallback of hover and some names
stockiNail Jan 31, 2023
eec18cb
improves update elements invocation logic
stockiNail Feb 1, 2023
3eb90dc
fixes CC
stockiNail Feb 1, 2023
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
Prev Previous commit
Next Next commit
sets prefixes
  • Loading branch information
@stockiNail
stockiNail committed Jan 31, 2023
commit 65bba50d9ee411559bd5cb0aa2810a2c08054ee2
50 changes: 25 additions & 25 deletions src/elements.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Animations} from 'chart.js';
import {isObject, defined, _capitalize} from 'chart.js/helpers';
import {isObject, defined} from 'chart.js/helpers';
import {eventHooks} from './events';
import {elementHooks} from './hooks';
import {annotationTypes} from './types';
Expand All @@ -9,6 +9,7 @@ const directUpdater = {
};

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

/**
* @typedef { import("chart.js").Chart } Chart
Expand All @@ -30,6 +31,21 @@ export function resolveType(type = 'line') {
return 'line';
}

/**
* @param {Chart} chart
* @param {Object} state
* @param {AnnotationPluginOptions} options
* @param {AnnotationElement[]} elements
*/
export function hoverElements(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
Expand All @@ -49,23 +65,8 @@ export function updateElements(chart, state, options, mode) {
}
}

/**
* @param {Chart} chart
* @param {Object} state
* @param {AnnotationPluginOptions} options
* @param {AnnotationElement[]} elements
*/
export function hoverElements(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);
});
}

function updateElement(chart, element, options, animations) {
const resolver = options.setContext(getContext(chart, element, options));
const resolver = options.setContext(getContext(chart, element, options), getPrefixes(element));
const properties = element.resolveElementProperties(chart, resolver);

properties.skip = toSkip(properties);
Expand All @@ -85,7 +86,7 @@ function updateElement(chart, element, options, animations) {
Object.assign(element, properties);
}

properties.options = resolveAnnotationOptions(resolver, element.active);
properties.options = resolveAnnotationOptions(resolver);

animations.update(element, properties);
}
Expand All @@ -108,8 +109,8 @@ 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);
properties.options = resolveAnnotationOptions(subResolver, mainElement.active);
const subResolver = resolver[definition.optionScope].override(definition, getPrefixes(mainElement));
properties.options = resolveAnnotationOptions(subResolver);
animations.update(subElement, properties);
}
}
Expand All @@ -126,15 +127,15 @@ function getOrCreateElement(elements, index, type, initProperties) {
return element;
}

function resolveAnnotationOptions(resolver, active) {
function resolveAnnotationOptions(resolver) {
const elementClass = annotationTypes[resolveType(resolver.type)];
const result = {};
result.id = resolver.id;
result.type = resolver.type;
result.drawTime = resolver.drawTime;
Object.assign(result,
resolveObj(resolver, elementClass.defaults, active),
resolveObj(resolver, elementClass.defaultRoutes, active));
resolveObj(resolver, elementClass.defaults),
resolveObj(resolver, elementClass.defaultRoutes));
for (const hook of hooks) {
result[hook] = resolver[hook];
}
Expand All @@ -145,8 +146,7 @@ function resolveObj(resolver, defs, active) {
const result = {};
for (const prop of Object.keys(defs)) {
const optDefs = defs[prop];
const hoverProp = active ? 'hover' + _capitalize(prop) : prop;
const value = resolver[hoverProp] || resolver[prop];
const value = resolver[prop];
result[prop] = isObject(optDefs) ? resolveObj(value, optDefs, active) : value;
}
return result;
Expand Down