Merge pull request #987 from Dygmalab/fixDualLayerSelect

fix: dual layer select now works as expected
Dygmalab · Jan 30, 2025 · 99f7486 · 99f7486
2 parents 8b00115 + 9eb9d55
commit 99f7486
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 13 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,7 +23,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: macos-12
+          - os: macos-13
           - os: windows-2019
           - os: ubuntu-20.04
     steps:
@@ -60,7 +60,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: macos-12
+          - os: macos-13
           - os: windows-2019
           - os: ubuntu-20.04
 

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: macos-12
+          - os: macos-13
           - os: windows-2019
           - os: ubuntu-20.04
 

diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
   },
   "homepage": "https://github.com/Dygmalab/Bazecor",
   "engines": {
-    "node": "^20.13.1",
+    "node": "^20",
     "npm": ">=10.0.0"
   },
   "devDependencies": {

diff --git a/src/renderer/modules/KeysTabs/LayersTab.tsx b/src/renderer/modules/KeysTabs/LayersTab.tsx
@@ -2,6 +2,7 @@
 import React, { useMemo, useState, useEffect, useCallback } from "react";
 import { AnimatePresence, motion } from "framer-motion";
 import { toast } from "react-toastify";
+// import log from "electron-log/renderer";
 
 import { Button } from "@Renderer/components/atoms/Button";
 import Heading from "@Renderer/components/atoms/Heading";
@@ -100,6 +101,17 @@ const LayersTab = ({
     keyNumInternal = 0;
   }
 
+  const handleDual = (keyBase: number, layer?: number) => {
+    const layerItem = layer
+      ? findLayerType(undefined, activeLayerTab, layer)
+      : findLayerType(undefined, activeLayerTab, activeLayerNumber);
+    // log.info("checking layer item", layerItem, layerItem.keynum + keyBase);
+    if (layerItem && layerItem.type === "layerDual") {
+      onKeySelect(layerItem.keynum + keyBase);
+      setOpenKeysPopover(false);
+    }
+  };
+
   const handleLayer = (layerNumber: number) => {
     const layerItem = findLayerType(undefined, activeLayerTab, layerNumber);
     // console.log("Layer inside handle: ", layerItem);
@@ -113,6 +125,8 @@ const LayersTab = ({
     }
     if (layerItem && layerItem.type !== "layerDual") {
       onKeySelect(layerItem.keynum);
+    } else {
+      handleDual(keyCode.base, layerNumber);
     }
   };
 
@@ -122,14 +136,6 @@ const LayersTab = ({
     onKeySelect(layerItem.keynum);
   };
 
-  const handleDual = (keyBase: number) => {
-    const layerItem = findLayerType(undefined, activeLayerTab, activeLayerNumber);
-    if (layerItem && layerItem.type === "layerDual") {
-      onKeySelect(layerItem.keynum + keyBase);
-      setOpenKeysPopover(false);
-    }
-  };
-
   useEffect(() => {
     const layerItem = findLayerType(undefined, activeLayerTab, activeLayerNumber);
     if (macros && activeTab === "macro" && layerItem && triggerDeleteLastItem) {
@@ -208,7 +214,10 @@ const LayersTab = ({
                       handleLayer(index + 1);
                     }}
                     selected={index + 1 === activeLayerNumber}
-                    disabled={index > 7 && disableOneShotButtons && activeLayerTab === "layerShot"}
+                    disabled={
+                      (index > 7 && disableOneShotButtons && activeLayerTab === "layerShot") ||
+                      (activeLayerTab === "layerDual" && index > 7)
+                    }
                     key={`buttonLayerID-${button.layer}`}
                     className="h-9 aspect-square"
                   >