Merge pull request #683 from intechstudio/bug/MinorFixes

🚩PR: Various bugfixes and minor feature updates

src/renderer/App.svelte

@@ -265,11 +265,11 @@
         </Pane>
 
         <Pane class="overflow-clip w-full h-full">
-          <MiddlePanelContainer>
-            {#if $modal?.options.snap === "middle"}
-              <svelte:component this={$modal?.component} reference={3} />
-            {/if}
-          </MiddlePanelContainer>
+          {#if $modal?.options.snap === "middle"}
+            <svelte:component this={$modal?.component} reference={3} />
+          {:else}
+            <MiddlePanelContainer />
+          {/if}
         </Pane>
 
         <Pane

src/renderer/config-blocks/ActionBlockInformation.ts

@@ -19,6 +19,7 @@ export class SyntaxPreprocessor {
 interface Information {
   short: string;
   name: string;
+  menuName?: string;
   rendering: "modifier" | "standard";
   category:
     | "variables"

src/renderer/config-blocks/ButtonPressRelease_End.svelte

@@ -50,11 +50,6 @@
 </script>
 
 <else-block
-  class="{$$props.class} w-full h-fit flex flex-col text-white py-1 {information.rounding ==
-  'top'
-    ? 'rounded-tr-xl '
-    : ''} {information.rounding == 'bottom'
-    ? 'rounded-br-xl '
-    : ''} pointer-events-auto"
+  class="{$$props.class} w-full h-fit flex flex-col text-white py-1 pointer-events-auto"
   style="min-height: 2.5rem; background: {information.color};"
 />

src/renderer/config-blocks/ButtonPressRelease_If.svelte

@@ -11,6 +11,7 @@
   export const information: ActionBlockInformation = {
     short: "bpr",
     name: "ButtonPressRelease_If",
+    menuName: "Press/Release",
     rendering: "modifier",
     rounding: "top",
     category: "special",
@@ -106,7 +107,7 @@
 
 <script>
   import { createEventDispatcher, onDestroy } from "svelte";
-  import stringManipulation from "../main/user-interface/_string-operations";
+  import { stringManipulation } from "../main/user-interface/_string-operations";
   import { parenthesis } from "./_validators";
 
   export let config;
@@ -147,12 +148,7 @@
 <svelte:window bind:innerWidth={sidebarWidth} />
 
 <if-block
-  class="{$$props.class} w-full h-fit flex flex-col text-white py-1 {information.rounding ==
-  'top'
-    ? 'rounded-tr-xl '
-    : ''} {information.rounding == 'bottom'
-    ? 'rounded-br-xl '
-    : ''} pointer-events-auto"
+  class="{$$props.class} w-full h-fit flex flex-col text-white py-1 pointer-events-auto"
   style="min-height: 2.5rem; background: {information.color};"
 >
   <div class="bg-secondary p-1 my-auto mr-1 rounded hidden">

src/renderer/config-blocks/CodeBlock.svelte

@@ -41,7 +41,7 @@
 
 <script>
   import * as luamin from "lua-format";
-  import stringManipulation from "../main/user-interface/_string-operations";
+  import { stringManipulation } from "../main/user-interface/_string-operations";
 
   import { createEventDispatcher, onMount, onDestroy } from "svelte";
 
@@ -102,35 +102,7 @@
   });
 
   function displayConfigScript(script) {
-    if (typeof codePreview === "undefined") return;
-
-    let code = "";
-
-    try {
-      //Step 1
-      let human = stringManipulation.humanize(String(script));
-      if (human.trim() !== "") {
-        code = human;
-      }
-
-      //Step2
-      let beautified = luamin.Beautify(human, {
-        RenameVariables: false,
-        RenameGlobals: false,
-        SolveMath: false,
-      });
-
-      if (beautified.charAt(0) === "\n") {
-        beautified = beautified.slice(1);
-      }
-      if (beautified.trim() !== "") {
-        code = beautified;
-      }
-    } catch (e) {
-      //Fallback
-      code = script;
-    }
-    codePreview.innerHTML = stringManipulation.noCommentToLineComment(code);
+    codePreview.innerHTML = stringManipulation.expandScript(script);
     monaco_editor.colorizeElement(codePreview, {
       theme: "my-theme",
       tabSize: 2,
@@ -142,16 +114,20 @@
       //evt.preventDefault();
       //codePreview.scrollLeft += evt.deltaY;
     });
-    displayConfigScript(config.script);
   });
 
+  $: {
+    if (codePreview) {
+      displayConfigScript(config.script);
+    }
+  }
+
   $: if (typeof $committed_code_store !== "undefined") {
     if ($committed_code_store.index == index) {
       dispatch("output", {
         short: "cb",
         script: $committed_code_store.script,
       });
-      displayConfigScript($committed_code_store.script);
     }
   }
 

