pxt-core 8.6.2 → 8.6.3

package/package.json

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

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/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>