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

[event] add touchEvt support to localPnt, find owner svg. fixes #15 #167

Merged
merged 1 commit into from
Oct 6, 2017
Merged

[event] add touchEvt support to localPnt, find owner svg. fixes #15 #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
74 changes: 51 additions & 23 deletions packages/vx-demo/components/tiles/area.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,27 @@ const yStock = d => d.close;
const bisectDate = bisector(d => new Date(d.date)).left;

class Area extends React.Component {
constructor(props) {
super(props);
this.handleTooltip = this.handleTooltip.bind(this);
}
handleTooltip({ event, data, xStock, xScale, yScale }) {
const { showTooltip } = this.props;
const { x } = localPoint(event);
const x0 = xScale.invert(x);
const index = bisectDate(data, x0, 1);
const d0 = data[index - 1];
const d1 = data[index];
let d = d0;
if (d1 && d1.date) {
d = x0 - xStock(d0.date) > xStock(d1.date) - x0 ? d1 : d0;
}
showTooltip({
tooltipData: d,
tooltipLeft: x,
tooltipTop: yScale(d.close),
});
}
render() {
const {
width,
Expand Down Expand Up @@ -108,28 +129,33 @@ class Area extends React.Component {
fill="transparent"
rx={14}
data={stock}
onTouchStart={data => event =>
this.handleTooltip({
event,
data,
xStock,
xScale,
yScale,
})}
onTouchMove={data => event =>
this.handleTooltip({
event,
data,
xStock,
xScale,
yScale,
})}
onMouseMove={data => event =>
this.handleTooltip({
event,
data,
xStock,
xScale,
yScale,
})}
onMouseLeave={data => event => hideTooltip()}
onMouseMove={data => event => {
const { x } = localPoint(this.svg, event);
const x0 = xScale.invert(x);
const index = bisectDate(data, x0, 1);
const d0 = data[index - 1];
const d1 = data[index];
let d = d0;
if (d1 && d1.date) {
d =
x0 - xStock(d0.date) > xStock(d1.date) - x0
? d1
: d0;
}
showTooltip({
tooltipData: d,
tooltipLeft: x,
tooltipTop: yScale(d.close),
});
}}
/>
{tooltipData &&
{tooltipData && (
<g>
<Line
from={{ x: tooltipLeft, y: 0 }}
Expand Down Expand Up @@ -159,9 +185,10 @@ class Area extends React.Component {
strokeWidth={2}
style={{ pointerEvents: 'none' }}
/>
</g>}
</g>
)}
</svg>
{tooltipData &&
{tooltipData && (
<div>
<Tooltip
top={tooltipTop - 12}
Expand All @@ -182,7 +209,8 @@ class Area extends React.Component {
>
{formatDate(xStock(tooltipData))}
</Tooltip>
</div>}
</div>
)}
</div>
);
}
Expand Down
82 changes: 57 additions & 25 deletions packages/vx-demo/pages/areas.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,27 @@ const yStock = d => d.close;
const bisectDate = bisector(d => new Date(d.date)).left;

class Area extends React.Component {
constructor(props) {
super(props);
this.handleTooltip = this.handleTooltip.bind(this);
}
handleTooltip({ event, data, xStock, xScale, yScale }) {
const { showTooltip } = this.props;
const { x } = localPoint(event);
const x0 = xScale.invert(x);
const index = bisectDate(data, x0, 1);
const d0 = data[index - 1];
const d1 = data[index];
let d = d0;
if (d1 && d1.date) {
d = x0 - xStock(d0.date) > xStock(d1.date) - x0 ? d1 : d0;
}
showTooltip({
tooltipData: d,
tooltipLeft: x,
tooltipTop: yScale(d.close),
});
}
render() {
const {
width,
Expand Down Expand Up @@ -83,7 +104,11 @@ class Area extends React.Component {
x2="0%"
y2="100%"
>
<stop offset="0%" stopColor="#FFFFFF" stopOpacity={1} />
<stop
offset="0%"
stopColor="#FFFFFF"
stopOpacity={1}
/>
<stop
offset="100%"
stopColor="#FFFFFF"
Expand Down Expand Up @@ -124,28 +149,33 @@ class Area extends React.Component {
fill="transparent"
rx={14}
data={stock}
onTouchStart={data => event =>
this.handleTooltip({
event,
data,
xStock,
xScale,
yScale,
})}
onTouchMove={data => event =>
this.handleTooltip({
event,
data,
xStock,
xScale,
yScale,
})}
onMouseMove={data => event =>
this.handleTooltip({
event,
data,
xStock,
xScale,
yScale,
})}
onMouseLeave={data => event => hideTooltip()}
onMouseMove={data => event => {
const { x } = localPoint(this.svg, event);
const x0 = xScale.invert(x);
const index = bisectDate(data, x0, 1);
const d0 = data[index - 1];
const d1 = data[index];
let d = d0;
if (d1 && d1.date) {
d =
x0 - xStock(d0.date) > xStock(d1.date) - x0
? d1
: d0;
}
showTooltip({
tooltipData: d,
tooltipLeft: x,
tooltipTop: yScale(d.close),
});
}}
/>
{tooltipData &&
{tooltipData && (
<g>
<Line
from={{ x: tooltipLeft, y: 0 }}
Expand Down Expand Up @@ -175,9 +205,10 @@ class Area extends React.Component {
strokeWidth={2}
style={{ pointerEvents: 'none' }}
/>
</g>}
</g>
)}
</svg>
{tooltipData &&
{tooltipData && (
<div>
<Tooltip
top={tooltipTop - 12}
Expand All @@ -187,7 +218,7 @@ class Area extends React.Component {
color: 'white',
}}
>
{\`\$\${yStock(tooltipData)}\`}
{\`$\${yStock(tooltipData)}\`}
</Tooltip>
<Tooltip
top={yMax - 14}
Expand All @@ -198,7 +229,8 @@ class Area extends React.Component {
>
{formatDate(xStock(tooltipData))}
</Tooltip>
</div>}
</div>
)}
</div>
);
}
Expand Down
1 change: 1 addition & 0 deletions packages/vx-event/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
export { default as localPoint } from './localPoint';
export { default as touchPoint } from './touchPoint';
42 changes: 34 additions & 8 deletions packages/vx-event/src/localPoint.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,47 @@
import { Point } from '@vx/point';

export default function localPoint(node, event) {
// called with no args
if (!node) return;
const svg = node.ownerSVGElement || node;
if (svg.createSVGPoint) {
let point = svg.createSVGPoint();
point.x = event.clientX;
point.y = event.clientY;

// called with localPoint(event)
if (node.target) {
event = node;

// set node to targets owner svg
node = event.target.ownerSVGElement;

// find the outermost svg
while (node.ownerSVGElement) {
node = node.ownerSVGElement;
}
}

// default to mouse event
let { clientX, clientY } = event;

// support touch event
if (event.changedTouches) {
clientX = event.changedTouches[0].clientX;
clientY = event.changedTouches[0].clientY;
}

// calculate coordinates from svg
if (node.createSVGPoint) {
let point = node.createSVGPoint();
point.x = clientX;
point.y = clientY;
point = point.matrixTransform(node.getScreenCTM().inverse());
return new Point({
x: point.x,
y: point.y
y: point.y,
});
}

// fallback to calculating position from non-svg dom node
let rect = node.getBoundingClientRect();
return new Point({
x: event.clientX - rect.left - node.clientLeft,
y: event.clientY - rect.top - node.clientTop
x: clientX - rect.left - node.clientLeft,
y: clientY - rect.top - node.clientTop,
});
}
6 changes: 3 additions & 3 deletions packages/vx-event/src/touchPoint.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ export default function touchPoint(node, event) {
point = point.matrixTransform(node.getScreenCTM().inverse());
return new Point({
x: point.x,
y: point.y
y: point.y,
});
}
const rect = node.getBoundingClientRect();
return new Point({
x: event.changedTouches[0].clientX - rect.left - node.clientLeft,
y: event.changedTouches[0].clientY - rect.top - node.clientTop
y: event.changedTouches[0].clientY - rect.top - node.clientTop,
});
}
}