Merge branch 'develop' into greenkeeper/chromedriver-76.0.0

Author: paulkaplan

package-lock.json

@@ -106,7 +106,7 @@
     "rimraf": "^2.6.1",
     "scratch-audio": "0.1.0-prerelease.20190114210212",
     "scratch-l10n": "3.5.20190724160319",
-    "scratch-blocks": "0.1.0-prerelease.1563990552",
+    "scratch-blocks": "0.1.0-prerelease.1564581595",
     "scratch-paint": "0.2.0-prerelease.20190729153946",
     "scratch-render": "0.1.0-prerelease.20190605151415",
     "scratch-storage": "1.3.2",

package.json

@@ -43,7 +43,8 @@ class AudioSelector extends React.Component {
         });
     }
     componentWillReceiveProps (newProps) {
-        if (newProps.trimStart === this.props.trimStart) return;
+        const {trimStart, trimEnd} = this.props;
+        if (newProps.trimStart === trimStart && newProps.trimEnd === trimEnd) return;
         this.setState({
             trimStart: newProps.trimStart,
             trimEnd: newProps.trimEnd

src/components/sound-editor/icon--fade-in.svg

@@ -42,11 +42,15 @@ class AudioTrimmer extends React.Component {
         this.containerSize = this.containerElement.getBoundingClientRect().width;
         this.trimStartDragRecognizer.start(e);
         this.initialTrim = this.props.trimStart;
+        e.stopPropagation();
+        e.preventDefault();
     }
     handleTrimEndMouseDown (e) {
         this.containerSize = this.containerElement.getBoundingClientRect().width;
         this.trimEndDragRecognizer.start(e);
         this.initialTrim = this.props.trimEnd;
+        e.stopPropagation();
+        e.preventDefault();
     }
     storeRef (el) {
         this.containerElement = el;