pxt-core 12.3.26 → 13.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pxt-core",
-  "version": "12.3.26",
+  "version": "13.0.1",
   "description": "Microsoft MakeCode provides Blocks / JavaScript / Python tools and editors",
   "keywords": [
     "TypeScript",
@@ -71,7 +71,7 @@
     "@zip.js/zip.js": "2.4.20",
     "adm-zip": "^0.5.12",
     "axios": "^1.12.2",
-    "blockly": "13.1.0",
+    "blockly": "13.1.1",
     "browserify": "17.0.0",
     "chai": "^3.5.0",
     "chalk": "^4.1.2",
@@ -151,10 +151,10 @@
   },
   "overrides": {
     "@blockly/field-grid-dropdown": {
-      "blockly": "13.1.0"
+      "blockly": "13.1.1"
     },
     "@blockly/plugin-workspace-search": {
-      "blockly": "13.1.0"
+      "blockly": "13.1.1"
     },
     "combine-source-map": {
       "source-map": "0.4.4"

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

@@ -25,6 +25,7 @@ export interface InputProps extends ControlProps {
     options?: pxt.Map<string>;
     filter?: string;
 
+    validator?: (value: string, prevValue: string) => string;
     onChange?: (newValue: string) => void;
     onEnterKey?: (value: string) => void;
     onIconClick?: (value: string) => void;
@@ -71,7 +72,8 @@ export const Input = (props: InputProps) => {
         onOptionSelected,
         handleInputRef,
         preserveValueOnBlur = true,
-        options
+        options,
+        validator,
     } = props;
 
     const [value, setValue] = React.useState(initialValue || "");
@@ -116,9 +118,14 @@ export const Input = (props: InputProps) => {
     const keyDownHandler = (e: React.KeyboardEvent) => {
         const charCode = (typeof e.which == "number") ? e.which : e.keyCode;
         if (charCode === /*enter*/13 || props.treatSpaceAsEnter && charCode === /*space*/32) {
+            let validatedValue = value;
+            if (validator) {
+                validatedValue = validator(value, initialValue || "");
+                setValue(validatedValue);
+            }
             if (onEnterKey) {
                 e.preventDefault();
-                onEnterKey(value);
+                onEnterKey(validatedValue);
             }
         } else if (options && e.key === "ArrowDown") {
             if (expanded) {
@@ -164,8 +171,13 @@ export const Input = (props: InputProps) => {
     }
 
     const blurHandler = () => {
+        let validatedValue = value;
+        if (validator) {
+            validatedValue = validator(value, initialValue || "");
+            setValue(validatedValue);
+        }
         if (onBlur) {
-            onBlur(value);
+            onBlur(validatedValue);
         }
         if (!preserveValueOnBlur) {
             setValue("");

package/react-common/components/extensions/ExtensionCard.tsx

@@ -10,9 +10,11 @@ export interface ExtensionCardProps<U> {
     imageUrl?: string;
     learnMoreUrl?: string;
     label?: string;
+    labelClass?: string;
     onClick?: (value: U) => void;
     extension?: U;
     loading?: boolean;
+    installed?: boolean;
     showDisclaimer?: boolean
 }
 
@@ -23,9 +25,11 @@ export const ExtensionCard = <U,>(props: ExtensionCardProps<U>) => {
         imageUrl,
         learnMoreUrl,
         label,
+        labelClass,
         onClick,
         extension,
         loading,
+        installed,
         showDisclaimer
     } = props;
 
@@ -34,15 +38,20 @@ export const ExtensionCard = <U,>(props: ExtensionCardProps<U>) => {
     }
 
     const id = pxt.Util.guidGen();
+    const cardLabel = installed ? lf("Installed") : label;
+    const cardLabelClass = installed ? classList("installed", labelClass) : labelClass;
+    const descriptionId = id + "-description";
+    const statusId = cardLabel ? id + "-status" : undefined;
 
     return <>
         <Card
-            className={classList("common-extension-card", loading && "loading")}
+            className={classList("common-extension-card", loading && "loading", installed && "installed")}
             onClick={onCardClick}
             ariaLabelledBy={id + "-title"}
-            ariaDescribedBy={id + "-description"}
+            ariaDescribedBy={classList(descriptionId, statusId)}
             tabIndex={onClick && 0}
-            label={label}>
+            label={cardLabel}
+            labelClass={cardLabelClass}>
             <div className="common-extension-card-contents">
                 {!loading && <>
                     {imageUrl && <LazyImage src={imageUrl} alt={title} />}
@@ -50,10 +59,11 @@ export const ExtensionCard = <U,>(props: ExtensionCardProps<U>) => {
                         {title}
                     </div>
                     <div className="common-extension-card-description">
-                        <div id={id + "-description"}>
+                        <div id={descriptionId}>
                             {description}
                         </div>
                     </div>
+                    {cardLabel && <div id={statusId} className="sr-only">{cardLabel}</div>}
                     {(showDisclaimer || learnMoreUrl) &&
                         <div className="common-extension-card-extra-content">
                             {showDisclaimer && lf("User-provided extension, not endorsed by Microsoft.")}

package/react-common/styles/extensions/ExtensionCard.less

@@ -58,6 +58,12 @@
         border-bottom-right-radius: 0.5rem;
     }
 
+    .common-card-label.installed {
+        color: var(--pxt-colors-green-foreground);
+        background-color: var(--pxt-colors-green-background);
+        border-color: var(--pxt-colors-green-hover);
+    }
+
     a.link-button {
         float: right;
         position: relative;
@@ -94,6 +100,14 @@
     }
 }
 
+.common-extension-card.installed {
+    overflow: visible;
+
+    .common-card-body {
+        overflow: hidden;
+    }
+}
+
 /****************************************************
  *                 High Contrast                    *
  ****************************************************/
@@ -102,5 +116,11 @@
     .common-extension-card {
         border-color: @highContrastTextColor;
         background-color: @highContrastBackgroundColor;
+
+        .common-card-label.installed {
+            color: @highContrastBackgroundColor;
+            background-color: @highContrastTextColor;
+            border-color: @highContrastTextColor;
+        }
     }
 }

package/theme/home.less

@@ -663,7 +663,7 @@
     }
 }
 
-.projectsdialog, .project-row-name {
+.projectsdialog, .project-row-name, .scriptmanager {
     .tutorial-progress.not-finished {
         background-color: var(--pxt-primary-background) !important;
         color: var(--pxt-primary-foreground) !important;

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.6c837cec.js"></script><link href="/blb/multiplayer/css/main.40f89d37.css" rel="stylesheet"></head>
+  <script defer="defer" src="/blb/multiplayer/js/main.58655f23.js"></script><link href="/blb/multiplayer/css/main.40f89d37.css" rel="stylesheet"></head>
   <body class="pxt-theme-root">
     <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.80271a2e.js"></script><link href="/blb/skillmap/css/main.450cb46e.css" rel="stylesheet"></head>
+  <script defer="defer" src="/blb/skillmap/js/main.e779c5ca.js"></script><link href="/blb/skillmap/css/main.450cb46e.css" rel="stylesheet"></head>
   <body class="pxt-theme-root">
     <noscript>You need to enable JavaScript to run this app.</noscript>
 

package/webapp/public/teachertool.html

@@ -18,7 +18,7 @@
     <!-- <link rel="manifest" href="/teachertool-data/manifest.json" /> -->
     <title>MakeCode Code Evaluation</title>
     <script>var pxtConfig=null</script>
-  <script defer="defer" src="/blb/teachertool/js/main.ed470286.js"></script><link href="/blb/teachertool/css/main.8ef9c91e.css" rel="stylesheet"></head>
+  <script defer="defer" src="/blb/teachertool/js/main.3e785c99.js"></script><link href="/blb/teachertool/css/main.8ef9c91e.css" rel="stylesheet"></head>
   <body class="pxt-theme-root">
     <noscript>You need to enable JavaScript to run this app.</noscript>