fix: heatmap ssr user profile

dailydotdev · Nov 25, 2024 · 9b5c7f0 · 9b5c7f0
1 parent e990a67
commit 9b5c7f0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/packages/shared/src/components/CalendarHeatmap.tsx b/packages/shared/src/components/CalendarHeatmap.tsx
@@ -47,6 +47,10 @@ const binsAttributes: React.SVGProps<SVGRectElement>[] = [
 ];
 
 function getRange(count: number): number[] {
+  if (count <= 0) {
+    return [];
+  }
+
   return Array.from(new Array(count), (_, i) => i);
 }
 

diff --git a/packages/shared/src/hooks/profile/useActivityTimeFilter.ts b/packages/shared/src/hooks/profile/useActivityTimeFilter.ts
@@ -11,13 +11,6 @@ import { useViewSize, ViewSize } from '../useViewSize';
 import SettingsContext from '../../contexts/SettingsContext';
 
 const BASE_YEAR = 2018;
-const currentYear = new Date().getFullYear();
-const dropdownOptions = [
-  'Last year',
-  ...Array.from(new Array(currentYear - BASE_YEAR + 1), (_, i) =>
-    (currentYear - i).toString(),
-  ),
-];
 
 type UseActivityTimeFilterRet = {
   selectedHistoryYear: number;
@@ -29,6 +22,18 @@ type UseActivityTimeFilterRet = {
 };
 
 export function useActivityTimeFilter(): UseActivityTimeFilterRet {
+  const dropdownOptions = useMemo(() => {
+    const currentYear = new Date().getFullYear();
+    const optionsLength = Math.max(currentYear - BASE_YEAR + 1, 0);
+
+    return [
+      'Last year',
+      ...Array.from(new Array(optionsLength), (_, i) =>
+        (currentYear - i).toString(),
+      ),
+    ];
+  }, []);
+
   const laptop = useViewSize(ViewSize.Laptop);
   const laptopL = useViewSize(ViewSize.LaptopL);
   const { sidebarExpanded } = useContext(SettingsContext);
@@ -47,7 +52,7 @@ export function useActivityTimeFilter(): UseActivityTimeFilterRet {
     const startYear = new Date(selected, 0, 1);
 
     return [addDays(endOfYear(startYear), 1), startYear];
-  }, [fullHistory, selectedHistoryYear]);
+  }, [fullHistory, selectedHistoryYear, dropdownOptions]);
 
   return {
     selectedHistoryYear,