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.

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

Add chart, p0.raw, p1.raw to segment context #9761

Merged
merged 3 commits into from Oct 15, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/controllers/controller.line.js
Expand Up @@ -26,6 +26,7 @@ export default class LineController extends DatasetController {
}

// Update Line
line._chart = this.chart;
line._datasetIndex = this.index;
line._decimated = !!_dataset._decimated;
line.points = points;
Expand All @@ -46,13 +47,13 @@ export default class LineController extends DatasetController {

updateElements(points, start, count, mode) {
const reset = mode === 'reset';
const {iScale, vScale, _stacked} = this._cachedMeta;
const {iScale, vScale, _stacked, _dataset} = this._cachedMeta;
const firstOpts = this.resolveDataElementOptions(start, mode);
const sharedOptions = this.getSharedOptions(firstOpts);
const includeOptions = this.includeOptions(mode, sharedOptions);
const iAxis = iScale.axis;
const vAxis = vScale.axis;
const spanGaps = this.options.spanGaps;
const {spanGaps, segment} = this.options;
const maxGapLength = isNumber(spanGaps) ? spanGaps : Number.POSITIVE_INFINITY;
const directUpdate = this.chart._animationsDisabled || reset || mode === 'none';
let prevParsed = start > 0 && this.getParsed(start - 1);
Expand All @@ -67,7 +68,10 @@ export default class LineController extends DatasetController {

properties.skip = isNaN(iPixel) || isNaN(vPixel) || nullData;
properties.stop = i > 0 && (parsed[iAxis] - prevParsed[iAxis]) > maxGapLength;
properties.parsed = parsed;
if (segment) {
properties.parsed = parsed;
properties.raw = _dataset.data[i];
}

if (includeOptions) {
properties.options = sharedOptions || this.resolveDataElementOptions(i, point.active ? 'active' : mode);
Expand Down
4 changes: 2 additions & 2 deletions src/core/core.controller.js
Expand Up @@ -8,7 +8,7 @@ import registry from './core.registry';
import Config, {determineAxis, getIndexAxis} from './core.config';
import {retinaScale, _isDomSupported} from '../helpers/helpers.dom';
import {each, callback as callCallback, uid, valueOrDefault, _elementsEqual, isNullOrUndef, setsEqual, defined} from '../helpers/helpers.core';
import {clearCanvas, clipArea, unclipArea, _isPointInArea} from '../helpers/helpers.canvas';
import {clearCanvas, clipArea, createContext, unclipArea, _isPointInArea} from '../helpers';
// @ts-ignore
import {version} from '../../package.json';
import {debounce} from '../helpers/helpers.extras';
Expand Down Expand Up @@ -737,7 +737,7 @@ class Chart {
}

getContext() {
return this.$context || (this.$context = {chart: this, type: 'chart'});
return this.$context || (this.$context = createContext(null, {chart: this, type: 'chart'}));
}

getVisibleDatasetCount() {
Expand Down
6 changes: 3 additions & 3 deletions src/core/core.datasetController.js
Expand Up @@ -2,7 +2,7 @@ import Animations from './core.animations';
import defaults from './core.defaults';
import {isArray, isFinite, isObject, valueOrDefault, resolveObjectKey, defined} from '../helpers/helpers.core';
import {listenArrayEvents, unlistenArrayEvents} from '../helpers/helpers.collection';
import {sign} from '../helpers/helpers.math';
import {createContext, sign} from '../helpers';

/**
* @typedef { import("./core.controller").default } Chart
Expand Down Expand Up @@ -167,7 +167,7 @@ function getFirstScaleId(chart, axis) {
}

function createDatasetContext(parent, index) {
return Object.assign(Object.create(parent),
return createContext(parent,
{
active: false,
dataset: undefined,
Expand All @@ -180,7 +180,7 @@ function createDatasetContext(parent, index) {
}

function createDataContext(parent, index, element) {
return Object.assign(Object.create(parent), {
return createContext(parent, {
active: false,
dataIndex: index,
parsed: undefined,
Expand Down
6 changes: 3 additions & 3 deletions src/core/core.scale.js
Expand Up @@ -3,7 +3,7 @@ import {_alignPixel, _measureText, renderText, clipArea, unclipArea} from '../he
import {callback as call, each, finiteOrDefault, isArray, isFinite, isNullOrUndef, isObject, valueOrDefault} from '../helpers/helpers.core';
import {toDegrees, toRadians, _int16Range, _limitValue, HALF_PI} from '../helpers/helpers.math';
import {_alignStartEnd, _toLeftRightCenter} from '../helpers/helpers.extras';
import {toFont, toPadding, _addGrace} from '../helpers/helpers.options';
import {createContext, toFont, toPadding, _addGrace} from '../helpers/helpers.options';

import './core.scale.defaults';

Expand Down Expand Up @@ -109,14 +109,14 @@ function getTitleHeight(options, fallback) {
}

function createScaleContext(parent, scale) {
return Object.assign(Object.create(parent), {
return createContext(parent, {
scale,
type: 'scale'
});
}

function createTickContext(parent, index, tick) {
return Object.assign(Object.create(parent), {
return createContext(parent, {
tick,
index,
type: 'tick'
Expand Down
1 change: 1 addition & 0 deletions src/elements/element.line.js
Expand Up @@ -244,6 +244,7 @@ export default class LineElement extends Element {

this.animated = true;
this.options = undefined;
this._chart = undefined;
this._loop = undefined;
this._fullLoop = undefined;
this._path = undefined;
Expand Down
10 changes: 10 additions & 0 deletions src/helpers/helpers.options.js
Expand Up @@ -184,3 +184,13 @@ export function _addGrace(minmax, grace, beginAtZero) {
max: keepZero(max, change)
};
}

/**
* Create a context inheriting parentContext
* @param {object|null} parentContext
* @param {object} context
* @returns {object}
*/
export function createContext(parentContext, context) {
etimberg marked this conversation as resolved.
Show resolved Hide resolved
return Object.assign(Object.create(parentContext), context);
}
6 changes: 4 additions & 2 deletions src/helpers/helpers.segment.js
@@ -1,4 +1,5 @@
import {_angleBetween, _angleDiff, _normalizeAngle} from './helpers.math';
import {createContext} from './helpers.options';

/**
* @typedef { import("../elements/element.line").default } LineElement
Expand Down Expand Up @@ -275,6 +276,7 @@ function splitByStyles(line, segments, points, segmentOptions) {
* @return {Segment[]}
*/
function doSplitByStyles(line, segments, points, segmentOptions) {
const chartContext = line._chart.getContext();
const baseStyle = readStyle(line.options);
const {_datasetIndex: datasetIndex, options: {spanGaps}} = line;
const count = points.length;
Expand Down Expand Up @@ -309,14 +311,14 @@ function doSplitByStyles(line, segments, points, segmentOptions) {
let style;
for (i = start + 1; i <= segment.end; i++) {
const pt = points[i % count];
style = readStyle(segmentOptions.setContext({
style = readStyle(segmentOptions.setContext(createContext(chartContext, {
type: 'segment',
p0: prev,
p1: pt,
p0DataIndex: (i - 1) % count,
p1DataIndex: i % count,
datasetIndex
}));
})));
if (styleChanged(style, prevStyle)) {
addStyle(start, i - 1, segment.loop, prevStyle);
}
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/plugin.tooltip.js
Expand Up @@ -5,7 +5,7 @@ import {each, noop, isNullOrUndef, isArray, _elementsEqual} from '../helpers/hel
import {toFont, toPadding, toTRBLCorners} from '../helpers/helpers.options';
import {getRtlAdapter, overrideTextDirection, restoreTextDirection} from '../helpers/helpers.rtl';
import {distanceBetweenPoints, _limitValue} from '../helpers/helpers.math';
import {drawPoint} from '../helpers';
import {createContext, drawPoint} from '../helpers';

/**
* @typedef { import("../platform/platform.base").ChartEvent } ChartEvent
Expand Down Expand Up @@ -335,7 +335,7 @@ function getBeforeAfterBodyLines(callback) {
}

function createTooltipContext(parent, tooltip, tooltipItems) {
return Object.assign(Object.create(parent), {
return createContext(parent, {
tooltip,
tooltipItems,
type: 'tooltip'
Expand Down
4 changes: 2 additions & 2 deletions src/scales/scale.radialLinear.js
Expand Up @@ -4,7 +4,7 @@ import {HALF_PI, isNumber, TAU, toDegrees, toRadians, _normalizeAngle} from '../
import LinearScaleBase from './scale.linearbase';
import Ticks from '../core/core.ticks';
import {valueOrDefault, isArray, isFinite, callback as callCallback, isNullOrUndef} from '../helpers/helpers.core';
import {toFont, toPadding} from '../helpers/helpers.options';
import {createContext, toFont, toPadding} from '../helpers/helpers.options';

function getTickBackdropHeight(opts) {
const tickOpts = opts.ticks;
Expand Down Expand Up @@ -265,7 +265,7 @@ function numberOrZero(param) {
}

function createPointLabelContext(parent, index, label) {
return Object.assign(Object.create(parent), {
return createContext(parent, {
label,
index,
type: 'pointLabel'
Expand Down