Merge pull request #85 from KilleenCode/70-close-omnibar-on-esc

feat: close omnibar on escape

package.json

@@ -1,10 +1,10 @@
 {
   "name": "brancato",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "private": true,
   "dependencies": {
-    "@algolia/autocomplete-js": "^1.5.3",
-    "@algolia/autocomplete-theme-classic": "^1.5.3",
+    "@algolia/autocomplete-js": "^1.7.1",
+    "@algolia/autocomplete-theme-classic": "^1.7.1",
     "@radix-ui/colors": "^0.1.8",
     "@radix-ui/react-tabs": "^0.1.5",
     "@stitches/react": "^1.2.7",
@@ -17,7 +17,7 @@
     "@types/node": "^16.11.26",
     "@types/react": "^17.0.39",
     "@types/react-dom": "^17.0.13",
-    "hotkeys-js": "^3.8.7",
+    "hotkeys-js": "^3.9.4",
     "keycode": "^2.2.1",
     "lodash": "^4.17.21",
     "math-expression-evaluator": "^1.3.14",
@@ -33,7 +33,8 @@
     "build": "react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
-    "tauri": "tauri"
+    "tauri": "tauri",
+    "dev": "tauri dev"
   },
   "eslintConfig": {
     "extends": [

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "brancato"
-version = "0.10.0"
+version = "0.11.0"
 description = "A tool for stage-managing your life"
 authors = ["Ryan Killeen"]
 license = ""

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "package": {
     "productName": "brancato",
-    "version": "0.10.0"
+    "version": "0.11.0"
   },
   "build": {
     "distDir": "../build",

src/components/Autocomplete.jsx

@@ -2,6 +2,7 @@ import { autocomplete } from '@algolia/autocomplete-js';
 import React, { createElement, Fragment, useEffect, useRef } from 'react';
 import { render } from 'react-dom';
 import "@algolia/autocomplete-theme-classic";
+import { appWindow } from '@tauri-apps/api/window';
 
 export const Action = ({ hit }) => {
     // Component to display the items
@@ -34,12 +35,19 @@ export const Action = ({ hit }) => {
 export function Autocomplete(props) {
 
   const containerRef = useRef(null);
+  const handleEscape = (e) => {
+    if (e.key === 'Escape') {
+      appWindow.hide()
+    }
+  }
 
   useEffect(() => {
     if (!containerRef.current) {
       return undefined;
     }
 
+
+
     const search = autocomplete({
       detachedMediaQuery: 'none',
       container: containerRef.current,
@@ -55,5 +63,5 @@ export function Autocomplete(props) {
     };
   }, [props, containerRef]);
 
-  return <div ref={containerRef} />;
+  return <div ref={containerRef} onKeyDown={handleEscape}/>;
 }

src/components/Omnibar/Omnibar.tsx

@@ -8,8 +8,9 @@ import createWebSearchSource, { searchEngines } from "./websearch-source";
 import mexp from "math-expression-evaluator";
 import createCalculatorSource from "./math-source";
 import { UnlistenFn } from "@tauri-apps/api/event";
+
 const focusSearchBar = () => {
-  let input = document.querySelector(".aa-Input") as HTMLElement | null;
+  let input = document.querySelector<HTMLInputElement>(".aa-Input");
   input?.focus();
 };