feat: long press esc

thewh1teagle · Nov 19, 2023 · e4d671d · e4d671d
1 parent a4cda6b
commit e4d671d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/desktop/src-tauri/src/main.rs b/desktop/src-tauri/src/main.rs
@@ -5,11 +5,6 @@ use enigo::*;
 use std::sync::Mutex;
 use tauri::State;
 
-// Learn more about Tauri commands at https://tauri.app/v1/guides/features/command
-#[tauri::command]
-fn greet(name: &str) -> String {
-    format!("Hello, {}! You've been greeted from Rust!", name)
-}
 
 struct Controller(Mutex<Enigo>);
 
@@ -31,6 +26,9 @@ fn press(controller: State<'_, Controller>, key: &str) {
         },
         "F5" => {
             controller.key_down(Key::F5);
+        },
+        "ESC" => {
+            controller.key_down(Key::Escape);
         }
         _ => {}
     }

diff --git a/desktop/src/App.tsx b/desktop/src/App.tsx
@@ -13,7 +13,8 @@ enum Action {
   VOL_DN,
   PG_UP,
   PG_DN,
-  F5
+  F5,
+  ESC
 }
 
 interface Message {

diff --git a/web/src/App.tsx b/web/src/App.tsx
@@ -11,7 +11,8 @@ enum Action {
   VOL_DN,
   PG_UP,
   PG_DN,
-  F5
+  F5,
+  ESC
 }
 interface Message {
   action: Action;
@@ -30,11 +31,13 @@ function App() {
   const [conn, setConn] = useState<DataConnection | null>(null);
 
   function sendMessage(data: Message) {
+    console.log('sending => ', data)
     navigator.vibrate(60)
     if (!noSleep.isEnabled) {
       console.log('No sleep enabled')
       noSleep.enable()
     }
+
     conn?.send(JSON.stringify(data));
   }
 
@@ -47,17 +50,25 @@ function App() {
     console.log("connecting to ", address);
     peer.on("open", () => {
       const connection = peer.connect(address!);
-      setLoading(false);
+      connection.on('open', () => {
+        setLoading(false);
+      })
       setConn(connection);
     });
 
+
+
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   const nextButtonBind = useLongPress(() => {
     sendMessage({ action: Action.F5 })
   });
 
+  const prevButtonBind = useLongPress(() => {
+    sendMessage({ action: Action.ESC })
+  });
+
   if (loading) {
     return (
       <div className="flex flex-col gap-5 w-[100vw] h-[100vh] items-center justify-center">
@@ -135,6 +146,7 @@ function App() {
             </svg>
           </button>
           <button
+            {...prevButtonBind()}
             onClick={() => sendMessage({ action: Action.PG_UP })} // prev
             className="btn btn-circle w-[80px] h-[80px]"
           >