@carto/ps-react-ui 4.25.0 → 4.26.0

package/src/widgets-v2/actions/fullscreen/fullscreen-store.test.tsx

@@ -130,26 +130,90 @@ describe('<FullScreen.Slot> — the dialog runs on its own store', () => {
   // Legend / dataZoom / brush live in the chart instance, not the store.
   // The Slot moves them through the instance registry, so Widget.Echart
   // doesn't need to know about fullscreen.
+  const fakeChart = (option: object, brushAreas?: unknown[]) =>
+    ({
+      getOption: vi.fn(() => option),
+      setOption: vi.fn(),
+      dispatchAction: vi.fn(),
+      getModel: () => ({
+        getComponent: (type: string) =>
+          type === 'brush' ? { areas: brushAreas } : undefined,
+      }),
+      isDisposed: () => false,
+    }) as unknown as ECharts & {
+      setOption: ReturnType<typeof vi.fn>
+      dispatchAction: ReturnType<typeof vi.fn>
+    }
+
   it('starts the dialog chart from the card chart and hands it back on close', async () => {
-    const fakeChart = (option: object) =>
-      ({
-        getOption: vi.fn(() => option),
-        setOption: vi.fn(),
-        dispatchAction: vi.fn(),
-        isDisposed: () => false,
-      }) as unknown as ECharts & {
-        setOption: ReturnType<typeof vi.fn>
-      }
-    const card = fakeChart({ from: 'card' })
-    const dialog = fakeChart({ from: 'dialog' })
+    const cardOption = {
+      series: [{ type: 'bar' }],
+      xAxis: [{ type: 'category' }],
+      legend: [{ selected: { a: true, b: false } }],
+      dataZoom: [{ start: 10, end: 60 }],
+    }
+    const card = fakeChart(cardOption)
+    const dialog = fakeChart({
+      legend: [{ selected: { a: false, b: true } }],
+      dataZoom: [{ start: 20, end: 80 }],
+    })
+    render(<Widget />)
+    act(() => setEchartInstance('w', card))
+
+    // The empty dialog chart takes the whole option, so the view state has
+    // the card's axes and series to land on.
+    fireEvent.click(screen.getByLabelText('OpenT'))
+    act(() => setEchartInstance(dialogId, dialog))
+    expect(dialog.setOption).toHaveBeenCalledWith(cardOption)
+
+    await close()
+    expect(card.setOption).toHaveBeenCalledWith({
+      legend: [{ selected: { a: false, b: true } }],
+      dataZoom: [{ start: 20, end: 80 }],
+    })
+  })
+
+  // The dialog often renders with its own styling (bigger axis labels,
+  // value labels on the series). Copying the whole option back would leave
+  // that styling on the card after closing.
+  it('hands back only the view state, not the dialog styling', async () => {
+    const card = fakeChart({ series: [{ type: 'bar' }] })
+    const dialog = fakeChart({
+      series: [{ type: 'bar', label: { show: true, rotate: 90 } }],
+      xAxis: [{ axisLabel: { fontSize: 13 } }],
+      dataZoom: [{ start: 0, end: 50, startValue: 3, endValue: 9 }],
+    })
+    render(<Widget />)
+    act(() => setEchartInstance('w', card))
+    fireEvent.click(screen.getByLabelText('OpenT'))
+    act(() => setEchartInstance(dialogId, dialog))
+
+    await close()
+    expect(card.setOption).toHaveBeenCalledWith({
+      dataZoom: [{ start: 0, end: 50, startValue: 3, endValue: 9 }],
+    })
+  })
+
+  // Brush areas aren't in getOption(); they travel through the brush action.
+  it('starts the dialog chart with the card brush areas and hands them back on close', async () => {
+    const cardAreas = [{ brushType: 'lineX', coordRange: [1, 3] }]
+    const dialogAreas = [{ brushType: 'lineX', coordRange: [4, 7] }]
+    const card = fakeChart({}, cardAreas)
+    const dialog = fakeChart({}, dialogAreas)
     render(<Widget />)
     act(() => setEchartInstance('w', card))
 
     fireEvent.click(screen.getByLabelText('OpenT'))
     act(() => setEchartInstance(dialogId, dialog))
-    expect(dialog.setOption).toHaveBeenCalledWith({ from: 'card' })
+    expect(dialog.dispatchAction).toHaveBeenCalledWith({
+      type: 'brush',
+      areas: cardAreas,
+    })
 
     await close()
-    expect(card.setOption).toHaveBeenCalledWith({ from: 'dialog' })
+    expect(card.dispatchAction).toHaveBeenCalledWith({
+      type: 'brush',
+      areas: dialogAreas,
+    })
   })
 })

