Merge branch 'main' into grammar-setnames-fix

packages/upset/src/components/SizeBar.tsx

@@ -2,29 +2,28 @@ import { Row } from '@visdesignlab/upset2-core';
 import { FC } from 'react';
 import { useRecoilValue } from 'recoil';
 
-import { currentIntersectionAtom } from '../atoms/config/currentIntersectionAtom';
+import { bookmarkedColorPalette, bookmarkedIntersectionSelector, currentIntersectionAtom } from '../atoms/config/currentIntersectionAtom';
 import { dimensionsSelector } from '../atoms/dimensionsAtom';
 import { maxSize } from '../atoms/maxSizeAtom';
 import { useScale } from '../hooks/useScale';
 import translate from '../utils/transform';
+import { newShade } from '../utils/colors';
 
 /** @jsxImportSource @emotion/react */
 type Props = {
   size: number;
   row?: Row;
 };
 
-const color1 = 'rgb(189, 189, 189)';
-const color2 = 'rgb(136, 136, 136)';
-const color3 = 'rgb(37, 37, 37)';
-const color4 = 'rgb(116, 173, 209)';
-const color5 = 'rgb(94, 102, 171)';
-const color6 = 'rgb(29, 41, 71)';
+const colors = ['rgb(189, 189, 189)', 'rgb(136, 136, 136)', 'rgb(37, 37, 37)'];
+const highlightColors = ['rgb(116, 173, 209)', 'rgb(94, 102, 171)', 'rgb(29, 41, 71)'];
 
 export const SizeBar: FC<Props> = ({ row, size }) => {
   const dimensions = useRecoilValue(dimensionsSelector);
   const sizeDomain = useRecoilValue(maxSize);
   const currentIntersection = useRecoilValue(currentIntersectionAtom);
+  const bookmarkedIntersections = useRecoilValue(bookmarkedIntersectionSelector);
+  const bookmarkedColorPallete = useRecoilValue(bookmarkedColorPalette);
 
   const scale = useScale(
     [0, sizeDomain],
@@ -34,10 +33,6 @@ export const SizeBar: FC<Props> = ({ row, size }) => {
   let fullBars = size > 0 ? Math.floor(size / sizeDomain) : size;
   const rem = size % sizeDomain;
 
-  const colors = [color1, color2, color3, color4, color5, color6];
-
-  const highlightOffset = 3;
-
   if (size < 0 || sizeDomain < 0) return null;
 
   if (fullBars >= 3) {
@@ -51,6 +46,22 @@ export const SizeBar: FC<Props> = ({ row, size }) => {
     rectArray[i] = i;
   }
 
+  function getFillColor(index: number) {
+    // if the row is bookmarked, highlight the bar with the bookmark color
+    if (row !== undefined && bookmarkedIntersections.some((bookmark) => bookmark.id === row.id)) {
+      // darken the color for advanced scale sub-bars
+      if (index !== 0) {
+        return newShade(bookmarkedColorPallete[row.id], -(12 + (index * 2)));
+      }
+      return bookmarkedColorPallete[row.id];
+    }
+
+    if (row !== undefined && currentIntersection !== null && currentIntersection.id === row.id) { // if currently selected, use the highlight colors
+      return highlightColors[index];
+    }
+    return colors[index];
+  }
+
   return (
     <g
       transform={translate(
@@ -69,15 +80,15 @@ export const SizeBar: FC<Props> = ({ row, size }) => {
           key={arr}
           height={dimensions.size.plotHeight - arr * offset}
           width={dimensions.attribute.width}
-          fill={row !== undefined && currentIntersection !== null && currentIntersection.id === row.id ? colors[arr + highlightOffset] : colors[arr]}
+          fill={getFillColor(arr)}
         />
       ))}
       {fullBars < 3 && (
         <rect
           transform={translate(0, (fullBars * offset) / 2)}
           height={dimensions.size.plotHeight - fullBars * offset}
           width={scale(rem)}
-          fill={row !== undefined && currentIntersection !== null && currentIntersection.id === row.id ? colors[fullBars + highlightOffset] : colors[fullBars]}
+          fill={getFillColor(fullBars)}
         />
       )}
       {fullBars === 3 && (

packages/upset/src/utils/colors.ts

@@ -0,0 +1,23 @@
+/* eslint-disable no-unused-expressions */
+/* eslint-disable no-bitwise */
+// from https://natclark.com/tutorials/javascript-lighten-darken-hex-color/
+// bitwise operation for generating shades of hex values
+export const newShade = (hexColor: string, magnitude: number) => {
+  hexColor = hexColor.replace('#', '');
+  if (hexColor.length === 6) {
+    const decimalColor = parseInt(hexColor, 16);
+    let r = (decimalColor >> 16) + magnitude;
+    r > 255 && (r = 255);
+    r < 0 && (r = 0);
+    let g = (decimalColor & 0x0000ff) + magnitude;
+    g > 255 && (g = 255);
+    g < 0 && (g = 0);
+    let b = ((decimalColor >> 8) & 0x00ff) + magnitude;
+    b > 255 && (b = 255);
+    b < 0 && (b = 0);
+
+    return `#${(g | (b << 8) | (r << 16)).toString(16)}`;
+  }
+
+  return hexColor;
+};