pxt-core 9.3.13 → 9.3.15

package/package.json

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

package/react-common/components/controls/MenuDropdown.tsx

@@ -10,12 +10,13 @@ export interface MenuItem extends ButtonProps {
 }
 
 export interface MenuDropdownProps extends ControlProps {
-    id: string;
+    id?: string;
     items: MenuItem[];
     label?: string | JSX.Element;
     title: string;
     icon?: string;
     tabIndex?: number;
+    disabled?: boolean;
 }
 
 export const MenuDropdown = (props: MenuDropdownProps) => {
@@ -29,7 +30,8 @@ export const MenuDropdown = (props: MenuDropdownProps) => {
         label,
         title,
         icon,
-        tabIndex
+        tabIndex,
+        disabled
     } = props;
 
     const [ expanded, setExpanded ] = React.useState(false);
@@ -80,6 +82,7 @@ export const MenuDropdown = (props: MenuDropdownProps) => {
             ariaControls={expanded ? menuId : undefined}
             ariaLabel={ariaLabel}
             ariaHidden={ariaHidden}
+            disabled={disabled}
             />
         {expanded &&
             <div role="menu"

package/react-common/components/util.tsx

@@ -46,7 +46,7 @@ export function fireClickOnEnter(e: React.KeyboardEvent<HTMLElement>) {
     }
 }
 
-export function classList(...classes: string[]) {
+export function classList(...classes: (string | undefined)[]) {
     return classes
         .filter(c => typeof c === "string")
         .reduce((prev, c) => prev.concat(c.split(" ")), [] as string[])

package/theme/pxt.less

@@ -3,6 +3,7 @@
 @import 'themes/pxt/globals/site.variables';
 @import 'pxtsemantic';
 
+@import 'themepacks'; // defines theme variables used everywhere
 @import 'common';
 @import 'common-components';
 @import 'monaco';

package/theme/themepacks.less

@@ -0,0 +1,41 @@
+/**************************************************************************
+    CSS theme variables
+    These are overridden by targets and used in: react-common, CRA webapps.
+    To add new theme variable:
+        1. Add variable to :root and .high-contrast below
+        2. Set the variable value in each target's theme/themepacks.less
+***************************************************************************/
+
+// TODO: Define the complete set of theme variables we want to support
+:root {
+    // Default to a resonable scheme that doesn't closely match any existing target's colors
+    /// Page
+    --pxt-page-font: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
+    --pxt-page-background: white;
+    --pxt-page-foreground: black;
+    /// Header bar
+    --pxt-headerbar-background: #475569;
+    --pxt-headerbar-background-glass: #47556940;
+    --pxt-headerbar-foreground: white;
+    --pxt-headerbar-accent: #475569;
+    --pxt-headerbar-accent-smoke: #334155;
+    /// Content area
+    --pxt-content-background: #C7D2FE;
+    --pxt-content-background-glass: #C7D2FE40;
+    --pxt-content-foreground: #1E293B;
+    --pxt-content-accent: #EEF2FF;
+    /// Primary button
+    --pxt-button-primary-background: #065F46;
+    --pxt-button-primary-background-glass: #065F4640;
+    --pxt-button-primary-foreground: white;
+    --pxt-button-primary-accent: #065F46;
+    /// Secondary button
+    --pxt-button-secondary-background: #CBD5E1;
+    --pxt-button-secondary-background-glass: #CBD5E140;
+    --pxt-button-secondary-foreground: #1E293B;
+    --pxt-button-secondary-accent: #334155;
+}
+
+.theme-highcontrast {
+    // TODO: Fill this in
+}

package/webapp/public/embed.js

@@ -27,7 +27,7 @@
     window.ksRunnerWhenLoaded = function() {
         pxt.docs.requireHighlightJs = function() { return hljs; }
         pxt.setupWebConfig(pxtConfig || window.pxtWebConfig)
-        pxt.runner.initCallbacks = pxtCallbacks
+        pxt.runner.setInitCallbacks(pxtCallbacks)
         pxtCallbacks.push(function() {
             pxtCallbacks = null
         })

package/webapp/public/multiplayer.html

@@ -9,7 +9,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-multiplayer.css">
-  <script defer="defer" src="/blb/multiplayer/js/main.78cecdcb.js"></script><link href="/blb/multiplayer/css/main.2a6ba47d.css" rel="stylesheet"></head>
+  <script defer="defer" src="/blb/multiplayer/js/main.75ca8c58.js"></script><link href="/blb/multiplayer/css/main.2a6ba47d.css" rel="stylesheet"></head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
 

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.8222bb34.js"></script><link href="/blb/skillmap/css/main.3c703680.css" rel="stylesheet"></head>
+  <script defer="defer" src="/blb/skillmap/js/main.236bd49e.js"></script><link href="/blb/skillmap/css/main.3c703680.css" rel="stylesheet"></head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
 

package/webapp/public/teachertool.html

@@ -17,7 +17,7 @@
     <link rel="manifest" href="/teachertool-data/manifest.json"/>
     <title>MakeCode Teacher Tool</title>
     <script>var pxtConfig=null</script>
-  <script defer="defer" src="/blb/teachertool/js/main.3a94a341.js"></script><link href="/blb/teachertool/css/main.59776cd1.css" rel="stylesheet"></head>
+  <script defer="defer" src="/blb/teachertool/js/main.8aa6604c.js"></script><link href="/blb/teachertool/css/main.e9386f28.css" rel="stylesheet"></head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
 
@@ -32,7 +32,5 @@
     <script type="text/javascript" src="/blb/pxtblocks.js"></script>
 
     <div id="root"></div>
-
-    <!-- @include footer.html -->
   </body>
 </html>