Skip to content

Commit 488e821

Browse files
williasterwilliaster
committed
[demo][rebase bugs] key => seriesKey
1 parent 80690b5 commit 488e821

File tree

5 files changed

+10
-39
lines changed

5 files changed

+10
-39
lines changed

‎packages/demo/examples/01-xy-chart/CirclePackWithCallback.jsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ export default class CirclePackWithCallback extends React.Component {
4848

4949
<CirclePackSeries
5050
data={circlePackData.concat(circlePackData)}
51-
label="Circle time pack"
5251
size={d => d.r}
5352
pointComponent={RectPointComponent}
5453
layoutCallback={this.resizeCallback}

‎packages/demo/examples/01-xy-chart/LinkedXYCharts.jsx‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ class LinkedXYCharts extends React.Component {
8383
}));
8484
}
8585

86-
onMouseMove({ datum, key }) {
87-
if (this.state.mousedOverDatum !== datum || this.state.mousedOverKey !== key) {
88-
this.setState(() => ({ mousedOverDatum: datum, mousedOverKey: key }));
86+
onMouseMove({ datum, seriesKey }) {
87+
if (this.state.mousedOverDatum !== datum || this.state.mousedOverKey !== seriesKey) {
88+
this.setState(() => ({ mousedOverDatum: datum, mousedOverKey: seriesKey }));
8989
}
9090
}
9191

@@ -172,10 +172,10 @@ class LinkedXYCharts extends React.Component {
172172
<XAxis tickFormat={formatDate} />
173173
</XYChart>
174174

175-
{stackKeys.map((stackKey, stackIndex) => (
175+
{stackKeys.map((seriesKey, stackIndex) => (
176176
<XYChart
177-
key={stackKey}
178-
ariaLabel={stackKey}
177+
key={seriesKey}
178+
ariaLabel={seriesKey}
179179
{...areaChartProps}
180180
width={width}
181181
height={height}
@@ -184,18 +184,16 @@ class LinkedXYCharts extends React.Component {
184184
>
185185
<XAxis tickFormat={formatDate} tickValues={tickValues} />
186186
<AreaSeries
187-
label={stackKey}
188-
data={stackedData.map(d => ({ ...d, y: d[stackKey] }))}
187+
data={stackedData.map(d => ({ ...d, y: d[seriesKey] }))}
189188
fill={stackFills[stackIndex]}
190189
fillOpacity={0.9}
191190
strokeWidth={1}
192191
stroke={stackFills[stackIndex]}
193-
onMouseMove={({ datum }) => { this.onMouseMove({ datum, key: stackKey }); }}
192+
onMouseMove={({ datum }) => { this.onMouseMove({ datum, seriesKey }); }}
194193
onMouseLeave={this.onMouseLeave}
195194
/>
196195
{intervalData &&
197196
<IntervalSeries
198-
label={stackKey}
199197
fill={`url(#${PATTERN_ID})`}
200198
opacity={0.3}
201199
data={intervalData}
@@ -204,7 +202,7 @@ class LinkedXYCharts extends React.Component {
204202
<CrossHair
205203
fullHeight
206204
showHorizontalLine={false}
207-
showCircle={stackKey === mousedOverKey}
205+
showCircle={seriesKey === mousedOverKey}
208206
circleFill={stackFills[stackIndex]}
209207
/>}
210208
</XYChart>

‎packages/demo/examples/01-xy-chart/ScatterWithHistograms.jsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ class ScatterWithHistogram extends React.PureComponent {
9191
{datasets.map((dataset, i) => (
9292
<PointSeries
9393
key={i}
94-
label={String(i)}
9594
data={dataset}
9695
fill={datasetColors[i]}
9796
opacity={0.7}

‎packages/demo/examples/01-xy-chart/StackedAreaExample.jsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ export default function StackedAreaExample() {
103103
fill={'#fff'}
104104
/>
105105
<StackedAreaSeries
106-
label="City Temperature"
107106
data={asPercent ? percentStackedData : stackedData}
108107
strokeWidth={2}
109108
stackKeys={stackKeys}

‎packages/demo/examples/01-xy-chart/index.jsx‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ export default {
8181
...d,
8282
fill: `url(#${i === 2 ? 'lines' : 'gradient'})`,
8383
}))}
84-
label="Apple Stock"
8584
fill="url(#aqua_lightaqua_gradient)"
8685
/>
8786
</ResponsiveXYChart>
@@ -100,7 +99,7 @@ export default {
10099
{useVoronoi => (
101100
<WithToggle id="line_show_voronoi_toggle" label="Show voronoi" initialChecked>
102101
{showVoronoi => (
103-
<WithToggle id="line_m_events_toggle" label="Disable mouse events" initialChecked>
102+
<WithToggle id="line_m_events_toggle" label="Disable mouse events">
104103
{disableMouseEvents => (
105104
<ResponsiveXYChart
106105
ariaLabel="Required label"
@@ -112,13 +111,11 @@ export default {
112111
<YAxis label="Price ($)" numTicks={4} />
113112
<LineSeries
114113
data={timeSeriesData}
115-
label="Apple Stock"
116114
showPoints
117115
disableMouseEvents={disableMouseEvents}
118116
/>
119117
<LineSeries
120118
data={data2}
121-
label="Apple Stock 2"
122119
stroke={colors.categories[2]}
123120
strokeDasharray="3 3"
124121
strokeLinecap="butt"
@@ -160,13 +157,11 @@ export default {
160157
/>
161158
<AreaSeries
162159
data={timeSeriesData}
163-
label="Apple Stock"
164160
fill="url(#area_gradient)"
165161
strokeWidth={null}
166162
/>
167163
<AreaSeries
168164
data={timeSeriesData}
169-
label="Apple Stock 2"
170165
fill="url(#area_pattern)"
171166
stroke={colors.categories[2]}
172167
/>
@@ -201,7 +196,6 @@ export default {
201196
/>,
202197
<AreaSeries
203198
key={`band-${data[0].key}`}
204-
label="Temperature range"
205199
data={data}
206200
strokeWidth={0.5}
207201
stroke={colors.categories[i + 1]}
@@ -211,7 +205,6 @@ export default {
211205
key={`line-${data[0].key}`}
212206
data={data}
213207
stroke={colors.categories[i + 1]}
214-
label="Temperature avg"
215208
/>,
216209
]))}
217210
<YAxis label="Temperature (°F)" numTicks={4} />
@@ -248,19 +241,16 @@ export default {
248241
strokeLinecap="butt"
249242
/>
250243
<AreaSeries
251-
label="band"
252244
data={priceBandData.band}
253245
fill="url(#confidence-interval-fill)"
254246
strokeWidth={0}
255247
/>
256248
<LineSeries
257-
label="line"
258249
data={priceBandData.points.map(d => (d.y >= reference ? d : { ...d, y: reference }))}
259250
stroke={colors.categories[3]}
260251
strokeWidth={2}
261252
/>
262253
<PointSeries
263-
label="line"
264254
data={priceBandData.points.filter(d => d.y < reference)}
265255
fill="#fff"
266256
fillOpacity={1}
@@ -316,7 +306,6 @@ export default {
316306
<XAxis label="X" numTicks={4} />
317307
<PointSeries
318308
data={pointData}
319-
label="Random"
320309
size={d => d.size}
321310
/>
322311
<CrossHair fullWidth fullHeight showCircle={false} />
@@ -338,7 +327,6 @@ export default {
338327
<XAxis label="X" numTicks={4} />
339328
<PointSeries
340329
data={pointData}
341-
label="Random"
342330
size={d => d.size}
343331
pointComponent={RectPointComponent}
344332
/>
@@ -357,7 +345,6 @@ export default {
357345
<YAxis label="Temperature (°F)" numTicks={4} />
358346
<StackedBarSeries
359347
data={stackedData}
360-
label="City Temperature"
361348
stackKeys={groupKeys}
362349
/>
363350
<XAxis tickFormat={dateFormatter} />
@@ -377,7 +364,6 @@ export default {
377364
<YAxis label="Temperature (°F)" numTicks={4} />
378365
<GroupedBarSeries
379366
data={groupedData}
380-
label="City Temperature"
381367
groupKeys={groupKeys}
382368
/>
383369
<XAxis tickFormat={dateFormatter} />
@@ -400,7 +386,6 @@ export default {
400386
/>
401387
<BarSeries
402388
data={categoricalData}
403-
label="Apple Stock"
404389
fill="url(#aqua_lightaqua_gradient)"
405390
/>
406391
<XAxis numTicks={categoricalData.length} />
@@ -433,12 +418,10 @@ export default {
433418
/>
434419
<LineSeries
435420
data={intervalLineData}
436-
label="Line interval"
437421
showPoints
438422
/>
439423
<IntervalSeries
440424
data={intervalData}
441-
label="Temperature interval"
442425
fill="url(#interval_pattern)"
443426
/>
444427
<XAxis numTicks={0} />
@@ -456,7 +439,6 @@ export default {
456439
>
457440
<CirclePackSeries
458441
data={circlePackData}
459-
label="Circle time pack"
460442
size={d => d.r}
461443
/>
462444
<HorizontalReferenceLine
@@ -495,12 +477,10 @@ export default {
495477
/>
496478
<BarSeries
497479
data={timeSeriesData}
498-
label="Apple Stock"
499480
fill="url(#aqua_lightaqua_gradient)"
500481
/>
501482
<LineSeries
502483
data={timeSeriesData}
503-
label="Apple Stock"
504484
stroke={colors.text}
505485
/>
506486
<XAxis label="Time" numTicks={5} />
@@ -525,7 +505,6 @@ export default {
525505
/>
526506
<BarSeries
527507
data={timeSeriesData}
528-
label="Apple Stock"
529508
fill="url(#aqua_lightaqua_gradient)"
530509
/>
531510
<XAxis label="Time" numTicks={5} orientation="top" />
@@ -549,7 +528,6 @@ export default {
549528
/>
550529
<BarSeries
551530
data={timeSeriesData}
552-
label="Apple Stock"
553531
fill="url(#aqua_lightaqua_gradient)"
554532
/>
555533
<XAxis numTicks={0} />
@@ -569,12 +547,10 @@ export default {
569547
<YAxis label="Price ($)" numTicks={4} />
570548
<BarSeries
571549
data={timeSeriesData.filter((d, i) => i % 2 === 0)}
572-
label="Apple Stock"
573550
fill="#484848"
574551
/>
575552
<BarSeries
576553
data={timeSeriesData.filter((d, i) => i % 2 !== 0 && i !== 5)}
577-
label="Apple Stock ii"
578554
fill="#767676"
579555
/>
580556
<XAxis label="Time" numTicks={5} />

0 commit comments

Comments
 (0)