fix colors

src/components/Heatmap.tsx

@@ -1,10 +1,10 @@
-import React, { useMemo, useCallback } from "react";
+import React, { useEffect, useState } from "react";
 import ActivityCalendar from "react-activity-calendar";
 import { Tooltip, Avatar } from "@mui/material";
 import Link from "next/link";
 import { aggregateToWeeklyData } from "../utils/weeklyCalendar";
-import { getHeatmapTheme } from "../utils/heatmapColors";
 import WeeklyHeatmap from "./WeeklyHeatmap";
+import { getHeatmapTheme, getHeatmapColorIntensity } from "../utils/heatmapColors";
 
 type ViewMode = 'daily' | 'weekly';
 
@@ -29,24 +29,41 @@ const Heatmap: React.FC<HeatmapProps> = ({
   showHeader = true,
   viewMode 
 }) => {
-  // Memoize the weekly data processing to avoid recalculation on every render
-  const weeklyData = useMemo(() => aggregateToWeeklyData(data), [data]);
+  // Process data based on view mode
+  const processedData = viewMode === 'weekly' ? aggregateToWeeklyData(data) : data;
   
-  // Choose data based on view mode
-  const processedData = viewMode === 'weekly' ? weeklyData : data;
+  // Track theme state for proper ActivityCalendar theming
+  const [isDarkMode, setIsDarkMode] = useState(false);
   
-  // Memoize the theme to prevent recreation
-  const theme = useMemo(() => getHeatmapTheme(color), [color]);
+  useEffect(() => {
+    // Check initial theme
+    const checkTheme = () => {
+      setIsDarkMode(document.documentElement.classList.contains('dark'));
+    };
+    
+    checkTheme();
+    
+    // Watch for theme changes
+    const observer = new MutationObserver(checkTheme);
+    observer.observe(document.documentElement, {
+      attributes: true,
+      attributeFilter: ['class']
+    });
+    
+    return () => observer.disconnect();
+  }, []);
   
-  // Memoize the render block callback
-  const renderBlock = useCallback((block: React.ReactElement, activity: any) => (
-    <Tooltip
-      title={`${activity.count} new repos on ${activity.date}`}
-      arrow
-    >
-      {block}
-    </Tooltip>
-  ), []);
+  // Use theme-aware colors
+  const emptyColor = isDarkMode ? "#374151" : "#d1d5db";
+  
+  // Create intensity levels for daily view (same as weekly)
+  const intensityColors = [
+    emptyColor,  // level 0
+    getHeatmapColorIntensity(1, color), // level 1 (40% intensity)
+    getHeatmapColorIntensity(2, color), // level 2 (60% intensity)
+    getHeatmapColorIntensity(3, color), // level 3 (80% intensity)
+    getHeatmapColorIntensity(4, color)  // level 4 (100% intensity)
+  ].filter((color): color is string => color !== null); // Remove any null values and type guard
   
   return (
     <div className="flex flex-col items-center w-full mx-auto">
@@ -75,11 +92,21 @@ const Heatmap: React.FC<HeatmapProps> = ({
         ) : (
           <ActivityCalendar
             data={processedData}
-            theme={theme}
+            theme={{
+              light: intensityColors,
+              dark: intensityColors
+            }}
             blockSize={11}
             blockMargin={2}
             hideTotalCount
-            renderBlock={renderBlock}
+            renderBlock={(block, activity) => (
+              <Tooltip
+                title={`${activity.count} new repos on ${activity.date}`}
+                arrow
+              >
+                {block}
+              </Tooltip>
+            )}
           />
         )}
       </div>
@@ -87,4 +114,4 @@ const Heatmap: React.FC<HeatmapProps> = ({
   );
 };
 
-export default React.memo(Heatmap);
+export default Heatmap;

src/components/HeatmapGrid.tsx

@@ -1,4 +1,4 @@
-import React, { useState, useCallback } from "react";
+import React, { useState } from "react";
 import { ProviderInfo, CalendarData } from "../types/heatmap";
 import OrganizationCard from "./OrganizationCard";
 import ProviderHeatmapSkeleton from "./ProviderHeatmapSkeleton";
@@ -15,11 +15,6 @@ interface HeatmapGridProps {
 const HeatmapGrid: React.FC<HeatmapGridProps> = ({ sortedProviders, calendarData, isLoading }) => {
   const [viewMode, setViewMode] = useState<ViewMode>('weekly');
 
-  // Memoize the toggle handler to prevent unnecessary re-renders
-  const handleViewModeToggle = useCallback((newMode: ViewMode) => {
-    setViewMode(newMode);
-  }, []);
-
   if (isLoading) {
     return (
       <div className="flex flex-col gap-8 max-w-4xl mx-auto mb-16">
@@ -36,7 +31,7 @@ const HeatmapGrid: React.FC<HeatmapGridProps> = ({ sortedProviders, calendarData
       <div className="flex justify-center">
         <ViewToggle
           viewMode={viewMode}
-          onToggle={handleViewModeToggle}
+          onToggle={setViewMode}
         />
       </div>
 
@@ -54,4 +49,4 @@ const HeatmapGrid: React.FC<HeatmapGridProps> = ({ sortedProviders, calendarData
   );
 };
 
-export default React.memo(HeatmapGrid);
+export default HeatmapGrid;

src/styles/globals.css

@@ -88,3 +88,64 @@
     display: none;  /* Safari and Chrome */
   }
 }
+
+/* Activity Calendar theme overrides for consistent empty dot colors */
+/* Try multiple possible selectors for react-activity-calendar */
+.react-activity-calendar rect[data-level="0"] {
+  fill: #d1d5db !important; /* Light theme empty dots */
+}
+
+.dark .react-activity-calendar rect[data-level="0"] {
+  fill: #374151 !important; /* Dark theme empty dots */
+}
+
+/* Alternative selectors in case the structure is different */
+.react-activity-calendar .react-activity-calendar__block[data-level="0"] {
+  fill: #d1d5db !important;
+}
+
+.dark .react-activity-calendar .react-activity-calendar__block[data-level="0"] {
+  fill: #374151 !important;
+}
+
+/* More general fallback selectors */
+.react-activity-calendar [data-level="0"] {
+  fill: #d1d5db !important;
+}
+
+.dark .react-activity-calendar [data-level="0"] {
+  fill: #374151 !important;
+}
+
+/* SVG rect elements specifically */
+.react-activity-calendar svg rect[data-level="0"] {
+  fill: #d1d5db !important;
+}
+
+.dark .react-activity-calendar svg rect[data-level="0"] {
+  fill: #374151 !important;
+}
+
+/* Override any background-color styles as well */
+.react-activity-calendar [data-level="0"] {
+  fill: #d1d5db !important;
+  background-color: #d1d5db !important;
+}
+
+.dark .react-activity-calendar [data-level="0"] {
+  fill: #374151 !important;
+  background-color: #374151 !important;
+}
+
+/* Even more specific selectors with higher specificity */
+html.dark .react-activity-calendar svg rect[data-level="0"],
+html.dark .react-activity-calendar [data-level="0"] {
+  fill: #374151 !important;
+  background-color: #374151 !important;
+}
+
+html:not(.dark) .react-activity-calendar svg rect[data-level="0"],
+html:not(.dark) .react-activity-calendar [data-level="0"] {
+  fill: #d1d5db !important;
+  background-color: #d1d5db !important;
+}

src/utils/heatmapColors.ts

@@ -14,9 +14,37 @@ export const getHeatmapColorIntensity = (level: number, primaryColor: string) =>
     return null; // Will use CSS classes for theme-aware empty state
   }
   
-  // Use different intensities of the primary color or default green scale
-  const greenIntensities = ['#0e4429', '#006d32', '#26a641', '#39d353'];
-  return greenIntensities[Math.min(level - 1, 3)] || primaryColor;
+  // Create different intensities of the primary color
+  const hexToRgb = (hex: string) => {
+    const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+    return result ? {
+      r: parseInt(result[1], 16),
+      g: parseInt(result[2], 16),
+      b: parseInt(result[3], 16)
+    } : null;
+  };
+  
+  const rgbToHex = (r: number, g: number, b: number) => {
+    return "#" + ((1 << 24) + (r << 16) + (g << 8) + b).toString(16).slice(1);
+  };
+  
+  const rgb = hexToRgb(primaryColor);
+  if (!rgb) {
+    // Fallback to green scale if color parsing fails
+    const greenIntensities = ['#0e4429', '#006d32', '#26a641', '#39d353'];
+    return greenIntensities[Math.min(level - 1, 3)];
+  }
+  
+  // Create intensity levels by adjusting brightness
+  // Level 1: 40% intensity, Level 2: 60%, Level 3: 80%, Level 4: 100%
+  const intensityMultipliers = [0.4, 0.6, 0.8, 1.0];
+  const multiplier = intensityMultipliers[Math.min(level - 1, 3)];
+  
+  const adjustedR = Math.round(rgb.r * multiplier);
+  const adjustedG = Math.round(rgb.g * multiplier);
+  const adjustedB = Math.round(rgb.b * multiplier);
+  
+  return rgbToHex(adjustedR, adjustedG, adjustedB);
 };
 
 export const getEmptyDotColors = () => ({