src/renderer/config-blocks/EncoderLeftRight_End.svelte

@@ -50,11 +50,6 @@
 </script>
 
 <else-block
-  class="{$$props.class} w-full h-fit flex flex-col text-white py-1 {information.rounding ==
-  'top'
-    ? 'rounded-tr-xl '
-    : ''} {information.rounding == 'bottom'
-    ? 'rounded-br-xl '
-    : ''} pointer-events-auto"
+  class="{$$props.class} w-full h-fit flex flex-col text-white py-1 pointer-events-auto"
   style="min-height: 2.5rem; background: {information.color};"
 />

src/renderer/config-blocks/EncoderLeftRight_If.svelte

@@ -15,6 +15,7 @@
     rounding: "top",
     category: "special",
     displayName: "Rotate Left",
+    menuName: "Left/Right Rotate",
     defaultLua: "if self:est()<64 then",
     compositeLua: [
       { short: "elrel", script: "else" },
@@ -62,7 +63,7 @@
 
 <script>
   import { createEventDispatcher, onDestroy } from "svelte";
-  import stringManipulation from "../main/user-interface/_string-operations";
+  import { stringManipulation } from "../main/user-interface/_string-operations";
   import { parenthesis } from "./_validators";
 
   export let config;
@@ -103,12 +104,7 @@
 <svelte:window bind:innerWidth={sidebarWidth} />
 
 <if-block
-  class="{$$props.class} w-full h-fit flex flex-col text-white py-1 {information.rounding ==
-  'top'
-    ? 'rounded-tr-xl '
-    : ''} {information.rounding == 'bottom'
-    ? 'rounded-br-xl '
-    : ''} pointer-events-auto"
+  class="{$$props.class} w-full h-fit flex flex-col text-white py-1 pointer-events-auto"
   style="min-height: 2.5rem; background: {information.color};"
 >
   <div class="bg-secondary p-1 my-auto mr-1 rounded hidden">

src/renderer/config-blocks/EncoderPushRotLeftRight_End.svelte

@@ -37,11 +37,6 @@
 </script>
 
 <else-block
-  class="{$$props.class} w-full h-fit flex flex-col text-white py-1 {information.rounding ==
-  'top'
-    ? 'rounded-tr-xl '
-    : ''} {information.rounding == 'bottom'
-    ? 'rounded-br-xl '
-    : ''} pointer-events-auto"
+  class="{$$props.class} w-full h-fit flex flex-col text-white py-1 pointer-events-auto"
   style="min-height: 2.5rem; background: {information.color};"
 />

src/renderer/config-blocks/EncoderPushRotLeftRight_If.svelte

@@ -15,6 +15,7 @@
     rounding: "top",
     category: "special",
     displayName: "Push & Rotate Left",
+    menuName: "Push & Rotate L R",
     defaultLua: "if (self:bst()>0 and self:est()<64) then",
     compositeLua: [
       {

src/renderer/config-blocks/EncoderPushRot_End.svelte

@@ -37,11 +37,6 @@
 </script>
 
 <else-block
-  class="{$$props.class} w-full h-fit flex flex-col text-white py-1 {information.rounding ==
-  'top'
-    ? 'rounded-tr-xl '
-    : ''} {information.rounding == 'bottom'
-    ? 'rounded-br-xl '
-    : ''} pointer-events-auto"
+  class="{$$props.class} w-full h-fit flex flex-col text-white py-1 pointer-events-auto"
   style="min-height: 2.5rem; background: {information.color};"
 />

src/renderer/config-blocks/EncoderPushRot_If.svelte

@@ -15,6 +15,7 @@
     rounding: "top",
     category: "special",
     displayName: "Push & Rotate",
+    menuName: "Push & Rotate",
     defaultLua: "if self:bst()>0 then",
     compositeLua: [
       { short: "eprel", script: "else" },
@@ -44,7 +45,7 @@
 
 <script>
   import { createEventDispatcher, onDestroy } from "svelte";
-  import stringManipulation from "../main/user-interface/_string-operations";
+  import { stringManipulation } from "../main/user-interface/_string-operations";
   import { parenthesis } from "./_validators";
 
   export let config;
@@ -85,12 +86,7 @@
 <svelte:window bind:innerWidth={sidebarWidth} />
 
 <if-block
-  class="{$$props.class} w-full h-fit flex flex-col text-white py-1 {information.rounding ==
-  'top'
-    ? 'rounded-tr-xl '
-    : ''} {information.rounding == 'bottom'
-    ? 'rounded-br-xl '
-    : ''} pointer-events-auto"
+  class="{$$props.class} w-full h-fit flex flex-col text-white py-1 pointer-events-auto"
   style="min-height: 2.5rem; background: {information.color};"
 >
   <div class="bg-secondary p-1 my-auto mr-1 rounded hidden">

src/renderer/config-blocks/Loop_End.svelte

@@ -45,11 +45,6 @@
 </script>
 
 <endif-block
-  class="{$$props.class} w-full h-fit flex flex-col text-white py-1 {information.rounding ==
-  'top'
-    ? 'rounded-tr-xl '
-    : ''} {information.rounding == 'bottom'
-    ? 'rounded-br-xl '
-    : ''} pointer-events-auto"
+  class="{$$props.class} w-full h-fit flex flex-col text-white py-1 pointer-events-auto"
   style="min-height: 2.5rem; background: {information.color};"
 />