package/src/widgets-v2/actions/fullscreen/fullscreen.tsx

@@ -315,15 +315,17 @@ function DialogStore({
     const unsubscribe = subscribeEchartInstance(dialogId, (chart) => {
       // Published from inside the chart's init, before its first
       // setOption, so the dialog's own option merges on top of the copy.
+      // The empty chart takes the card's whole option: the legend, dataZoom
+      // and brush areas need the card's components (axes, brush) to land on.
       const card = liveChart(sourceId)
-      if (chart && card) copyChartState(card, chart)
+      if (chart && card) copyChartState(card, chart, card.getOption())
       dialogChart = chart
     })
     return () => {
       unsubscribe()
       const card = liveChart(sourceId)
       if (card && dialogChart && !dialogChart.isDisposed()) {
-        copyChartState(dialogChart, card)
+        copyChartState(dialogChart, card, viewState(dialogChart))
       }
     }
   }, [dialogId, sourceId])
@@ -351,10 +353,15 @@ function liveChart(id: string): ECharts | null {
 /**
  * Put on `chart` what `peer` is showing: the legend selection, the dataZoom
  * window and any drawn brush areas, which live in the ECharts instance
- * rather than the widget store.
+ * rather than the widget store. `option` is what of `peer`'s option to merge
+ * into `chart`.
  */
-function copyChartState(peer: ECharts, chart: ECharts): void {
-  chart.setOption(peer.getOption())
+function copyChartState(
+  peer: ECharts,
+  chart: ECharts,
+  option: Parameters<ECharts['setOption']>[0],
+): void {
+  chart.setOption(option)
   // The pointer was over `peer`, not `chart`: drop the tooltip and axis
   // pointer that came along, or they'd stay drawn until the next hover.
   chart.dispatchAction({ type: 'hideTip' })
@@ -374,6 +381,42 @@ function copyChartState(peer: ECharts, chart: ECharts): void {
   if (areas?.length) chart.dispatchAction({ type: 'brush', areas })
 }
 
+interface ViewStateOption {
+  // setOption takes an indexed option.
+  [key: string]: unknown
+  legend?: { selected?: Record<string, boolean> }[]
+  dataZoom?: Record<string, unknown>[]
+}
+
+const ZOOM_WINDOW_KEYS = ['start', 'end', 'startValue', 'endValue'] as const
+
+/**
+ * The part of `peer`'s option that is user view state. Only this goes back
+ * to the card on close: the dialog's full option also carries its own
+ * styling (value labels, bigger axis text), and merging it into the card
+ * would leave that styling behind once the dialog closes.
+ */
+function viewState(peer: ECharts): ViewStateOption {
+  const { legend, dataZoom } = peer.getOption() as ViewStateOption
+  const state: ViewStateOption = {}
+  if (legend?.some((l) => l.selected)) {
+    state.legend = legend.map((l) =>
+      l.selected ? { selected: l.selected } : {},
+    )
+  }
+  if (dataZoom?.length) {
+    state.dataZoom = dataZoom.map((zoom) =>
+      Object.fromEntries(
+        ZOOM_WINDOW_KEYS.filter((k) => zoom[k] !== undefined).map((k) => [
+          k,
+          zoom[k],
+        ]),
+      ),
+    )
+  }
+  return state
+}
+
 /**
  * Merge a caller's `paperSx` over the default paper.
  *

package/src/widgets-v2/bar/options.test.ts

@@ -1,4 +1,5 @@
 import { describe, it, expect } from 'vitest'
+import * as echarts from 'echarts'
 import { createTheme, type Theme } from '@mui/material'
 import { barOptions, createBarOptionFactory } from './options'
 
@@ -359,3 +360,108 @@ describe('createBarOptionFactory', () => {
     expect(html).toContain('[ITEM:A]')
   })
 })
+
+describe('createBarOptionFactory — per-item colour', () => {
+  interface Out {
+    series: { itemStyle: { color: (p: unknown) => string } }[]
+  }
+  const data = [
+    [
+      { name: 'A', value: 1, color: '#00ff00' },
+      { name: 'B', value: -2 },
+    ],
+  ]
+  const dim = (c: string) => echarts.color.modifyAlpha(c, 0.15)
+
+  it('datum colour wins over the series colour', () => {
+    const merge = createBarOptionFactory({
+      theme,
+      series: [{ name: 'S', color: '#0000ff' }],
+    })
+    const out = merge({}, data) as Out
+    const colorFn = out.series[0]!.itemStyle.color
+    expect(colorFn({ dataIndex: 0, color: '#0000ff', name: 'A' })).toBe(
+      '#00ff00',
+    )
+    expect(colorFn({ dataIndex: 1, color: '#0000ff', name: 'B' })).toBe(
+      '#0000ff',
+    )
+  })
+
+  it('uses a string template itemStyle.color from optionsOverride', () => {
+    const factory = createBarOptionFactory({
+      theme,
+      series: [{ name: 'S', color: '#0000ff' }],
+      optionsOverride: {
+        series: [{ type: 'bar', itemStyle: { color: '#123456' } }],
+      },
+    })
+    const out = factory(factory(undefined, undefined), data) as Out
+    const colorFn = out.series[0]!.itemStyle.color
+    expect(colorFn({ dataIndex: 0, color: '#0000ff', name: 'A' })).toBe(
+      '#00ff00',
+    )
+    expect(colorFn({ dataIndex: 1, color: '#0000ff', name: 'B' })).toBe(
+      '#123456',
+    )
+  })
+
+  it('calls a function template itemStyle.color with the ECharts params', () => {
+    const merge = createBarOptionFactory({ theme })
+    const out = merge(
+      {
+        series: [
+          {
+            type: 'bar',
+            itemStyle: {
+              color: (p: { dataIndex: number }) =>
+                p.dataIndex === 1 ? '#ff0000' : '#00ff00',
+            },
+          },
+        ],
+      },
+      [
+        [
+          { name: 'A', value: 1 },
+          { name: 'B', value: -2 },
+        ],
+      ],
+    ) as Out
+    const colorFn = out.series[0]!.itemStyle.color
+    expect(colorFn({ dataIndex: 0, color: '#abc', name: 'A' })).toBe('#00ff00')
+    expect(colorFn({ dataIndex: 1, color: '#abc', name: 'B' })).toBe('#ff0000')
+  })
+
+  it('resolves theme palette paths on the datum colour', () => {
+    const merge = createBarOptionFactory({ theme })
+    const out = merge({}, [[{ name: 'A', value: 1, color: 'primary.main' }]])
+    const colorFn = (out as Out).series[0]!.itemStyle.color
+    expect(colorFn({ dataIndex: 0, color: '#abc', name: 'A' })).toBe(
+      theme.palette.primary.main,
+    )
+  })
+
+  it('dims both datum and template colours outside the selection', () => {
+    const merge = createBarOptionFactory({ theme, selection: ['Z'] })
+    const out = merge(
+      { series: [{ type: 'bar', itemStyle: { color: '#123456' } }] },
+      data,
+    ) as Out
+    const colorFn = out.series[0]!.itemStyle.color
+    expect(colorFn({ dataIndex: 0, color: '#abc', name: 'A' })).toBe(
+      dim('#00ff00'),
+    )
+    expect(colorFn({ dataIndex: 1, color: '#abc', name: 'B' })).toBe(
+      dim('#123456'),
+    )
+  })
+
+  it('keeps the series / palette colour when no item colour is given', () => {
+    const merge = createBarOptionFactory({ theme, selection: ['Z'] })
+    const out = merge({}, [[{ name: 'A', value: 1 }]]) as Out
+    const colorFn = out.series[0]!.itemStyle.color
+    expect(colorFn({ dataIndex: 0, color: '#abcdef', name: 'A' })).toBe(
+      dim('#abcdef'),
+    )
+  })
+})

package/src/widgets-v2/bar/options.ts

@@ -12,6 +12,7 @@ import {
 import { ZOOM_LAYOUT } from '../actions/zoom-toggle'
 import type { OptionFactory } from '../echart'
 import { mergeOptions, resolveThemeColor } from '../utils'
+import { createItemColorResolver } from '../utils/item-color'
 import { positionDataZoomForLegend } from '../utils/data-zoom-layout'
 import type {
   BarEChartsOption,
@@ -234,10 +235,12 @@ export function createBarOptionFactory(
       : baseBottom
 
     // When a selection is active, dim non-selected bars by routing the
-    // resolved palette color through `modifyAlpha`. Per-row `itemStyle` on
+    // item's base colour through `modifyAlpha`. Per-row `itemStyle` on
     // dataset object-rows is silently ignored when `series.encode` is in
     // play — the callback approach is the standard ECharts pattern for
-    // per-data styling derived from a dataset.
+    // per-data styling derived from a dataset. The base colour is the
+    // datum's `color`, else the template's `itemStyle.color`, else the
+    // series colour / palette (`params.color`).
     //
     // We *always* emit `itemStyle.color` (a passthrough when nothing is
     // selected), not conditionally — dropping the key between renders
@@ -245,22 +248,30 @@ export function createBarOptionFactory(
     // and bars would stay dimmed forever after an external clear. Always
     // emitting lets normal merge swap the callback in place, no
     // `replaceMerge` and no entry-animation flash on selection on/off.
-    const dimItemStyle = {
-      color: (params: CallbackDataParams) => {
-        const base = params.color as string
-        if (!selectionSet) return base
-        const datum = params.value as { name?: string | number } | undefined
-        const name = datum?.name ?? params.name
-        return name != null && selectionSet.has(name)
-          ? base
-          : echarts.color.modifyAlpha(base, 0.15)
-      },
+    const makeDimItemStyle = (datums: readonly object[], template: unknown) => {
+      const baseColor = createItemColorResolver({
+        theme,
+        datums,
+        template,
+        fallback: (params) => params.color as string,
+      })
+      return {
+        color: (params: CallbackDataParams) => {
+          const base = baseColor(params)
+          if (!selectionSet) return base
+          const datum = params.value as { name?: string | number } | undefined
+          const name = datum?.name ?? params.name
+          return name != null && selectionSet.has(name)
+            ? base
+            : echarts.color.modifyAlpha(base, 0.15)
+        },
+      }
     }
 
     return {
       ...option,
       dataset: seriesArr.map((s) => ({ source: s as readonly object[] })),
-      series: seriesArr.map((_, i) => {
+      series: seriesArr.map((s, i) => {
         const template =
           (seriesTemplates[i] as object | undefined) ??
           (broadcastTemplate as object)
@@ -277,7 +288,7 @@ export function createBarOptionFactory(
           encode: { x: 'name', y: 'value' },
           barMaxWidth: 100,
           emphasis: { focus: 'series' },
-          itemStyle: dimItemStyle,
+          itemStyle: makeDimItemStyle(s, template),
           ...(overrideColor ? { color: overrideColor } : {}),
         }
       }),

package/src/widgets-v2/bar/types.ts

@@ -6,6 +6,12 @@ import type { WidgetSeries } from '../types'
 export interface BarDatum {
   name: string | number
   value: number
+  /**
+   * Optional colour for this item (CSS colour or theme palette path such as
+   * `'primary.main'`). Wins over the template's `itemStyle.color` and the
+   * series colour; selection dimming still applies on top.
+   */
+  color?: string
 }
 
 /** v2 bar widget data shape: array of series, each a flat list of `{name, value}`. */

package/src/widgets-v2/histogram/bins.ts

@@ -0,0 +1,22 @@
+import type { HistogramBin } from './types'
+
+/** Count of a {@link HistogramBin}, whichever form it takes. */
+export function getHistogramBinValue(bin: HistogramBin): number {
+  return typeof bin === 'number' ? bin : bin.value
+}
+
+/** Whether `v` is a valid {@link HistogramBin} with a finite count. */
+export function isHistogramBin(v: unknown): v is HistogramBin {
+  if (typeof v === 'number') return Number.isFinite(v)
+  if (v == null || typeof v !== 'object') return false
+  const value = (v as { value?: unknown }).value
+  return typeof value === 'number' && Number.isFinite(value)
+}
+
+/** Same bin with its count replaced; keeps the object form (and `color`). */
+export function withHistogramBinValue(
+  bin: HistogramBin,
+  value: number,
+): HistogramBin {
+  return typeof bin === 'number' ? value : { ...bin, value }
+}

package/src/widgets-v2/histogram/download.test.ts

@@ -61,6 +61,16 @@ describe('createHistogramDownloadConfig', () => {
     )
   })
 
+  it('CSV writes the count of object bins (colour is not exported)', async () => {
+    const items = createHistogramDownloadConfig({
+      filename: 'h',
+      getData: () => [[{ value: 1, color: '#f00' }, 2, { value: 3 }]],
+      getTicks: () => ticks,
+    })
+    await items.find((i) => i.id === 'csv')!.resolve({ id: null })
+    expect(csvText).toBe('bin_low,bin_high,series_1\n0,10,1\n10,20,2\n20,30,3')
+  })
+
   it('CSV honours supplied seriesNames', async () => {
     const items = createHistogramDownloadConfig({
       filename: 'h',

package/src/widgets-v2/histogram/download.ts

@@ -4,7 +4,8 @@ import {
   type DownloadContext,
   type DownloadItem,
 } from '../actions/download'
-import type { HistogramWidgetData } from './types'
+import { getHistogramBinValue } from './bins'
+import type { HistogramBin, HistogramWidgetData } from './types'
 
 /**
  * Download menu items for histograms. Always includes a CSV item with
@@ -14,7 +15,7 @@ import type { HistogramWidgetData } from './types'
  */
 export function createHistogramDownloadConfig(args: {
   filename: string
-  getData: (ctx: DownloadContext) => HistogramWidgetData
+  getData: (ctx: DownloadContext) => HistogramWidgetData<HistogramBin>
   getTicks: () => readonly number[]
   seriesNames?: readonly string[]
   getCaptureEl?: (ctx: DownloadContext) => HTMLElement | null
@@ -46,7 +47,10 @@ export function createHistogramDownloadConfig(args: {
         const rows: unknown[][] = [header]
         for (let bin = 0; bin < Math.max(0, ticks.length - 1); bin++) {
           const row: unknown[] = [ticks[bin], ticks[bin + 1]]
-          for (let s = 0; s < seriesCount; s++) row.push(data[s]?.[bin] ?? 0)
+          for (let s = 0; s < seriesCount; s++) {
+            const value = data[s]?.[bin]
+            row.push(value == null ? 0 : getHistogramBinValue(value))
+          }
           rows.push(row)
         }
         return rows

package/src/widgets-v2/histogram/index.ts

@@ -5,7 +5,10 @@ export {
   toRelativeHistogramData,
   filterHistogramByLockedBins,
 } from './transforms'
+export { getHistogramBinValue } from './bins'
 export type {
+  HistogramBin,
+  HistogramBinObject,
   HistogramWidgetData,
   HistogramOptionsInput,
   HistogramOptionFactoryInput,

package/src/widgets-v2/histogram/options.test.ts

@@ -1,4 +1,5 @@
 import { describe, it, expect } from 'vitest'
+import * as echarts from 'echarts'
 import { createTheme, type Theme } from '@mui/material'
 import { createHistogramOptionFactory, histogramOptions } from './options'
 
@@ -409,3 +410,64 @@ describe('createHistogramOptionFactory (data → dataset merger)', () => {
     })
   })
 })
+
+describe('createHistogramOptionFactory — per-item colour', () => {
+  interface Out {
+    dataset: { source: (string | number)[][] }[]
+    series: { itemStyle: { color: (p: unknown) => string } }[]
+  }
+  const ticks = [0, 10, 20, 30]
+  const dim = (c: string) => echarts.color.modifyAlpha(c, 0.15)
+
+  it('accepts object bins: dataset carries the counts', () => {
+    const merge = createHistogramOptionFactory({ theme, ticks })
+    const out = merge({}, [[{ value: 1, color: '#00ff00' }, 2, { value: 3 }]])
+    expect((out as Out).dataset[0]!.source.map(([, v]) => v)).toEqual([1, 2, 3])
+  })
+
+  it('bin colour wins over the series colour; template next', () => {
+    const merge = createHistogramOptionFactory({
+      theme,
+      ticks,
+      series: [{ name: 'S', color: '#0000ff' }],
+      selection: [0, 1],
+    })
+    const out = merge(
+      { series: [{ type: 'bar', itemStyle: { color: '#123456' } }] },
+      [[{ value: 1, color: '#00ff00' }, 2, { value: 3 }]],
+    ) as Out
+    const colorFn = out.series[0]!.itemStyle.color
+    expect(colorFn({ dataIndex: 0, color: '#0000ff' })).toBe('#00ff00')
+    expect(colorFn({ dataIndex: 1, color: '#0000ff' })).toBe('#123456')
+    expect(colorFn({ dataIndex: 2, color: '#0000ff' })).toBe(dim('#123456'))
+  })
+
+  it('calls a function template itemStyle.color via optionsOverride', () => {
+    const factory = createHistogramOptionFactory({
+      theme,
+      ticks,
+      optionsOverride: {
+        series: [
+          {
+            type: 'bar',
+            itemStyle: {
+              color: (p: { dataIndex: number }) => `#c${p.dataIndex}`,
+            },
+          },
+        ],
+      },
+    })
+    const out = factory(factory(undefined, undefined), [[1, 2, 3]]) as Out
+    expect(out.series[0]!.itemStyle.color({ dataIndex: 2, color: '#x' })).toBe(
+      '#c2',
+    )
+  })
+
+  it('keeps the series / palette colour for plain number bins', () => {
+    const merge = createHistogramOptionFactory({ theme, ticks, selection: [1] })
+    const out = merge({}, [[1, 2, 3]]) as Out
+    const colorFn = out.series[0]!.itemStyle.color
+    expect(colorFn({ dataIndex: 0, color: '#abcdef' })).toBe(dim('#abcdef'))
+    expect(colorFn({ dataIndex: 1, color: '#abcdef' })).toBe('#abcdef')
+  })
+})

package/src/widgets-v2/histogram/options.ts

@@ -12,11 +12,14 @@ import {
 import { ZOOM_LAYOUT } from '../actions/zoom-toggle'
 import type { OptionFactory } from '../echart'
 import { mergeOptions, resolveThemeColor } from '../utils'
+import { createItemColorResolver } from '../utils/item-color'
+import { getHistogramBinValue } from './bins'
 import { positionDataZoomForLegend } from '../utils/data-zoom-layout'
 import type {
   HistogramEChartsOption,
   HistogramOptionFactoryInput,
   HistogramOptionsInput,
+  HistogramBin,
   HistogramWidgetData,
 } from './types'
 
@@ -147,7 +150,7 @@ export function histogramOptions({
  *     the consumer-supplied `optionsOverride`. Called once by Provider to
  *     seed `rawOptions` in the store.
  *   - **Merge phase** (`option != null`) — fuses post-pipeline `state.data`
- *     (`HistogramWidgetData` — `number[][]`) into the option via the
+ *     (`HistogramWidgetData` — `HistogramBin[][]`) into the option via the
  *     dataset API. Each series gets its own dataset of `[binLabel, count]`
  *     pairs derived from `ticks`; series reference their dataset by
  *     `datasetIndex` and are encoded by column position. Reactive
@@ -199,8 +202,8 @@ export function createHistogramOptionFactory(
         : structural
     }
 
-    const seriesArr: HistogramWidgetData = Array.isArray(data)
-      ? (data as HistogramWidgetData)
+    const seriesArr: HistogramWidgetData<HistogramBin> = Array.isArray(data)
+      ? (data as HistogramWidgetData<HistogramBin>)
       : []
     if (seriesArr.length === 0 || binLabels.length === 0) {
       return { ...option, dataset: [], series: [] }
@@ -261,14 +264,28 @@ export function createHistogramOptionFactory(
     // and bins would stay dimmed forever after an external clear. Always
     // emitting lets normal merge swap the callback in place, no
     // `replaceMerge` and no entry-animation flash on selection on/off.
-    const dimItemStyle = {
-      color: (params: CallbackDataParams) => {
-        const base = params.color as string
-        if (!selectionSet) return base
-        return selectionSet.has(params.dataIndex)
-          ? base
-          : echarts.color.modifyAlpha(base, 0.15)
-      },
+    //
+    // The base colour is the bin's own `color` (object bins), else the
+    // template's `itemStyle.color`, else the series colour / palette.
+    const makeDimItemStyle = (
+      datums: readonly unknown[],
+      template: unknown,
+    ) => {
+      const baseColor = createItemColorResolver({
+        theme,
+        datums,
+        template,
+        fallback: (params) => params.color as string,
+      })
+      return {
+        color: (params: CallbackDataParams) => {
+          const base = baseColor(params)
+          if (!selectionSet) return base
+          return selectionSet.has(params.dataIndex)
+            ? base
+            : echarts.color.modifyAlpha(base, 0.15)
+        },
+      }
     }
 
     // A consumer's `optionsOverride.xAxis` may legitimately be an array
@@ -306,12 +323,16 @@ export function createHistogramOptionFactory(
     return {
       ...option,
       xAxis: nextXAxis,
-      dataset: seriesArr.map((counts) => ({
-        source: binLabels.map(
-          (label, i) => [label, counts[i] ?? 0] as [string, number],
-        ),
+      dataset: seriesArr.map((bins) => ({
+        source: binLabels.map((label, i) => {
+          const bin = bins[i]
+          return [label, bin == null ? 0 : getHistogramBinValue(bin)] as [
+            string,
+            number,
+          ]
+        }),
       })),
-      series: seriesArr.map((_, i) => {
+      series: seriesArr.map((bins, i) => {
         const template =
           (seriesTemplates[i] as object | undefined) ??
           (broadcastTemplate as object)
@@ -324,7 +345,7 @@ export function createHistogramOptionFactory(
           encode: { x: 0, y: 1 },
           barCategoryGap: '0%',
           emphasis: { focus: 'series' },
-          itemStyle: dimItemStyle,
+          itemStyle: makeDimItemStyle(bins, template),
           ...(overrideColor ? { color: overrideColor } : {}),
         }
       }),