fix: contributor profile tab click state flicker (#1432)

open-sauced · Jul 26, 2023 · c9cf8ed · c9cf8ed
1 parent 5614886
commit c9cf8ed
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/components/organisms/ContributorProfileTab/contributor-profile-tab.tsx b/components/organisms/ContributorProfileTab/contributor-profile-tab.tsx
@@ -83,14 +83,14 @@ const ContributorProfileTab = ({
   useEffect(() => {
     setInputVisible(highlights && highlights.length !== 0 ? true : false);
     if (login && currentPathname) {
-      router.push(`/user/${login}/${currentPathname}`);
       setCurrentPathname(getCurrentPathName);
+      router.push(`/user/${login}/${currentPathname}`);
     }
-    if (login && !hasHighlights) {
-      router.push(`/user/${login}/contributions`);
-      setCurrentPathname("contributions");
+    if (login && !hasHighlights && currentPathname) {
+      setCurrentPathname(currentPathname);
+      router.push(`/user/${login}/${currentPathname}`);
     }
-  }, [currentPathname, hasHighlights, highlights, login]);
+  }, [login, hasHighlights]);
 
   useEffect(() => {
     // sets the highlights state to true if the user has highlights on profile route change
@@ -100,7 +100,7 @@ const ContributorProfileTab = ({
   }, [highlights]);
 
   return (
-    <Tabs value={uppercaseFirst(currentPathname as string)} onValueChange={handleTabUrl}>
+    <Tabs defaultValue={uppercaseFirst(currentPathname as string)} onValueChange={handleTabUrl}>
       <TabsList className="justify-start w-full overflow-x-auto border-b">
         {tabLinks.map((tab) => (
           <TabsTrigger
@@ -262,8 +262,8 @@ const ContributorProfileTab = ({
                 )}
               </div>
             </div>
-            <div className="h-32 mt-10">
-              <CardLineChart lineChartOption={chart} className="!h-32" />
+            <div className="mt-2 h-36">
+              <CardLineChart lineChartOption={chart} className="!h-36" />
             </div>
             <div>
               <CardRepoList limit={7} repoList={repoList} />

diff --git a/lib/hooks/useContributorPullRequestsChart.ts b/lib/hooks/useContributorPullRequestsChart.ts
@@ -23,7 +23,7 @@ const useContributorPullRequestsChart = (contributor: string, topic: string, rep
       },
     },
     grid: {
-      height: 100,
+      height: 130,
       top: 0,
       bottom: 0,
       right: 0,
@@ -41,6 +41,7 @@ const useContributorPullRequestsChart = (contributor: string, topic: string, rep
           color: "#FFB74D",
           opacity: 0.6,
         },
+        clip: false,
       },
     ],
     tooltip: {

diff --git a/pages/_app.tsx b/pages/_app.tsx
@@ -58,8 +58,6 @@ function MyApp({ Component, pageProps }: ComponentWithPageLayout) {
 
   if (typeof window !== "undefined") hostname = window.location.hostname;
 
-  console.log(router.asPath);
-
   useEffect(() => {
     let chatButton = document.getElementById("sitegpt-chat-icon");