Fixed instant search when pressing some function keys and some other …

…shortcut keys + brought back the codriver badge
RickyDane · Aug 24, 2024 · fd10da5 · fd10da5
1 parent 47f4077
commit fd10da5
Show file tree

Hide file tree

Showing 6 changed files with 83 additions and 24 deletions.
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -1,7 +1,7 @@
 # cargo-features = ["profile-rustflags"]
 [package]
 name = "CoDriver"
-version = "0.4.831"
+version = "0.4.832"
 description = "A simple file explorer"
 authors = ["Ricky Dane Perlick"]
 license = "none"

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "CoDriver",
-    "version": "0.4.831"
+    "version": "0.4.832"
   },
   "tauri": {
     "updater": {

diff --git a/ui/index.html b/ui/index.html
@@ -22,6 +22,10 @@
         </div>
     </div>
     <div class="popup-background"></div>
+
+    <!-- :instant-search | Instant Search -->
+    <input class="instant-search-input text-input" type="text" placeholder="Start typing ..." disabled/>
+
     <div style="display: flex; width: 100%; height: 100vh;">
         <div data-tauri-drag-region class="site-nav-bar">
             <div class="codriver-name">CoDriver</div>

diff --git a/ui/main_logic.js b/ui/main_logic.js
@@ -208,30 +208,14 @@ document.addEventListener("keydown", async (e) => {
 	}
 	if (IsInputFocused === false &&
 		IsPopUpOpen === false &&
-		e.key !== "Escape" &&
-		e.key !== "ArrowLeft" &&
-		e.key !== "ArrowRight" &&
-		e.key !== "ArrowUp" &&
-		e.key !== "ArrowDown" &&
-		e.key !== "Enter" &&
-		e.key !== "Backspace" &&
-		e.key !== "Delete" &&
-		e.key !== "CapsLock" &&
-		e.key !== "Shift" &&
-		e.key !== "Control" &&
-		e.key !== "Alt" &&
-		e.key !== "Meta" &&
-		e.key !== "Tab" &&
-		e.key !== " " &&
-		!e.metaKey &&
-		!e.ctrlKey &&
-		!e.altKey &&
-		!e.shiftKey &&
 		IsMetaDown === false &&
 		IsCtrlDown === false &&
-		IsShiftDown === false
+		IsShiftDown === false &&
+		isShortcut(e.key) === false	
 	) {
 		CurrentQuickSearch += e.key;
+		$(".instant-search-input").css("display", "block");
+		$(".instant-search-input").val(CurrentQuickSearch);
 		await searchFor(CurrentQuickSearch, 9999999, 1, true);
 		setTimeout(() => {
 			if (IsDualPaneEnabled === true) {
@@ -252,6 +236,8 @@ function resetQuickSearch() {
 			clearInterval(CurrentQuickSearchTimer);
 			CurrentQuickSearchTime = TIMETORESET;
 			CurrentQuickSearch = "";
+			$(".instant-search-input").val("");
+			$(".instant-search-input").css("display", "none");
 		} else {
 			CurrentQuickSearchTime -= 50;
 		}
@@ -410,6 +396,56 @@ function positionContextMenu(e) {
 
 /* :shortcuts Shortcuts configuration */
 
+function isShortcut(key) {
+	if (key == "Meta" ||
+		key == "Control" ||
+		key == "Shift" ||
+		key == "Alt" ||
+		key == "CapsLock" ||
+		key == "Enter" ||
+		key == "Backspace" ||
+		key == "Delete" ||
+		key == "ArrowLeft" ||
+		key == "ArrowRight" ||
+		key == "ArrowUp" ||
+		key == "ArrowDown" ||
+		key == "Escape" ||
+		key == "Tab" ||
+		key == "F1" ||
+		key == "F2" ||
+		key == "F3" ||
+		key == "F4" ||
+		key == "F5" ||
+		key == "F6" ||
+		key == "F7" ||
+		key == "F8" ||
+		key == "F9" ||
+		key == "F10" ||
+		key == "F11" ||
+		key == "F12" ||
+		key == "F13" ||
+		key == "Home" ||
+		key == "End" ||
+		key == "PageUp" ||
+		key == "PageDown" ||
+		key == "PrintScreen" ||
+		key == "Insert" ||
+		key == "Pause" ||
+		key == "Help" ||
+		key == "NumLock" ||
+		key == "Clear" ||
+		key == "ScrollLock" ||
+		key == "+" ||
+		key == "-" ||
+		key == "*" ||
+		key == "/" ||
+		key == ",") {
+		return true;
+	} else {
+		return false;
+	}
+}
+
 document.onkeydown = async (e) => {
 	if (IsDisableShortcuts === false) {
 		// Shortcut for jumping to configured directory
@@ -4019,7 +4055,7 @@ async function getDir(number) {
 
 async function insertSiteNavButtons() {
 	for (let children of document.querySelector(".site-nav-bar").children) {
-		if (!children.classList.contains("active-actions-container")) {
+		if (!children.classList.contains("active-actions-container") && !children.classList.contains("codriver-name")) {
 			children.remove();
 		}
 	}

diff --git a/ui/style.css b/ui/style.css
@@ -2115,4 +2115,23 @@ button > svg {
 }
 .c-item-custom:hover {
     background-color: var(--transparentColorActive);
+}
+
+.instant-search-input {
+    display: none;
+    position: fixed;
+    left: 0;
+    right: 0;
+    bottom: 100px;
+    margin: auto;
+    border: 1px solid var(--tertiaryColor);
+    border-radius: 10px;
+    padding: 5px;
+    background-color: var(--transparentColor);
+    backdrop-filter: blur(2px);
+    -webkit-backdrop-filter: blur(2px);
+    color: var(--textColor);
+    font-size: var(--fontSize);
+    width: 200px;
+    z-index: 5;
 }