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

Improve mouse actions (click, hover, leave) #50

Merged
merged 1 commit into from
Mar 29, 2018
+85 −90
Merged

Improve mouse actions (click, hover, leave) #50

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
24 changes: 10 additions & 14 deletions addon/components/simple-chart-bar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,20 +44,6 @@ export default Component.extend(ChartProperties, {
.attr('fill', d => color(d.label));

if (!isIcon) {
rect.on('mouseenter', data => {
if (hover) {
const rects = svg.selectAll('rect');
const selected = rects.filter(rectData => rectData.label === data.label);
hover(data, selected.node());
}
});

svg.on('mouseleave', () => {
if (leave) {
leave();
}
});

const text = bars.selectAll('text').data(dataOrArray).enter()
.append("text")
.attr("fill", "#ffffff")
Expand All @@ -67,6 +53,16 @@ export default Component.extend(ChartProperties, {
.attr('y', d => `${110 - yScale(d.data)}%`)
.text(d => d.label);

const handleHover = data => {
const rects = svg.selectAll('rect');
const selected = rects.filter(rectData => rectData.label === data.label);
hover(data, selected.node());
}
rect.on('mouseenter', handleHover);
text.on('mouseenter', handleHover);
rect.on('mouseleave', leave);
text.on('mouseleave', leave);

if (isClickable) {
rect.on('click', data => {
click(data);
Expand Down
24 changes: 10 additions & 14 deletions addon/components/simple-chart-donut.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,6 @@ export default Component.extend(ChartProperties, {
});

if (!isIcon) {
path.on('mouseenter', ({ data }) => {
if (hover) {
const slices = svg.selectAll('.slice');
const selectedSlice = slices.filter(({data: sliceData}) => sliceData.label === data.label);
hover(data, selectedSlice.node());
}
});

svg.on('mouseleave', () => {
if (leave) {
leave();
}
});

const text = chart.selectAll('.slice')
.append("text")
.attr("fill", "#ffffff")
Expand All @@ -77,6 +63,16 @@ export default Component.extend(ChartProperties, {
.attr("text-anchor", "middle")
.text(d => d.data.label);

const handleHover = ({ data }) => {
const slices = svg.selectAll('.slice');
const selectedSlice = slices.filter(({data: sliceData}) => sliceData.label === data.label);
hover(data, selectedSlice.node());
}
path.on('mouseenter', handleHover);
text.on('mouseenter', handleHover);
path.on('mouseleave', leave);
text.on('mouseleave', leave);

if (isClickable) {
path.on('click', ({ data }) => {
click(data);
Expand Down
24 changes: 10 additions & 14 deletions addon/components/simple-chart-horz-bar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,20 +44,6 @@ export default Component.extend(ChartProperties, {
.attr('fill', d => color(d.label));

if (!isIcon) {
rect.on('mouseenter', data => {
if (hover) {
const rects = svg.selectAll('rect');
const selected = rects.filter(rectData => rectData.label === data.label);
hover(data, selected.node());
}
});

svg.on('mouseleave', () => {
if (leave) {
leave();
}
});

const text = bars.selectAll('text').data(dataOrArray).enter()
.append("text")
.attr("fill", "#ffffff")
Expand All @@ -69,6 +55,16 @@ export default Component.extend(ChartProperties, {
.attr('x', d => `${xScale(d.data) - 3}%`)
.text(d => d.label);

const handleHover = data => {
const rects = svg.selectAll('rect');
const selected = rects.filter(rectData => rectData.label === data.label);
hover(data, selected.node());
}
rect.on('mouseenter', handleHover);
text.on('mouseenter', handleHover);
rect.on('mouseleave', leave);
text.on('mouseleave', leave);

if (isClickable) {
rect.on('click', data => {
click(data);
Expand Down
24 changes: 10 additions & 14 deletions addon/components/simple-chart-pie.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,6 @@ export default Component.extend(ChartProperties, {
});

if (!isIcon) {
path.on('mouseenter', ({data}) => {
if (hover) {
const slices = svg.selectAll('.slice');
const selectedSlice = slices.filter(({data: sliceData}) => sliceData.label === data.label);
hover(data, selectedSlice.node());
}
});

svg.on('mouseleave', () => {
if (leave) {
leave();
}
});

const text = chart.selectAll('.slice')
.append("text")
.attr("fill", "#ffffff")
Expand All @@ -76,6 +62,16 @@ export default Component.extend(ChartProperties, {
.attr("text-anchor", "middle")
.text(d => d.data.label);

const handleHover = ({ data }) => {
const slices = svg.selectAll('.slice');
const selectedSlice = slices.filter(({data: sliceData}) => sliceData.label === data.label);
hover(data, selectedSlice.node());
}
path.on('mouseenter', handleHover);
text.on('mouseenter', handleHover);
path.on('mouseleave', leave);
text.on('mouseleave', leave);

if (isClickable) {
path.on('click', ({ data }) => {
click(data);
Expand Down
60 changes: 31 additions & 29 deletions addon/components/simple-chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Component from '@ember/component';
import { set, get, computed } from '@ember/object';
import { isPresent } from '@ember/utils';
import { task, taskGroup, timeout } from 'ember-concurrency';
import layout from '../templates/components/simple-chart';

const DEBOUNCE_MS = 100;
export default Component.extend({
layout,
classNames: ['simple-chart'],
Expand All @@ -18,45 +19,46 @@ export default Component.extend({
const click = get(this, 'click');
return isPresent(click);
}),
actions: {
async handleHover(data, tooltipTarget) {
const hover = get(this, 'hover');
mouse: taskGroup().restartable(),
handleHover: task(function* (data, tooltipTarget) {
const hover = get(this, 'hover');
yield timeout(DEBOUNCE_MS);
if (hover) {
try {
await hover(data);
yield hover(data);
if ( !(get(this, 'isDestroyed') || get(this, 'isDestroying')) ) {
set(this, 'tooltipTarget', tooltipTarget);
}
} catch (e) {
//we will just ignore errors here since the mouse state is transient
}
}
},
async handleLeave() {
const leave = get(this, 'leave');
if (leave) {
try {
await leave();
if ( !(get(this, 'isDestroyed') || get(this, 'isDestroying')) ) {
set(this, 'tooltipTarget', null);
}
} catch (e) {
//we will just ignore errors here since the mouse state is transient
}).group('mouse'),
handleLeave: task(function* () {
yield timeout(DEBOUNCE_MS);
const leave = get(this, 'leave');
if (leave) {
try {
yield leave();
if ( !(get(this, 'isDestroyed') || get(this, 'isDestroying')) ) {
set(this, 'tooltipTarget', null);
}
} catch (e) {
//we will just ignore errors here since the mouse state is transient
}
},
async handleClick(data) {
const click = get(this, 'click');
if (click) {
try {
await click(data);
if ( !(get(this, 'isDestroyed') || get(this, 'isDestroying')) ) {
set(this, 'tooltipTarget', null);
}
} catch (e) {
//we will just ignore errors here since the mouse state is transient
}
}).group('mouse'),
handleClick: task(function* (data) {
const click = get(this, 'click');
if (click) {
try {
yield click(data);
if ( !(get(this, 'isDestroyed') || get(this, 'isDestroying')) ) {
set(this, 'tooltipTarget', null);
}
} catch (e) {
//we will just ignore errors here since the mouse state is transient
}
},
}
}
}).group('mouse'),
});
6 changes: 3 additions & 3 deletions addon/templates/components/simple-chart.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{{component chartName
data=data
isIcon=isIcon
hover=(action 'handleHover')
click=(action 'handleClick')
leave=(action 'handleLeave')
hover=(perform handleHover)
click=(perform handleClick)
leave=(perform handleLeave)
isClickable=isClickable
}}

Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"ember-cli-babel": "^6.8.1",
"ember-cli-htmlbars": "^2.0.1",
"ember-cli-sass": "^7.1.2",
"ember-concurrency": "^0.8.17",
"ember-d3": "^0.4.3",
"ember-modal-dialog": "^2.4.1",
"ember-resize-aware": "^1.0.0",
Expand Down
12 changes: 10 additions & 2 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ babel-core@^5.0.0:
trim-right "^1.0.0"
try-resolve "^1.0.0"

babel-core@^6.14.0, babel-core@^6.26.0:
babel-core@^6.14.0, babel-core@^6.24.1, babel-core@^6.26.0:
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"
dependencies:
Expand Down Expand Up @@ -3034,6 +3034,14 @@ ember-cli@2.18.2:
walk-sync "^0.3.0"
yam "0.0.22"

ember-concurrency@^0.8.17:
version "0.8.17"
resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-0.8.17.tgz#be47a90342f1960f4f57284c2fe5f7ce2396142a"
dependencies:
babel-core "^6.24.1"
ember-cli-babel "^6.8.2"
ember-maybe-import-regenerator "^0.1.5"

ember-d3@^0.4.3:
version "0.4.3"
resolved "https://registry.yarnpkg.com/ember-d3/-/ember-d3-0.4.3.tgz#3025897ec6a294cd4c6763e91c2e30a78a0ecb7e"
Expand Down Expand Up @@ -3066,7 +3074,7 @@ ember-load-initializers@^1.0.0:
dependencies:
ember-cli-babel "^6.0.0-beta.7"

ember-maybe-import-regenerator@^0.1.6:
ember-maybe-import-regenerator@^0.1.5, ember-maybe-import-regenerator@^0.1.6:
version "0.1.6"
resolved "https://registry.yarnpkg.com/ember-maybe-import-regenerator/-/ember-maybe-import-regenerator-0.1.6.tgz#35d41828afa6d6a59bc0da3ce47f34c573d776ca"
dependencies:
Expand Down