feat: updated search list item nested links

dastrong-codiga · dastrong-codiga · commit c8bc0e25d58e · 2022-09-02T12:11:03.000-07:00
diff --git a/src/renderer/components/SnippetResults/SnippetResults.tsx b/src/renderer/components/SnippetResults/SnippetResults.tsx
@@ -1,9 +1,6 @@
 import { Flex } from '@chakra-ui/react';
-import { useState } from 'react';
-import {
-  AssistantRecipeWithStats,
-  RecipeSummary,
-} from '../../types/assistantTypes';
+import useUrlQuery from '../../hooks/useUrlQuery';
+import { AssistantRecipeWithStats } from '../../types/assistantTypes';
 import Code from '../Code/Code';
 import SnippetResultsList from './SnippetResultsList';
 import SnippetResultsListItem from './SnippetResultsListItem';
@@ -13,11 +10,12 @@ type SnippetResultsProps = {
 };
 
 export default function SnippetResults({ results }: SnippetResultsProps) {
-  const [snippetInFocus, setSnippetInFocus] = useState(results[0] || {});
+  const query = useUrlQuery();
+  const currentSnippetId = query.get('currentSnippetId');
 
-  const changeSnippetInFocus = (recipe: RecipeSummary) => {
-    setSnippetInFocus(recipe);
-  };
+  const currentSnippet = currentSnippetId
+    ? results.find((recipe) => String(recipe.id) === currentSnippetId)
+    : results[0] || {};
 
   return (
     <Flex h="full" overflow="hidden">
@@ -26,13 +24,12 @@ export default function SnippetResults({ results }: SnippetResultsProps) {
           <SnippetResultsListItem
             key={result.id}
             recipe={result}
-            changeSnippetInFocus={changeSnippetInFocus}
-            currentSnippet={result.id === snippetInFocus.id}
+            isCurrentSnippet={currentSnippet?.id === result.id}
           />
         ))}
       </SnippetResultsList>
 
-      {results[0] ? <Code recipe={snippetInFocus} /> : null}
+      {currentSnippet?.id ? <Code recipe={currentSnippet} /> : null}
     </Flex>
   );
 }
diff --git a/src/renderer/components/SnippetResults/SnippetResultsListItem.tsx b/src/renderer/components/SnippetResults/SnippetResultsListItem.tsx
@@ -1,33 +1,32 @@
-import { Flex, Text } from '@chakra-ui/react';
+import { Flex, LinkBox, LinkOverlay, Text } from '@chakra-ui/react';
 import { ChartBarsIcon, DotIcon, Logo, Tags } from '@codiga/components';
-import {
-  AssistantRecipeWithStats,
-  RecipeSummary,
-} from '../../types/assistantTypes';
+import { Link as RouterLink } from 'react-router-dom';
+
+import { AssistantRecipeWithStats } from '../../types/assistantTypes';
 import FavoriteSnippet from '../Favorite/FavoriteSnippet';
 import Votes from '../Votes';
 
 type SnippetResultsListItemProps = {
   recipe: AssistantRecipeWithStats;
-  changeSnippetInFocus: (recipe: RecipeSummary) => void;
-  currentSnippet: boolean;
+  isCurrentSnippet: boolean;
 };
 
 export default function SnippetResultsListItem({
   recipe,
-  changeSnippetInFocus,
-  currentSnippet,
+  isCurrentSnippet,
 }: SnippetResultsListItemProps) {
   return (
-    <Flex
+    <LinkBox
+      cursor="pointer"
+      as={Flex}
       flexDirection="column"
       p="space_16"
       gridGap="space_8"
       borderBottom="1px"
       borderColor="neutral.50"
-      bg={currentSnippet ? 'neutral.25' : 'neutral.0'}
+      bg={isCurrentSnippet ? 'neutral.25' : 'neutral.0'}
       _dark={{
-        bg: currentSnippet ? 'base.onyx' : 'neutral.100',
+        bg: isCurrentSnippet ? 'base.onyx' : 'neutral.100',
         borderColor: 'base.onyx',
       }}
       _focus={{
@@ -42,14 +41,13 @@ export default function SnippetResultsListItem({
         bg: 'neutral.25',
         _dark: { bg: 'base.onyx' },
       }}
-      onClick={() => changeSnippetInFocus(recipe)}
-      cursor="pointer"
-      tabIndex={0}
     >
       <Flex alignItems="center" gridGap="space_8">
         <Logo value={recipe.language} fullSize={false} logoSize={18} />
         <Text size="sm" fontWeight="bold" noOfLines={1}>
-          {recipe.name}
+          <LinkOverlay as={RouterLink} to={`?currentSnippetId=${recipe.id}`}>
+            {recipe.name}
+          </LinkOverlay>
         </Text>
         <FavoriteSnippet
           isSubscribed={recipe.isSubscribed}
@@ -75,6 +73,6 @@ export default function SnippetResultsListItem({
       {recipe?.tags && recipe?.tags.length > 0 && (
         <Tags values={recipe?.tags || []} max={1} tagProps={{ size: 'sm' }} />
       )}
-    </Flex>
+    </LinkBox>
   );
 }
diff --git a/src/renderer/hooks/useUrlQuery.ts b/src/renderer/hooks/useUrlQuery.ts
@@ -0,0 +1,8 @@
+import { useMemo } from 'react';
+import { useLocation } from 'react-router-dom';
+
+export default function useUrlQuery() {
+  const { search } = useLocation();
+
+  return useMemo(() => new URLSearchParams(search), [search]);
+}
