refactor: fix compatibility with checkboxes and category status indicators (#29)

* refactor: fix compatibility with checkboxes and category status indicators

* chore: remove errant logging

Author: gonfunko

src/containers/blocks.jsx

@@ -94,7 +94,7 @@ class Blocks extends React.Component {
         this.ScratchBlocks.ScratchVariables.setPromptHandler(
             this.handlePromptStart
         );
-        this.ScratchBlocks.statusButtonCallback =
+        this.ScratchBlocks.StatusIndicatorLabel.statusButtonCallback =
             this.handleConnectionModalStart;
         this.ScratchBlocks.recordSoundCallback = this.handleOpenSoundRecorder;
 
@@ -110,7 +110,7 @@ class Blocks extends React.Component {
             this.props.useCatBlocks
         );
         this.ScratchBlocks.dialog.setPrompt(this.handlePromptStart);
-        this.ScratchBlocks.statusButtonCallback =
+        this.ScratchBlocks.StatusIndicatorLabel.statusButtonCallback =
             this.handleConnectionModalStart;
         this.ScratchBlocks.recordSoundCallback = this.handleOpenSoundRecorder;
 
@@ -716,7 +716,7 @@ class Blocks extends React.Component {
         this.props.onOpenConnectionModal(extensionId);
     }
     handleStatusButtonUpdate() {
-        this.ScratchBlocks.refreshStatusButtons(this.workspace);
+        this.workspace.getFlyout().refreshStatusButtons();
     }
     handleOpenSoundRecorder() {
         this.props.onOpenSoundRecorder();

src/lib/blocks.js

@@ -396,19 +396,20 @@ export default function (vm, useCatBlocks) {
         this.jsonInit(json);
     };
 
-    ScratchBlocks.CheckableContinuousFlyout.prototype.getCheckboxState =
-        function (blockId) {
-            const monitoredBlock = vm.runtime.monitorBlocks._blocks[blockId];
-            return monitoredBlock ? monitoredBlock.isMonitored : false;
-        };
+    ScratchBlocks.CheckboxBubble.prototype.isChecked = function (blockId) {
+        const monitoredBlock = vm.runtime.monitorBlocks._blocks[blockId];
+        return monitoredBlock ? monitoredBlock.isMonitored : false;
+    };
+
+    ScratchBlocks.StatusIndicatorLabel.prototype.getExtensionState = function (
+        extensionId
+    ) {
+        if (vm.getPeripheralIsConnected(extensionId)) {
+            return ScratchBlocks.StatusButtonState.READY;
+        }
+        return ScratchBlocks.StatusButtonState.NOT_READY;
+    };
 
-    // ScratchBlocks.FlyoutExtensionCategoryHeader.getExtensionState = function (extensionId) {
-    //     if (vm.getPeripheralIsConnected(extensionId)) {
-    //         return ScratchBlocks.StatusButtonState.READY;
-    //     }
-    //     return ScratchBlocks.StatusButtonState.NOT_READY;
-    // };
-    //
     // ScratchBlocks.FieldNote.playNote_ = function (noteNum, extensionId) {
     //     vm.runtime.emit('PLAY_NOTE', noteNum, extensionId);
     // };