pxt-core 7.5.9 → 7.5.12

package/built/pxt.js

@@ -107946,9 +107946,9 @@ var pxt;
             return cached;
         }
         github.downloadPackageAsync = downloadPackageAsync;
-        async function downloadLatestPackageAsync(repo) {
+        async function downloadLatestPackageAsync(repo, useProxy, noCache) {
             const packageConfig = await pxt.packagesConfigAsync();
-            const tag = await pxt.github.latestVersionAsync(repo.slug, packageConfig);
+            const tag = await pxt.github.latestVersionAsync(repo.slug, packageConfig, useProxy, noCache);
             // download package into cache
             const repoWithTag = `${repo.fullName}#${tag}`;
             await pxt.github.downloadPackageAsync(repoWithTag, packageConfig);
@@ -154688,7 +154688,7 @@ var pxsim;
                                     return this.buffer;
                                 }
                                 // Synthesize a sample
-                                let s = this.effect.tone.tonePrint(this.effect.tone.parameter, this.position);
+                                let s = this.effect.tone.tonePrint(this.effect.tone.parameter, Math.max(this.position, 0));
                                 // Apply volume scaling and OR mask (if specified).
                                 this.buffer[sample] = (((s * gain) + offset)); // | this.orMask;
                                 // Move on our pointers.

package/built/pxtblockly.js

@@ -10889,6 +10889,7 @@ var pxt;
             state.setEventsEnabled(true);
             Blockly.Extensions.apply('inline-svgs', b, false);
             let updatingInputs = false;
+            let firstRender = true;
             appendMutation(b, {
                 mutationToDom: (el) => {
                     // The reason we store the inputsInitialized variable separately from visibleOptions
@@ -10944,9 +10945,12 @@ var pxt;
             b.render = (opt_bubble) => {
                 if (updatingInputs)
                     return;
-                updatingInputs = true;
-                updateShape(0, undefined, true);
-                updatingInputs = false;
+                if (firstRender) {
+                    firstRender = false;
+                    updatingInputs = true;
+                    updateShape(0, undefined, true);
+                    updatingInputs = false;
+                }
                 Blockly.BlockSvg.prototype.render.call(b, opt_bubble);
             };
             // Set skipRender to true if the block is still initializing. Otherwise
@@ -15143,6 +15147,17 @@ var pxtblockly;
     const Y_PADDING = 4;
     const PREVIEW_WIDTH = TOTAL_WIDTH - X_PADDING * 5 - MUSIC_ICON_WIDTH;
     class FieldSoundEffect extends pxtblockly.FieldBase {
+        constructor() {
+            super(...arguments);
+            this.onWorkspaceChange = (ev) => {
+                if (ev.type !== Blockly.Events.CHANGE)
+                    return;
+                const block = this.sourceBlock_.workspace.getBlockById(ev.blockId);
+                if (!block || block !== this.sourceBlock_ && block.parentBlock_ !== this.sourceBlock_)
+                    return;
+                this.redrawPreview();
+            };
+        }
         onInit() {
             if (!this.options)
                 this.options = {};
@@ -15163,8 +15178,10 @@ var pxtblockly;
             if (!this.options.effectFieldName)
                 this.options.effectFieldName = "effect";
             this.redrawPreview();
+            this.sourceBlock_.workspace.addChangeListener(this.onWorkspaceChange);
         }
         onDispose() {
+            this.sourceBlock_.workspace.removeChangeListener(this.onWorkspaceChange);
         }
         onValueChanged(newValue) {
             return newValue;
@@ -15172,6 +15189,17 @@ var pxtblockly;
         redrawPreview() {
             if (!this.fieldGroup_)
                 return;
+            if (this.drawnSound) {
+                const current = this.readCurrentSound();
+                if (current.startFrequency === this.drawnSound.startFrequency &&
+                    current.endFrequency === this.drawnSound.endFrequency &&
+                    current.startVolume === this.drawnSound.startVolume &&
+                    current.endVolume === this.drawnSound.endVolume &&
+                    current.wave === this.drawnSound.wave &&
+                    current.interpolation === this.drawnSound.interpolation) {
+                    return;
+                }
+            }
             pxsim.U.clear(this.fieldGroup_);
             const bg = new svg.Rect()
                 .at(X_PADDING, Y_PADDING)
@@ -15188,10 +15216,11 @@ var pxtblockly;
                 .fill("#FFF")
                 .at(0, 0);
             clip.appendChild(clipRect);
+            this.drawnSound = this.readCurrentSound();
             const path = new svg.Path()
                 .stroke("grey", 2)
                 .fill("none")
-                .setD(pxt.assets.renderSoundPath(this.readCurrentSound(), TOTAL_WIDTH - X_PADDING * 4 - MUSIC_ICON_WIDTH, TOTAL_HEIGHT - Y_PADDING * 2))
+                .setD(pxt.assets.renderSoundPath(this.drawnSound, TOTAL_WIDTH - X_PADDING * 4 - MUSIC_ICON_WIDTH, TOTAL_HEIGHT - Y_PADDING * 2))
                 .clipPath("url('#" + clipPathId + "')");
             const g = new svg.Group()
                 .translate(MUSIC_ICON_WIDTH + X_PADDING * 3, Y_PADDING + 3);
@@ -15209,7 +15238,13 @@ var pxtblockly;
         showEditor_() {
             const initialSound = this.readCurrentSound();
             Blockly.Events.disable();
-            Blockly.WidgetDiv.show(this, this.sourceBlock_.RTL, () => {
+            let bbox;
+            // This is due to the changes in https://github.com/microsoft/pxt-blockly/pull/289
+            // which caused the widgetdiv to jump around if any fields underneath changed size
+            let widgetOwner = {
+                getScaledBBox: () => bbox
+            };
+            Blockly.WidgetDiv.show(widgetOwner, this.sourceBlock_.RTL, () => {
                 fv.hide();
                 widgetDiv.classList.remove("sound-effect-editor-widget");
                 widgetDiv.style.transform = "";
@@ -15238,7 +15273,7 @@ var pxtblockly;
             const opts = {
                 onClose: () => {
                     fv.hide();
-                    Blockly.WidgetDiv.hideIfOwner(this);
+                    Blockly.WidgetDiv.hideIfOwner(widgetOwner);
                 },
                 onSoundChange: (newSound) => {
                     this.mostRecentValue = newSound;
@@ -15263,6 +15298,7 @@ var pxtblockly;
             widgetDiv.style.height = "40rem";
             widgetDiv.style.display = "block";
             widgetDiv.style.transition = "transform 0.25s ease 0s, opacity 0.25s ease 0s";
+            widgetDiv.style.borderRadius = "";
             fv.onHide(() => {
                 // do nothing
             });
@@ -15272,7 +15308,7 @@ var pxtblockly;
             if (divBounds.height > injectDivBounds.height) {
                 widgetDiv.style.height = "";
                 widgetDiv.style.top = `calc(1rem - ${animationDistance}px)`;
-                widgetDiv.style.bottom = "1rem";
+                widgetDiv.style.bottom = `calc(1rem + ${animationDistance}px)`;
             }
             else {
                 if (divBounds.bottom > injectDivBounds.bottom || divBounds.top < injectDivBounds.top) {
@@ -15280,7 +15316,8 @@ var pxtblockly;
                     widgetDiv.style.top = (injectDivBounds.top + (injectDivBounds.height / 2) - (divBounds.height / 2)) - animationDistance + "px";
                 }
             }
-            if (divBounds.width > injectDivBounds.width) {
+            const toolboxWidth = block.workspace.getToolbox().getWidth();
+            if (divBounds.width > injectDivBounds.width - toolboxWidth) {
                 widgetDiv.style.width = "";
                 widgetDiv.style.left = "1rem";
                 widgetDiv.style.right = "1rem";
@@ -15290,7 +15327,6 @@ var pxtblockly;
                 if (divBounds.left + divBounds.width >= injectDivBounds.right) {
                     // If so, try and place to the left of the block instead of the right
                     const blockLeft = pxtblockly.workspaceToScreenCoordinates(block.workspace, new Blockly.utils.Coordinate(bounds.left, bounds.top));
-                    const toolboxWidth = block.workspace.getToolbox().getWidth();
                     const workspaceLeft = injectDivBounds.left + toolboxWidth;
                     if (blockLeft.x - divBounds.width - 20 > workspaceLeft) {
                         widgetDiv.style.left = (blockLeft.x - divBounds.width - 20) + "px";
@@ -15301,6 +15337,8 @@ var pxtblockly;
                     }
                 }
             }
+            const finalDimensions = widgetDiv.getBoundingClientRect();
+            bbox = new Blockly.utils.Rect(finalDimensions.top, finalDimensions.bottom, finalDimensions.left, finalDimensions.right);
             requestAnimationFrame(() => {
                 widgetDiv.style.opacity = "1";
                 widgetDiv.style.transform = `translateY(${animationDistance}px)`;

package/built/pxtblocks.d.ts

@@ -1144,6 +1144,7 @@ declare namespace pxtblockly {
     }
     class FieldSoundEffect extends FieldBase<FieldSoundEffectParams> {
         protected mostRecentValue: pxt.assets.Sound;
+        protected drawnSound: pxt.assets.Sound;
         protected onInit(): void;
         protected onDispose(): void;
         protected onValueChanged(newValue: string): string;
@@ -1159,6 +1160,7 @@ declare namespace pxtblockly {
         protected fireFieldDropdownUpdate(name: string, oldValue: string): void;
         protected readCurrentSound(): pxt.assets.Sound;
         protected readBlockDataSound(): pxt.assets.Sound;
+        protected onWorkspaceChange: (ev: Blockly.Events.BlockChange) => void;
     }
 }
 declare namespace pxtblockly {

package/built/pxtblocks.js

@@ -7327,6 +7327,7 @@ var pxt;
             state.setEventsEnabled(true);
             Blockly.Extensions.apply('inline-svgs', b, false);
             let updatingInputs = false;
+            let firstRender = true;
             appendMutation(b, {
                 mutationToDom: (el) => {
                     // The reason we store the inputsInitialized variable separately from visibleOptions
@@ -7382,9 +7383,12 @@ var pxt;
             b.render = (opt_bubble) => {
                 if (updatingInputs)
                     return;
-                updatingInputs = true;
-                updateShape(0, undefined, true);
-                updatingInputs = false;
+                if (firstRender) {
+                    firstRender = false;
+                    updatingInputs = true;
+                    updateShape(0, undefined, true);
+                    updatingInputs = false;
+                }
                 Blockly.BlockSvg.prototype.render.call(b, opt_bubble);
             };
             // Set skipRender to true if the block is still initializing. Otherwise
@@ -11581,6 +11585,17 @@ var pxtblockly;
     const Y_PADDING = 4;
     const PREVIEW_WIDTH = TOTAL_WIDTH - X_PADDING * 5 - MUSIC_ICON_WIDTH;
     class FieldSoundEffect extends pxtblockly.FieldBase {
+        constructor() {
+            super(...arguments);
+            this.onWorkspaceChange = (ev) => {
+                if (ev.type !== Blockly.Events.CHANGE)
+                    return;
+                const block = this.sourceBlock_.workspace.getBlockById(ev.blockId);
+                if (!block || block !== this.sourceBlock_ && block.parentBlock_ !== this.sourceBlock_)
+                    return;
+                this.redrawPreview();
+            };
+        }
         onInit() {
             if (!this.options)
                 this.options = {};
@@ -11601,8 +11616,10 @@ var pxtblockly;
             if (!this.options.effectFieldName)
                 this.options.effectFieldName = "effect";
             this.redrawPreview();
+            this.sourceBlock_.workspace.addChangeListener(this.onWorkspaceChange);
         }
         onDispose() {
+            this.sourceBlock_.workspace.removeChangeListener(this.onWorkspaceChange);
         }
         onValueChanged(newValue) {
             return newValue;
@@ -11610,6 +11627,17 @@ var pxtblockly;
         redrawPreview() {
             if (!this.fieldGroup_)
                 return;
+            if (this.drawnSound) {
+                const current = this.readCurrentSound();
+                if (current.startFrequency === this.drawnSound.startFrequency &&
+                    current.endFrequency === this.drawnSound.endFrequency &&
+                    current.startVolume === this.drawnSound.startVolume &&
+                    current.endVolume === this.drawnSound.endVolume &&
+                    current.wave === this.drawnSound.wave &&
+                    current.interpolation === this.drawnSound.interpolation) {
+                    return;
+                }
+            }
             pxsim.U.clear(this.fieldGroup_);
             const bg = new svg.Rect()
                 .at(X_PADDING, Y_PADDING)
@@ -11626,10 +11654,11 @@ var pxtblockly;
                 .fill("#FFF")
                 .at(0, 0);
             clip.appendChild(clipRect);
+            this.drawnSound = this.readCurrentSound();
             const path = new svg.Path()
                 .stroke("grey", 2)
                 .fill("none")
-                .setD(pxt.assets.renderSoundPath(this.readCurrentSound(), TOTAL_WIDTH - X_PADDING * 4 - MUSIC_ICON_WIDTH, TOTAL_HEIGHT - Y_PADDING * 2))
+                .setD(pxt.assets.renderSoundPath(this.drawnSound, TOTAL_WIDTH - X_PADDING * 4 - MUSIC_ICON_WIDTH, TOTAL_HEIGHT - Y_PADDING * 2))
                 .clipPath("url('#" + clipPathId + "')");
             const g = new svg.Group()
                 .translate(MUSIC_ICON_WIDTH + X_PADDING * 3, Y_PADDING + 3);
@@ -11647,7 +11676,13 @@ var pxtblockly;
         showEditor_() {
             const initialSound = this.readCurrentSound();
             Blockly.Events.disable();
-            Blockly.WidgetDiv.show(this, this.sourceBlock_.RTL, () => {
+            let bbox;
+            // This is due to the changes in https://github.com/microsoft/pxt-blockly/pull/289
+            // which caused the widgetdiv to jump around if any fields underneath changed size
+            let widgetOwner = {
+                getScaledBBox: () => bbox
+            };
+            Blockly.WidgetDiv.show(widgetOwner, this.sourceBlock_.RTL, () => {
                 fv.hide();
                 widgetDiv.classList.remove("sound-effect-editor-widget");
                 widgetDiv.style.transform = "";
@@ -11676,7 +11711,7 @@ var pxtblockly;
             const opts = {
                 onClose: () => {
                     fv.hide();
-                    Blockly.WidgetDiv.hideIfOwner(this);
+                    Blockly.WidgetDiv.hideIfOwner(widgetOwner);
                 },
                 onSoundChange: (newSound) => {
                     this.mostRecentValue = newSound;
@@ -11701,6 +11736,7 @@ var pxtblockly;
             widgetDiv.style.height = "40rem";
             widgetDiv.style.display = "block";
             widgetDiv.style.transition = "transform 0.25s ease 0s, opacity 0.25s ease 0s";
+            widgetDiv.style.borderRadius = "";
             fv.onHide(() => {
                 // do nothing
             });
@@ -11710,7 +11746,7 @@ var pxtblockly;
             if (divBounds.height > injectDivBounds.height) {
                 widgetDiv.style.height = "";
                 widgetDiv.style.top = `calc(1rem - ${animationDistance}px)`;
-                widgetDiv.style.bottom = "1rem";
+                widgetDiv.style.bottom = `calc(1rem + ${animationDistance}px)`;
             }
             else {
                 if (divBounds.bottom > injectDivBounds.bottom || divBounds.top < injectDivBounds.top) {
@@ -11718,7 +11754,8 @@ var pxtblockly;
                     widgetDiv.style.top = (injectDivBounds.top + (injectDivBounds.height / 2) - (divBounds.height / 2)) - animationDistance + "px";
                 }
             }
-            if (divBounds.width > injectDivBounds.width) {
+            const toolboxWidth = block.workspace.getToolbox().getWidth();
+            if (divBounds.width > injectDivBounds.width - toolboxWidth) {
                 widgetDiv.style.width = "";
                 widgetDiv.style.left = "1rem";
                 widgetDiv.style.right = "1rem";
@@ -11728,7 +11765,6 @@ var pxtblockly;
                 if (divBounds.left + divBounds.width >= injectDivBounds.right) {
                     // If so, try and place to the left of the block instead of the right
                     const blockLeft = pxtblockly.workspaceToScreenCoordinates(block.workspace, new Blockly.utils.Coordinate(bounds.left, bounds.top));
-                    const toolboxWidth = block.workspace.getToolbox().getWidth();
                     const workspaceLeft = injectDivBounds.left + toolboxWidth;
                     if (blockLeft.x - divBounds.width - 20 > workspaceLeft) {
                         widgetDiv.style.left = (blockLeft.x - divBounds.width - 20) + "px";
@@ -11739,6 +11775,8 @@ var pxtblockly;
                     }
                 }
             }
+            const finalDimensions = widgetDiv.getBoundingClientRect();
+            bbox = new Blockly.utils.Rect(finalDimensions.top, finalDimensions.bottom, finalDimensions.left, finalDimensions.right);
             requestAnimationFrame(() => {
                 widgetDiv.style.opacity = "1";
                 widgetDiv.style.transform = `translateY(${animationDistance}px)`;

package/built/pxtlib.d.ts

@@ -1267,7 +1267,7 @@ declare namespace pxt.github {
     function listRefsExtAsync(repopath: string, namespace?: string, useProxy?: boolean, noCache?: boolean): Promise<RefsResult>;
     function pkgConfigAsync(repopath: string, tag: string, config: pxt.PackagesConfig): Promise<PackageConfig>;
     function downloadPackageAsync(repoWithTag: string, config: pxt.PackagesConfig): Promise<CachedPackage>;
-    function downloadLatestPackageAsync(repo: ParsedRepo): Promise<{
+    function downloadLatestPackageAsync(repo: ParsedRepo, useProxy?: boolean, noCache?: boolean): Promise<{
         version: string;
         config: pxt.PackageConfig;
     }>;

package/built/pxtlib.js

@@ -10260,9 +10260,9 @@ var pxt;
             return cached;
         }
         github.downloadPackageAsync = downloadPackageAsync;
-        async function downloadLatestPackageAsync(repo) {
+        async function downloadLatestPackageAsync(repo, useProxy, noCache) {
             const packageConfig = await pxt.packagesConfigAsync();
-            const tag = await pxt.github.latestVersionAsync(repo.slug, packageConfig);
+            const tag = await pxt.github.latestVersionAsync(repo.slug, packageConfig, useProxy, noCache);
             // download package into cache
             const repoWithTag = `${repo.fullName}#${tag}`;
             await pxt.github.downloadPackageAsync(repoWithTag, packageConfig);

package/built/pxtsim.js

@@ -8039,7 +8039,7 @@ var pxsim;
                                     return this.buffer;
                                 }
                                 // Synthesize a sample
-                                let s = this.effect.tone.tonePrint(this.effect.tone.parameter, this.position);
+                                let s = this.effect.tone.tonePrint(this.effect.tone.parameter, Math.max(this.position, 0));
                                 // Apply volume scaling and OR mask (if specified).
                                 this.buffer[sample] = (((s * gain) + offset)); // | this.orMask;
                                 // Move on our pointers.