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

refactor: decouple tooltip from XY chart #553

Merged
merged 18 commits into from
Feb 20, 2020
Merged

refactor: decouple tooltip from XY chart #553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
e8814e1
chore: remove unused interface
markov00 Feb 13, 2020
f3680e3
chore: remove unused interfaces
markov00 Feb 13, 2020
4344c73
chore: move tooltips component to global folder
markov00 Feb 14, 2020
f56a0d3
chore: remove unused TooltipProps type
markov00 Feb 14, 2020
58def88
refactor: generalize SeriesIdentifier
markov00 Feb 14, 2020
4a8c218
refactor(legend): rename displayValue to extra
markov00 Feb 14, 2020
0c979eb
refactor(tooltip): remove isXValue prop from TooltipValue
markov00 Feb 14, 2020
2fa3fb0
refactor: update TooltipValue type with decoupled names
markov00 Feb 18, 2020
7c2d964
refactor: decoupled tooltipHeaderFormatter selector
markov00 Feb 18, 2020
0fd0042
refactor: move annotation vis check inside tooltip vis check
markov00 Feb 18, 2020
6f34ca7
refactor: move TooltipData type near to Tooltip component
markov00 Feb 18, 2020
126532b
refactor: move isTooltipVisible to internal state
markov00 Feb 18, 2020
ad1033a
refactor: cleanup TooltipStateProps
markov00 Feb 18, 2020
e39fa4e
refactor: move getTooltipValues in the internal state
markov00 Feb 18, 2020
75448c8
refactor: decouple tooltip anchor position
markov00 Feb 18, 2020
e1197ae
fix: rotated tooltip position
markov00 Feb 19, 2020
ebb0637
refactor(legend): showLegendExtra to false by default
markov00 Feb 20, 2020
886c636
Merge branch 'master' into 2020_02_13-decouple_tooltip
markov00 Feb 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .playground/playground.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { Chart, ScaleType, Position, Axis, getAxisId, timeFormatter, getSpecId, AreaSeries } from '../src';
import { Chart, ScaleType, Position, Axis, getAxisId, timeFormatter, getSpecId, AreaSeries, Settings } from '../src';
import { KIBANA_METRICS } from '../src/utils/data_samples/test_dataset_kibana';
export class Playground extends React.Component {
chartRef: React.RefObject<Chart> = React.createRef();
Expand All @@ -13,6 +13,7 @@ export class Playground extends React.Component {
<>
<div className="chart">
<Chart className={'story-chart'}>
<Settings showLegend={true} />
<Axis
id={getAxisId('bottom')}
title={'timestamp per 1 minute'}
Expand All @@ -33,7 +34,10 @@ export class Playground extends React.Component {
yScaleType={ScaleType.Linear}
xAccessor={0}
yAccessors={[1]}
data={KIBANA_METRICS.metrics.kibana_os_load[0].data}
y0Accessors={[2]}
data={KIBANA_METRICS.metrics.kibana_os_load[0].data.map((d) => {
return [...d, d[1] - 10];
})}
/>
</Chart>
</div>
Expand Down
4 changes: 2 additions & 2 deletions docs/0-Intro/1-Overview.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ Return types:
```ts
type BarStyleAccessor = (
datum: RawDataSeriesDatum,
seriesIdentifier: SeriesIdentifier,
seriesIdentifier: XYChartSeriesIdentifier,
) => RecursivePartial<BarSeriesStyle> | Color | null;
```

Expand All @@ -250,7 +250,7 @@ Return types:
```ts
type PointStyleAccessor = (
datum: RawDataSeriesDatum,
seriesIdentifier: SeriesIdentifier,
seriesIdentifier: XYChartSeriesIdentifier,
) => RecursivePartial<PointStyle> | Color | null;
```

Expand Down
9 changes: 9 additions & 0 deletions src/chart_types/partition_chart/state/chart_state.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,13 @@ export class PartitionState implements InternalChartState {
getPointerCursor() {
return 'default';
}
isTooltipVisible() {
return false;
}
getTooltipInfo() {
return undefined;
}
getTooltipAnchor() {
return null;
}
}
114 changes: 41 additions & 73 deletions src/chart_types/xy_chart/crosshair/crosshair_utils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getFinalTooltipPosition } from './crosshair_utils';
import { getFinalTooltipPosition } from '../../../components/tooltip/utils';

describe('Tooltip position', () => {
const container = {
Expand All @@ -19,15 +19,11 @@ describe('Tooltip position', () => {
container,
tooltip,
{
isRotatedHorizontal: true,
vPosition: {
bandHeight: 0,
bandTop: 0,
},
hPosition: {
bandWidth: 0,
bandLeft: 10,
},
isRotated: false,
y1: 0,
y0: 0,
x0: 10,
x1: 10,
},
5,
);
Expand All @@ -39,15 +35,11 @@ describe('Tooltip position', () => {
container,
tooltip,
{
isRotatedHorizontal: true,
vPosition: {
bandHeight: 0,
bandTop: 90,
},
hPosition: {
bandWidth: 0,
bandLeft: 10,
},
isRotated: false,
y0: 90,
y1: 90,
x0: 10,
x1: 10,
},
5,
);
Expand All @@ -59,15 +51,11 @@ describe('Tooltip position', () => {
container,
tooltip,
{
isRotatedHorizontal: true,
vPosition: {
bandHeight: 0,
bandTop: 0,
},
hPosition: {
bandWidth: 0,
bandLeft: 100,
},
isRotated: false,
y0: 0,
y1: 0,
x0: 100,
x1: 100,
},
5,
);
Expand All @@ -79,15 +67,11 @@ describe('Tooltip position', () => {
container,
tooltip,
{
isRotatedHorizontal: true,
vPosition: {
bandHeight: 0,
bandTop: 90,
},
hPosition: {
bandWidth: 0,
bandLeft: 100,
},
isRotated: false,
y0: 90,
y1: 90,
x0: 100,
x1: 100,
},
5,
);
Expand All @@ -101,15 +85,11 @@ describe('Tooltip position', () => {
container,
tooltip,
{
isRotatedHorizontal: false,
vPosition: {
bandHeight: 0,
bandTop: 0,
},
hPosition: {
bandWidth: 0,
bandLeft: 10,
},
isRotated: true,
y0: 0,
y1: 0,
x1: 10,
x0: 10,
},
5,
);
Expand All @@ -121,15 +101,11 @@ describe('Tooltip position', () => {
container,
tooltip,
{
isRotatedHorizontal: false,
vPosition: {
bandHeight: 0,
bandTop: 90,
},
hPosition: {
bandWidth: 0,
bandLeft: 10,
},
isRotated: true,
y0: 90,
y1: 90,
x1: 10,
x0: 10,
},
5,
);
Expand All @@ -141,15 +117,11 @@ describe('Tooltip position', () => {
container,
tooltip,
{
isRotatedHorizontal: false,
vPosition: {
bandHeight: 0,
bandTop: 0,
},
hPosition: {
bandWidth: 0,
bandLeft: 100,
},
isRotated: true,
y0: 0,
y1: 0,
x1: 100,
x0: 100,
},
5,
);
Expand All @@ -161,15 +133,11 @@ describe('Tooltip position', () => {
container,
tooltip,
{
isRotatedHorizontal: false,
vPosition: {
bandHeight: 0,
bandTop: 90,
},
hPosition: {
bandWidth: 0,
bandLeft: 100,
},
isRotated: true,
y0: 90,
y1: 90,
x1: 100,
x0: 100,
},
5,
);
Expand Down
Loading