Merge branch 'master' of https://github.com/microsoft/pxt into tball/settingSizeConfig

Author: tballmsft

cli/cli.ts

@@ -2647,6 +2647,7 @@ async function buildTargetCoreAsync(options: BuildTargetOptions = {}) {
         delete targetlight.compile.compilerExtension;
     const targetlightjson = nodeutil.stringify(targetlight);
     nodeutil.writeFileSync("built/targetlight.json", targetlightjson)
+    nodeutil.writeFileSync("built/targetlight.js", targetJsPrefix + targetlightjson)
     nodeutil.writeFileSync("built/sim.webmanifest", nodeutil.stringify(webmanifest))
 
     console.log("target.json built.");
@@ -7352,10 +7353,10 @@ ${pxt.crowdin.KEY_VARIABLE} - crowdin key
         name: "buildskillmap",
         aliases: ["skillmap"],
         advanced: true,
-        help: "Serves the skill map webapp",
+        help: "Serves the skillmap webapp",
         flags: {
             serve: {
-                description: "Serve the skill map locally after building (npm start)"
+                description: "Serve the skillmap locally after building (npm start)"
             },
             docs: {
                 description: "Path to local docs folder to copy into skillmap",

common-docs/static/logo/Microsoft_logo_rgb_W-white_D-square.png

@@ -144,7 +144,7 @@ For those of you paying close attention, you may have noticed a new "Game Maker
 
 We are experimenting with a new format for tutorials where there are a series of tutorial activities which build upon each other through progressive levels of difficulty. This helps provide a bit more guidance to students on a recommended progression path It also helps keep individual tutorials shorter.
 
-![Skills map](/static/blog/arcade/update-jan-2021/skills-map.png)
+![Skillmap](/static/blog/arcade/update-jan-2021/skills-map.png)
 
 Right now we have 2 learning paths available in the Game Maker Guide – Design a Space Explorer game, and Learn to Make a Platformer. Students must complete a sequence of tutorials in order – once they complete a tutorial, the next tutorial in the series unlocks.
 

docs/blog/arcade/update-jan-2021.md

@@ -2,14 +2,13 @@ declare namespace ocv {
 
     type FeedbackKind = "generic" | "rating";
 
-    const enum FeedbackAgeGroup {
-        Undefined = "Undefined",
-        MinorWithoutParentalConsent = "MinorWithoutParentalConsent",
-        MinorWithParentalConsent = "MinorWithParentalConsent",
-        NotAdult = "NotAdult",
-        Adult = "Adult",
-        MinorNoParentalConsentRequired = "MinorNoParentalConsentRequired"
-    }
+    type FeedbackAgeGroup =
+        | "Undefined"
+        | "MinorWithoutParentalConsent"
+        | "MinorWithParentalConsent"
+        | "NotAdult"
+        | "Adult"
+        | "MinorNoParentalConsentRequired";
 
     interface IFeedbackCallbackFunctions {
         attachDiagnosticsLogs?: (diagnosticsUploadId: string, diagnosticsEndpoint: string) => void;
@@ -21,26 +20,12 @@ declare namespace ocv {
         setSubmitButtonState?: (isEnabled: boolean) => void;
     }
 
-    const enum FeedbackAuthenticationType {
-        MSA = "MSA",
-        AAD = "AAD",
-        Unauthenticated = "Unauthenticated"
-    }
 
-    const enum FeedbackType {
-        Smile = "Smile",
-        Frown = "Frown",
-        Idea = "Idea",
-        Unclassified = "Unclassified",
-        Survey = "Survey"
-    }
+    type FeedbackAuthenticationType = "MSA" | "AAD" | "Unauthenticated";
 
-    const enum FeedbackPolicyValue {
-        Enabled = "Enabled",
-        Disabled = "Disabled",
-        NotConfigured = "Not Configured",
-        NotApplicable = "Not Applicable"
-    }
+    type FeedbackType = "Smile" | "Frown" | "Idea" | "Unclassified" | "Survey";
+
+    type FeedbackPolicyValue = "Enabled" | "Disabled" | "Not Configured" | "Not Applicable";
 
     interface IThemeOptions {
         isFluentV9?: boolean;
@@ -68,79 +53,63 @@ declare namespace ocv {
         themeOptions?: IThemeOptions;
     }
 
-    const enum FeedbackUiType {
-        SidePane = "SidePane",// Default: Used for side pane/detail view
-        Modal = "Modal",// Used for modal view
-        CallOut = "CallOut",// Used for inscreen pop up dialogue
-        IFrameWithinSidePane = "IFrameWithinSidePane",// Same as side pane but used inside an iframe
-        IFrameWithinModal = "IFrameWithinModal",// Same as modal but used inside an iframe
-        IFrameWithinCallOut = "IFrameWithinCallOut",// Same as callout but used inside an iframe
-        NoSurface = "NoSurface",// Used when the surface is provided by the host app
-        NoSurfaceWithoutTitle = "NoSurfaceWithoutTitle"
-    }
-    
-    const enum FeedbackHostPlatformType {
-        Windows = "Windows",
-        IOS = "iOS",
-        Android = "Android",
-        WacTaskPane = "WacTaskPane",
-        MacOS = "MacOS",
-        Web = "Web",
-        IFrame = "IFrame"
-    }
-
-    const enum FeedbackHostEventName {
-        SubmitClicked = "InAppFeedback_HostEvent_SubmitClicked",
-        BackClicked = "InAppFeedback_HostEvent_BackClicked"
-    }
-
-    const enum InitializationStatus {
-        Success = "Success",
-        Error = "Error",
-        Warning = "Warning"
-    }
-
-    const enum InAppFeedbackQuestionUiType {
-        DropDown = "DropDown",
-        MultiSelect = "MultiSelect",
-        Rating = "Rating",
-        SingleSelect = "SingleSelect",
-        SingleSelectHorizontal = "SingleSelectHorizontal"
-    }
-    
-    const enum InAppFeedbackScenarioType {
-        FeatureArea = "FeatureArea",
-        ResponsibleAI = "ResponsibleAI",
-        Experience = "Experience",
-        ProductSatisfaction = "ProductSatisfaction",
-        CrashImpact = "CrashImpact",// CrashImpact is of type Survey
-        Custom = "Custom",
-        AIThumbsDown = "AIThumbsDown",
-        AIThumbsUp = "AIThumbsUp",
-        AIError = "AIError",
-        PromptSuggestion = "PromptSuggestion"
-    }
-
-    const enum InAppFeedbackQuestionUiBehaviour {
-        QuestionNotRequired = "QuestionNotRequired",
-        CommentNotRequired = "CommentNotRequired",
-        CommentRequiredWithLastOption = "CommentRequiredWithLastOption"
-    }
-
-    const enum FeedbackAttachmentOrigin {
-        Application = "Application",
-        User = "User"
-    }
-
-    const enum FeedbackEntryPoint {
-        Header = "Header",
-        Footer = "Footer",
-        Backstage = "Backstage",
-        HelpMenu = "Help Menu",
-        Canvas = "Canvas",
-        Chat = "Chat"
-    }
+    type FeedbackUiType =
+        | "SidePane"
+        | "Modal"
+        | "CallOut"
+        | "IFrameWithinSidePane"
+        | "IFrameWithinModal"
+        | "IFrameWithinCallOut"
+        | "NoSurface"
+        | "NoSurfaceWithoutTitle";
+
+
+    type FeedbackHostPlatformType =
+        | "Windows"
+        | "iOS"
+        | "Android"
+        | "WacTaskPane"
+        | "MacOS"
+        | "Web"
+        | "IFrame";
+
+    type FeedbackHostEventName = "InAppFeedback_HostEvent_SubmitClicked" | "InAppFeedback_HostEvent_BackClicked";
+
+    type InitializationStatus = "Success" | "Error" | "Warning";
+
+    type InAppFeedbackQuestionUiType =
+        | "DropDown"
+        | "MultiSelect"
+        | "Rating"
+        | "SingleSelect"
+        | "SingleSelectHorizontal";
 
+    type InAppFeedbackScenarioType =
+        | "FeatureArea"
+        | "ResponsibleAI"
+        | "Experience"
+        | "ProductSatisfaction"
+        | "CrashImpact"
+        | "Custom"
+        | "AIThumbsDown"
+        | "AIThumbsUp"
+        | "AIError"
+        | "PromptSuggestion";
+
+    type InAppFeedbackQuestionUiBehaviour =
+        | "QuestionNotRequired"
+        | "CommentNotRequired"
+        | "CommentRequiredWithLastOption";
+
+    type FeedbackAttachmentOrigin = "Application" | "User";
+
+    type FeedbackEntryPoint =
+        | "Header"
+        | "Footer"
+        | "Backstage"
+        | "Help Menu"
+        | "Canvas"
+        | "Chat";
     interface InitializationResult {
         status: InitializationStatus;
         /**

localtypings/ocv.d.ts

@@ -527,9 +527,6 @@ declare namespace pxt {
         timeMachineDiffInterval?: number; // An interval in milliseconds at which to take diffs to store in project history. Defaults to 5 minutes
         timeMachineSnapshotInterval?: number; // An interval in milliseconds at which to take full project snapshots in project history. Defaults to 15 minutes
         adjustBlockContrast?: boolean; // If set to true, all block colors will automatically be adjusted to have a contrast ratio of 4.5 with text
-        feedbackEnabled?: boolean; // allow feedback to be shown on a target
-        ocvAppId?: number; // the app id needed to attach to the OCV service
-        ocvFrameUrl?: string; // the base url for the OCV service
     }
 
     interface DownloadDialogTheme {

localtypings/pxtarget.d.ts

@@ -104,7 +104,7 @@ declare namespace pxt.editor {
         | "serviceworkerregistered"
         | "runeval"
         | "precachetutorial"
-        | "setcolortheme"
+        | "setcolorthemebyid"
 
         // package extension messasges
         | ExtInitializeType
@@ -512,8 +512,9 @@ declare namespace pxt.editor {
     }
 
     export interface EditorMessageSetColorThemeRequest extends EditorMessageRequest {
-        action: "setcolortheme";
+        action: "setcolorthemebyid";
         colorThemeId: string;
+        savePreference?: boolean;
     }
 
     /**
@@ -1044,6 +1045,7 @@ declare namespace pxt.editor {
         isEmbedSimActive(): boolean;
         isBlocksActive(): boolean;
         isJavaScriptActive(): boolean;
+        isTextSourceCodeEditorActive(): boolean;
         isPythonActive(): boolean;
         isAssetsActive(): boolean;
 
@@ -1100,7 +1102,7 @@ declare namespace pxt.editor {
         hasHeaderBeenPersistentShared(): boolean;
         getSharePreferenceForHeader(): boolean;
         saveSharePreferenceForHeaderAsync(anonymousByDefault: boolean): Promise<void>;
-        setColorTheme(colorThemeId: string): void;
+        setColorThemeById(colorThemeId: string, savePreference: boolean): void;
     }
 
     export interface IHexFileImporter {
@@ -1167,7 +1169,7 @@ declare namespace pxt.editor {
         perfMeasurementThresholdMs?: number;
         onPerfMilestone?: (payload: { milestone: string, time: number, params?: Map<string> }) => void;
         onPerfMeasurement?: (payload: { name: string, start: number, duration: number, params?: Map<string> }) => void;
-    
+
         // Used with the @tutorialCompleted macro. See docs/writing-docs/tutorials.md for more info
         onTutorialCompleted?: () => void;
         onMarkdownActivityLoad?: (path: string, title?: string, editorProjectName?: string) => Promise<void>;

localtypings/pxteditor.d.ts

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

package.json

@@ -1,5 +1,7 @@
 import * as Blockly from "blockly";
 
+const MAX_CACHED_FLYOUTS = 20;
+
 export class VerticalFlyout implements Blockly.IFlyout {
     horizontalLayout = false;
     RTL: boolean;
@@ -129,12 +131,21 @@ export class VerticalFlyout implements Blockly.IFlyout {
             this.activeFlyout = existing;
             this.activeFlyout.autoClose = this.autoClose;
             this.activeFlyout.setContainerVisible(this.containerVisible);
-            this.activeFlyout.show(flyoutDef)
+            this.activeFlyout.show(flyoutDef);
+
+            // move to most recently used in the cache
+            this.cached.splice(this.cached.indexOf(existing), 1);
+            this.cached.push(existing);
             return;
         }
 
         this.activeFlyout = new CachedFlyout(this.options);
         this.cached.push(this.activeFlyout);
+
+        if (this.cached.length >= MAX_CACHED_FLYOUTS) {
+            this.cached.shift().dispose();
+        }
+
         this.element.appendChild(this.activeFlyout.createDom("g"));
         this.activeFlyout.init(this.targetWorkspace);
 

pxtblocks/plugins/flyout/verticalFlyout.ts

@@ -5,17 +5,24 @@ import {
     FUNCTION_CALL_OUTPUT_BLOCK_TYPE,
     FUNCTION_DEFINITION_BLOCK_TYPE,
 } from "../constants";
-import { getDefinition, getShadowBlockInfoFromType_, isVariableBlockType, mutateCallersAndDefinition } from "../utils";
+import { getArgMap, getDefinition, getShadowBlockInfoFromType_, isVariableBlockType, mutateCallersAndDefinition } from "../utils";
 import { MsgKey } from "../msg";
 
+export interface SerializedShadow {
+    inputName: string;
+    connectedShadow?: any;
+    connectedBlock?: string;
+}
+
 interface FunctionCallMixin extends CommonFunctionMixin {
     attachShadow_(input: Blockly.Input, typeName: string): void;
     buildShadowDom_(argumentType: string): Element;
     onchange(event: Blockly.Events.Abstract): void;
     afterWorkspaceLoad(): void;
+    serializeChangedInputs(newMutation: Element): SerializedShadow[];
 }
 
-type FunctionCallBlock = CommonFunctionBlock & FunctionCallMixin;
+export type FunctionCallBlock = CommonFunctionBlock & FunctionCallMixin;
 
 const FUNCTION_CALL_MIXIN: FunctionCallMixin = {
     ...COMMON_FUNCTION_MIXIN,
@@ -188,6 +195,34 @@ const FUNCTION_CALL_MIXIN: FunctionCallMixin = {
             }
         }
     },
+    serializeChangedInputs(this: FunctionCallBlock, newMutation: Element) {
+        const out: SerializedShadow[] = [];
+
+        const newIdToArg = getArgMap(newMutation, true);
+
+        for (const argument of this.arguments_) {
+            if (newIdToArg[argument.id]) continue;
+
+            const connection = this.getInput(argument.id).connection;
+
+            const targetBlock = connection.targetBlock() as Blockly.BlockSvg;
+
+            if (targetBlock.isShadow()) {
+                out.push({
+                    inputName: argument.id,
+                    connectedShadow: connection.getShadowState(true)
+                });
+            }
+            else {
+                out.push({
+                    inputName: argument.id,
+                    connectedBlock: targetBlock.id
+                });
+            }
+        }
+
+        return out;
+    }
 };
 
 Blockly.Blocks[FUNCTION_CALL_BLOCK_TYPE] = {