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

Jump to bottom

[demo] tile updates #186

Merged
merged 4 commits into from
Nov 2, 2017
Merged

[demo] tile updates #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b68e995
[shape] remove build/index.js
hshoff Nov 2, 2017
5db6ae2
[demo] tile updates
hshoff Nov 2, 2017
d508e4e
[demo] update gallery placeholder
hshoff Nov 2, 2017
dd930b6
[demo] radar prettier
hshoff Nov 2, 2017
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: 8 additions & 5 deletions packages/vx-demo/components/gallery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,8 @@ export default class Gallery extends React.Component {
>
<div className="title">Radar</div>
<div className="description">
<pre>{`<Radar />`}</pre>
<pre
>{`<Shape.Line /> + <Shape.LineRadial />`}</pre>
</div>
</div>
</div>
Expand All @@ -692,7 +693,10 @@ export default class Gallery extends React.Component {
}}
>
<div className="image">
<BarStackHorizontal width={t24[0]} height={t24[1]} />
<BarStackHorizontal
width={t24[0]}
height={t24[1]}
/>
</div>
<div
className="details"
Expand All @@ -705,9 +709,8 @@ export default class Gallery extends React.Component {
</div>
</div>
</Link>
</Tilt>
{<div className="gallery-item placeholder" />}
{<div className="gallery-item placeholder" />}
</Tilt>
<div className="gallery-item placeholder" />
</div>

<div>
Expand Down
183 changes: 89 additions & 94 deletions packages/vx-demo/components/tiles/barstackhorizontal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,62 +9,64 @@ import { withTooltip, Tooltip } from '@vx/tooltip';
import { LegendOrdinal } from '@vx/legend';
import { extent, max } from 'd3-array';

const data = cityTemperature.slice(0, 12);
const keys = Object.keys(data[0]).filter(d => d !== 'date');
const parseDate = timeParse('%Y%m%d');
const format = timeFormat('%b %d');
const formatDate = date => format(parseDate(date));

const totals = data.reduce((ret, cur) => {
const t = keys.reduce((dailyTotal, k) => {
dailyTotal += +cur[k];
return dailyTotal;
}, 0);
ret.push(t);
return ret;
}, []);

export default withTooltip(
({
width,
height,
events = false,
margin = {
top: 40,
left: 0,
left: 50,
right: 40,
bottom: 100,
},
tooltipOpen,
tooltipLeft,
tooltipTop,
tooltipData,
hideTooltip,
showTooltip
showTooltip,
}) => {
if (width < 10) return null;

const data = cityTemperature.slice(0, 12);
const keys = Object.keys(data[0]).filter(d => d !== 'date');
const parseDate = timeParse('%Y%m%d');
const format = timeFormat('%b %d');
const formatDate = date => format(parseDate(date));

// accessors
const y = d => d.date;
const x = d => d.value;

const totals = data.reduce((ret, cur) => {
const t = keys.reduce((dailyTotal, k) => {
dailyTotal += +cur[k];
return dailyTotal;
}, 0);
ret.push(t);
return ret;
}, []);

// bounds
const xMax = width;
const yMax = height - margin.top - 100;
const xMax = width - margin.left - margin.right;
const yMax = height - margin.top - margin.bottom;

// // scales
const xScale = scaleLinear({
rangeRound: [0, xMax],
domain: [0, max(totals)],
nice: true,
domain: [0, max(totals)],
nice: true,
});
const yScale = scaleBand({
rangeRound: [yMax, 0],
domain: data.map(y),
domain: data.map(y),
padding: 0.2,
tickFormat: () => val => formatDate(val)
tickFormat: () => val => formatDate(val),
});
const zScale = scaleOrdinal({
domain: keys,
range: ['#6c5efb', '#c998ff', '#a44afe']
range: ['#6c5efb', '#c998ff', '#a44afe'],
});

let tooltipTimeout;
Expand All @@ -77,63 +79,61 @@ export default withTooltip(
y={0}
width={width}
height={height}
fill='#eaedff'
fill="#eaedff"
rx={14}
/>
<BarStackHorizontal
top={margin.top}
left={50 + margin.left}
data={data}
keys={keys}
height={yMax}
y={y}
xScale={xScale}
yScale={yScale}
zScale={zScale}
onClick={data => event => {
if (!events) return;
alert(`clicked: ${JSON.stringify(data)}`);
}}
onMouseLeave={data => event => {
tooltipTimeout = setTimeout(() => {
hideTooltip();
}, 300);
}}
onMouseMove={data => event => {
if (tooltipTimeout) clearTimeout(tooltipTimeout);
showTooltip({
tooltipData: data,
tooltipTop: margin.top + yScale(y(data.data)),
tooltipLeft: margin.left + data.width + 75,
});
}}
/>
<AxisLeft
hideAxisLine={true}
hideTicks={true}
scale={yScale}
top={margin.top}
left={margin.left + 30}
stroke="#a44afe"
tickStroke="#a44afe"
tickLabelProps={(value, index) => ({
fill: '#a44afe',
fontSize: 11,
textAnchor: 'middle',
})}
/>
<AxisBottom
scale={xScale}
top={yMax + margin.top}
left={50 + margin.left}
stroke="#a44afe"
tickStroke="#a44afe"
tickLabelProps={(value, index) => ({
fill: '#a44afe',
fontSize: 11,
textAnchor: 'middle',
})}
/>
<Group top={margin.top} left={margin.left}>
<BarStackHorizontal
data={data}
keys={keys}
height={yMax}
y={y}
xScale={xScale}
yScale={yScale}
zScale={zScale}
onClick={data => event => {
if (!events) return;
alert(`clicked: ${JSON.stringify(data)}`);
}}
onMouseLeave={data => event => {
tooltipTimeout = setTimeout(() => {
hideTooltip();
}, 300);
}}
onMouseMove={data => event => {
if (tooltipTimeout) clearTimeout(tooltipTimeout);
showTooltip({
tooltipData: data,
tooltipTop: margin.top + yScale(y(data.data)),
tooltipLeft: margin.left + data.width + 75,
});
}}
/>
<AxisLeft
hideAxisLine={true}
hideTicks={true}
scale={yScale}
stroke="#a44afe"
tickStroke="#a44afe"
tickLabelProps={(value, index) => ({
fill: '#a44afe',
fontSize: 11,
textAnchor: 'end',
dy: '0.33em',
})}
/>
<AxisBottom
scale={xScale}
top={yMax}
stroke="#a44afe"
tickStroke="#a44afe"
tickLabelProps={(value, index) => ({
fill: '#a44afe',
fontSize: 11,
textAnchor: 'middle',
})}
/>
</Group>
</svg>
<div
style={{
Expand All @@ -142,7 +142,7 @@ export default withTooltip(
width: '100%',
display: 'flex',
justifyContent: 'center',
fontSize: '14px'
fontSize: '14px',
}}
>
<LegendOrdinal
Expand All @@ -151,31 +151,26 @@ export default withTooltip(
labelMargin="0 15px 0 0"
/>
</div>
{tooltipOpen &&
{tooltipOpen && (
<Tooltip
top={tooltipTop}
left={tooltipLeft}
style={{
minWidth: 60,
backgroundColor: 'rgba(0,0,0,0.9)',
color: 'white'
color: 'white',
}}
>
<div style={{ color: zScale(tooltipData.key) }}>
<strong>
{tooltipData.key}
</strong>
</div>
<div>
{tooltipData.data[tooltipData.key]}℉
<strong>{tooltipData.key}</strong>
</div>
<div>{tooltipData.data[tooltipData.key]}℉</div>
<div>
<small>
{tooltipData.xFormatted}
</small>
<small>{tooltipData.xFormatted}</small>
</div>
</Tooltip>}
</Tooltip>
)}
</div>
);
}
);
},
);
Loading