Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

move logic for keydown events to timelinejs (#4423)

Patrick Moulden45a4273307cc
diff --git a/web/js/components/timeline/timeline-controls/date-change-arrows.js b/web/js/components/timeline/timeline-controls/date-change-arrows.js
index 32c2278ae..71adbf00b 100644
--- a/web/js/components/timeline/timeline-controls/date-change-arrows.js
+++ b/web/js/components/timeline/timeline-controls/date-change-arrows.js
@@ -27,11 +27,6 @@ class DateChangeArrows extends PureComponent {
};
}
- componentDidMount() {
- document.addEventListener('keydown', this.handleKeyDown);
- document.addEventListener('keyup', this.handleKeyUp);
- }
-
componentDidUpdate (prevProps) {
const { tilesPreloaded, arrowDown } = this.props;
const notAnimating = !intervals.left && !intervals.right;
@@ -45,8 +40,6 @@ class DateChangeArrows extends PureComponent {
componentWillUnmount() {
clearInterval(intervals.left);
clearInterval(intervals.right);
- document.removeEventListener('keydown', this.handleKeyDown);
- document.removeEventListener('keyup', this.handleKeyUp);
}
clickAndHold = (direction) => {
@@ -55,26 +48,6 @@ class DateChangeArrows extends PureComponent {
arrowDownCheckTimer = null;
};
- handleKeyDown = (e) => {
- const { arrowDown } = this.props;
- const direction = e.keyCode === 37 ? 'left' : e.keyCode === 39 ? 'right' : null;
- if (e.target.tagName === 'INPUT' || e.target.className === 'form-range' || e.ctrlKey || e.metaKey) {
- return;
- }
- if (direction) {
- e.preventDefault();
- if (!arrowDown) this.onArrowDown(direction);
- }
- };
-
- handleKeyUp = (e) => {
- const direction = e.keyCode === 37 ? 'left' : e.keyCode === 39 ? 'right' : null;
- if (direction) {
- e.preventDefault();
- this.onArrowUp(direction);
- }
- };
-
onArrowDown = (direction) => {
this.arrowDownMap[direction]();
arrowDownCheckTimer = setTimeout(() => {
diff --git a/web/js/containers/timeline/timeline.js b/web/js/containers/timeline/timeline.js
index 67cedd84f..161e6a412 100644
--- a/web/js/containers/timeline/timeline.js
+++ b/web/js/containers/timeline/timeline.js
@@ -515,17 +515,23 @@ class Timeline extends React.Component {
if (e.target.tagName !== 'INPUT' && e.target.className !== 'form-range' && !e.ctrlKey && !e.metaKey && !isTimelineDragging) {
const timeScaleNumber = Number(TIME_SCALE_TO_NUMBER[timeScale]);
const maxTimeScaleNumber = hasSubdailyLayers ? 5 : 3;
- if (e.keyCode === 38) {
+ if (e.key === 'ArrowUp') {
e.preventDefault();
if (timeScaleNumber > 1) {
this.changeTimeScale(timeScaleNumber - 1);
}
// down arrow
- } else if (e.keyCode === 40) {
+ } else if (e.key === 'ArrowDown') {
e.preventDefault();
if (timeScaleNumber < maxTimeScaleNumber) {
this.changeTimeScale(timeScaleNumber + 1);
}
+ } else if (e.key === 'ArrowLeft') {
+ e.preventDefault();
+ this.handleArrowDateChange(-1);
+ } else if (e.key === 'ArrowRight') {
+ e.preventDefault();
+ this.handleArrowDateChange(1);
}
}
};