applying merge

Author: murphybrandon

src/app/components/App.jsx

@@ -1,4 +1,4 @@
-import React, { useContext, Component } from 'react';
+import React, { Component } from 'react';
 import { createGlobalStyle } from 'styled-components';
 
 // containers
@@ -48,7 +48,7 @@ class App extends Component {
  };
 
  this.portToExtension = null;
- 
+
  this.addActionToView = this.addActionToView.bind(this);
  this.toTheFuture = this.toTheFuture.bind(this);
  this.toThePast = this.toThePast.bind(this);
@@ -82,6 +82,7 @@ class App extends Component {
  }));
  });
  });
+ }
 
  // functionality to change 'play' button to 'stop'
  setIsPlaying() {
@@ -120,16 +121,19 @@ class App extends Component {
 
  actionInPlay() {
  let { isPlayingIndex } = this.state;
- if (isPlayingIndex >= this.state.data.length - 1) isPlayingIndex = 0;
+ const { isPlaying, data } = this.state;
+
+ if (isPlayingIndex >= data.length - 1) isPlayingIndex = 0;
 
  this.setState({ isPlayingIndex: isPlayingIndex + 1 });
- const { id, action, state } = this.state.data[isPlayingIndex + 1];
+ const { id, action, state } = data[isPlayingIndex + 1];
+ this.toTheFuture();
 
  setTimeout(() => {
  this.setState((prev, props) => {
  return { ...prev, id, action, state };
  });
- if (this.state.isPlaying && isPlayingIndex + 1 < this.state.data.length - 1) {
+ if (isPlaying && isPlayingIndex + 1 < data.length - 1) {
  this.actionInPlay();
  } else {
  this.setState({ isPlaying: false });
@@ -153,12 +157,12 @@ class App extends Component {
  // filter search bar results
  searchChange(e) {
  const { data } = this.state;
- 
+
  // grab user entry from filter bar
  const compareSearchValue = e.target.value;
 
  // set state with compare value
- this.setState({ searchField: compareSearchValue })
+ this.setState({ searchField: compareSearchValue });
 
  // match results from our filter entry to data
  const actions = data.filter(function(item) {
@@ -200,7 +204,6 @@ class App extends Component {
  }
 
  render() {
- console.log(this.state.isPlayingIndex);
  const {
  action,
  id,
@@ -254,4 +257,4 @@ class App extends Component {
  }
 }
 
-export default App;
+export default App;