From 36d67f22e9beef4479ab60ddd9f481707272f455 Mon Sep 17 00:00:00 2001 From: ryan Date: Wed, 13 Mar 2019 11:24:18 -0700 Subject: [PATCH] generic repeater --- .../src/components/VizRepeater/VizRepeater.tsx | 18 +++++++++--------- .../plugins/panel/bargauge/BarGaugePanel.tsx | 2 +- public/app/plugins/panel/gauge/GaugePanel.tsx | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/grafana-ui/src/components/VizRepeater/VizRepeater.tsx b/packages/grafana-ui/src/components/VizRepeater/VizRepeater.tsx index 767be6764ca..a78a362d616 100644 --- a/packages/grafana-ui/src/components/VizRepeater/VizRepeater.tsx +++ b/packages/grafana-ui/src/components/VizRepeater/VizRepeater.tsx @@ -1,23 +1,23 @@ import React, { PureComponent } from 'react'; -import { SingleStatValueInfo, VizOrientation } from '../../types'; +import { VizOrientation } from '../../types'; -interface RenderProps { +interface RenderProps { vizWidth: number; vizHeight: number; - valueInfo: SingleStatValueInfo; + value: T; } -interface Props { - children: (renderProps: RenderProps) => JSX.Element | JSX.Element[]; +interface Props { + children: (renderProps: RenderProps) => JSX.Element | JSX.Element[]; height: number; width: number; - values: SingleStatValueInfo[]; + values: T[]; orientation: VizOrientation; } const SPACE_BETWEEN = 10; -export class VizRepeater extends PureComponent { +export class VizRepeater extends PureComponent> { getOrientation(): VizOrientation { const { orientation, width, height } = this.props; @@ -64,10 +64,10 @@ export class VizRepeater extends PureComponent { return (
- {values.map((valueInfo, index) => { + {values.map((value, index) => { return (
- {children({ vizHeight, vizWidth, valueInfo })} + {children({ vizHeight, vizWidth, value })}
); })} diff --git a/public/app/plugins/panel/bargauge/BarGaugePanel.tsx b/public/app/plugins/panel/bargauge/BarGaugePanel.tsx index cef28414e73..aad6b00fdc0 100644 --- a/public/app/plugins/panel/bargauge/BarGaugePanel.tsx +++ b/public/app/plugins/panel/bargauge/BarGaugePanel.tsx @@ -49,7 +49,7 @@ export class BarGaugePanel extends PureComponent { return ( - {({ vizHeight, vizWidth, valueInfo }) => this.renderBarGauge(valueInfo.value, vizWidth, vizHeight)} + {({ vizHeight, vizWidth, value }) => this.renderBarGauge(value, vizWidth, vizHeight)} ); } diff --git a/public/app/plugins/panel/gauge/GaugePanel.tsx b/public/app/plugins/panel/gauge/GaugePanel.tsx index ca7f4d5057e..f2f53cdc2ee 100644 --- a/public/app/plugins/panel/gauge/GaugePanel.tsx +++ b/public/app/plugins/panel/gauge/GaugePanel.tsx @@ -52,7 +52,7 @@ export class GaugePanel extends PureComponent { return ( - {({ vizHeight, vizWidth, valueInfo }) => this.renderGauge(valueInfo.value, vizWidth, vizHeight)} + {({ vizHeight, vizWidth, value }) => this.renderGauge(value, vizWidth, vizHeight)} ); }