pxt-core 13.1.15 → 13.1.17

package/built/cli.js

@@ -1732,7 +1732,7 @@ function replaceStaticImagesInJsonBlob(cfg, staticAssetHandler) {
     return pxt.replaceStringsInJsonBlob(cfg, /^\.?\/static\/.+\.(png|gif|jpeg|jpg|svg|mp4|ico)$/i, staticAssetHandler);
 }
 function saveThemeJson(cfg, localDir, packaged) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
     cfg.appTheme.id = cfg.id;
     cfg.appTheme.title = cfg.title;
     cfg.appTheme.name = cfg.name;
@@ -1757,6 +1757,15 @@ function saveThemeJson(cfg, localDir, packaged) {
         targetStrings[theme.name] = theme.name;
     if (theme.description)
         targetStrings[theme.description] = theme.description;
+    for (const preset of (_b = (_a = cfg.simulator) === null || _a === void 0 ? void 0 : _a.themePresets) !== null && _b !== void 0 ? _b : []) {
+        targetStrings[`{id:simulator-theme-name}${preset.name}`] = preset.name;
+    }
+    for (const layout of (_d = (_c = cfg.simulator) === null || _c === void 0 ? void 0 : _c.themeLayouts) !== null && _d !== void 0 ? _d : []) {
+        targetStrings[`{id:simulator-layout-name}${layout.name}`] = layout.name;
+        for (const field of (_e = layout.colorFields) !== null && _e !== void 0 ? _e : []) {
+            targetStrings[`{id:simulator-theme-field}${field.label}`] = field.label;
+        }
+    }
     if (theme.homeScreenHero && typeof theme.homeScreenHero != "string") {
         const heroBannerCard = theme.homeScreenHero;
         if (heroBannerCard.title)
@@ -1767,7 +1776,7 @@ function saveThemeJson(cfg, localDir, packaged) {
             targetStrings[heroBannerCard.buttonLabel] = heroBannerCard.buttonLabel;
     }
     // add the labels for the target contributed types that appear in the block function create dialog
-    if ((_c = (_b = (_a = cfg.runtime) === null || _a === void 0 ? void 0 : _a.functionsOptions) === null || _b === void 0 ? void 0 : _b.extraFunctionEditorTypes) === null || _c === void 0 ? void 0 : _c.length) {
+    if ((_h = (_g = (_f = cfg.runtime) === null || _f === void 0 ? void 0 : _f.functionsOptions) === null || _g === void 0 ? void 0 : _g.extraFunctionEditorTypes) === null || _h === void 0 ? void 0 : _h.length) {
         cfg.runtime.functionsOptions.extraFunctionEditorTypes.forEach(extraType => {
             if (extraType.label) {
                 targetStrings[`{id:type}${extraType.label}`] = extraType.label;
@@ -1780,7 +1789,7 @@ function saveThemeJson(cfg, localDir, packaged) {
             }
         });
     }
-    if (typeof ((_d = cfg.appTheme) === null || _d === void 0 ? void 0 : _d.assetEditor) === "object") {
+    if (typeof ((_j = cfg.appTheme) === null || _j === void 0 ? void 0 : _j.assetEditor) === "object") {
         for (const key of Object.keys(cfg.appTheme.assetEditor)) {
             const entry = cfg.appTheme.assetEditor[key];
             if (typeof entry === "object" && entry.label) {
@@ -1788,7 +1797,7 @@ function saveThemeJson(cfg, localDir, packaged) {
             }
         }
     }
-    if ((_f = (_e = cfg.appTheme) === null || _e === void 0 ? void 0 : _e.pxtJsonOptions) === null || _f === void 0 ? void 0 : _f.length) {
+    if ((_l = (_k = cfg.appTheme) === null || _k === void 0 ? void 0 : _k.pxtJsonOptions) === null || _l === void 0 ? void 0 : _l.length) {
         for (const option of cfg.appTheme.pxtJsonOptions) {
             targetStrings[`{id:setting}${option.label}`] = option.label;
         }
@@ -1867,29 +1876,29 @@ ${gcards.map(gcard => `[${gcard.name}](${gcard.url})`).join(',\n')}
 
 `, { encoding: "utf8" });
         }
-        const multiplayerGames = (_g = targetConfig === null || targetConfig === void 0 ? void 0 : targetConfig.multiplayer) === null || _g === void 0 ? void 0 : _g.games;
+        const multiplayerGames = (_m = targetConfig === null || targetConfig === void 0 ? void 0 : targetConfig.multiplayer) === null || _m === void 0 ? void 0 : _m.games;
         for (const game of (multiplayerGames !== null && multiplayerGames !== void 0 ? multiplayerGames : [])) {
             if (game.title)
                 targetStrings[`{id:game-title}${game.title}`] = game.title;
             if (game.subtitle)
                 targetStrings[`{id:game-subtitle}${game.subtitle}`] = game.subtitle;
         }
-        const kioskGames = (_h = targetConfig === null || targetConfig === void 0 ? void 0 : targetConfig.kiosk) === null || _h === void 0 ? void 0 : _h.games;
+        const kioskGames = (_o = targetConfig === null || targetConfig === void 0 ? void 0 : targetConfig.kiosk) === null || _o === void 0 ? void 0 : _o.games;
         for (const game of (kioskGames !== null && kioskGames !== void 0 ? kioskGames : [])) {
             if (game.name)
                 targetStrings[`{id:game-name}${game.name}`] = game.name;
             if (game.description)
                 targetStrings[`{id:game-description}${game.description}`] = game.description;
         }
-        const approvedRepoLib = (_j = targetConfig === null || targetConfig === void 0 ? void 0 : targetConfig.packages) === null || _j === void 0 ? void 0 : _j.approvedRepoLib;
+        const approvedRepoLib = (_p = targetConfig === null || targetConfig === void 0 ? void 0 : targetConfig.packages) === null || _p === void 0 ? void 0 : _p.approvedRepoLib;
         for (const [extension, repoData] of Object.entries(approvedRepoLib !== null && approvedRepoLib !== void 0 ? approvedRepoLib : {})) {
-            for (const tag of ((_k = repoData.tags) !== null && _k !== void 0 ? _k : [])) {
+            for (const tag of ((_q = repoData.tags) !== null && _q !== void 0 ? _q : [])) {
                 targetStrings[`{id:extension-tag}${tag}`] = tag;
             }
         }
-        const builtinExtensionLib = (_l = targetConfig === null || targetConfig === void 0 ? void 0 : targetConfig.packages) === null || _l === void 0 ? void 0 : _l.builtinExtensionsLib;
+        const builtinExtensionLib = (_r = targetConfig === null || targetConfig === void 0 ? void 0 : targetConfig.packages) === null || _r === void 0 ? void 0 : _r.builtinExtensionsLib;
         for (const [extension, repoData] of Object.entries(builtinExtensionLib !== null && builtinExtensionLib !== void 0 ? builtinExtensionLib : {})) {
-            for (const tag of ((_m = repoData.tags) !== null && _m !== void 0 ? _m : [])) {
+            for (const tag of ((_s = repoData.tags) !== null && _s !== void 0 ? _s : [])) {
                 targetStrings[`{id:extension-tag}${tag}`] = tag;
             }
         }
@@ -2219,6 +2228,7 @@ function updateColorThemes(cfg) {
             id: themeData.id,
             name: themeData.name,
             weight: themeData.weight,
+            defaultSimulatorTheme: themeData.defaultSimulatorTheme,
             monacoBaseTheme: themeData.monacoBaseTheme,
             colors: themeData.colors
         };

package/built/pxt.js

@@ -97927,11 +97927,60 @@ var pxt;
         const X_PXT_TARGET = "x-pxt-target"; // header passed in auth rest calls.
         const INTERACTIVE_LOGIN_UNTIL = "interactive-login-until"; // hint whether to prompt user or try SSO first.
         let authDisabled = false;
+        auth.DEFAULT_SIMULATOR_THEME_COLOR_PROPERTIES = [
+            "background-color",
+            "button-stroke",
+            "text-color",
+            "button-fill",
+            "dpad-fill",
+            "joystick-handle-stroke",
+        ];
+        auth.DEFAULT_SIMULATOR_LAYOUT = "default";
+        auth.SIMULATOR_THEMES_LOCAL_STORAGE_KEY = "user-pref:simulatorThemes";
+        function isSimulatorThemeColorProperty(property) {
+            return property !== "layout"
+                && property !== "skin"
+                && /^[a-z][a-z0-9-]*$/.test(property);
+        }
+        auth.isSimulatorThemeColorProperty = isSimulatorThemeColorProperty;
+        function isSimulatorThemeColor(value) {
+            return typeof value === "string" && /^#[0-9a-f]{6}$/i.test(value);
+        }
+        auth.isSimulatorThemeColor = isSimulatorThemeColor;
+        function isValidSimulatorTheme(theme) {
+            if (!theme || typeof theme !== "object")
+                return false;
+            const candidate = theme;
+            const colorProperties = Object.keys(candidate).filter(property => property !== "layout");
+            return colorProperties.length > 0
+                && colorProperties.every(property => isSimulatorThemeColorProperty(property)
+                    && isSimulatorThemeColor(candidate[property]))
+                && typeof candidate.layout === "string"
+                && !!candidate.layout;
+        }
+        auth.isValidSimulatorTheme = isValidSimulatorTheme;
+        function simulatorThemeColorsEqual(left, right) {
+            const leftProperties = Object.keys(left).filter(isSimulatorThemeColorProperty);
+            const rightProperties = Object.keys(right).filter(isSimulatorThemeColorProperty);
+            return leftProperties.length === rightProperties.length
+                && leftProperties.every(property => left[property] === right[property]);
+        }
+        auth.simulatorThemeColorsEqual = simulatorThemeColorsEqual;
+        function isValidSimulatorThemePreference(preference) {
+            if (!preference || typeof preference !== "object")
+                return false;
+            const candidate = preference;
+            return typeof candidate.presetId === "string"
+                && !!candidate.presetId
+                && isValidSimulatorTheme(candidate.theme);
+        }
+        auth.isValidSimulatorThemePreference = isValidSimulatorThemePreference;
         auth.DEFAULT_USER_PREFERENCES = () => ({
             language: pxt.appTarget.appTheme.defaultLocale,
             highContrast: false,
             screenReaderMode: false,
             colorThemeIds: {},
+            simulatorThemes: {},
             reader: "",
             skillmap: { mapProgress: {}, completedTags: {} },
             email: false
@@ -100446,7 +100495,11 @@ var ts;
                         stringFiles = [{ staticName: "bundled-strings.json", path: targetId + "/bundled-strings.json" }];
                         break;
                     case TranslationsKind.SkillMap:
-                        stringFiles = [{ staticName: "skillmap-strings.json", path: "/skillmap-strings.json" }];
+                        stringFiles = [
+                            { staticName: "strings.json", path: "strings.json" },
+                            { staticName: "target-strings.json", path: targetId + "/target-strings.json" },
+                            { staticName: "skillmap-strings.json", path: "/skillmap-strings.json" },
+                        ];
                         break;
                 }
                 let translations;
@@ -117338,6 +117391,10 @@ var pxt;
                 (isControllerMode() && editorReadonly));
         }
         shell.isReadOnly = isReadOnly;
+        function hideOrganizationLogos() {
+            return /[?&]hidelogos=1/i.test(window.location.href);
+        }
+        shell.hideOrganizationLogos = hideOrganizationLogos;
         function isNoProject() {
             return noDefaultProject;
         }
@@ -165956,7 +166013,7 @@ function replaceStaticImagesInJsonBlob(cfg, staticAssetHandler) {
     return pxt.replaceStringsInJsonBlob(cfg, /^\.?\/static\/.+\.(png|gif|jpeg|jpg|svg|mp4|ico)$/i, staticAssetHandler);
 }
 function saveThemeJson(cfg, localDir, packaged) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
     cfg.appTheme.id = cfg.id;
     cfg.appTheme.title = cfg.title;
     cfg.appTheme.name = cfg.name;
@@ -165981,6 +166038,15 @@ function saveThemeJson(cfg, localDir, packaged) {
         targetStrings[theme.name] = theme.name;
     if (theme.description)
         targetStrings[theme.description] = theme.description;
+    for (const preset of (_b = (_a = cfg.simulator) === null || _a === void 0 ? void 0 : _a.themePresets) !== null && _b !== void 0 ? _b : []) {
+        targetStrings[`{id:simulator-theme-name}${preset.name}`] = preset.name;
+    }
+    for (const layout of (_d = (_c = cfg.simulator) === null || _c === void 0 ? void 0 : _c.themeLayouts) !== null && _d !== void 0 ? _d : []) {
+        targetStrings[`{id:simulator-layout-name}${layout.name}`] = layout.name;
+        for (const field of (_e = layout.colorFields) !== null && _e !== void 0 ? _e : []) {
+            targetStrings[`{id:simulator-theme-field}${field.label}`] = field.label;
+        }
+    }
     if (theme.homeScreenHero && typeof theme.homeScreenHero != "string") {
         const heroBannerCard = theme.homeScreenHero;
         if (heroBannerCard.title)
@@ -165991,7 +166057,7 @@ function saveThemeJson(cfg, localDir, packaged) {
             targetStrings[heroBannerCard.buttonLabel] = heroBannerCard.buttonLabel;
     }
     // add the labels for the target contributed types that appear in the block function create dialog
-    if ((_c = (_b = (_a = cfg.runtime) === null || _a === void 0 ? void 0 : _a.functionsOptions) === null || _b === void 0 ? void 0 : _b.extraFunctionEditorTypes) === null || _c === void 0 ? void 0 : _c.length) {
+    if ((_h = (_g = (_f = cfg.runtime) === null || _f === void 0 ? void 0 : _f.functionsOptions) === null || _g === void 0 ? void 0 : _g.extraFunctionEditorTypes) === null || _h === void 0 ? void 0 : _h.length) {
         cfg.runtime.functionsOptions.extraFunctionEditorTypes.forEach(extraType => {
             if (extraType.label) {
                 targetStrings[`{id:type}${extraType.label}`] = extraType.label;
@@ -166004,7 +166070,7 @@ function saveThemeJson(cfg, localDir, packaged) {
             }
         });
     }
-    if (typeof ((_d = cfg.appTheme) === null || _d === void 0 ? void 0 : _d.assetEditor) === "object") {
+    if (typeof ((_j = cfg.appTheme) === null || _j === void 0 ? void 0 : _j.assetEditor) === "object") {
         for (const key of Object.keys(cfg.appTheme.assetEditor)) {
             const entry = cfg.appTheme.assetEditor[key];
             if (typeof entry === "object" && entry.label) {
@@ -166012,7 +166078,7 @@ function saveThemeJson(cfg, localDir, packaged) {
             }
         }
     }
-    if ((_f = (_e = cfg.appTheme) === null || _e === void 0 ? void 0 : _e.pxtJsonOptions) === null || _f === void 0 ? void 0 : _f.length) {
+    if ((_l = (_k = cfg.appTheme) === null || _k === void 0 ? void 0 : _k.pxtJsonOptions) === null || _l === void 0 ? void 0 : _l.length) {
         for (const option of cfg.appTheme.pxtJsonOptions) {
             targetStrings[`{id:setting}${option.label}`] = option.label;
         }
@@ -166091,29 +166157,29 @@ ${gcards.map(gcard => `[${gcard.name}](${gcard.url})`).join(',\n')}
 
 `, { encoding: "utf8" });
         }
-        const multiplayerGames = (_g = targetConfig === null || targetConfig === void 0 ? void 0 : targetConfig.multiplayer) === null || _g === void 0 ? void 0 : _g.games;
+        const multiplayerGames = (_m = targetConfig === null || targetConfig === void 0 ? void 0 : targetConfig.multiplayer) === null || _m === void 0 ? void 0 : _m.games;
         for (const game of (multiplayerGames !== null && multiplayerGames !== void 0 ? multiplayerGames : [])) {
             if (game.title)
                 targetStrings[`{id:game-title}${game.title}`] = game.title;
             if (game.subtitle)
                 targetStrings[`{id:game-subtitle}${game.subtitle}`] = game.subtitle;
         }
-        const kioskGames = (_h = targetConfig === null || targetConfig === void 0 ? void 0 : targetConfig.kiosk) === null || _h === void 0 ? void 0 : _h.games;
+        const kioskGames = (_o = targetConfig === null || targetConfig === void 0 ? void 0 : targetConfig.kiosk) === null || _o === void 0 ? void 0 : _o.games;
         for (const game of (kioskGames !== null && kioskGames !== void 0 ? kioskGames : [])) {
             if (game.name)
                 targetStrings[`{id:game-name}${game.name}`] = game.name;
             if (game.description)
                 targetStrings[`{id:game-description}${game.description}`] = game.description;
         }
-        const approvedRepoLib = (_j = targetConfig === null || targetConfig === void 0 ? void 0 : targetConfig.packages) === null || _j === void 0 ? void 0 : _j.approvedRepoLib;
+        const approvedRepoLib = (_p = targetConfig === null || targetConfig === void 0 ? void 0 : targetConfig.packages) === null || _p === void 0 ? void 0 : _p.approvedRepoLib;
         for (const [extension, repoData] of Object.entries(approvedRepoLib !== null && approvedRepoLib !== void 0 ? approvedRepoLib : {})) {
-            for (const tag of ((_k = repoData.tags) !== null && _k !== void 0 ? _k : [])) {
+            for (const tag of ((_q = repoData.tags) !== null && _q !== void 0 ? _q : [])) {
                 targetStrings[`{id:extension-tag}${tag}`] = tag;
             }
         }
-        const builtinExtensionLib = (_l = targetConfig === null || targetConfig === void 0 ? void 0 : targetConfig.packages) === null || _l === void 0 ? void 0 : _l.builtinExtensionsLib;
+        const builtinExtensionLib = (_r = targetConfig === null || targetConfig === void 0 ? void 0 : targetConfig.packages) === null || _r === void 0 ? void 0 : _r.builtinExtensionsLib;
         for (const [extension, repoData] of Object.entries(builtinExtensionLib !== null && builtinExtensionLib !== void 0 ? builtinExtensionLib : {})) {
-            for (const tag of ((_m = repoData.tags) !== null && _m !== void 0 ? _m : [])) {
+            for (const tag of ((_s = repoData.tags) !== null && _s !== void 0 ? _s : [])) {
                 targetStrings[`{id:extension-tag}${tag}`] = tag;
             }
         }
@@ -166443,6 +166509,7 @@ function updateColorThemes(cfg) {
             id: themeData.id,
             name: themeData.name,
             weight: themeData.weight,
+            defaultSimulatorTheme: themeData.defaultSimulatorTheme,
             monacoBaseTheme: themeData.monacoBaseTheme,
             colors: themeData.colors
         };

package/built/pxtlib.d.ts

@@ -71,6 +71,24 @@ declare namespace pxt.auth {
     type ColorThemeIdsState = {
         [targetId: string]: string;
     };
+    const DEFAULT_SIMULATOR_THEME_COLOR_PROPERTIES: readonly ["background-color", "button-stroke", "text-color", "button-fill", "dpad-fill", "joystick-handle-stroke"];
+    const DEFAULT_SIMULATOR_LAYOUT = "default";
+    type SimulatorTheme = Map<string> & {
+        layout: string;
+    };
+    type SimulatorThemePreference = {
+        presetId: string;
+        theme: SimulatorTheme;
+    };
+    type SimulatorThemesState = {
+        [targetId: string]: SimulatorThemePreference;
+    };
+    const SIMULATOR_THEMES_LOCAL_STORAGE_KEY = "user-pref:simulatorThemes";
+    function isSimulatorThemeColorProperty(property: string): boolean;
+    function isSimulatorThemeColor(value: unknown): value is string;
+    function isValidSimulatorTheme(theme: unknown): theme is SimulatorTheme;
+    function simulatorThemeColorsEqual(left: Map<string>, right: Map<string>): boolean;
+    function isValidSimulatorThemePreference(preference: unknown): preference is SimulatorThemePreference;
     type SetPrefResult = {
         success: boolean;
         res: UserPreferences;
@@ -83,6 +101,7 @@ declare namespace pxt.auth {
         highContrast?: boolean;
         screenReaderMode?: boolean;
         colorThemeIds?: ColorThemeIdsState;
+        simulatorThemes?: SimulatorThemesState;
         reader?: string;
         skillmap?: UserSkillmapState;
         badges?: UserBadgeState;
@@ -2641,6 +2660,7 @@ declare namespace pxt.shell {
     function isSandboxMode(): boolean;
     function isTimeMachineEmbed(): boolean;
     function isReadOnly(): boolean;
+    function hideOrganizationLogos(): boolean;
     function isNoProject(): boolean;
     function isControllerMode(): boolean;
     function getControllerMode(): ControllerMode;

package/built/pxtlib.js

@@ -206,11 +206,60 @@ var pxt;
         const X_PXT_TARGET = "x-pxt-target"; // header passed in auth rest calls.
         const INTERACTIVE_LOGIN_UNTIL = "interactive-login-until"; // hint whether to prompt user or try SSO first.
         let authDisabled = false;
+        auth.DEFAULT_SIMULATOR_THEME_COLOR_PROPERTIES = [
+            "background-color",
+            "button-stroke",
+            "text-color",
+            "button-fill",
+            "dpad-fill",
+            "joystick-handle-stroke",
+        ];
+        auth.DEFAULT_SIMULATOR_LAYOUT = "default";
+        auth.SIMULATOR_THEMES_LOCAL_STORAGE_KEY = "user-pref:simulatorThemes";
+        function isSimulatorThemeColorProperty(property) {
+            return property !== "layout"
+                && property !== "skin"
+                && /^[a-z][a-z0-9-]*$/.test(property);
+        }
+        auth.isSimulatorThemeColorProperty = isSimulatorThemeColorProperty;
+        function isSimulatorThemeColor(value) {
+            return typeof value === "string" && /^#[0-9a-f]{6}$/i.test(value);
+        }
+        auth.isSimulatorThemeColor = isSimulatorThemeColor;
+        function isValidSimulatorTheme(theme) {
+            if (!theme || typeof theme !== "object")
+                return false;
+            const candidate = theme;
+            const colorProperties = Object.keys(candidate).filter(property => property !== "layout");
+            return colorProperties.length > 0
+                && colorProperties.every(property => isSimulatorThemeColorProperty(property)
+                    && isSimulatorThemeColor(candidate[property]))
+                && typeof candidate.layout === "string"
+                && !!candidate.layout;
+        }
+        auth.isValidSimulatorTheme = isValidSimulatorTheme;
+        function simulatorThemeColorsEqual(left, right) {
+            const leftProperties = Object.keys(left).filter(isSimulatorThemeColorProperty);
+            const rightProperties = Object.keys(right).filter(isSimulatorThemeColorProperty);
+            return leftProperties.length === rightProperties.length
+                && leftProperties.every(property => left[property] === right[property]);
+        }
+        auth.simulatorThemeColorsEqual = simulatorThemeColorsEqual;
+        function isValidSimulatorThemePreference(preference) {
+            if (!preference || typeof preference !== "object")
+                return false;
+            const candidate = preference;
+            return typeof candidate.presetId === "string"
+                && !!candidate.presetId
+                && isValidSimulatorTheme(candidate.theme);
+        }
+        auth.isValidSimulatorThemePreference = isValidSimulatorThemePreference;
         auth.DEFAULT_USER_PREFERENCES = () => ({
             language: pxt.appTarget.appTheme.defaultLocale,
             highContrast: false,
             screenReaderMode: false,
             colorThemeIds: {},
+            simulatorThemes: {},
             reader: "",
             skillmap: { mapProgress: {}, completedTags: {} },
             email: false
@@ -2725,7 +2774,11 @@ var ts;
                         stringFiles = [{ staticName: "bundled-strings.json", path: targetId + "/bundled-strings.json" }];
                         break;
                     case TranslationsKind.SkillMap:
-                        stringFiles = [{ staticName: "skillmap-strings.json", path: "/skillmap-strings.json" }];
+                        stringFiles = [
+                            { staticName: "strings.json", path: "strings.json" },
+                            { staticName: "target-strings.json", path: targetId + "/target-strings.json" },
+                            { staticName: "skillmap-strings.json", path: "/skillmap-strings.json" },
+                        ];
                         break;
                 }
                 let translations;
@@ -19617,6 +19670,10 @@ var pxt;
                 (isControllerMode() && editorReadonly));
         }
         shell.isReadOnly = isReadOnly;
+        function hideOrganizationLogos() {
+            return /[?&]hidelogos=1/i.test(window.location.href);
+        }
+        shell.hideOrganizationLogos = hideOrganizationLogos;
         function isNoProject() {
             return noDefaultProject;
         }

package/built/pxtsim.d.ts

@@ -562,9 +562,13 @@ declare namespace pxsim {
     }
     interface SetSimThemeMessage extends SimulatorMessage {
         type: "setsimthemecolor";
-        part: "background-color" | "button-stroke" | "text-color" | "button-fill" | "dpad-fill";
+        part: string;
         color: string;
     }
+    interface SetSimulatorThemeMessage extends SimulatorMessage {
+        type: "setsimtheme";
+        theme: string | pxt.Map<string>;
+    }
     interface SetMuteButtonStateMessage extends SimulatorMessage {
         type: "setmutebuttonstate";
         state: "muted" | "unmuted" | "disabled";

package/built/react-common/components/controls/Card.d.ts

@@ -4,6 +4,7 @@ export interface CardProps extends ContainerProps {
     onClick?: () => void;
     tabIndex?: number;
     ariaLabelledBy?: string;
+    ariaPressed?: boolean;
     label?: React.ReactNode;
     labelClass?: string;
 }

package/built/react-common/components/controls/Modal.d.ts

@@ -13,6 +13,7 @@ export interface ModalAction {
 }
 export interface ModalProps extends ContainerProps {
     title: string;
+    hideTitle?: boolean;
     leftIcon?: string;
     ariaDescribedBy?: string;
     actions?: ModalAction[];

package/built/react-common/components/share/Share.d.ts

@@ -19,10 +19,11 @@ export interface ShareProps {
     hasProjectBeenPersistentShared?: boolean;
     anonymousShareByDefault?: boolean;
     isMultiplayerGame?: boolean;
+    simulatorTheme?: pxt.SimulatorTheme;
     kind?: "multiplayer" | "vscode" | "share";
     setAnonymousSharePreference?: (anonymousByDefault: boolean) => void;
     simRecorder: SimRecorder;
-    publishAsync: (name: string, description?: string, screenshotUri?: string, forceAnonymous?: boolean) => Promise<ShareData>;
+    publishAsync: (name: string, description?: string, screenshotUri?: string, forceAnonymous?: boolean, simulatorTheme?: pxt.SimulatorTheme) => Promise<ShareData>;
     onClose: () => void;
 }
 export declare const Share: (props: ShareProps) => JSX.Element;

package/built/react-common/components/share/ShareInfo.d.ts

@@ -7,8 +7,9 @@ export interface ShareInfoProps {
     isLoggedIn?: boolean;
     hasProjectBeenPersistentShared?: boolean;
     simRecorder: SimRecorder;
-    publishAsync: (name: string, description?: string, screenshotUri?: string, forceAnonymous?: boolean) => Promise<ShareData>;
+    publishAsync: (name: string, description?: string, screenshotUri?: string, forceAnonymous?: boolean, simulatorTheme?: pxt.SimulatorTheme) => Promise<ShareData>;
     isMultiplayerGame?: boolean;
+    simulatorTheme?: pxt.SimulatorTheme;
     kind?: "multiplayer" | "vscode" | "share";
     anonymousShareByDefault?: boolean;
     setAnonymousSharePreference?: (anonymousByDefault: boolean) => void;

package/built/react-common/components/theming/SimulatorThemePickerModal.d.ts

@@ -0,0 +1,15 @@
+import * as React from "react";
+export interface SimulatorThemePickerModalProps {
+    presets: pxt.SimulatorThemePreset[];
+    layouts?: pxt.SimulatorThemeLayout[];
+    initialPreference?: pxt.auth.SimulatorThemePreference;
+    defaultTheme?: pxt.SimulatorTheme;
+    accountTheme?: pxt.SimulatorTheme;
+    renderPreview: (theme: pxt.SimulatorTheme) => React.ReactNode;
+    onEditorThemeClicked?: () => void;
+    onUseAccountTheme?: () => void | Promise<void>;
+    onThemeChanged?: (preference: pxt.auth.SimulatorThemePreference) => void;
+    onSave: (preference: pxt.auth.SimulatorThemePreference) => void | Promise<void>;
+    onClose: () => void;
+}
+export declare const SimulatorThemePickerModal: (props: SimulatorThemePickerModalProps) => JSX.Element;

package/built/react-common/components/theming/ThemeCard.d.ts

@@ -1,6 +1,7 @@
 interface ThemeCardProps {
     theme: pxt.ColorThemeInfo;
-    onClick?: (theme: pxt.ColorThemeInfo) => void;
+    selected: boolean;
+    onClick: (theme: pxt.ColorThemeInfo) => void;
 }
 export declare const ThemeCard: (props: ThemeCardProps) => JSX.Element;
 export {};

package/built/react-common/components/theming/ThemePickerModal.d.ts

@@ -1,6 +1,15 @@
+export declare type ThemePickerMode = "editor" | "simulator";
+export interface ThemePickerToggleProps {
+    selected: ThemePickerMode;
+    onModeChanged: (mode: ThemePickerMode) => void;
+}
+export declare const ThemePickerToggle: (props: ThemePickerToggleProps) => JSX.Element;
 export interface ThemePickerModalProps {
     themes: pxt.ColorThemeInfo[];
-    onThemeClicked(them: pxt.ColorThemeInfo): void;
+    selectedThemeId?: string;
+    onThemeChanged: (theme: pxt.ColorThemeInfo) => void;
+    onSave: (theme: pxt.ColorThemeInfo) => void;
+    onSimulatorThemeClicked?: () => void;
     onClose(): void;
 }
 export declare const ThemePickerModal: (props: ThemePickerModalProps) => JSX.Element;

package/built/react-common/components/theming/simulatorThemeDefaults.d.ts

@@ -0,0 +1,5 @@
+export declare function getSimulatorThemePreferenceForColorThemeChange(preference: pxt.auth.SimulatorThemePreference | undefined, previousColorTheme: pxt.ColorThemeInfo | undefined, nextColorTheme: pxt.ColorThemeInfo | undefined, presets: pxt.SimulatorThemePreset[] | undefined): pxt.auth.SimulatorThemePreference | undefined;
+export declare function getDefaultSimulatorThemePreference(colorTheme: pxt.ColorThemeInfo | undefined, presets: pxt.SimulatorThemePreset[] | undefined): pxt.auth.SimulatorThemePreference | undefined;
+export declare function isImplicitSimulatorThemePreference(preference: pxt.auth.SimulatorThemePreference, presets: pxt.SimulatorThemePreset[] | undefined): boolean;
+export declare function copySimulatorTheme(theme: pxt.SimulatorTheme): pxt.SimulatorTheme;
+export declare function getSimulatorThemeForLayout(theme: pxt.SimulatorTheme, layoutId: string, colorFields?: pxt.SimulatorThemeColorField[]): pxt.SimulatorTheme;