fix(PatternStopPopup): fix bug preventing users from adding stops to a pattern in certain non-adjace

Author: landonreed

lib/editor/components/map/PatternStopPopup.js

@@ -58,26 +58,38 @@ export default class PatternStopPopup extends Component {
                 </Button>
                 <Dropdown.Toggle bsStyle='success' />
                 <Dropdown.Menu style={{maxHeight: '200px', overflowY: 'scroll'}}>
-                  <MenuItem disabled={index >= activePattern.patternStops.length - 2} value={activePattern.patternStops.length} eventKey={activePattern.patternStops.length}>
+                  <MenuItem
+                    disabled={index >= activePattern.patternStops.length - 1}
+                    value={activePattern.patternStops.length}
+                    eventKey={activePattern.patternStops.length}>
                     Add to end (default)
                   </MenuItem>
                   {activePattern.patternStops && activePattern.patternStops.map((stop, i) => {
+                    // addIndex is in "reverse" order
                     const addIndex = activePattern.patternStops.length - i
-                    if (index === activePattern.patternStops.length - 1 && index === addIndex - 1) {
+                    // skip MenuItem index is the same as the pattern stop index
+                    if (index === addIndex - 1) {
                       return null
                     }
                     // disable adding stop to current position or directly before/after current position
                     return (
                       <MenuItem
-                        disabled={index >= addIndex - 2 && index <= addIndex}
+                        disabled={index >= addIndex - 2 && index < addIndex}
                         value={addIndex - 1}
                         key={i}
                         eventKey={addIndex - 1}
                       >
-                        {addIndex === 1 ? 'Add to beginning' : `Insert as stop #${addIndex}`}
+                        {`Insert as stop #${addIndex}`}
                       </MenuItem>
                     )
                   })}
+                  <MenuItem
+                    disabled={index === 0}
+                    value={0}
+                    eventKey={0}
+                  >
+                    Add to beginning
+                  </MenuItem>
                 </Dropdown.Menu>
               </Dropdown>
             </ButtonGroup>