src/renderer/config-blocks/VarGlobal.svelte

@@ -25,7 +25,7 @@
 <script>
   import { createEventDispatcher, onDestroy, onMount } from "svelte";
   import { fly } from "svelte/transition";
-  import stringManipulation from "../main/user-interface/_string-operations";
+  import { stringManipulation } from "../main/user-interface/_string-operations";
 
   import { parenthesis } from "./_validators.js";
 

src/renderer/config-blocks/VarLocals.svelte

@@ -25,7 +25,7 @@
 <script>
   import { createEventDispatcher, onDestroy, onMount } from "svelte";
   import { fly } from "svelte/transition";
-  import stringManipulation from "../main/user-interface/_string-operations";
+  import { stringManipulation } from "../main/user-interface/_string-operations";
 
   import { parenthesis } from "./_validators.js";
 

src/renderer/config-blocks/VarSelf.svelte

@@ -25,7 +25,7 @@
 <script>
   import { createEventDispatcher, onDestroy, onMount } from "svelte";
   import { fly } from "svelte/transition";
-  import stringManipulation from "../main/user-interface/_string-operations";
+  import { stringManipulation } from "../main/user-interface/_string-operations";
 
   import { parenthesis } from "./_validators.js";
 

src/renderer/config-blocks/headers/CompositeFace.svelte

@@ -15,8 +15,6 @@
 <div
   class="{$$props.class} text-white flex items-center"
   style="background-color:{config.information.color}"
-  class:rounded-tr-xl={config.information.rounding == "top"}
-  class:rounded-br-xl={config.information.rounding == "bottom"}
   on:click={handleClick}
 >
   <span>{config.information.displayName}</span>

src/renderer/config-blocks/headers/ConditionElseIfFace.svelte

@@ -1,6 +1,6 @@
 <script>
   import { createEventDispatcher, onDestroy } from "svelte";
-  import stringManipulation from "../../main/user-interface/_string-operations";
+  import { stringManipulation } from "../../main/user-interface/_string-operations";
   import { parenthesis } from "../_validators";
 
   const dispatch = createEventDispatcher();

src/renderer/config-blocks/headers/ConditionIfFace.svelte

@@ -1,6 +1,6 @@
 <script>
   import { createEventDispatcher, onDestroy } from "svelte";
-  import stringManipulation from "../../main/user-interface/_string-operations";
+  import { stringManipulation } from "../../main/user-interface/_string-operations";
   import { parenthesis } from "../_validators";
 
   export let config;
@@ -38,7 +38,7 @@
 </script>
 
 <if-block
-  class="{$$props.class} h-fit flex text-white py-1 pointer-events-none rounded-tr-xl"
+  class="{$$props.class} h-fit flex text-white py-1 pointer-events-none"
   style="background-color:{config.information.color}"
 >
   <div class="flex flex-row items-center w-full">

src/renderer/config-blocks/headers/ForLoopHeader.svelte

@@ -3,7 +3,7 @@
   import { createEventDispatcher } from "svelte";
   import { Script } from "../_script_parsers.js";
   import Toggle from "../../main/user-interface/Toggle.svelte";
-  import stringManipulation from "../../main/user-interface/_string-operations";
+  import { stringManipulation } from "../../main/user-interface/_string-operations";
   import { Validator } from "../_validators";
   import AtomicInput from "../../main/user-interface/AtomicInput.svelte";
   import SendFeedback from "../../main/user-interface/SendFeedback.svelte";
@@ -97,7 +97,7 @@
 <!-- svelte-ignore a11y-click-events-have-key-events -->
 <!-- svelte-ignore a11y-no-static-element-interactions -->
 <container
-  class="{$$props.class} h-full justify-center flex flex-col rounded-tr-xl"
+  class="{$$props.class} h-full justify-center flex flex-col"
   class:p-2={toggleValue}
   style="background-color:{config.information.color}"
 >

src/renderer/main/MiddlePanelContainer.svelte

@@ -143,6 +143,4 @@
       on:content-change={handleContentChange}
     />
   </div>
-
-  <slot />
 </div>