Merge branch 'main' into playwright

leaphy-robotics · Apr 1, 2024 · 6cf22ee · 6cf22ee
2 parents 35295c5 + c3ae66d
commit 6cf22ee
Show file tree

Hide file tree

Showing 9 changed files with 233 additions and 224 deletions.
diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
     "@fortawesome/fontawesome-free": "^6.1.1",
     "@leaphy-robotics/avrdude-webassembly": "^1.3.0",
     "@leaphy-robotics/dfu-util-wasm": "1.0.2",
-    "@leaphy-robotics/leaphy-blocks": "2.0.0",
+    "@leaphy-robotics/leaphy-blocks": "2.0.2",
     "@leaphy-robotics/picotool-wasm": "1.0.2",
     "@ngx-translate/core": "^14.0.0",
     "@ngx-translate/http-loader": "^7.0.0",

diff --git a/src/app/effects/blockly-editor.effects.ts b/src/app/effects/blockly-editor.effects.ts
@@ -42,6 +42,13 @@ export class BlocklyEditorEffects {
         Blockly.Extensions.register('appendStatementInputStack', EXTENSIONS.APPEND_STATEMENT_INPUT_STACK)
         Blockly.Extensions.register('list_select_extension', EXTENSIONS.LIST_SELECT_EXTENSION);
 
+        Blockly.Extensions.registerMutator(
+            'l_controls_if_mutator',
+            EXTENSIONS.CONTROLS_IF_MUTATOR_MIXIN,
+            null as unknown as undefined, // TODO(#6920)
+            ['controls_if_elseif', 'controls_if_else'],
+        );
+
         // When the current language is set: Find and set the blockly translations
         this.appState.currentLanguage$
             .pipe(filter(language => !!language))

diff --git a/src/assets/backgrounds/flitz_nano.svg b/src/assets/backgrounds/flitz_nano.svg
diff --git a/src/assets/backgrounds/flitz_uno.svg b/src/assets/backgrounds/flitz_uno.svg