Skip to content

fix(highlighter): clip path unique id #490

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

Merged
merged 3 commits into from
Dec 12, 2019
Merged

fix(highlighter): clip path unique id #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
755a346
fix(highlighter): identify the clipPath using the chartId
markov00 Dec 9, 2019
007816d
fix: missing hash on clipPath url
markov00 Dec 9, 2019
f7b7332
Merge branch 'master' into 2019-12-09_fix_highlighter_multichart
monfera Dec 12, 2019
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
31 changes: 28 additions & 3 deletions .playground/playgroud.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, Settings, TooltipType, LineSeries } from '../src';
import { Chart, Settings, TooltipType, BarSeries } 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 Down Expand Up @@ -31,14 +31,39 @@ export class Playground extends React.Component {
return (
<>
<button onClick={this.onSnapshot}>Snapshot</button>
<div className="chart">
<Chart size={[200, 100]}>
<Settings tooltip={{ type: TooltipType.Crosshairs }} showLegend />
<BarSeries
id="lines"
xAccessor={0}
yAccessors={[1]}
data={KIBANA_METRICS.metrics.kibana_os_load[0].data.slice(0, 5)}
/>
<BarSeries
id="lines2"
xAccessor={0}
yAccessors={[1]}
data={KIBANA_METRICS.metrics.kibana_os_load[0].data.slice(0, 5)}
/>
</Chart>
</div>
<div className="chart">
<Chart>
<Settings tooltip={{ type: TooltipType.Crosshairs }} showLegend />
<LineSeries
<BarSeries
id="lines"
xAccessor={0}
yAccessors={[1]}
data={KIBANA_METRICS.metrics.kibana_os_load[0].data}
stackAccessors={[0]}
data={KIBANA_METRICS.metrics.kibana_os_load[0].data.slice(0, 5)}
/>
<BarSeries
id="lines2"
xAccessor={0}
yAccessors={[1]}
stackAccessors={[0]}
data={KIBANA_METRICS.metrics.kibana_os_load[0].data.slice(0, 5)}
/>
</Chart>
</div>
Expand Down
12 changes: 8 additions & 4 deletions src/chart_types/xy_chart/renderer/dom/highlighter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ import { getChartRotationSelector } from '../../../../state/selectors/get_chart_
import { computeChartDimensionsSelector } from '../../state/selectors/compute_chart_dimensions';

interface HighlighterProps {
highlightedGeometries: IndexedGeometry[];
initialized: boolean;
chartId: string;
highlightedGeometries: IndexedGeometry[];
chartTransform: Transform;
chartDimensions: Dimensions;
chartRotation: Rotation;
Expand All @@ -23,15 +24,16 @@ class HighlighterComponent extends React.Component<HighlighterProps> {
static displayName = 'Highlighter';

render() {
const { highlightedGeometries, chartTransform, chartDimensions, chartRotation } = this.props;
const { highlightedGeometries, chartTransform, chartDimensions, chartRotation, chartId } = this.props;
const left = chartDimensions.left + chartTransform.x;
const top = chartDimensions.top + chartTransform.y;
const clipWidth = [90, -90].includes(chartRotation) ? chartDimensions.height : chartDimensions.width;
const clipHeight = [90, -90].includes(chartRotation) ? chartDimensions.width : chartDimensions.height;
const clipPathId = `echHighlighterClipPath__${chartId}`;
return (
<svg className="echHighlighter">
<defs>
<clipPath id="echHighlighterClipPath">
<clipPath id={clipPathId}>
<rect x="0" y="0" width={clipWidth} height={clipHeight} />
</clipPath>
</defs>
Expand Down Expand Up @@ -59,7 +61,7 @@ class HighlighterComponent extends React.Component<HighlighterProps> {
width={geom.width}
height={geom.height}
className="echHighlighter__rect"
clipPath="url(#echHighlighterClipPath)"
clipPath={`url(#${clipPathId})`}
/>
);
})}
Expand All @@ -73,6 +75,7 @@ const mapStateToProps = (state: GlobalChartState): HighlighterProps => {
if (!isInitialized(state)) {
return {
initialized: false,
chartId: state.chartId,
highlightedGeometries: [],
chartTransform: {
x: 0,
Expand All @@ -85,6 +88,7 @@ const mapStateToProps = (state: GlobalChartState): HighlighterProps => {
}
return {
initialized: true,
chartId: state.chartId,
highlightedGeometries: getHighlightedGeomsSelector(state),
chartTransform: computeChartTransformSelector(state),
chartDimensions: computeChartDimensionsSelector(state).chartDimensions,
Expand Down