pxt-core 8.4.2 → 8.4.4

package/react-common/styles/react-common-authcode-core.less

@@ -1,5 +1,5 @@
 /**
- * This file is the same as react-common-skillmap.less except it doesn't import any
+ * This file is the same as react-common-authcode.less except it doesn't import any
  * variables from the target. This is used for pxt-core's css build
  */
 

package/react-common/styles/react-common-authcode.less

@@ -1,5 +1,5 @@
 /**
- * Used for building react-common-skillmap.css
+ * Used for building react-common-authcode.css
  */
 
 // Import variables from pxt-core

package/react-common/styles/react-common-multiplayer-core.less

@@ -0,0 +1,10 @@
+/**
+ * This file is the same as react-common-multiplayer.less except it doesn't import any
+ * variables from the target. This is used for pxt-core's css build
+ */
+
+// Import variables from pxt-core
+@import "themes/default/globals/site.variables";
+@import "themes/pxt/globals/site.variables";
+
+@import "react-common.less";

package/react-common/styles/react-common-multiplayer.less

@@ -0,0 +1,12 @@
+/**
+ * Used for building react-common-multiplayer.css
+ */
+
+// Import variables from pxt-core
+@import "themes/default/globals/site.variables";
+@import "themes/pxt/globals/site.variables";
+
+// Import the variables from the target
+@import "site/globals/site.variables";
+
+@import "react-common.less";

package/theme/highcontrast.less

@@ -882,6 +882,12 @@
         }
     }
 
