Merge pull request #741 from vcync/next

merge next into main
vcync · Jul 4, 2022 · 649e347 · 649e347
2 parents 9905349 + 8e42216
commit 649e347
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 29 deletions.
diff --git a/package.json b/package.json
@@ -79,7 +79,7 @@
     "@vue/eslint-config-prettier": "^4.0.1",
     "babel-eslint": "^10.0.3",
     "core-js": "^3.19.1",
-    "electron": "^17.0.0",
+    "electron": "^17.2.0",
     "electron-builder": "^22.9.1",
     "electron-notarize": "^1.0.0",
     "eslint": "^5.16.0",

diff --git a/src/App.vue b/src/App.vue
@@ -48,7 +48,7 @@
           </gl-component>
 
           <gl-stack title="Input Stack">
-            <gl-component title="Input config" :closable="false">
+            <gl-component title="Input Config" :closable="false">
               <InputConfig />
             </gl-component>
 
@@ -458,13 +458,29 @@ body {
   --rowGap: 8px;
   --displayScale: 1;
   --pixel: 1px;
-  --foreground-color-rgb: 0, 0, 0;
+  --foreground-color-rgb: 255, 255, 255;
   --foreground-color-a: 1;
   --foreground-color: rgba(
     var(--foreground-color-rgb),
     var(--foreground-color-a)
   );
 
+  --foreground-color-1: rgba(var(--foreground-color-rgb), 0.5);
+  --foreground-color-2: rgba(var(--foreground-color-rgb), 0.4);
+  --foreground-color-3: rgba(var(--foreground-color-rgb), 0.2);
+  --foreground-color-4: rgba(var(--foreground-color-rgb), 0.1);
+
+  --background-color-rgb: 17, 17, 17;
+  --background-color-a: 1;
+  --background-color: rgba(
+    var(--background-color-rgb),
+    var(--background-color-a)
+  );
+  --background-color-1: rgba(var(--background-color-rgb), 0.8);
+  --background-color-2: rgba(var(--background-color-rgb), 0.7);
+  --background-color-3: rgba(var(--background-color-rgb), 0.5);
+  --background-color-4: rgba(var(--background-color-rgb), 0.4);
+
   --focus-color-rgb: 241, 196, 16;
   --focus-color-a: 1;
   --focus-color: rgba(var(--focus-color-rgb), var(--focus-color-a));

diff --git a/src/components/InputConfig.vue b/src/components/InputConfig.vue
@@ -2,6 +2,20 @@
   <div
     class="input-config"
     v-infoView="{ title: iVTitle, body: iVBody, id: 'Input Config Panel' }"
+    v-searchTerms="{
+      terms: [
+        'input link',
+        'input config',
+        'link',
+        'config',
+        'midi',
+        'audio feature',
+        'expression',
+        'smoothing'
+      ],
+      title: 'Input Config',
+      type: 'Panel'
+    }"
   >
     <div v-if="inputConfig">
       <grid class="borders">

diff --git a/src/components/Search.vue b/src/components/Search.vue
@@ -24,7 +24,7 @@
           v-for="(key, index) in resultsKeys"
           :key="key"
           @mousedown="select(results[key].id)"
-          @mouseover="mouseOverHandler(results[key].id, index)"
+          @mousemove="mouseMoveHandler(results[key].id, index)"
           :class="{
             selected: index === keyboardSelectedIndex
           }"
@@ -179,7 +179,11 @@ export default {
       }
     },
 
-    mouseOverHandler(id, index) {
+    mouseMoveHandler(id, index) {
+      if (this.keyboardSelectedIndex === index) {
+        return;
+      }
+
       this.keyboardSelectedIndex = index;
       this.highlight(id);
     },
@@ -225,7 +229,16 @@ export default {
   z-index: 1;
 }
 
+.search .search-box-container {
+  background: var(--background-color-1);
+  border-radius: 5px;
+  padding: 0.5rem;
+  z-index: 1;
+}
+
 .search .search-box-container .search-box {
+  color: var(--background-color);
+  background: var(--foreground-color-1);
   border-radius: 5px;
   width: 100%;
   padding-left: var(--baseline);
@@ -236,12 +249,6 @@ export default {
   border-radius: 5px 5px 0 0;
 }
 
-.search .search-box-container {
-  border-radius: 5px;
-  padding: 0.5rem;
-  z-index: 1;
-}
-
 .search .search-box-container .results {
   margin: 0;
   padding: 0;
@@ -256,12 +263,11 @@ export default {
   padding-left: var(--baseline);
   padding-right: var(--baseline);
 }
-
 .search .search-box-container .results:last-child {
   border-radius: 0 0 5px 5px;
 }
 
-.search .search-box-container .results.selected {
+.search .search-box-container .results .selected {
   background: var(--foreground-color-1);
 }
 

diff --git a/yarn.lock b/yarn.lock
@@ -1221,12 +1221,7 @@
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
-"@types/node@*":
-  version "14.0.13"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.13.tgz#ee1128e881b874c371374c1f72201893616417c9"
-  integrity sha512-rouEWBImiRaSJsVA+ITTFM6ZxibuAlTuNOCyxVbwreu6k6+ujs7DfnU9o+PShFhET78pMBl3eH+AGSI5eOTkPA==
-
-"@types/node@^14.6.2":
+"@types/node@*", "@types/node@^14.6.2":
   version "14.18.11"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.11.tgz#9bd810a959e1728d78df0f68b5c825b8ea7156f4"
   integrity sha512-zCoCEMA+IPpsRkyCFBqew5vGb7r8RSiB3uwdu/map7uwLAfu1MTazW26/pUDWoNnF88vJz4W3U56i5gtXNqxGg==
@@ -4521,10 +4516,10 @@ electron-updater@^4.3.1:
     lodash.isequal "^4.5.0"
     semver "^7.1.3"
 
-electron@^17.0.0:
-  version "17.0.0"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-17.0.0.tgz#60f00f3e3c657020e807a519700213943468b4d1"
-  integrity sha512-3UXcBQMwbMWdPvGHaSdPMluHrd+/bc+K143MyvE5zVZ+S1XCHt4sau7dj6svJHns5llN0YG/c6h/vRfadIp8Zg==
+electron@^17.2.0:
+  version "17.2.0"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-17.2.0.tgz#a5c42c16352ea968fcb5d1ce256bec51e7d140fe"
+  integrity sha512-eNXhPVEUofkgAeqRFvTizzYecoCMyS0Rar08WZHSAw9wjfZXawYMvTpjjjk9GiX9W/+Cjxua4YtGn5bOTabc0A==
   dependencies:
     "@electron/get" "^1.13.0"
     "@types/node" "^14.6.2"
@@ -4972,9 +4967,9 @@ events@^3.0.0:
   integrity sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==
 
 eventsource@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0"
-  integrity sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.1.tgz#4544a35a57d7120fba4fa4c86cb4023b2c09df2f"
+  integrity sha512-qV5ZC0h7jYIAOhArFJgSfdyz6rALJyb270714o7ZtNnw2WSJ+eexhKtE0O8LYPRsHZHf2osHKZBxGPvm3kPkCA==
   dependencies:
     original "^1.0.0"
 
@@ -11103,9 +11098,9 @@ shebang-regex@^3.0.0:
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
 shell-quote@^1.6.1:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2"
-  integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123"
+  integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==
 
 shvl@^2.0.2:
   version "2.0.3"