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.

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

Add HorizontalBarChart chart #30

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions example/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<div id="brush" class="brush"></div>
<div id="barchart"></div>
<div id="barchart2"></div>
<div id="horizontalbarchart"></div>
<div id="stackedbarchart"></div>
<div id="scatterplot"></div>
<div id="scatterplot2"></div>
Expand All @@ -26,6 +27,7 @@

<script type="text/jsx;harmony=true">
var BarChart = ReactD3.BarChart;
var HorizontalBarChart = ReactD3.HorizontalBarChart;
var PieChart = ReactD3.PieChart;
var AreaChart = ReactD3.AreaChart;
var ScatterPlot = ReactD3.ScatterPlot;
Expand Down Expand Up @@ -137,6 +139,17 @@
/>,
document.getElementById('barchart')
);

React.render(
<HorizontalBarChart
data={data}
width={480}
height={400}
margin={{top: 20, bottom: 0, left: 75, right: 25}}
tooltipHtml={tooltip}
/>,
document.getElementById('horizontalbarchart')
);
/*
data = [{
customLabel: 'somethingA',
Expand Down
162 changes: 162 additions & 0 deletions src/HorizontalBarChart.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,162 @@
let React = require('react');
let d3 = require('d3');

let Chart = require('./Chart');
let Axis = require('./Axis');
let Bar = require('./Bar');
let Tooltip = require('./Tooltip');

let DefaultPropsMixin = require('./DefaultPropsMixin');
let HeightWidthMixin = require('./HeightWidthMixin');
let ArrayifyMixin = require('./ArrayifyMixin');
let StackAccessorMixin = require('./StackAccessorMixin');
let StackDataMixin = require('./StackDataMixin');
let DefaultScalesMixin = require('./DefaultScalesMixin');
let TooltipMixin = require('./TooltipMixin');

let DataSet = React.createClass({
propTypes: {
data: React.PropTypes.array.isRequired,
xScale: React.PropTypes.func.isRequired,
yScale: React.PropTypes.func.isRequired,
colorScale: React.PropTypes.func.isRequired,
values: React.PropTypes.func.isRequired,
label: React.PropTypes.func.isRequired,
x: React.PropTypes.func.isRequired,
y: React.PropTypes.func.isRequired,
y0: React.PropTypes.func.isRequired
},

render() {
let {data,
xScale,
yScale,
colorScale,
values,
label,
x,
y,
y0,
onMouseEnter,
onMouseLeave} = this.props;

let bars = data.map(stack => {
return values(stack).map((e, index) => {
return (
<Bar
key={`${label(stack)}.${index}`}
width={yScale(yScale.domain()[0]) - yScale(y(e))}
height={xScale.rangeBand()}
x={yScale.domain()[0]}
y={xScale(x(e))}
fill={colorScale(label(stack))}
data={e}
onMouseEnter={onMouseEnter}
onMouseLeave={onMouseLeave}
/>
);
});
});

return (
<g>{bars}</g>
);
}
});

let HorizontalBarChart = React.createClass({
mixins: [DefaultPropsMixin,
HeightWidthMixin,
ArrayifyMixin,
StackAccessorMixin,
StackDataMixin,
DefaultScalesMixin,
TooltipMixin],

getDefaultProps() {
return {};
},

_tooltipHtml(d, position) {
return this.props.tooltipHtml(this.props.x(d), this.props.y0(d), this.props.y(d));
},

render() {
let {height,
width,
margin,
colorScale,
values,
label,
y,
y0,
x,
xAxis,
yAxis} = this.props;

let [data,
innerWidth,
innerHeight,
xScale,
yScale] = [this._data,
this._innerWidth,
this._innerHeight,
this._xScale,
this._yScale];

// Oddly the ticks seem to be reversed, as a temporary workaround just flip
// them to show up correctly.
let yAxisTicks = yScale
.ticks()
.reverse();

let formatter = tick => {
return yAxisTicks[tick];
};

return (
<div>
<Chart height={height} width={width} margin={margin}>
<DataSet
data={data}
xScale={xScale}
yScale={yScale}
colorScale={colorScale}
values={values}
label={label}
y={y}
y0={y0}
x={x}
onMouseEnter={this.onMouseEnter}
onMouseLeave={this.onMouseLeave}
/>
<Axis
className={"y axis"}
orientation={"top"}
scale={yScale}
tickFormat={formatter}
height={innerHeight}
width={innerWidth}

/>
<Axis
className={"x axis"}
orientation={"left"}
scale={xScale}
height={innerHeight}
width={innerWidth}
{...xAxis}
/>
</Chart>

<Tooltip
hidden={this.state.tooltip.hidden}
top={this.state.tooltip.top}
left={this.state.tooltip.left}
html={this.state.tooltip.html}/>
</div>
);
}
});

module.exports = HorizontalBarChart;
2 changes: 2 additions & 0 deletions src/index.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
let BarChart = require('./BarChart');
let HorizontalBarChart = require('./HorizontalBarChart');
let PieChart = require('./PieChart');
let ScatterPlot = require('./ScatterPlot');
let LineChart = require('./LineChart');
Expand All @@ -7,6 +8,7 @@ let Brush = require('./Brush');

module.exports = {
BarChart: BarChart,
HorizontalBarChart: HorizontalBarChart,
PieChart: PieChart,
ScatterPlot: ScatterPlot,
LineChart: LineChart,
Expand Down