From 77ca0518310bdd854d36c49b190724a4ea500d4f Mon Sep 17 00:00:00 2001
From: sjhuang26 <sjhuang26@gmail.com>
Date: Tue, 29 May 2018 16:17:20 -0400
Subject: [PATCH] Change list wraparound logic
---
src/containers/list-monitor.jsx | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/containers/list-monitor.jsx b/src/containers/list-monitor.jsx
index d6e8bf7ae..c4b40584e 100644
--- a/src/containers/list-monitor.jsx
+++ b/src/containers/list-monitor.jsx
@@ -72,7 +72,7 @@ class ListMonitor extends React.Component {
else if (e.key === 'ArrowDown') navigateDirection = 1;
if (navigateDirection) {
this.handleDeactivate(); // Submit in-progress edits
- const newIndex = (previouslyActiveIndex + navigateDirection) % this.props.value.length;
+ const newIndex = this.wrapListIndex(previouslyActiveIndex + navigateDirection, this.props.value.length);
this.setState({
activeIndex: newIndex,
activeValue: this.props.value[newIndex]
@@ -87,7 +87,7 @@ class ListMonitor extends React.Component {
.concat([newListItemValue])
.concat(listValue.slice(previouslyActiveIndex + newValueOffset));
setVariableValue(vm, targetId, variableId, newListValue);
- const newIndex = (previouslyActiveIndex + newValueOffset) % newListValue.length;
+ const newIndex = this.wrapListIndex(previouslyActiveIndex + newValueOffset, newListValue.length);
this.setState({
activeIndex: newIndex,
activeValue: newListItemValue
@@ -144,6 +144,11 @@ class ListMonitor extends React.Component {
window.addEventListener('mouseup', onMouseUp);
}
+
+ wrapListIndex (index, length) {
+ return (index + length) % length;
+ }
+
render () {
const {
vm, // eslint-disable-line no-unused-vars
--
GitLab