fix: simplify and improve stop replaying flow

fbaiodias · Dec 7, 2018 · 10b52d3 · 10b52d3
1 parent e0feb7f
commit 10b52d3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/src/defaults/render-actions.js b/src/defaults/render-actions.js
@@ -36,6 +36,7 @@ export default ({
   onOpenVideoInput,
   onStartRecording,
   onStopRecording,
+  onStopReplaying,
   onConfirm
 }) => {
   const renderContent = () => {
@@ -52,11 +53,7 @@ export default ({
     }
 
     if (isReplayingVideo) {
-      return shouldUseVideoInput ? (
-        <Button onClick={onOpenVideoInput}>Record another video</Button>
-      ) : (
-        <RecordButton onClick={onTurnOnCamera} />
-      )
+      return <Button onClick={onStopReplaying}>Record another video</Button>
     }
 
     if (isRecording) {

diff --git a/src/video-recorder.js b/src/video-recorder.js
@@ -129,6 +129,7 @@ export default class VideoRecorder extends Component {
     this.handleStopRecording = this.handleStopRecording.bind(this)
     this.handleDataAvailable = this.handleDataAvailable.bind(this)
     this.handleStop = this.handleStop.bind(this)
+    this.handleStopReplaying = this.handleStopReplaying.bind(this)
     this.renderCameraView = this.renderCameraView.bind(this)
     this.handleVideoSelected = this.handleVideoSelected.bind(this)
     this.handleOpenVideoInput = this.handleOpenVideoInput.bind(this)
@@ -433,6 +434,22 @@ export default class VideoRecorder extends Component {
     this.videoInput.click()
   }
 
+  handleStopReplaying () {
+    if (this.props.onStopReplaying) {
+      this.props.onStopReplaying()
+    }
+
+    this.setState({
+      isReplayingVideo: false
+    })
+
+    if (this.state.isInlineRecordingSupported && this.props.isOnInitially) {
+      this.turnOnCamera()
+    } else if (this.state.isVideoInputSupported && this.props.isOnInitially) {
+      this.handleOpenVideoInput()
+    }
+  }
+
   renderCameraView () {
     const {
       renderDisconnectedView,
@@ -549,7 +566,8 @@ export default class VideoRecorder extends Component {
           onTurnOffCamera: this.turnOffCamera,
           onOpenVideoInput: this.handleOpenVideoInput,
           onStartRecording: this.handleStartRecording,
-          onStopRecording: this.handleStopRecording
+          onStopRecording: this.handleStopRecording,
+          onStopReplaying: this.handleStopReplaying
         })}
       </Wrapper>
     )