pxt-core 8.6.2 → 8.6.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pxt-core",
-  "version": "8.6.2",
+  "version": "8.6.4",
   "description": "Microsoft MakeCode provides Blocks / JavaScript / Python tools and editors",
   "keywords": [
     "TypeScript",

package/react-common/components/palette/ColorPickerField.tsx

@@ -45,7 +45,7 @@ export const ColorPickerField = (props: ColorPickerFieldProps) => {
             <input className="color-input" type="color" value={currentColor || color} onBlur={onBlur} onChange={onColorPickerChanged} />
             <Input initialValue={currentColor || color.toUpperCase()} onChange={onTextInputChanged} />
         </div>
-        <Button className="circle-button" title={lf("Move color up")} leftIcon="fas fa-arrow-up" onClick={() => onMoveColor(true)} />
-        <Button className="circle-button" title={lf("Move color down")} leftIcon="fas fa-arrow-down" onClick={() => onMoveColor(false)} />
+        <Button className="circle-button" title={lf("Move color up")} leftIcon="fas fa-arrow-up" onClick={() => onMoveColor(true)} disabled={index === 1}/>
+        <Button className="circle-button" title={lf("Move color down")} leftIcon="fas fa-arrow-down" onClick={() => onMoveColor(false)} disabled={index === 15}/>
     </div>
 }

package/react-common/components/share/Share.tsx

@@ -23,7 +23,7 @@ export interface ShareProps {
     hasProjectBeenPersistentShared?: boolean;
     anonymousShareByDefault?: boolean;
     isMultiplayerGame?: boolean; // Arcade: Does the game being shared have multiplayer enabled?
-    forMultiplayer?: boolean; // Arcade: Was the share dialog opened specifically for hosting a multiplayer game?
+    kind?: "multiplayer" | "vscode" | "share"; // Arcade: Was the share dialog opened specifically for hosting a multiplayer game?
     setAnonymousSharePreference?: (anonymousByDefault: boolean) => void;
     simRecorder: SimRecorder;
     publishAsync: (name: string, screenshotUri?: string, forceAnonymous?: boolean) => Promise<ShareData>;
@@ -41,7 +41,7 @@ export const Share = (props: ShareProps) => {
         anonymousShareByDefault,
         setAnonymousSharePreference,
         isMultiplayerGame,
-        forMultiplayer,
+        kind,
         onClose
     } = props;
 
@@ -52,7 +52,7 @@ export const Share = (props: ShareProps) => {
             simRecorder={simRecorder}
             publishAsync={publishAsync}
             isMultiplayerGame={isMultiplayerGame}
-            forMultiplayer={forMultiplayer}
+            kind={kind}
             hasProjectBeenPersistentShared={hasProjectBeenPersistentShared}
             anonymousShareByDefault={anonymousShareByDefault}
             setAnonymousSharePreference={setAnonymousSharePreference}

package/react-common/components/share/ShareInfo.tsx

@@ -13,6 +13,7 @@ import { SimRecorder } from "./ThumbnailRecorder";
 import { MultiplayerConfirmation } from "./MultiplayerConfirmation";
 import { addGameToKioskAsync } from "./Kiosk";
 import { pushNotificationMessage } from "../Notification";
+import { classList } from "../util";
 
 export interface ShareInfoProps {
     projectName: string;
@@ -23,7 +24,7 @@ export interface ShareInfoProps {
     simRecorder: SimRecorder;
     publishAsync: (name: string, screenshotUri?: string, forceAnonymous?: boolean) => Promise<ShareData>;
     isMultiplayerGame?: boolean; // Arcade: Does the game being shared have multiplayer enabled?
-    forMultiplayer?: boolean; // Arcade: Was the share dialog opened specifically for hosting a multiplayer game?
+    kind?: "multiplayer" | "vscode" | "share"; // Arcade: Was the share dialog opened specifically for hosting a multiplayer game?
     anonymousShareByDefault?: boolean;
     setAnonymousSharePreference?: (anonymousByDefault: boolean) => void;
     onClose: () => void;
@@ -41,7 +42,7 @@ export const ShareInfo = (props: ShareInfoProps) => {
         anonymousShareByDefault,
         setAnonymousSharePreference,
         isMultiplayerGame,
-        forMultiplayer,
+        kind,
         onClose,
     } = props;
     const [ name, setName ] = React.useState(projectName);
@@ -236,7 +237,7 @@ export const ShareInfo = (props: ShareInfoProps) => {
         if (!publishedShareData?.error) setShareState("publish");
         else setShareState("share")
 
-        if (forMultiplayer) {
+        if (kind === "multiplayer") {
             // If we're in the "for multiplayer" context, we want to close the share dialog after launching the multiplayer session.
             onClose();
         }
@@ -350,18 +351,29 @@ export const ShareInfo = (props: ShareInfoProps) => {
                         <div className="project-share-publish-actions">
                             {shareState === "share" &&
                             <>
-                                {pxt.appTarget?.appTheme?.multiplayer && (isMultiplayerGame || forMultiplayer) &&
-                                    <Button className={(forMultiplayer ? "primary share-publish-button share-host-button" : "primary inverted text-only share-publish-button share-host-button")}
+                                {pxt.appTarget?.appTheme?.multiplayer && (isMultiplayerGame || kind === "multiplayer") &&
+                                    <Button className={
+                                            classList(
+                                                "primary share-host-button",
+                                                kind === "share" && "primary inverted text-only",
+                                                kind === "multiplayer" && "share-publish-button"
+                                            )
+                                        }
                                         title={lf("Host a multiplayer game")}
                                         label={lf("Host a multiplayer game")}
                                         leftIcon={"xicon multiplayer"}
                                         onClick={handleMultiplayerShareClick} />
                                 }
-                                {!forMultiplayer && <Button className="primary share-publish-button"
+                                {kind === "share" && <Button className="primary share-publish-button"
                                         title={lf("Share Project")}
                                         label={lf("Share Project")}
                                         onClick={handlePublishClick} />
                                 }
+                                {kind === "vscode" && <Button className="primary share-publish-button"
+                                        title={lf("Open in VS Code")}
+                                        label={lf("Open in VS Code")}
+                                        onClick={handlePublishClick} />
+                                }
                             </>
                             }
                             { shareState === "publishing" &&

package/react-common/styles/palette/ColorPickerField.less

@@ -3,6 +3,9 @@
     grid-template-columns: 0.5fr 8fr 1fr 1fr;
     align-items: center;
     padding: 0.1rem 0rem;
+    i.fas {
+        margin: 0;
+    }
 }
 
 .common-color-inputs {

package/webapp/public/index.html

@@ -107,7 +107,29 @@
             "rtlblockly.css": "/blb/rtlblockly.css",
             "gifjs/gif.js": "/blb/gifjs/gif.js",
             "qrcode/qrcode.min.js": "/blb/qrcode/qrcode.min.js",
-            "zip.js/zip.min.js": "/blb/zip.js/zip.min.js"
+            "zip.js/zip.min.js": "/blb/zip.js/zip.min.js",
+            "music-editor/apple.png": "/blb/music-editor/apple.png",
+            "music-editor/burger.png": "/blb/music-editor/burger.png",
+            "music-editor/cake.png": "/blb/music-editor/cake.png",
+            "music-editor/car.png": "/blb/music-editor/car.png",
+            "music-editor/cat.png": "/blb/music-editor/cat.png",
+            "music-editor/cherry.png": "/blb/music-editor/cherry.png",
+            "music-editor/clam.png": "/blb/music-editor/clam.png",
+            "music-editor/computer.png": "/blb/music-editor/computer.png",
+            "music-editor/crab.png": "/blb/music-editor/crab.png",
+            "music-editor/dog.png": "/blb/music-editor/dog.png",
+            "music-editor/duck.png": "/blb/music-editor/duck.png",
+            "music-editor/egg.png": "/blb/music-editor/egg.png",
+            "music-editor/explosion.png": "/blb/music-editor/explosion.png",
+            "music-editor/fish.png": "/blb/music-editor/fish.png",
+            "music-editor/ice-cream.png": "/blb/music-editor/ice-cream.png",
+            "music-editor/lemon.png": "/blb/music-editor/lemon.png",
+            "music-editor/snake.png": "/blb/music-editor/snake.png",
+            "music-editor/star.png": "/blb/music-editor/star.png",
+            "music-editor/strawberry.png": "/blb/music-editor/strawberry.png",
+            "music-editor/taco.png": "/blb/music-editor/taco.png",
+            "music-editor/bass-clef.svg": "/blb/music-editor/bass-clef.svg",
+            "music-editor/treble-clef.svg": "/blb/music-editor/treble-clef.svg",
         }
     </script>
 </body>

package/webapp/public/music-editor/bass-clef.svg

@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="112mm" height="132mm" style="shape-rendering:geometricPrecision;text-rendering:geometricPrecision;image-rendering:optimizeQuality;fill-rule:evenodd" viewBox="0 0 8268 11692" id="svg2">
+  <defs id="defs4">
+    <style type="text/css" id="style6">
+      .str0{stroke:#131516;stroke-width:42}.fil0{fill:none}
+    </style>
+  </defs>
+  <g id="Layer 1" transform="matrix(4.58848 0 0 4.57504 -4898.431 -28736.72)">
+    <path d="M1239 8245c158-107 276-188 352-244 76-55 156-124 238-206s151-175 207-278c44-76 82-164 113-264 31-99 47-195 50-286 0-85-11-166-34-242-22-77-60-140-114-191-54-50-124-75-211-75-84 0-163 17-237 50-73 34-125 88-154 164 0 7-4 16-10 29 2 16 10 28 25 37s28 13 40 13c6 0 23-3 49-9 27-6 49-10 67-10 53 0 100 19 143 56 42 37 63 82 63 135 0 38-11 74-32 107s-50 60-87 79c-37 20-78 29-122 29-80 0-148-24-204-73-55-50-83-113-83-192 0-101 31-188 92-262 62-74 140-129 236-166 95-38 191-56 289-56 107 0 209 27 304 82 96 54 171 129 227 222 56 94 85 194 85 302 0 192-64 370-192 535s-286 308-475 430c-126 83-330 195-611 336l-14-52zm1389-1547c0-36 13-66 39-90 25-25 56-37 93-37 32 0 62 14 89 41 27 26 40 57 40 91 0 36-14 67-40 92-28 24-59 36-94 36-37 0-67-12-91-39-24-26-36-57-36-94zm0 524c0-36 13-67 37-91 25-25 56-37 95-37 32 0 61 13 89 40 26 27 40 56 40 88 0 39-13 70-38 95-26 25-56 38-91 38-39 0-70-13-95-37-24-24-37-56-37-96z" id="path19" style="fill:#131516;stroke:#131516;stroke-width:3"/>
+  </g>
+</svg>

package/webapp/public/music-editor/treble-clef.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="110mm" height="216mm" style="shape-rendering:geometricPrecision;text-rendering:geometricPrecision;image-rendering:optimizeQuality;fill-rule:evenodd" viewBox="0 0 8268 11692" id="svg2"><defs id="defs4"><style type="text/css" id="style6">.str1{stroke:#131516;stroke-width:42}.fil1{fill:none}</style></defs><g id="Layer 1" transform="matrix(3.81735 0 0 3.8081 -3380.452 -23251.63)"><path d="M2002 7851c-61 17-116 55-167 113-51 59-76 124-76 194 0 44 15 94 44 147 29 54 73 93 130 118 19 4 28 14 28 28 0 5-7 10-24 14-91-23-166-72-224-145-58-74-88-158-90-254 3-103 34-199 93-287 60-89 137-152 231-189l-69-355c-154 128-279 261-376 401-97 139-147 290-151 453 2 73 17 144 45 212 28 69 70 131 126 188 113 113 260 172 439 178 61-4 126-15 196-33l-155-783zm72-10 156 769c154-62 231-197 231-403-9-69-29-131-63-186-33-56-77-100-133-132s-119-48-191-48zm-205-1040c33-20 71-55 112-104 41-48 81-105 119-169 39-65 70-131 93-198 23-66 34-129 34-187 0-25-2-50-7-72-4-36-15-64-34-83-19-18-43-28-73-28-60 0-114 37-162 111-37 64-68 140-90 226-23 87-36 173-38 260 5 99 21 180 46 244zm-63 58c-45-162-70-327-75-495 1-108 12-209 33-303 20-94 49-175 87-245 37-70 80-123 128-159 43-32 74-49 91-49 13 0 24 5 34 14s23 24 39 44c119 169 179 373 179 611 0 113-15 223-45 333-29 109-72 213-129 310-58 98-126 183-205 256l81 394c44-5 74-9 91-9 76 0 144 16 207 48s117 75 161 130c44 54 78 116 102 186 23 70 36 143 36 219 0 118-31 226-93 323s-155 168-280 214c8 49 22 120 43 211 20 92 35 165 45 219s14 106 14 157c0 79-19 149-57 211-39 62-91 110-157 144-65 34-137 51-215 51-110 0-206-31-288-92-82-62-126-145-130-251 3-47 14-91 34-133s47-76 82-102c34-27 75-41 122-44 39 0 76 11 111 32 34 22 62 51 83 88 20 37 31 78 31 122 0 59-20 109-60 150s-91 62-152 62h-23c39 60 103 91 192 91 45 0 91-10 137-28 47-19 86-44 119-76s55-66 64-102c17-41 25-98 25-169 0-48-5-96-14-144-9-47-23-110-42-188-19-77-33-137-41-178-60 15-122 23-187 23-109 0-212-22-309-67s-182-107-256-187c-73-80-130-170-171-272-40-101-61-207-62-317 4-102 23-200 59-292 36-93 82-181 139-263s116-157 177-224c62-66 143-151 245-254z" id="path9" style="fill:#131516;stroke:#131516;stroke-width:3"/></g></svg>

package/webapp/public/skillmap.html

@@ -7,7 +7,7 @@
     <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-skillmap.css">
-  <script defer="defer" src="/blb/skillmap/js/main.a715c76c.js"></script><link href="/blb/skillmap/css/main.06a18ee8.css" rel="stylesheet"></head>
+  <script defer="defer" src="/blb/skillmap/js/main.2dfa3448.js"></script><link href="/blb/skillmap/css/main.06a18ee8.css" rel="stylesheet"></head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>