Fix tooltip ranges.
This commit is contained in:
		
							parent
							
								
									fec603d5c5
								
							
						
					
					
						commit
						af3af5f099
					
				@ -34,7 +34,7 @@ export class MempoolGraphComponent implements OnInit, OnChanges {
 | 
				
			|||||||
  hoverIndexSerie = 0;
 | 
					  hoverIndexSerie = 0;
 | 
				
			||||||
  feeLimitIndex: number;
 | 
					  feeLimitIndex: number;
 | 
				
			||||||
  feeLevelsOrdered = [];
 | 
					  feeLevelsOrdered = [];
 | 
				
			||||||
  chartColorsOrdered = [];
 | 
					  chartColorsOrdered = chartColors;
 | 
				
			||||||
  inverted: boolean;
 | 
					  inverted: boolean;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  constructor(
 | 
					  constructor(
 | 
				
			||||||
@ -85,7 +85,8 @@ export class MempoolGraphComponent implements OnInit, OnChanges {
 | 
				
			|||||||
  generateArray(mempoolStats: OptimizedMempoolStats[]) {
 | 
					  generateArray(mempoolStats: OptimizedMempoolStats[]) {
 | 
				
			||||||
    const finalArray: number[][] = [];
 | 
					    const finalArray: number[][] = [];
 | 
				
			||||||
    let feesArray: number[] = [];
 | 
					    let feesArray: number[] = [];
 | 
				
			||||||
    for (let index = 37; index > -1; index--) {
 | 
					
 | 
				
			||||||
 | 
					    for (let index = 28; index > -1; index--) {
 | 
				
			||||||
      feesArray = [];
 | 
					      feesArray = [];
 | 
				
			||||||
      mempoolStats.forEach((stats) => {
 | 
					      mempoolStats.forEach((stats) => {
 | 
				
			||||||
        feesArray.push(stats.vsizes[index] ? stats.vsizes[index] : 0);
 | 
					        feesArray.push(stats.vsizes[index] ? stats.vsizes[index] : 0);
 | 
				
			||||||
@ -100,9 +101,13 @@ export class MempoolGraphComponent implements OnInit, OnChanges {
 | 
				
			|||||||
    this.orderLevels();
 | 
					    this.orderLevels();
 | 
				
			||||||
    const { labels, series } = this.mempoolVsizeFeesData;
 | 
					    const { labels, series } = this.mempoolVsizeFeesData;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    const seriesGraph = series.map((value: Array<number>, index: number) => {
 | 
					    const seriesGraph = [];
 | 
				
			||||||
      if (index >= this.feeLimitIndex){
 | 
					    const newColors = [];
 | 
				
			||||||
        return {
 | 
					    for (let index = 0; index < series.length; index++) {
 | 
				
			||||||
 | 
					      const value = series[index];
 | 
				
			||||||
 | 
					      if (index >= this.feeLimitIndex) {
 | 
				
			||||||
 | 
					        newColors.push(this.chartColorsOrdered[index]);
 | 
				
			||||||
 | 
					        seriesGraph.push({
 | 
				
			||||||
          name: this.feeLevelsOrdered[index],
 | 
					          name: this.feeLevelsOrdered[index],
 | 
				
			||||||
          type: 'line',
 | 
					          type: 'line',
 | 
				
			||||||
          stack: 'fees',
 | 
					          stack: 'fees',
 | 
				
			||||||
@ -138,18 +143,18 @@ export class MempoolGraphComponent implements OnInit, OnChanges {
 | 
				
			|||||||
            }],
 | 
					            }],
 | 
				
			||||||
          },
 | 
					          },
 | 
				
			||||||
          areaStyle: {
 | 
					          areaStyle: {
 | 
				
			||||||
            color: chartColors[index],
 | 
					            color: this.chartColorsOrdered[index],
 | 
				
			||||||
            opacity: 1,
 | 
					            opacity: 1,
 | 
				
			||||||
          },
 | 
					          },
 | 
				
			||||||
          data: value
 | 
					          data: value
 | 
				
			||||||
        };
 | 
					        });
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
    });
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    this.mempoolVsizeFeesOptions = {
 | 
					    this.mempoolVsizeFeesOptions = {
 | 
				
			||||||
      series: this.inverted ? [...seriesGraph].reverse() : seriesGraph,
 | 
					      series: this.inverted ? [...seriesGraph].reverse() : seriesGraph,
 | 
				
			||||||
      hover: true,
 | 
					      hover: true,
 | 
				
			||||||
      color: this.inverted ? [...this.chartColorsOrdered].reverse() : this.chartColorsOrdered,
 | 
					      color: this.inverted ? [...newColors].reverse() : newColors,
 | 
				
			||||||
      tooltip: {
 | 
					      tooltip: {
 | 
				
			||||||
        show: (window.innerWidth >= 768) ? true : false,
 | 
					        show: (window.innerWidth >= 768) ? true : false,
 | 
				
			||||||
        trigger: 'axis',
 | 
					        trigger: 'axis',
 | 
				
			||||||
@ -174,12 +179,10 @@ export class MempoolGraphComponent implements OnInit, OnChanges {
 | 
				
			|||||||
          const items = this.inverted ? [...params].reverse() : params;
 | 
					          const items = this.inverted ? [...params].reverse() : params;
 | 
				
			||||||
          items.map((item: any, index: number) => {
 | 
					          items.map((item: any, index: number) => {
 | 
				
			||||||
            totalParcial += item.value;
 | 
					            totalParcial += item.value;
 | 
				
			||||||
            let progressPercentage = 0;
 | 
					            const progressPercentage = (item.value / totalValue) * 100;
 | 
				
			||||||
            let progressPercentageSum = 0;
 | 
					            const progressPercentageSum = (totalValueArray[index] / totalValue) * 100;
 | 
				
			||||||
            progressPercentage = (item.value / totalValue) * 100;
 | 
					 | 
				
			||||||
            progressPercentageSum = (totalValueArray[index] / totalValue) * 100;
 | 
					 | 
				
			||||||
            let activeItemClass = '';
 | 
					            let activeItemClass = '';
 | 
				
			||||||
            let hoverActive: number;
 | 
					            let hoverActive = 0;
 | 
				
			||||||
            if (this.inverted) {
 | 
					            if (this.inverted) {
 | 
				
			||||||
              hoverActive = Math.abs(this.feeLevelsOrdered.length - item.seriesIndex - this.feeLevelsOrdered.length);
 | 
					              hoverActive = Math.abs(this.feeLevelsOrdered.length - item.seriesIndex - this.feeLevelsOrdered.length);
 | 
				
			||||||
            } else {
 | 
					            } else {
 | 
				
			||||||
@ -198,7 +201,7 @@ export class MempoolGraphComponent implements OnInit, OnChanges {
 | 
				
			|||||||
                  <span class="total-percentage-bar-background">
 | 
					                  <span class="total-percentage-bar-background">
 | 
				
			||||||
                    <span style="
 | 
					                    <span style="
 | 
				
			||||||
                      width: ${progressPercentage}%;
 | 
					                      width: ${progressPercentage}%;
 | 
				
			||||||
                      background: ${this.inverted ? this.chartColorsOrdered[index] : item.color}
 | 
					                      background: ${item.color}
 | 
				
			||||||
                    "></span>
 | 
					                    "></span>
 | 
				
			||||||
                  </span>
 | 
					                  </span>
 | 
				
			||||||
                </div>
 | 
					                </div>
 | 
				
			||||||
@ -208,10 +211,10 @@ export class MempoolGraphComponent implements OnInit, OnChanges {
 | 
				
			|||||||
            itemFormatted.push(`<tr class="item ${activeItemClass}">
 | 
					            itemFormatted.push(`<tr class="item ${activeItemClass}">
 | 
				
			||||||
              <td class="indicator-container">
 | 
					              <td class="indicator-container">
 | 
				
			||||||
                <span class="indicator" style="
 | 
					                <span class="indicator" style="
 | 
				
			||||||
                  background-color: ${this.inverted ? this.chartColorsOrdered[index] : item.color}
 | 
					                  background-color: ${item.color}
 | 
				
			||||||
                "></span>
 | 
					                "></span>
 | 
				
			||||||
                <span>
 | 
					                <span>
 | 
				
			||||||
                  ${this.inverted ? this.feeLevelsOrdered[index] : item.seriesName}
 | 
					                  ${item.seriesName}
 | 
				
			||||||
                </span>
 | 
					                </span>
 | 
				
			||||||
              </td>
 | 
					              </td>
 | 
				
			||||||
              <td class="total-progress-sum">
 | 
					              <td class="total-progress-sum">
 | 
				
			||||||
@ -336,6 +339,7 @@ export class MempoolGraphComponent implements OnInit, OnChanges {
 | 
				
			|||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  orderLevels() {
 | 
					  orderLevels() {
 | 
				
			||||||
 | 
					    this.feeLevelsOrdered = [];
 | 
				
			||||||
    for (let i = 0; i < feeLevels.length; i++) {
 | 
					    for (let i = 0; i < feeLevels.length; i++) {
 | 
				
			||||||
      if (feeLevels[i] === this.limitFilterFee) {
 | 
					      if (feeLevels[i] === this.limitFilterFee) {
 | 
				
			||||||
        this.feeLimitIndex = i;
 | 
					        this.feeLimitIndex = i;
 | 
				
			||||||
 | 
				
			|||||||
@ -50,7 +50,7 @@
 | 
				
			|||||||
                          <span class="square" [ngStyle]="{'backgroundColor': chartColors[i]}"></span>
 | 
					                          <span class="square" [ngStyle]="{'backgroundColor': chartColors[i]}"></span>
 | 
				
			||||||
                        </ng-template>
 | 
					                        </ng-template>
 | 
				
			||||||
                        <ng-template [ngIf]="!inverted">
 | 
					                        <ng-template [ngIf]="!inverted">
 | 
				
			||||||
                          <span class="square" [ngStyle]="{'backgroundColor': chartColors[i - 1]}"></span>
 | 
					                          <span class="square" [ngStyle]="{'backgroundColor': chartColors[i]}"></span>
 | 
				
			||||||
                        </ng-template>
 | 
					                        </ng-template>
 | 
				
			||||||
                        <span class="fee-text" >0 - {{ fee }}</span>
 | 
					                        <span class="fee-text" >0 - {{ fee }}</span>
 | 
				
			||||||
                      </li>
 | 
					                      </li>
 | 
				
			||||||
@ -62,7 +62,7 @@
 | 
				
			|||||||
                        <span class="fee-text" >{{feeLevels[i - 1]}} - {{ fee }}</span>
 | 
					                        <span class="fee-text" >{{feeLevels[i - 1]}} - {{ fee }}</span>
 | 
				
			||||||
                      </ng-template>
 | 
					                      </ng-template>
 | 
				
			||||||
                      <ng-template [ngIf]="!inverted">
 | 
					                      <ng-template [ngIf]="!inverted">
 | 
				
			||||||
                          <span class="square" [ngStyle]="{'backgroundColor': chartColors[i - 1]}"></span>
 | 
					                          <span class="square" [ngStyle]="{'backgroundColor': chartColors[i]}"></span>
 | 
				
			||||||
                          <span class="fee-text" >{{feeLevels[i + 1]}} - {{ fee }}</span>
 | 
					                          <span class="fee-text" >{{feeLevels[i + 1]}} - {{ fee }}</span>
 | 
				
			||||||
                      </ng-template>
 | 
					                      </ng-template>
 | 
				
			||||||
                    </li>
 | 
					                    </li>
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user