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

Remove const me = this pattern #9646

Merged
merged 1 commit into from Sep 14, 2021
Merged

Remove const me = this pattern #9646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
80 changes: 35 additions & 45 deletions src/controllers/controller.bar.js
View file
Open in desktop
Expand Up @@ -310,10 +310,9 @@ export default class BarController extends DatasetController {
* @protected
*/
getLabelAndValue(index) {
const me = this;
const meta = me._cachedMeta;
const meta = this._cachedMeta;
const {iScale, vScale} = meta;
const parsed = me.getParsed(index);
const parsed = this.getParsed(index);
const custom = parsed._custom;
const value = isFloatBar(custom)
? '[' + custom.start + ', ' + custom.end + ']'
Expand All @@ -326,39 +325,35 @@ export default class BarController extends DatasetController {
}

initialize() {
const me = this;
me.enableOptionSharing = true;
this.enableOptionSharing = true;

super.initialize();

const meta = me._cachedMeta;
meta.stack = me.getDataset().stack;
const meta = this._cachedMeta;
meta.stack = this.getDataset().stack;
}

update(mode) {
const me = this;
const meta = me._cachedMeta;

me.updateElements(meta.data, 0, meta.data.length, mode);
const meta = this._cachedMeta;
this.updateElements(meta.data, 0, meta.data.length, mode);
}

updateElements(bars, start, count, mode) {
const me = this;
const reset = mode === 'reset';
const {index, _cachedMeta: {vScale}} = me;
const {index, _cachedMeta: {vScale}} = this;
const base = vScale.getBasePixel();
const horizontal = vScale.isHorizontal();
const ruler = me._getRuler();
const firstOpts = me.resolveDataElementOptions(start, mode);
const sharedOptions = me.getSharedOptions(firstOpts);
const includeOptions = me.includeOptions(mode, sharedOptions);
const ruler = this._getRuler();
const firstOpts = this.resolveDataElementOptions(start, mode);
const sharedOptions = this.getSharedOptions(firstOpts);
const includeOptions = this.includeOptions(mode, sharedOptions);

me.updateSharedOptions(sharedOptions, mode, firstOpts);
this.updateSharedOptions(sharedOptions, mode, firstOpts);

for (let i = start; i < start + count; i++) {
const parsed = me.getParsed(i);
const vpixels = reset || isNullOrUndef(parsed[vScale.axis]) ? {base, head: base} : me._calculateBarValuePixels(i);
const ipixels = me._calculateBarIndexPixels(i, ruler);
const parsed = this.getParsed(i);
const vpixels = reset || isNullOrUndef(parsed[vScale.axis]) ? {base, head: base} : this._calculateBarValuePixels(i);
const ipixels = this._calculateBarIndexPixels(i, ruler);
const stack = (parsed._stacks || {})[vScale.axis];

const properties = {
Expand All @@ -372,10 +367,10 @@ export default class BarController extends DatasetController {
};

if (includeOptions) {
properties.options = sharedOptions || me.resolveDataElementOptions(i, bars[i].active ? 'active' : mode);
properties.options = sharedOptions || this.resolveDataElementOptions(i, bars[i].active ? 'active' : mode);
}
setBorderSkipped(properties, properties.options || bars[i].options, stack, index);
me.updateElement(bars[i], i, properties, mode);
this.updateElement(bars[i], i, properties, mode);
}
}

Expand All @@ -387,10 +382,9 @@ export default class BarController extends DatasetController {
* @private
*/
_getStacks(last, dataIndex) {
const me = this;
const meta = me._cachedMeta;
const meta = this._cachedMeta;
const iScale = meta.iScale;
const metasets = iScale.getMatchingVisibleMetas(me._type);
const metasets = iScale.getMatchingVisibleMetas(this._type);
const stacked = iScale.options.stacked;
const ilen = metasets.length;
const stacks = [];
Expand Down Expand Up @@ -468,15 +462,14 @@ export default class BarController extends DatasetController {
* @private
*/
_getRuler() {
const me = this;
const opts = me.options;
const meta = me._cachedMeta;
const opts = this.options;
const meta = this._cachedMeta;
const iScale = meta.iScale;
const pixels = [];
let i, ilen;

for (i = 0, ilen = meta.data.length; i < ilen; ++i) {
pixels.push(iScale.getPixelForValue(me.getParsed(i)[iScale.axis], i));
pixels.push(iScale.getPixelForValue(this.getParsed(i)[iScale.axis], i));
}

const barThickness = opts.barThickness;
Expand All @@ -487,7 +480,7 @@ export default class BarController extends DatasetController {
pixels,
start: iScale._startPixel,
end: iScale._endPixel,
stackCount: me._getStackCount(),
stackCount: this._getStackCount(),
scale: iScale,
grouped: opts.grouped,
// bar thickness ratio used for non-grouped bars
Expand All @@ -500,15 +493,14 @@ export default class BarController extends DatasetController {
* @private
*/
_calculateBarValuePixels(index) {
const me = this;
const {_cachedMeta: {vScale, _stacked}, options: {base: baseValue, minBarLength}} = me;
const {_cachedMeta: {vScale, _stacked}, options: {base: baseValue, minBarLength}} = this;
const actualBase = baseValue || 0;
const parsed = me.getParsed(index);
const parsed = this.getParsed(index);
const custom = parsed._custom;
const floating = isFloatBar(custom);
let value = parsed[vScale.axis];
let start = 0;
let length = _stacked ? me.applyStack(vScale, parsed, _stacked) : value;
let length = _stacked ? this.applyStack(vScale, parsed, _stacked) : value;
let head, size;

if (length !== value) {
Expand All @@ -529,7 +521,7 @@ export default class BarController extends DatasetController {
const startValue = !isNullOrUndef(baseValue) && !floating ? baseValue : start;
let base = vScale.getPixelForValue(startValue);

if (me.chart.getDataVisibility(index)) {
if (this.chart.getDataVisibility(index)) {
head = vScale.getPixelForValue(start + length);
} else {
// When not visible, no height
Expand Down Expand Up @@ -564,24 +556,23 @@ export default class BarController extends DatasetController {
* @private
*/
_calculateBarIndexPixels(index, ruler) {
const me = this;
const scale = ruler.scale;
const options = me.options;
const options = this.options;
const skipNull = options.skipNull;
const maxBarThickness = valueOrDefault(options.maxBarThickness, Infinity);
let center, size;
if (ruler.grouped) {
const stackCount = skipNull ? me._getStackCount(index) : ruler.stackCount;
const stackCount = skipNull ? this._getStackCount(index) : ruler.stackCount;
const range = options.barThickness === 'flex'
? computeFlexCategoryTraits(index, ruler, options, stackCount)
: computeFitCategoryTraits(index, ruler, options, stackCount);

const stackIndex = me._getStackIndex(me.index, me._cachedMeta.stack, skipNull ? index : undefined);
const stackIndex = this._getStackIndex(this.index, this._cachedMeta.stack, skipNull ? index : undefined);
center = range.start + (range.chunk * stackIndex) + (range.chunk / 2);
size = Math.min(maxBarThickness, range.chunk * range.ratio);
} else {
// For non-grouped bar charts, exact pixel values are used
center = scale.getPixelForValue(me.getParsed(index)[scale.axis], index);
center = scale.getPixelForValue(this.getParsed(index)[scale.axis], index);
size = Math.min(maxBarThickness, ruler.min * ruler.ratio);
}

Expand All @@ -594,16 +585,15 @@ export default class BarController extends DatasetController {
}

draw() {
const me = this;
const meta = me._cachedMeta;
const meta = this._cachedMeta;
const vScale = meta.vScale;
const rects = meta.data;
const ilen = rects.length;
let i = 0;

for (; i < ilen; ++i) {
if (me.getParsed(i)[vScale.axis] !== null) {
rects[i].draw(me._ctx);
if (this.getParsed(i)[vScale.axis] !== null) {
rects[i].draw(this._ctx);
}
}
}
Expand Down
27 changes: 12 additions & 15 deletions src/controllers/controller.bubble.js
View file
Open in desktop
Expand Up @@ -44,10 +44,9 @@ export default class BubbleController extends DatasetController {
* @protected
*/
getLabelAndValue(index) {
const me = this;
const meta = me._cachedMeta;
const meta = this._cachedMeta;
const {xScale, yScale} = meta;
const parsed = me.getParsed(index);
const parsed = this.getParsed(index);
const x = xScale.getLabelForValue(parsed.x);
const y = yScale.getLabelForValue(parsed.y);
const r = parsed._custom;
Expand All @@ -59,44 +58,42 @@ export default class BubbleController extends DatasetController {
}

update(mode) {
const me = this;
const points = me._cachedMeta.data;
const points = this._cachedMeta.data;

// Update Points
me.updateElements(points, 0, points.length, mode);
this.updateElements(points, 0, points.length, mode);
}

updateElements(points, start, count, mode) {
const me = this;
const reset = mode === 'reset';
const {iScale, vScale} = me._cachedMeta;
const firstOpts = me.resolveDataElementOptions(start, mode);
const sharedOptions = me.getSharedOptions(firstOpts);
const includeOptions = me.includeOptions(mode, sharedOptions);
const {iScale, vScale} = 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;

for (let i = start; i < start + count; i++) {
const point = points[i];
const parsed = !reset && me.getParsed(i);
const parsed = !reset && this.getParsed(i);
const properties = {};
const iPixel = properties[iAxis] = reset ? iScale.getPixelForDecimal(0.5) : iScale.getPixelForValue(parsed[iAxis]);
const vPixel = properties[vAxis] = reset ? vScale.getBasePixel() : vScale.getPixelForValue(parsed[vAxis]);

properties.skip = isNaN(iPixel) || isNaN(vPixel);

if (includeOptions) {
properties.options = me.resolveDataElementOptions(i, point.active ? 'active' : mode);
properties.options = this.resolveDataElementOptions(i, point.active ? 'active' : mode);

if (reset) {
properties.options.radius = 0;
}
}

me.updateElement(point, i, properties, mode);
this.updateElement(point, i, properties, mode);
}

me.updateSharedOptions(sharedOptions, mode, firstOpts);
this.updateSharedOptions(sharedOptions, mode, firstOpts);
}

/**
Expand Down