Update src/lib/blocks.js

src/lib/blocks.js

@@ -115,8 +115,20 @@ export default function (vm) {
     };
 
     const costumesMenu = function () {
+        const next = ScratchBlocks.ScratchMsgs.translate('LOOKS_NEXTCOSTUME', 'next costume');
+        const previous = "previous costume" //ScratchBlocks.ScratchMsgs.translate('LOOKS_PREVIOUSCOSTUME', 'previous costume');
+        // TODO: Add translation index into ScratchBlocks for this.
+
+        const random = "random costume"//ScratchBlocks.ScratchMsgs.translate('LOOKS_RANDOMBACKDROP', 'random costume');
+        // TODO: Add translation entry
         if (vm.editingTarget && vm.editingTarget.getCostumes().length > 0) {
-            return vm.editingTarget.getCostumes().map(costume => [costume.name, costume.name]);
+            return vm.editingTarget.getCostumes().map(costume => [costume.name, costume.name])
+                .concat([
+                    [next, "next costume"],
+                    [previous, "previous costume"],
+                    [random, "random costume"]
+                ])
+            ;
         }
         return [['', '']];
     };
@@ -474,9 +486,28 @@ export default function (vm) {
         this.jsonInit(json);
     };
 
-    ScratchBlocks.VerticalFlyout.getCheckboxState = function (blockId) {
+    ScratchBlocks.VerticalFlyout.getCheckboxState = function (blockId, inputList) {
         const monitoredBlock = vm.runtime.monitorBlocks._blocks[blockId];
-        return monitoredBlock ? monitoredBlock.isMonitored : false;
+        if (!monitoredBlock)
+            return false;
+
+        const { opcode, fields } = monitoredBlock;
+
+        if (opcode == "data_variable" || opcode == "data_listcontents")
+            return monitoredBlock ? monitoredBlock.isMonitored : false;
+
+        const parsedFields = inputList[0].fieldRow
+            .filter(({ name }) => name in fields)
+            .map(field => {
+                if (field.variable_) return field.variable_.name;
+                return field.name === "CURRENTMENU" ? field.value_.toLowerCase() : field.value_;
+            }).join("_");
+
+        const newBlockId = blockId + (parsedFields.length ? "_" : "") + parsedFields;
+
+        const newMonitoredBlock = vm.runtime.monitorBlocks._blocks[newBlockId];
+
+        return newMonitoredBlock ? newMonitoredBlock.isMonitored : false;
     };
 
     ScratchBlocks.FlyoutExtensionCategoryHeader.getExtensionState = function (extensionId) {
@@ -521,4 +552,4 @@ export default function (vm) {
     ]);
 
     return ScratchBlocks;
-}
+}