Merge pull request #85 from fuzue/63-the-search-dialog-results-dont-c…

…lose-when-a-item-is-selected 63 the search dialog results don't close when a item is selected
fuzue · Aug 30, 2023 · 6744f03 · 6744f03
2 parents d96c6da + df380bd
commit 6744f03
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 33 deletions.
diff --git a/src/components/HeaderBar.tsx b/src/components/HeaderBar.tsx
@@ -1,16 +1,16 @@
 import type { FoodList, FoodObject } from "../types/food";
-import Fuse from 'fuse.js'
-import { useRef, useEffect } from "react"
+import Fuse from "fuse.js";
+import { useRef, useEffect } from "react";
 import i18next from "i18next";
 import { useTranslation } from "react-i18next";
 import { Menu, Search } from "@mui/icons-material";
 import {
   AppBar,
   styled,
-  alpha,
   Toolbar,
   IconButton,
-  InputBase
+  InputBase,
+  Box,
 } from "@mui/material";
 
 type Props = {
@@ -45,17 +45,23 @@ export default function HeaderBar(props: Props) {
     const options = {
       threshold: 0.3,
       keys: [
-        { name: 'name-en', getFn: (food: FoodObject) => food.description[0].name },
-        { name: 'name-it', getFn: (food: FoodObject) => food.description[1].name }
-      ]
-    }
+        {
+          name: "name-en",
+          getFn: (food: FoodObject) => food.description[0].name,
+        },
+        {
+          name: "name-it",
+          getFn: (food: FoodObject) => food.description[1].name,
+        },
+      ],
+    };
 
-    const fuse = new Fuse(food, options)
-    const searchText = query.current.value.trim().toLowerCase()
-    const searchLanguage: { [lang: string]: string } = {}
-    searchLanguage["name-" + i18next.language] = searchText
+    const fuse = new Fuse(food, options);
+    const searchText = query.current.value.trim().toLowerCase();
+    const searchLanguage: { [lang: string]: string } = {};
+    searchLanguage["name-" + i18next.language] = searchText;
 
-    return fuse.search(searchLanguage).map((i) => i.item)
+    return fuse.search(searchLanguage).map((i) => i.item);
   };
 
   function leftButton() {
@@ -72,20 +78,6 @@ export default function HeaderBar(props: Props) {
     );
   }
 
-  const SearchBar = styled("div")(({ theme }) => ({
-    position: "relative",
-    borderRadius: theme.shape.borderRadius,
-    backgroundColor: alpha(theme.palette.common.white, 0.15),
-    "&:hover": {
-      backgroundColor: alpha(theme.palette.common.white, 0.25),
-    },
-    "&:focus": {
-      backgroundColor: alpha(theme.palette.common.white, 0.25),
-    },
-    marginLeft: "auto",
-    width: "auto",
-  }));
-
   const SearchIconWrapper = styled("div")(() => ({
     height: "100%",
     aspectRatio: 1,
@@ -114,7 +106,12 @@ export default function HeaderBar(props: Props) {
     <AppBar position="static" sx={{ mb: 1, backgroundColor: "primary.dark" }}>
       <Toolbar>
         {leftButton()}
-        <SearchBar>
+        <Box
+          position="relative"
+          marginLeft="auto"
+          borderRadius=".5rem"
+          bgcolor="rgba(255,255,255,.1)"
+        >
           <SearchIconWrapper>
             <IconButton
               sx={{ m: 0 }}
@@ -128,15 +125,15 @@ export default function HeaderBar(props: Props) {
           </SearchIconWrapper>
           <form onSubmit={(e) => handleSubmit(e)}>
             <StyledInputBase
+              key="searchInput"
               placeholder={t("Header_searchBar")}
               inputProps={{ "aria-label": "search" }}
               inputRef={query}
               id="search-bar"
             />
           </form>
-        </SearchBar>
+        </Box>
       </Toolbar>
     </AppBar>
   );
 }
-
diff --git a/src/components/RenderFoods.tsx b/src/components/RenderFoods.tsx
@@ -14,9 +14,9 @@ interface RenderFoodProps {
 //render the grid of foods
 const RenderFoods:FunctionComponent<RenderFoodProps> = (props:RenderFoodProps) => {
   const foodList = props.foodList
-  const foodItems = foodList.map((item ) => {
+  const foodItems = foodList.map((item, key) => {
     return (
-      <Item {...item} />
+      <Item key={key} {...item} />
     );
   });
   return (

diff --git a/src/components/SearchResult.tsx b/src/components/SearchResult.tsx
@@ -41,6 +41,7 @@ function SearchResult(props: Props) {
       maxWidth="md"
       open={ifSearched}
       onClose={closeModal}
+      onClick={closeModal}
       aria-labelledby="search results"
       aria-describedby="the results of your search are shown here"
       TransitionComponent={Transition}
@@ -51,7 +52,6 @@ function SearchResult(props: Props) {
           sx={{ml: "auto" }}
           edge="start"
           color="inherit"
-          onClick={closeModal}
           aria-label="close"
         >
           <Close />