@cdc/map 4.25.6 → 4.25.7

package/src/helpers/applyColorToLegend.ts

@@ -7,49 +7,68 @@ type LegendItem = {
   special: boolean
 }
 
-/**
- * applyColorToLegend
- * @param legendIdx legend item index
- * @param config chart config
- * @param result hash of legend items
- * @returns string - the corresponding color for the legend item
- */
-export const applyColorToLegend = (legendIdx: number, config: MapConfig, result: LegendItem[] = []): string => {
+//  Applies color to a legend item based on its index and special classes.
+export const applyColorToLegend = (legendItemIndex: number, config: MapConfig, result: LegendItem[] = []): string => {
   if (!config) throw new Error('Config is required')
 
   const { legend, customColors, general, color } = config
   const { geoType, palette } = general
   const specialClasses = legend?.specialClasses ?? []
-  const mapColorPalette = customColors ?? colorPalettes[color] ?? colorPalettes['bluegreen']
+  const colorPalette = customColors ?? colorPalettes[color] ?? colorPalettes['bluegreen']
 
   // Handle Region Maps need for a 10th color
-  if (geoType === 'us-region' && mapColorPalette.length < 10 && mapColorPalette.length > 8) {
-    const newColor = chroma(mapColorPalette[palette.isReversed ? 0 : 8])
+  if (geoType === 'us-region' && colorPalette.length < 10 && colorPalette.length > 8) {
+    const darkenedColor = chroma(colorPalette[palette.isReversed ? 0 : 8])
       .darken(0.75)
       .hex()
-    palette.isReversed ? mapColorPalette.unshift(newColor) : mapColorPalette.push(newColor)
+    palette.isReversed ? colorPalette.unshift(darkenedColor) : colorPalette.push(darkenedColor)
   }
 
-  const colorIdx = legendIdx - specialClasses.length
+  // Check if there are actually any special classes in the current result
+  const actualSpecialClassesCount = result.filter(item => item.special).length
+
+  const regularItemColorIndex = legendItemIndex - actualSpecialClassesCount
 
   // Handle special classes coloring
-  if (result[legendIdx]?.special) {
+  if (result[legendItemIndex]?.special) {
     const specialClassColors = chroma.scale(['#D4D4D4', '#939393']).colors(specialClasses.length)
-    return specialClassColors[legendIdx]
+    return specialClassColors[legendItemIndex]
+  }
+
+  // For categorical maps with custom colors, use color distribution logic
+  if (config.legend?.type === 'category' && customColors) {
+    const amt = config.legend.additionalCategories?.length ?? 10
+    const distributionArray = colorDistributions[amt] ?? []
+
+    const specificColor = distributionArray[legendItemIndex - specialClasses.length] ?? colorPalette.at(-1)
+
+    // If specificColor is a number, use it as an index; otherwise return the color directly
+    return colorPalette[specificColor] ?? '#fff'
   }
 
   // Use qualitative color palettes directly
-  if (color.includes('qualitative')) return mapColorPalette[colorIdx]
+  if (color.includes('qualitative')) {
+    const safeIndex = Math.max(0, Math.min(regularItemColorIndex, colorPalette.length - 1))
+    return colorPalette[safeIndex]
+  }
 
-  // Determine color distribution
-  const amt =
-    Math.max(result.length - specialClasses.length, 1) < 10
-      ? Math.max(result.length - specialClasses.length, 1)
+  // Determine color distribution - use actual special classes count for consistent coloring
+  const legendItemCount =
+    Math.max(result.length - actualSpecialClassesCount, 1) < 10
+      ? Math.max(result.length - actualSpecialClassesCount, 1)
       : Object.keys(colorDistributions).length
-  const distributionArray = colorDistributions[amt] ?? []
 
-  const specificColor =
-    distributionArray[legendIdx - specialClasses.length] ?? mapColorPalette[colorIdx] ?? mapColorPalette.at(-1)
+  const colorDistributionArray = colorDistributions[legendItemCount] ?? []
+
+  const rowDistributionIndex = colorDistributionArray[legendItemIndex - actualSpecialClassesCount]
+
+  const colorValue = rowDistributionIndex ?? colorPalette[regularItemColorIndex] ?? colorPalette.at(-1)
+
+  // Check if specificColor is a string(e.g., a valid color code)
+  if (typeof colorValue === 'string' && config.legend?.type === 'category' && customColors) {
+    return colorValue
+  }
 
-  return mapColorPalette[specificColor]
+  // Otherwise, use specificColor as an index for mapColorPalette
+  return colorPalette[colorValue]
 }

package/src/helpers/applyLegendToRow.ts

@@ -29,21 +29,23 @@ export const applyLegendToRow = (
       return generateColorsArray(mapColorPalette[3])
     }
 
-    const hash = hashObj(rowObj)
+    const hash = String(hashObj(rowObj))
 
     if (!legendMemo.current.has(hash)) {
       return generateColorsArray()
     }
 
     const idx = legendMemo.current.get(hash)!
-    const disabledIdx = showSpecialClassesLast ? legendSpecialClassLastMemo.current.get(hash) ?? idx : idx
 
-    if (runtimeLegend.items?.[disabledIdx]?.disabled) {
+    if (runtimeLegend.items?.[idx]?.disabled) {
       return generateColorsArray()
     }
 
-    const legendBinColor = runtimeLegend.items.find(o => o.bin === idx)?.color
-    return generateColorsArray(legendBinColor, runtimeLegend.items[idx]?.special)
+    // Use the index from legendMemo which should already be updated for reordered items
+    const legendItem = runtimeLegend.items?.[idx]
+    const legendBinColor = legendItem?.color
+
+    return generateColorsArray(legendBinColor, legendItem?.special)
   } catch (e) {
     console.error('COVE: ', e)
     return null