Fit button style, make search focus when closing web

Witherbomb47 · Jan 28, 2024 · 39778a3 · 39778a3
1 parent 769bf67
commit 39778a3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -112,6 +112,7 @@
 - [ ] Config file
 - [ ] Privacy policy
 - [ ] "Open" option in settings => search with: default, direct, about:blank
+- [ ] Page title and icon in web nav
 
 ### Roadmap
 The roadmap has moved [here](https://github.com/orgs/cognetwork-dev/projects/1/views/1).
diff --git a/src/components/web.tsx b/src/components/web.tsx
@@ -7,6 +7,7 @@ import { RefreshIcon } from "../assets/refreshIcon";
 import { FullscreenIcon } from "../assets/fullscreenIcon";
 
 let web: any = null;
+let search: any = null;
 
 function Web({ open, setOpen }: WebTypes) {
     const webRef = useRef<HTMLIFrameElement>(null);
@@ -41,7 +42,9 @@ function Web({ open, setOpen }: WebTypes) {
 
     function closeWeb() {
         if (open) {
+            search.value = "";
             setOpen(false);
+            search.focus();
         }
     }
 
@@ -52,13 +55,13 @@ function Web({ open, setOpen }: WebTypes) {
                     {/**Title and Icon */}
                 </div>
                 <div class="flex gap-4">
-                    <RoundButton onclick={fullscreenWeb}>
+                    <RoundButton onclick={fullscreenWeb} active={true}>
                         <FullscreenIcon />
                     </RoundButton>
-                    <RoundButton onclick={refreshWeb}>
+                    <RoundButton onclick={refreshWeb} active={true}>
                         <RefreshIcon />
                     </RoundButton>
-                    <RoundButton onClick={closeWeb}>
+                    <RoundButton onClick={closeWeb} active={true}>
                         <CloseIcon />
                     </RoundButton>
                 </div>
@@ -68,12 +71,13 @@ function Web({ open, setOpen }: WebTypes) {
     )
 }
 
-async function searchWeb(input: string, service: string, searchEngine: string, open: boolean, setOpen: any) {
+async function searchWeb(input: string, service: string, searchEngine: string, open: boolean, setOpen: any, searchRef: any) {
     if (!open) {
         setOpen(true)
         if (web && web.current) {
             web.current.src = await searchURL(input, service, searchEngine)
             web.current.focus()
+            search = searchRef;
         }
     }
 }

diff --git a/src/pages/home.tsx b/src/pages/home.tsx
@@ -21,7 +21,7 @@ function Home() {
     const handleSearch = async (e: any) => {
         if (e.key == "Enter") {
             if (e.target.value) {
-                await searchWeb(e.target.value, service, geSearchEngine(searchEngine), webOpen, setWebOpen)
+                await searchWeb(e.target.value, service, geSearchEngine(searchEngine), webOpen, setWebOpen, e.target);
             }
         }
     }