Merge branch 'main' into desktop

package.json

@@ -56,7 +56,7 @@
     "minilog": "3.1.0",
     "monaco-editor": "^0.20.0",
     "omggif": "1.0.9",
-    "openblock-blocks": "0.1.0-prerelease.20240616014658",
+    "openblock-blocks": "^0.1.0-prerelease.20240624113036",
     "openblock-l10n": "^3.15.20240620160344",
     "openblock-save-svg-as-png": "^1.4.18",
     "openblock-vm": "^0.2.0-prerelease.20240620151653",

src/components/menu-bar/menu-bar.jsx

@@ -391,8 +391,8 @@ class MenuBar extends React.Component {
         }
     }
     handleSelectDeviceMouseUp () {
-        const blocks = document.querySelector('.blocklyWorkspace .blocklyBlockCanvas');
-        if (blocks.getBBox().height === 0) {
+        const blocklyBlockCanvas = document.querySelector('.blocklyWorkspace .blocklyBlockCanvas');
+        if (blocklyBlockCanvas.childNodes.length === 0) {
             this.props.onOpenDeviceLibrary();
         } else {
             this.props.onWorkspaceIsNotEmpty();
@@ -429,19 +429,19 @@ class MenuBar extends React.Component {
         }
     }
     handleScreenshot () {
-        const blocks = document.querySelector('.blocklyWorkspace .blocklyBlockCanvas');
-        if (blocks.getBBox().height === 0) {
+        const blocklyBlockCanvas = document.querySelector('.blocklyWorkspace .blocklyBlockCanvas');
+        if (blocklyBlockCanvas.childNodes.length === 0) {
             this.props.onWorkspaceIsEmpty();
         } else {
-            const transform = blocks.getAttribute('transform');
+            const transform = blocklyBlockCanvas.getAttribute('transform');
             const scale = parseFloat(transform.substring(transform.indexOf('scale') + 6, transform.length - 1));
             const data = new Date();
 
-            saveSvgAsPng.saveSvgAsPng(blocks, `${this.props.projectTitle}-${data.getTime()}.png`, {
-                left: blocks.getBBox().x * scale,
-                top: blocks.getBBox().y * scale,
-                height: blocks.getBBox().height * scale,
-                width: blocks.getBBox().width * scale,
+            saveSvgAsPng.saveSvgAsPng(blocklyBlockCanvas, `${this.props.projectTitle}-${data.getTime()}.png`, {
+                left: blocklyBlockCanvas.getBBox().x * scale,
+                top: blocklyBlockCanvas.getBBox().y * scale,
+                height: blocklyBlockCanvas.getBBox().height * scale,
+                width: blocklyBlockCanvas.getBBox().width * scale,
                 scale: 2 / scale,
                 encoderOptions: 1
             });

src/containers/hardware-header.jsx

@@ -25,8 +25,8 @@ class HardwareHeader extends React.Component {
 
     handleUpload () {
         if (this.props.peripheralName) {
-            const blocks = document.querySelector('.blocklyWorkspace .blocklyBlockCanvas');
-            if (blocks.getBBox().height === 0) {
+            const blocklyBlockCanvas = document.querySelector('.blocklyWorkspace .blocklyBlockCanvas');
+            if (blocklyBlockCanvas.childNodes.length === 0) {
                 this.props.onWorkspaceIsEmpty();
             } else {
                 this.props.vm.uploadToPeripheral(this.props.deviceId, this.props.codeEditorValue);