microsoft · thsparks · Feb 26, 2025 · Jan 21, 2025 · Jan 21, 2025 · Jan 21, 2025
diff --git a/multiplayer/public/index.html b/multiplayer/public/index.html
@@ -13,7 +13,7 @@
     <link rel="stylesheet" href="/blb/icons.css" type="text/css">
     <link rel="stylesheet" href="/blb/react-common-multiplayer.css" type="text/css">
   </head>
-  <body>
+  <body class="pxt-theme-root">
     <noscript>You need to enable JavaScript to run this app.</noscript>
 
     <!-- @include tracking.html -->
@@ -23,6 +23,7 @@
     <script type="text/javascript" src="/blb/target.js"></script>
     <script type="text/javascript" src="/blb/pxtlib.js"></script>
     <script type="text/javascript" src="/blb/pxtsim.js"></script>
+    <script type="text/javascript" src="/blb/pxtrcdeps.js"></script>
 
 
     <div id="root"></div>

diff --git a/multiplayer/src/App.tsx b/multiplayer/src/App.tsx
@@ -12,6 +12,7 @@ import { setDeepLinks, setTargetConfig } from "./state/actions";
 import { cleanupJoinCode, cleanupShareCode } from "./util";
 import { joinGameAsync, hostGameAsync, visibilityChanged } from "./epics";
 import { useVisibilityChange } from "./hooks";
+import { ThemeManager } from "react-common/components/theming/themeManager";
 
 // eslint-disable-next-line import/no-unassigned-import
 import "./App.css";
@@ -44,6 +45,17 @@ function App() {
             .catch(() => setAuthCheckComplete(true));
     }, [setAuthCheckComplete]);
 
+    useEffect(() => {
+        // We don't currently support switching themes in multiplayer, so just load the default.
+        const themeId = pxt.appTarget?.appTheme?.defaultColorTheme;
+        if (themeId) {
+            const themeManager = ThemeManager.getInstance(document);
+            if (themeId !== themeManager.getCurrentColorTheme()?.id) {
+                themeManager.switchColorTheme(themeId);
+            }
+        }
+    });
+
     const parseUrlParams = useCallback(() => {
         let params: URLSearchParams | undefined = undefined;
         if (window.location.hash[1] === "?") {

diff --git a/multiplayer/src/components/Presence.tsx b/multiplayer/src/components/Presence.tsx
@@ -141,7 +141,7 @@ function PlayerMenu(
         <div>
             <div className="tw-px-[50%]">{menu}</div>
             <Button
-                className="tw-rounded-full tw-m-0 tw-p-0"
+                className="tw-rounded-full tw-m-0 tw-p-0 !tw-bg-white"
                 hardDisabled={!menu}
                 label={
                     <div

diff --git a/multiplayer/src/index.tsx b/multiplayer/src/index.tsx
@@ -49,7 +49,7 @@ window.addEventListener("DOMContentLoaded", () => {
         const wc = pxt.webConfig as any;
 
         for (const key of Object.keys(wc)) {
-            if (wc[key]?.startsWith("/") && wc[key]?.indexOf("worker") == -1) {
+            if (typeof wc[key] === "string" && wc[key]?.startsWith("/") && wc[key]?.indexOf("worker") == -1) {
                 wc[key] = `http://localhost:3232${wc[key]}`;
             }
         }