machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #380 from junderw/fixCacheUpdate

Browse Source 
Fix bug where legend state is reverted when clicking 1-2 after a 1-minute auto-update.
This commit is contained in:
wiz 2021-03-08 16:10:10 +09:00 committed by GitHub
commit 7beb832007
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
frontend/src/app/components/statistics/chartist.component.ts
View File

@ -309,7 +309,7 @@ const defaultOptions = {
Chartist.plugins.legend = function (options: any) { Chartist.plugins.legend = function (options: any) {
let cachedDOMPosition; let cachedDOMPosition;
let cacheInactiveLegends: any = []; let cacheInactiveLegends: { [key:number]: boolean } = {};
// Catch invalid options // Catch invalid options
if (options && options.position) { if (options && options.position) {
if (!(options.position === 'top' || options.position === 'bottom' || options.position instanceof HTMLElement)) { if (!(options.position === 'top' || options.position === 'bottom' || options.position instanceof HTMLElement)) {
@ -453,16 +453,13 @@ Chartist.plugins.legend = function (options: any) {
legends[_legendIndex].active = true; legends[_legendIndex].active = true;
legendElement.childNodes[_legendIndex].classList.remove('inactive'); legendElement.childNodes[_legendIndex].classList.remove('inactive');
const indexOfInactiveLegend = cacheInactiveLegends.indexOf(_legendIndex, 0); cacheInactiveLegends[_legendIndex] = false;
if (indexOfInactiveLegend > -1) {
cacheInactiveLegends.splice(indexOfInactiveLegend, 1);
}
} }
const deactivateLegend = (_legendIndex: number): void => { const deactivateLegend = (_legendIndex: number): void => {
legends[_legendIndex].active = false; legends[_legendIndex].active = false;
legendElement.childNodes[_legendIndex].classList.add('inactive'); legendElement.childNodes[_legendIndex].classList.add('inactive');
cacheInactiveLegends.push(_legendIndex); cacheInactiveLegends[_legendIndex] = true;
} }
for (let i = legends.length - 1; i >= 0; i--) { for (let i = legends.length - 1; i >= 0; i--) {
@ -472,6 +469,9 @@ Chartist.plugins.legend = function (options: any) {
if (legend.active) deactivateLegend(i); if (legend.active) deactivateLegend(i);
} }
} }
// Make sure all values are undefined (falsy) when clicking the first legend
// After clicking the first legend all indices should be falsy
if (legendIndex === 0) cacheInactiveLegends = {};
const newSeries = []; const newSeries = [];
const newLabels = []; const newLabels = [];
@ -509,7 +509,8 @@ Chartist.plugins.legend = function (options: any) {
const legendSeries = legend.series || [i]; const legendSeries = legend.series || [i];
const li = createNameElement(i, legendText, classNamesViable); const li = createNameElement(i, legendText, classNamesViable);
const isActive: boolean = !(cacheInactiveLegends.indexOf(i) > -1); // If the value is undefined or false, isActive is true
const isActive: boolean = !cacheInactiveLegends[i];
if (isActive) { if (isActive) {
activeSeries.push(seriesMetadata[i].data); activeSeries.push(seriesMetadata[i].data);
activeLabels.push(seriesMetadata[i].label); activeLabels.push(seriesMetadata[i].label);