Merge branch 'master' of github.com:RakanNimer/react-orchestra

Author: rakannimer

native/src/MidiIO/src/MidiIO.js

@@ -83,26 +83,32 @@ class MidiIO {
     };
     return metaObject;
   }
+  static indexMidiTrack(track) {
+    const indexedTrack = track.reduce(
+      (prev, current) => {
+        const currentIndex = `${current.type}_${current.subtype}`;
+        const updated = Object.assign({}, prev);
+        if (!updated[currentIndex]) {
+          updated[currentIndex] = [];
+        }
+        updated[currentIndex].push(current);
+        return updated;
+      },
+      {},
+    );
+    return indexedTrack;
+  }
   static getAllTracks(parsedMidi) {
     const tracks = parsedMidi.tracks.filter((track, i) => i >= 1);
 
     const indexedTracks = tracks.map((track, i) => {
-      const indexedTrack = track.reduce(
-        (prev, current) => {
-          const currentIndex = `${current.type}_${current.subtype}`;
-          const updated = Object.assign({}, prev);
-          if (!updated[currentIndex]) {
-            updated[currentIndex] = [];
-          }
-          updated[currentIndex].push(current);
-          return updated;
-        },
-        {},
-      );
+      let previousNote;
+      const indexedTrack = MidiIO.indexMidiTrack(track);
       const instrumentNumber = indexedTrack.channel_programChange[0].programNumber;
       const instrumentName = Object.keys(INSTRUMENT_MIDI_MAPPING).find(instrumentKey => (
         INSTRUMENT_MIDI_MAPPING[instrumentKey] === instrumentNumber),
       );
+
       return {
         controller: indexedTrack.channel_controller,
         programChange: indexedTrack.channel_programChange,
@@ -344,6 +350,7 @@ class MidiIO {
       const trackInstrumentName = meta.instrumentNames[i];
       const millisecondsPerTick = meta.millisecondsPerTick;
       let previousEndTime = 0;
+      let previousNote = {};
       return noteOffs.map((noteOff) => {
         const {
           noteNumber,
@@ -360,6 +367,14 @@ class MidiIO {
           previousEndTime,
           millisecondsPerTick,
         );
+        if (deltaTime === 0) {
+          const note = Object.assign({},
+            previousNote,
+            { noteNumber, noteName, instrumentName: noteInstrumentName },
+          );
+          previousNote = note;
+          return note;
+        }
         previousEndTime = endTimeInMS;
         const note = {
           noteNumber,
@@ -371,6 +386,7 @@ class MidiIO {
           deltaTime,
           msPerTick,
         };
+        previousNote = note;
         return note;
       });
     });

native/src/components/MidiTrack.js

@@ -40,7 +40,7 @@ export default class MidiTrack extends React.PureComponent {
   }
   async onTimerCall(note) {
     const { noteName, instrumentName, durationInMS } = note;
-    const noteInstrumentName = this.props.instrumentName || instrumentName
+    const noteInstrumentName = this.props.instrumentName || instrumentName;
     const key = generateNoteKey(noteInstrumentName, noteName);
     this.setState({
       playingNotes: {
@@ -85,6 +85,7 @@ export default class MidiTrack extends React.PureComponent {
         key={i}
         onStartPlayingNote={this.props.onNotePlayed}
         onStopPlayingNote={this.props.onNoteStopPlaying}
+        delayPressOut={400}
       >
         {
           this.props.renderNote(instrumentName, sharpToBemol(noteName), i)

native/src/components/Note.js

@@ -42,7 +42,10 @@ class Note extends React.PureComponent {
   shouldComponentUpdate(nextProps, nextState) {
     // TODO: split into consts
     // return true;
-    const shouldUpdate = this.state.isLoading || (nextProps.name !== this.props.name) || (nextProps.instrumentName !== this.props.instrumentName) || (nextState.isPlaying !== this.state.isPlaying) || (nextProps.play !== this.props.play) || this.state.isPlaying || this.state.isPlaying !== nextState.isPlaying;
+    const isLoading = this.state.isLoading || nextState.isLoading;
+    const isPlaying = this.state.isPlaying !== nextState.isPlaying;
+    const isPlayingControlled = this.props.play !== nextProps.play;
+    const shouldUpdate = isLoading || isPlaying || isPlayingControlled; // this.state.isLoading || (nextProps.name !== this.props.name) || (nextProps.instrumentName !== this.props.instrumentName) || (nextState.isPlaying !== this.state.isPlaying) || (nextProps.play !== this.props.play) || this.state.isPlaying || this.state.isPlaying !== nextState.isPlaying;
     return shouldUpdate;
   }
   componentWillUnmount() {

native/src/components/Orchestra.js

@@ -57,7 +57,9 @@ class Orchestra extends React.Component {
       <View>
         { this.props.children }
         {
-          this.state.tracks.map((track, i) => (
+          this.state.tracks
+          .filter((track, i) => this.props.selectedTracks.indexOf(i) !== -1)
+          .map((track, i) => (
             <MidiTrack
               onNotePlayed={this.props.onNotePlayed}
               onNoteStopPlaying={this.props.onNoteStopPlaying}
@@ -66,7 +68,7 @@ class Orchestra extends React.Component {
               trackIndex={i}
               key={i}
               renderNote={this.props.renderNote}
-              play={this.props.selectedTracks.indexOf(i) > -1 && this.props.play}
+              play={this.props.play}
               onInstrumentsReady={this.onInstrumentsReady}
               instrumentStyle={this.props.instrumentStyle}
               instrumentName={this.props.instrumentName || null}