pxt-core 8.0.1 → 8.0.2

package/built/pxt.js

@@ -151712,6 +151712,7 @@ var pxsim;
         }
         kill() {
             super.kill();
+            pxsim.codal.music.__stopSoundExpressions();
             pxsim.AudioContextManager.stopAll();
         }
     }
@@ -155368,6 +155369,10 @@ var pxsim;
                 const soundPromise = new Promise((resolve, reject) => {
                     soundQueue.push({
                         notes,
+                        onStarted: () => {
+                            if (!waitTillDone)
+                                cb();
+                        },
                         onFinished: resolve,
                         onCancelled: resolve
                     });
@@ -155375,10 +155380,9 @@ var pxsim;
                 if (!playing) {
                     playNextSoundAsync();
                 }
-                if (!waitTillDone)
-                    cb();
-                else
+                if (waitTillDone) {
                     soundPromise.then(cb);
+                }
             }
             music.__playSoundExpression = __playSoundExpression;
             async function playNextSoundAsync() {
@@ -155387,6 +155391,7 @@ var pxsim;
                     const sound = soundQueue.shift();
                     let currentToken = cancellationToken;
                     try {
+                        sound.onStarted();
                         await playSoundExpressionAsync(sound.notes, () => currentToken.cancelled);
                         if (currentToken.cancelled) {
                             sound.onCancelled();

package/built/pxtblockly.js

@@ -6997,7 +6997,7 @@ var pxt;
                 const xmlString = serializeNode(sg)
                     .replace(/^\s*<svg[^>]+>/i, '')
                     .replace(/<\/svg>\s*$/i, ''); // strip out svg tag
-                const svgXml = `<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="${XLINK_NAMESPACE}" width="${renderWidth}" height="${renderHeight}" viewBox="${x} ${y} ${width} ${height}" class="pxt-renderer">${xmlString}</svg>`;
+                const svgXml = `<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="${XLINK_NAMESPACE}" width="${renderWidth}" height="${renderHeight}" viewBox="${x} ${y} ${width} ${height}" class="pxt-renderer classic-theme">${xmlString}</svg>`;
                 const xsg = new DOMParser().parseFromString(svgXml, "image/svg+xml");
                 const cssLink = xsg.createElementNS("http://www.w3.org/1999/xhtml", "style");
                 const isRtl = pxt.Util.isUserLanguageRtl();
@@ -7011,7 +7011,7 @@ var pxt;
                         .filter((el) => /\.blocklySvg/.test(el.innerText))[0];
                     // Custom CSS injected directly into the DOM by Blockly
                     customCss.unshift(((_a = document.getElementById(`blockly-common-style`)) === null || _a === void 0 ? void 0 : _a.innerText) || "");
-                    customCss.unshift(((_b = document.getElementById(`blockly-renderer-style-pxt`)) === null || _b === void 0 ? void 0 : _b.innerText) || "");
+                    customCss.unshift(((_b = document.getElementById(`blockly-renderer-style-pxt-classic`)) === null || _b === void 0 ? void 0 : _b.innerText) || "");
                     // CSS may contain <, > which need to be stored in CDATA section
                     const cssString = (blocklySvg ? blocklySvg.innerText : "") + '\n\n' + customCss.map(el => el + '\n\n');
                     cssLink.appendChild(xsg.createCDATASection(cssString));
@@ -14088,6 +14088,7 @@ var pxtblockly;
                     .at((FieldCustomMelody.COLOR_BLOCK_WIDTH + FieldCustomMelody.COLOR_BLOCK_SPACING) * i + FieldCustomMelody.COLOR_BLOCK_X, FieldCustomMelody.COLOR_BLOCK_Y)
                     .size(FieldCustomMelody.COLOR_BLOCK_WIDTH, FieldCustomMelody.COLOR_BLOCK_HEIGHT)
                     .stroke("#898989", 1)
+                    .fill(getPlaceholderColor(pxtmelody.noteToRow(notes[i])))
                     .corners(3, 2);
                 pxt.BrowserUtils.addClass(cb.el, className);
                 this.fieldGroup_.appendChild(cb.el);
@@ -14516,6 +14517,24 @@ var pxtblockly;
             props.switchColor = "#ffffff";
         return props;
     }
+    /**
+     * This gets the placeholder color which is embedded in the rendered svg. These are overridden
+     * by the css class we set on each rect from pxtmelody.getColorClass and will only be seen
+     * if the svg is taken without the corresponding css (e.g. in a blockly snapshot)
+     */
+    function getPlaceholderColor(row) {
+        switch (row) {
+            case 0: return "#A80000"; // Middle C
+            case 1: return "#D83B01"; // Middle D
+            case 2: return "#FFB900"; // Middle E
+            case 3: return "#107C10"; // Middle F
+            case 4: return "#008272"; // Middle G
+            case 5: return "#0078D7"; // Middle A
+            case 6: return "#5C2D91"; // Middle B
+            case 7: return "#B4009E"; // Tenor C
+        }
+        return "#DCDCDC";
+    }
 })(pxtblockly || (pxtblockly = {}));
 /// <reference path="../../localtypings/pxtblockly.d.ts" />
 var pxtblockly;

package/built/pxtblocks.js

@@ -3435,7 +3435,7 @@ var pxt;
                 const xmlString = serializeNode(sg)
                     .replace(/^\s*<svg[^>]+>/i, '')
                     .replace(/<\/svg>\s*$/i, ''); // strip out svg tag
-                const svgXml = `<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="${XLINK_NAMESPACE}" width="${renderWidth}" height="${renderHeight}" viewBox="${x} ${y} ${width} ${height}" class="pxt-renderer">${xmlString}</svg>`;
+                const svgXml = `<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="${XLINK_NAMESPACE}" width="${renderWidth}" height="${renderHeight}" viewBox="${x} ${y} ${width} ${height}" class="pxt-renderer classic-theme">${xmlString}</svg>`;
                 const xsg = new DOMParser().parseFromString(svgXml, "image/svg+xml");
                 const cssLink = xsg.createElementNS("http://www.w3.org/1999/xhtml", "style");
                 const isRtl = pxt.Util.isUserLanguageRtl();
@@ -3449,7 +3449,7 @@ var pxt;
                         .filter((el) => /\.blocklySvg/.test(el.innerText))[0];
                     // Custom CSS injected directly into the DOM by Blockly
                     customCss.unshift(((_a = document.getElementById(`blockly-common-style`)) === null || _a === void 0 ? void 0 : _a.innerText) || "");
-                    customCss.unshift(((_b = document.getElementById(`blockly-renderer-style-pxt`)) === null || _b === void 0 ? void 0 : _b.innerText) || "");
+                    customCss.unshift(((_b = document.getElementById(`blockly-renderer-style-pxt-classic`)) === null || _b === void 0 ? void 0 : _b.innerText) || "");
                     // CSS may contain <, > which need to be stored in CDATA section
                     const cssString = (blocklySvg ? blocklySvg.innerText : "") + '\n\n' + customCss.map(el => el + '\n\n');
                     cssLink.appendChild(xsg.createCDATASection(cssString));
@@ -10526,6 +10526,7 @@ var pxtblockly;
                     .at((FieldCustomMelody.COLOR_BLOCK_WIDTH + FieldCustomMelody.COLOR_BLOCK_SPACING) * i + FieldCustomMelody.COLOR_BLOCK_X, FieldCustomMelody.COLOR_BLOCK_Y)
                     .size(FieldCustomMelody.COLOR_BLOCK_WIDTH, FieldCustomMelody.COLOR_BLOCK_HEIGHT)
                     .stroke("#898989", 1)
+                    .fill(getPlaceholderColor(pxtmelody.noteToRow(notes[i])))
                     .corners(3, 2);
                 pxt.BrowserUtils.addClass(cb.el, className);
                 this.fieldGroup_.appendChild(cb.el);
@@ -10954,6 +10955,24 @@ var pxtblockly;
             props.switchColor = "#ffffff";
         return props;
     }
