Merge branch 'uepr56-react18' of github.com:scratchfoundation/scratch-editor into UEPR-56-UEPR-282

Author: adzhindzhi

packages/scratch-gui/src/containers/sound-editor.jsx

@@ -485,11 +485,11 @@ const mapStateToProps = (state, {soundIndex}) => {
     const sound = state.scratchGui.vm.editingTarget.sprite.sounds[index];
     const audioBuffer = state.scratchGui.vm.getSoundBuffer(index);
     return {
-        soundId: sound.soundId,
-        sampleRate: audioBuffer.sampleRate,
-        samples: audioBuffer.getChannelData(0),
+        soundId: sound?.soundId,
+        sampleRate: audioBuffer?.sampleRate,
+        samples: audioBuffer?.getChannelData(0),
         isFullScreen: state.scratchGui.mode.isFullScreen,
-        name: sound.name,
+        name: sound?.name,
         vm: state.scratchGui.vm
     };
 };

packages/scratch-vm/src/virtual-machine.js

@@ -797,7 +797,7 @@ class VirtualMachine extends EventEmitter {
      * @return {AudioBuffer} the sound's audio buffer.
      */
     getSoundBuffer (soundIndex) {
-        const id = this.editingTarget.sprite.sounds[soundIndex].soundId;
+        const id = this.editingTarget.sprite.sounds[soundIndex]?.soundId;
         if (id && this.runtime && this.runtime.audioEngine) {
             return this.editingTarget.sprite.soundBank.getSoundPlayer(id).buffer;
         }