+    &.tabTutorial details {
+        background-color: @HCbackground !important;
+        border: 2px solid @HCtextColor !important;
+        color: @HCtextColor !important;
+    }
+
     .ui.label {
         background-color: @HCbackground !important;
         border: 2px solid @HCtextColor !important;

package/theme/music-editor/EditControls.less

@@ -0,0 +1,22 @@
+.music-editor-edit-controls {
+    display: flex;
+    flex-direction: row;
+    height: 2rem;
+    background-color: @music-editor-header-color;
+    justify-content: end;
+
+    .common-button.green {
+        padding: 0 2rem;
+        height: 100%;
+        margin: 0;
+        border-radius: 0;
+    }
+
+    button.menu-button i.fas, button.menu-button i.xicon {
+        font-size: 18px;
+    }
+
+    .common-input-group {
+        border-radius: 0;
+    }
+}

package/theme/music-editor/MusicEditor.less

@@ -0,0 +1,25 @@
+@import "EditControls";
+@import "Note";
+@import "NoteGroup";
+@import "PlaybackControls";
+@import "ScrollableWorkspace";
+@import "Staff";
+@import "Track";
+@import "TrackSelector";
+@import "Workspace";
+
+@music-editor-background-color: #fff;
+@music-editor-header-color: #e30fc0;
+@music-editor-header-border-color: #c10da3;
+
+.music-editor {
+    background: @music-editor-background-color;
+}
+
+.music-asset-editor {
+    .gallery-editor-header {
+        background-color: @music-editor-header-color;
+        border: 2px solid @music-editor-header-border-color;
+        border-bottom: none;
+    }
+}

package/theme/music-editor/Note.less

@@ -0,0 +1,16 @@
+.music-staff-note {
+    image {
+        image-rendering: optimizeSpeed;
+        image-rendering: -moz-crisp-edges;
+        image-rendering: -webkit-optimize-contrast;
+        image-rendering: optimize-contrast;
+        image-rendering: pixelated;
+        -ms-interpolation-mode: nearest-neighbor;
+    }
+
+    rect {
+        fill: #03adfc;
+        stroke: darken(#03adfc, 20%);
+        stroke-width: 3;
+    }
+}

package/theme/music-editor/NoteGroup.less

@@ -0,0 +1,7 @@
+.music-staff-note-group.music-note-playing {
+    rect {
+        fill: #47c965;
+        stroke: darken(#47c965, 20%);
+        stroke-width: 3;
+    }
+}

package/theme/music-editor/PlaybackControls.less

@@ -0,0 +1,55 @@
+.music-playback-controls {
+    padding: 0.5rem;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+
+    .common-input-wrapper {
+        display: flex;
+        flex-direction: row;
+
+        .common-input-label {
+            padding-right: 0.5rem;
+            font-size: 18px;
+            font-weight: 700;
+            user-select: none;
+        }
+
+        .common-input-group {
+            max-width: 3rem;
+        }
+    }
+
+    & > .common-input-wrapper {
+        margin-right: 0.5rem;
+    }
+}
+
+.music-playback-buttons {
+    margin-right: 0.5rem;
+}
+
+.music-playback-label {
+    padding-right: 0.5rem;
+    font-size: 18px;
+    font-weight: 700;
+    user-select: none;
+}
+
+.music-playback-measures {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    flex-grow: 1;
+    justify-content: end;
+
+    .common-button.menu-button {
+        color: black;
+        height: 2rem;
+        padding: 0.1rem;
+
+        i.fas {
+            margin: 0;
+        }
+    }
+}

package/theme/music-editor/ScrollableWorkspace.less

@@ -0,0 +1,3 @@
+.music-scrollable-workspace {
+    overflow-x: scroll;
+}

package/theme/music-editor/Staff.less

@@ -0,0 +1,31 @@
+.music-staff-row {
+    stroke-width: 3;
+    stroke: black;
+}
+
+.music-staff-beat {
+    stroke-width: 2;
+    stroke: #666666;
+    stroke-dasharray: 2;
+}
+
+.music-staff-beat.measure-start {
+    stroke: orange;
+}
+
+.music-staff-background {
+    fill: #c9e4e2;
+}
+
+.music-staff text {
+    user-select: none;
+}
+
+.music-playback-line {
+    stroke-width: 3;
+    stroke: white;
+}
+
+.music-playback-head {
+    transition: translate 0.06ms linear;
+}

package/theme/music-editor/TrackSelector.less

@@ -0,0 +1,48 @@
+.music-track-selector {
+    padding: 0.5rem;
+    display: flex;
+    flex-direction: row;
+
+    .common-button.common-dropdown-button {
+        border: 3px solid #000;
+        min-width: 6rem;
+        height: 100%;
+    }
+
+    .music-track-grid {
+        flex-grow: 1;
+        display: flex;
+        flex-direction: row;
+        justify-content: end;
+        align-items: center;
+    }
+
+    .music-track-grid-label {
+        padding-right: 0.5rem;
+        font-size: 18px;
+        font-weight: 700;
+        user-select: none;
+    }
+}
+
+.common-button.music-track-button {
+    border: 3px solid #000;
+    padding: 0.1rem;
+    border-radius: 0;
+
+    img {
+        image-rendering: optimizeSpeed;
+        image-rendering: -moz-crisp-edges;
+        image-rendering: -webkit-optimize-contrast;
+        image-rendering: optimize-contrast;
+        image-rendering: pixelated;
+        -ms-interpolation-mode: nearest-neighbor;
+
+        width: 2rem;
+        height: 2rem;
+    }
+}
+
+.common-button.music-track-button.selected {
+    border: 3px solid orange;
+}

package/theme/music-editor/Workspace.less

@@ -0,0 +1,3 @@
+.music-workspace {
+    height: 20rem;
+}

package/theme/pxt.less

@@ -38,6 +38,7 @@
 @import 'webusb';
 
 @import 'image-editor/imageEditor';
+@import 'music-editor/MusicEditor';
 @import "soundeffecteditor";
 
 @import "react-common";

package/theme/tutorial-sidebar.less

@@ -542,6 +542,9 @@
     color: @tutorialHintForegroundColor;
     background-color: @tutorialHintBackgroundColor;
     border-radius: .5rem;
+    summary {
+        cursor: pointer;
+    }
 }
 
 

package/webapp/public/multiplayer.html

@@ -0,0 +1 @@
+<!doctype html><html lang="@locale@"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><title>MakeCode Arcade Multiplayer</title><link rel="stylesheet" data-rtl="/blb/rtlsemantic.css" href="/blb/semantic.css"><link rel="stylesheet" href="/blb/icons.css"><link rel="stylesheet" href="/blb/react-common-multiplayer.css"><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png"><link rel="manifest" href="/site.webmanifest"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5"><meta name="msapplication-TileColor" content="#2d89ef"><meta name="theme-color" content="#ffffff"><script defer="defer" src="/blb/multiplayer/js/main.9f7f3192.js"></script><link href="/blb/multiplayer/css/main.1b9969ea.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><script type="text/javascript" src="/blb/target.js"></script><script type="text/javascript" src="/blb/pxtlib.js"></script><div id="root"></div><script>var pxtConfig=null</script></body></html>

package/webapp/public/run.html

@@ -119,6 +119,7 @@
         var server = !!/server(?:[:=])1/i.test(window.location.href);
         var mpRole = /[\&\?]mp=(server|client)/i.exec(window.location.href)?.[1]?.toLowerCase();
         var codeFromSrc = /code(?:[:=])([^&?]+)/i.exec(window.location.href);
+        var additionalSimParams = /simParams(?:[:=])([^&?]+)/i.exec(window.location.href)?.[1];
         var codeFromData = undefined;
         var assetJsonFromData = undefined;
         try {
@@ -132,6 +133,13 @@
         }
         var code = codeFromData || (codeFromSrc ? codeFromSrc[1] : undefined);
 
+
+        if (additionalSimParams) {
+            additionalSimParams = decodeURIComponent(additionalSimParams);
+            if (!/^[a-z0-9=\-:&]+$/i.test(additionalSimParams)) {
+                additionalSimParams = undefined;
+            }
+        }
         if (!id && !code && !debugSim && !server) {
             console.error("missing id or code");
             loading.textContent = 'Oops, wrong arguments...';
@@ -190,7 +198,9 @@
                                 fullScreen: fullScreen,
                                 builtJsInfo: builtSimJs,
                                 single: single,
-                                hideSimButtons: hideSimButtons
+                                hideSimButtons: hideSimButtons,
+                                autofocus: autofocus,
+                                additionalQueryParameters: additionalSimParams
                             };
                             console.log('simulating project')
                             pxt.runner.simulateAsync(sims, options).then(function() {
@@ -247,7 +257,8 @@
                         builtJsInfo: builtSimJs,
                         single: single,
                         hideSimButtons: hideSimButtons,
-                        autofocus: autofocus
+                        autofocus: autofocus,
+                        additionalQueryParameters: additionalSimParams
                     };
                     console.log('simulating script')
                     pxt.runner.simulateAsync(sims, options).then(function() {

package/webapp/public/skillmap.html

@@ -28,5 +28,5 @@
     <!-- end usabilla live embed code -->
 
     <!-- @include thin-footer.html -->
-  <script>!function(e){function r(r){for(var n,l,i=r[0],a=r[1],p=r[2],c=0,s=[];c<i.length;c++)l=i[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in a)Object.prototype.hasOwnProperty.call(a,n)&&(e[n]=a[n]);for(f&&f(r);s.length;)s.shift()();return u.push.apply(u,p||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,i=1;i<t.length;i++){var a=t[i];0!==o[a]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={1:0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="/";var i=this.webpackJsonpskillsmap=this.webpackJsonpskillsmap||[],a=i.push.bind(i);i.push=r,i=i.slice();for(var p=0;p<i.length;p++)r(i[p]);var f=a;t()}([])</script><script src="/blb/skillmap/js/2.d9c1cec5.chunk.js"></script><script src="/blb/skillmap/js/main.6eec9e0f.chunk.js"></script></body>
+  <script>!function(e){function r(r){for(var n,l,i=r[0],a=r[1],p=r[2],c=0,s=[];c<i.length;c++)l=i[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in a)Object.prototype.hasOwnProperty.call(a,n)&&(e[n]=a[n]);for(f&&f(r);s.length;)s.shift()();return u.push.apply(u,p||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,i=1;i<t.length;i++){var a=t[i];0!==o[a]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={1:0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="/";var i=this.webpackJsonpskillsmap=this.webpackJsonpskillsmap||[],a=i.push.bind(i);i.push=r,i=i.slice();for(var p=0;p<i.length;p++)r(i[p]);var f=a;t()}([])</script><script src="/blb/skillmap/js/2.d9c1cec5.chunk.js"></script><script src="/blb/skillmap/js/main.a6cf40e1.chunk.js"></script></body>
 </html>