+    /**
+     * This gets the placeholder color which is embedded in the rendered svg. These are overridden
+     * by the css class we set on each rect from pxtmelody.getColorClass and will only be seen
+     * if the svg is taken without the corresponding css (e.g. in a blockly snapshot)
+     */
+    function getPlaceholderColor(row) {
+        switch (row) {
+            case 0: return "#A80000"; // Middle C
+            case 1: return "#D83B01"; // Middle D
+            case 2: return "#FFB900"; // Middle E
+            case 3: return "#107C10"; // Middle F
+            case 4: return "#008272"; // Middle G
+            case 5: return "#0078D7"; // Middle A
+            case 6: return "#5C2D91"; // Middle B
+            case 7: return "#B4009E"; // Tenor C
+        }
+        return "#DCDCDC";
+    }
 })(pxtblockly || (pxtblockly = {}));
 /// <reference path="../../localtypings/pxtblockly.d.ts" />
 var pxtblockly;

package/built/pxtsim.js

@@ -4835,6 +4835,7 @@ var pxsim;
         }
         kill() {
             super.kill();
+            pxsim.codal.music.__stopSoundExpressions();
             pxsim.AudioContextManager.stopAll();
         }
     }
@@ -8491,6 +8492,10 @@ var pxsim;
                 const soundPromise = new Promise((resolve, reject) => {
                     soundQueue.push({
                         notes,
+                        onStarted: () => {
+                            if (!waitTillDone)
+                                cb();
+                        },
                         onFinished: resolve,
                         onCancelled: resolve
                     });
@@ -8498,10 +8503,9 @@ var pxsim;
                 if (!playing) {
                     playNextSoundAsync();
                 }
-                if (!waitTillDone)
-                    cb();
-                else
+                if (waitTillDone) {
                     soundPromise.then(cb);
+                }
             }
             music.__playSoundExpression = __playSoundExpression;
             async function playNextSoundAsync() {
@@ -8510,6 +8514,7 @@ var pxsim;
                     const sound = soundQueue.shift();
                     let currentToken = cancellationToken;
                     try {
+                        sound.onStarted();
                         await playSoundExpressionAsync(sound.notes, () => currentToken.cancelled);
                         if (currentToken.cancelled) {
                             sound.onCancelled();