diff --git a/src/components/sound-editor/sound-editor.jsx b/src/components/sound-editor/sound-editor.jsx index ce25dc50b2ed84485e423a22f724a28e3c53bcc7..57fc2149e08b92989b476b133764b6ad3b519743 100644 --- a/src/components/sound-editor/sound-editor.jsx +++ b/src/components/sound-editor/sound-editor.jsx @@ -15,6 +15,8 @@ import styles from './sound-editor.css'; import playIcon from '../record-modal/icon--play.svg'; import stopIcon from '../record-modal/icon--stop-playback.svg'; +import trimIcon from './icon--trim.svg'; +import trimConfirmIcon from './icon--trim-confirm.svg'; import redoIcon from './icon--redo.svg'; import undoIcon from './icon--undo.svg'; import echoIcon from './icon--echo.svg'; @@ -251,6 +253,7 @@ SoundEditor.propTypes = { chunkLevels: PropTypes.arrayOf(PropTypes.number).isRequired, intl: intlShape, name: PropTypes.string.isRequired, + onActivateTrim: PropTypes.func.isRequired, onChangeName: PropTypes.func.isRequired, onContainerClick: PropTypes.func.isRequired, onEcho: PropTypes.func.isRequired, diff --git a/src/containers/sound-editor.jsx b/src/containers/sound-editor.jsx index d3c58f811f4ac816f645f30948e49969265c0786..5e54f7e9c27149f00758a5cbc2588d9d43c16ac8 100644 --- a/src/containers/sound-editor.jsx +++ b/src/containers/sound-editor.jsx @@ -28,7 +28,7 @@ class SoundEditor extends React.Component { 'handleEffect', 'handleUndo', 'handleRedo', - 'submitNewSamples' + 'submitNewSamples', 'handleContainerClick', 'setRef' ]); @@ -153,11 +153,6 @@ class SoundEditor extends React.Component { trimEnd: null }); } - handleUpdateTrimEnd (trimEnd) { - this.setState({trimEnd}); - } - handleUpdateTrimStart (trimStart) { - this.setState({trimStart}); handleUpdateTrim (trimStart, trimEnd) { this.setState({trimStart, trimEnd}); this.handleStopPlaying(); @@ -195,6 +190,8 @@ class SoundEditor extends React.Component { this.undoStack.push(this.copyCurrentBuffer()); this.submitNewSamples(samples, sampleRate, true); this.handlePlay(); + } + } setRef (element) { this.ref = element; } @@ -216,6 +213,7 @@ class SoundEditor extends React.Component { setRef={this.setRef} trimEnd={this.state.trimEnd} trimStart={this.state.trimStart} + onActivateTrim={this.handleDelete} onChangeName={this.handleChangeName} onContainerClick={this.handleContainerClick} onDelete={this.handleDelete}