@automattic/charts 4.1.1 → 4.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (73) hide show
  1. package/CHANGELOG.md +19 -0
  2. package/TOKENS.md +1 -1
  3. package/dist/index.cjs +875 -237
  4. package/dist/index.cjs.map +1 -1
  5. package/dist/index.css +30 -1
  6. package/dist/index.d.cts +106 -6
  7. package/dist/index.d.ts +106 -6
  8. package/dist/index.js +875 -239
  9. package/dist/index.js.map +1 -1
  10. package/package.json +8 -8
  11. package/src/charts/area-chart/private/overlays.tsx +1 -2
  12. package/src/charts/bar-chart/bar-chart.tsx +67 -17
  13. package/src/charts/bar-chart/index.ts +1 -1
  14. package/src/charts/bar-chart/private/band-highlight.tsx +85 -0
  15. package/src/charts/bar-chart/private/band-scale.ts +13 -0
  16. package/src/charts/bar-chart/private/band-tooltip.tsx +138 -0
  17. package/src/charts/bar-chart/private/comparison-bars.tsx +5 -10
  18. package/src/charts/bar-chart/private/index.ts +2 -0
  19. package/src/charts/bar-chart/private/test/band-highlight.test.tsx +109 -0
  20. package/src/charts/bar-chart/private/test/band-tooltip.test.ts +26 -0
  21. package/src/charts/bar-chart/private/truncated-tick-component.tsx +1 -1
  22. package/src/charts/bar-chart/private/use-bar-chart-options.ts +1 -1
  23. package/src/charts/bar-chart/test/bar-chart-pointer-events.test.tsx +11 -23
  24. package/src/charts/bar-chart/test/bar-chart.test.tsx +565 -1
  25. package/src/charts/bar-list-chart/bar-list-chart.tsx +5 -3
  26. package/src/charts/conversion-funnel-chart/conversion-funnel-chart.tsx +1 -1
  27. package/src/charts/conversion-funnel-chart/types.ts +4 -2
  28. package/src/charts/geo-chart/types.ts +4 -2
  29. package/src/charts/heatmap-chart/build-calendar-data.ts +5 -11
  30. package/src/charts/heatmap-chart/build-month-calendar-data.ts +124 -0
  31. package/src/charts/heatmap-chart/heatmap-chart.module.scss +32 -0
  32. package/src/charts/heatmap-chart/heatmap-chart.tsx +191 -114
  33. package/src/charts/heatmap-chart/index.ts +6 -0
  34. package/src/charts/heatmap-chart/private/civil-day.ts +26 -0
  35. package/src/charts/heatmap-chart/private/column-groups.ts +71 -0
  36. package/src/charts/heatmap-chart/private/heatmap-legend.tsx +19 -3
  37. package/src/charts/heatmap-chart/private/index.ts +2 -0
  38. package/src/charts/heatmap-chart/private/keyboard-navigation.ts +201 -0
  39. package/src/charts/heatmap-chart/test/build-calendar-data.test.ts +36 -0
  40. package/src/charts/heatmap-chart/test/build-month-calendar-data.test.ts +194 -0
  41. package/src/charts/heatmap-chart/test/column-groups.test.ts +83 -0
  42. package/src/charts/heatmap-chart/test/heatmap-chart.test.tsx +428 -2
  43. package/src/charts/heatmap-chart/test/keyboard-navigation.test.ts +25 -0
  44. package/src/charts/heatmap-chart/test/use-month-calendar-heatmap-data.test.tsx +90 -0
  45. package/src/charts/heatmap-chart/test/zoned-month-calendar-data.test.ts +23 -0
  46. package/src/charts/heatmap-chart/types.ts +59 -3
  47. package/src/charts/heatmap-chart/use-month-calendar-heatmap-data.ts +34 -0
  48. package/src/charts/leaderboard-chart/types.ts +13 -14
  49. package/src/charts/line-chart/line-chart.tsx +1 -1
  50. package/src/charts/line-chart/private/line-chart-annotation.tsx +1 -1
  51. package/src/charts/line-chart/types.ts +2 -2
  52. package/src/charts/private/time-axis-options.ts +1 -1
  53. package/src/charts/private/with-responsive/with-responsive.tsx +2 -2
  54. package/src/charts/private/x-zoom/test/x-zoom.test.tsx +1 -3
  55. package/src/charts/private/x-zoom/x-zoom.tsx +1 -2
  56. package/src/components/legend/private/base-legend.tsx +1 -1
  57. package/src/components/tooltip/accessible-tooltip.tsx +127 -40
  58. package/src/components/tooltip/base-tooltip.module.scss +6 -1
  59. package/src/components/tooltip/private/bounded-tooltip.tsx +12 -6
  60. package/src/components/tooltip/test/accessible-tooltip.test.tsx +128 -0
  61. package/src/components/tooltip/test/bounded-tooltip.test.tsx +17 -0
  62. package/src/components/tooltip/test/xy-chart-tooltip.test.tsx +7 -0
  63. package/src/components/tooltip/xy-chart-tooltip.tsx +9 -10
  64. package/src/hooks/test/use-element-size.test.tsx +13 -13
  65. package/src/hooks/use-xychart-theme.ts +1 -1
  66. package/src/index.ts +7 -1
  67. package/src/providers/chart-context/themes.ts +1 -0
  68. package/src/styles/test/chart-scope.test.ts +1 -1
  69. package/src/types.ts +6 -13
  70. package/src/utils/format-metric-value.ts +4 -4
  71. package/src/utils/get-edge-tick-widths.ts +1 -1
  72. package/src/utils/get-styles.ts +1 -1
  73. package/src/visx/types.ts +7 -10
@@ -1,8 +1,10 @@
1
1
  import { render, screen } from '@testing-library/react';
2
2
  import userEvent from '@testing-library/user-event';
3
+ import { useRef, useState } from 'react';
3
4
  import { LineChartUnresponsive } from '../../../charts/line-chart/line-chart';
4
5
  import { GlobalChartsProvider } from '../../../providers';
5
6
  import { ChartScopeContext } from '../../../providers/chart-scope';
7
+ import { useKeyboardNavigation } from '../accessible-tooltip';
6
8
  import type { ReactNode } from 'react';
7
9
 
8
10
  // A real chart is the harness rather than the subject: the crosshairs render only once visx has a data context and an open tooltip. The unresponsive export is what lets the test own the scope element — `withResponsive` otherwise provides its own wrapper as the scope.
@@ -124,3 +126,129 @@ describe( 'AccessibleTooltip', () => {
124
126
  await expect( openTooltip() ).resolves.toHaveAttribute( 'stroke', '#dbdbdb' );
125
127
  } );
126
128
  } );
129
+
130
+ // Mirrors the charts' markup: the focusable grid wraps the element `chartRef` points at.
131
+ const NavigationHarness = ( { totalPoints }: { totalPoints: number } ) => {
132
+ const [ selectedIndex, setSelectedIndex ] = useState< number | undefined >();
133
+ const [ isNavigating, setIsNavigating ] = useState( false );
134
+ const chartRef = useRef< HTMLDivElement >( null );
135
+ const { onChartKeyDown } = useKeyboardNavigation( {
136
+ selectedIndex,
137
+ setSelectedIndex,
138
+ isNavigating,
139
+ setIsNavigating,
140
+ chartRef,
141
+ totalPoints,
142
+ } );
143
+
144
+ return (
145
+ <>
146
+ <div role="grid" aria-label="Harness" tabIndex={ 0 } onKeyDown={ onChartKeyDown }>
147
+ <div ref={ chartRef } data-testid="selected-index">
148
+ { selectedIndex ?? 'none' }
149
+ <button type="button">Inside</button>
150
+ </div>
151
+ </div>
152
+ <button type="button">Outside</button>
153
+ </>
154
+ );
155
+ };
156
+
157
+ describe( 'useKeyboardNavigation', () => {
158
+ const navigate = async ( presses: number ) => {
159
+ const user = userEvent.setup();
160
+ const view = render( <NavigationHarness totalPoints={ 6 } /> );
161
+
162
+ screen.getByRole( 'grid', { name: 'Harness' } ).focus();
163
+ for ( let i = 0; i < presses; i++ ) {
164
+ await user.keyboard( '{ArrowRight}' );
165
+ }
166
+ expect( screen.getByTestId( 'selected-index' ) ).toHaveTextContent( String( presses - 1 ) );
167
+
168
+ return { user, view };
169
+ };
170
+
171
+ it( 'moves the selection to the last point when the count shrinks while the grid has focus', async () => {
172
+ const { view } = await navigate( 6 );
173
+
174
+ view.rerender( <NavigationHarness totalPoints={ 3 } /> );
175
+
176
+ expect( screen.getByTestId( 'selected-index' ) ).toHaveTextContent( '2' );
177
+ expect( screen.getByRole( 'grid', { name: 'Harness' } ) ).toHaveFocus();
178
+ } );
179
+
180
+ // In range rather than past the end: the effect reconciles on any count change, not only an overflow.
181
+ it( 'clears an in-range selection when the count changes after focus has left the chart', async () => {
182
+ const { view } = await navigate( 2 );
183
+
184
+ screen.getByRole( 'button', { name: 'Outside' } ).focus();
185
+ view.rerender( <NavigationHarness totalPoints={ 3 } /> );
186
+
187
+ expect( screen.getByTestId( 'selected-index' ) ).toHaveTextContent( 'none' );
188
+ } );
189
+
190
+ it( 'returns focus to the grid on Escape when there are no points', async () => {
191
+ const user = userEvent.setup();
192
+ render( <NavigationHarness totalPoints={ 0 } /> );
193
+
194
+ screen.getByRole( 'button', { name: 'Inside' } ).focus();
195
+ await user.keyboard( '{Escape}' );
196
+
197
+ expect( screen.getByRole( 'grid', { name: 'Harness' } ) ).toHaveFocus();
198
+ } );
199
+
200
+ it( 'returns focus to the grid when the count drops to zero while focus is in the chart', async () => {
201
+ const { view } = await navigate( 2 );
202
+
203
+ screen.getByRole( 'button', { name: 'Inside' } ).focus();
204
+ view.rerender( <NavigationHarness totalPoints={ 0 } /> );
205
+
206
+ expect( screen.getByTestId( 'selected-index' ) ).toHaveTextContent( 'none' );
207
+ expect( screen.getByRole( 'grid', { name: 'Harness' } ) ).toHaveFocus();
208
+ } );
209
+
210
+ // The page sees the event after the handler, so this is what a surrounding scroll or Modal gets.
211
+ const recordPageKeyDown = () => {
212
+ const onKeyDown = jest.fn< void, [ KeyboardEvent ] >();
213
+ document.addEventListener( 'keydown', onKeyDown );
214
+ return { onKeyDown, stop: () => document.removeEventListener( 'keydown', onKeyDown ) };
215
+ };
216
+
217
+ it( 'leaves keys it does not handle available to the page', async () => {
218
+ const user = userEvent.setup();
219
+ render( <NavigationHarness totalPoints={ 6 } /> );
220
+ const { onKeyDown, stop } = recordPageKeyDown();
221
+
222
+ try {
223
+ screen.getByRole( 'grid', { name: 'Harness' } ).focus();
224
+ await user.keyboard( '{ArrowDown}{PageDown}[Space]' );
225
+
226
+ expect( onKeyDown ).toHaveBeenCalledTimes( 3 );
227
+ for ( const [ event ] of onKeyDown.mock.calls ) {
228
+ expect( event.defaultPrevented ).toBe( false );
229
+ }
230
+ } finally {
231
+ stop();
232
+ }
233
+ } );
234
+
235
+ // `@wordpress/components` Modal skips its own close-on-Escape once the event is defaultPrevented.
236
+ it( 'leaves Escape to the page when there is no selection to dismiss', async () => {
237
+ const user = userEvent.setup();
238
+ render( <NavigationHarness totalPoints={ 6 } /> );
239
+ const { onKeyDown, stop } = recordPageKeyDown();
240
+
241
+ try {
242
+ screen.getByRole( 'grid', { name: 'Harness' } ).focus();
243
+ await user.keyboard( '{Escape}' );
244
+
245
+ expect( onKeyDown.mock.calls[ 0 ][ 0 ].defaultPrevented ).toBe( false );
246
+
247
+ await user.keyboard( '{ArrowRight}{Escape}' );
248
+
249
+ expect( onKeyDown.mock.calls.at( -1 )?.[ 0 ].defaultPrevented ).toBe( true );
250
+ } finally {
251
+ stop();
252
+ }
253
+ } );
254
+ } );
@@ -5,6 +5,23 @@ const BOX = { width: 208, height: 36 };
5
5
  const OFFSETS = { offsetLeft: 10, offsetTop: 10 };
6
6
 
7
7
  describe( 'getBoundedPosition', () => {
8
+ test.each( [
9
+ [ 40, 50 ],
10
+ [ 700, 425 ],
11
+ ] )( 'keeps a beside tooltip at its anchor and flips horizontally at %s', ( left, x ) => {
12
+ expect(
13
+ getBoundedPosition( {
14
+ left,
15
+ top: -20,
16
+ ...OFFSETS,
17
+ box: { width: 265, height: 382 },
18
+ wrapper: { left: 0, top: 0, right: 800, bottom: 300 },
19
+ bounds: { left: 0, top: -100, right: 800, bottom: 500 },
20
+ placement: 'beside',
21
+ } )
22
+ ).toEqual( { x, y: -20 } );
23
+ } );
24
+
8
25
  test( 'sits below and to the right of the anchor when that fits', () => {
9
26
  expect(
10
27
  getBoundedPosition( {
@@ -139,6 +139,13 @@ describe( 'XyChartTooltip', () => {
139
139
  } );
140
140
  } );
141
141
 
142
+ test( 'pins beside placement to the explicit SVG top anchor', async () => {
143
+ renderChart( { tooltipPlacement: 'beside', tooltipAnchorTop: 20, snapTooltipToDatumY: true } );
144
+ await expect( screen.findByTestId( 'tooltip-box' ) ).resolves.toHaveStyle( {
145
+ transform: 'translate(133px, 20px)',
146
+ } );
147
+ } );
148
+
142
149
  test( 'snaps the box to the nearest datum', async () => {
143
150
  renderChart( { snapTooltipToDatumX: true, snapTooltipToDatumY: true } );
144
151
 
@@ -3,7 +3,7 @@ import { DataContext, TooltipContext } from '@visx/xychart';
3
3
  import { useCallback, useContext, useState } from 'react';
4
4
  import { createPortal } from 'react-dom';
5
5
  import { isValidHexColor } from '../../utils';
6
- import { BoundedTooltip } from './private/bounded-tooltip';
6
+ import { BoundedTooltip, TOOLTIP_Z_INDEX } from './private/bounded-tooltip';
7
7
  import type {
8
8
  CrosshairStyle,
9
9
  RenderTooltipGlyphProps,
@@ -36,9 +36,6 @@ const crosshairPaintProps = ( props: CrosshairStyle = {} ) => {
36
36
  };
37
37
  const DEFAULT_GLYPH_RADIUS = 4;
38
38
  const FALLBACK_COLOR = '#222';
39
- // Above the chart's own overlays (the zoom reset button sits at 2). The chart
40
- // wrapper isolates its stacking context, so this never competes with page chrome.
41
- const DEFAULT_TOOLTIP_Z_INDEX = 3;
42
39
  // Portal-era options, accepted for compatibility and dropped before the box
43
40
  // renders: it sits in the chart wrapper and moves with it, and nothing
44
41
  // measures it any more.
@@ -110,7 +107,8 @@ const XyChartTooltipContent = < Datum extends object >( {
110
107
  horizontalCrosshairStyle,
111
108
  detectBounds = true,
112
109
  tooltipPlacement = 'auto',
113
- zIndex = DEFAULT_TOOLTIP_Z_INDEX,
110
+ tooltipAnchorTop,
111
+ zIndex = TOOLTIP_Z_INDEX,
114
112
  style,
115
113
  ...rest
116
114
  }: XyChartTooltipContentProps< Datum > ) => {
@@ -171,7 +169,9 @@ const XyChartTooltipContent = < Datum extends object >( {
171
169
  const size = Number( glyphStyle?.radius ?? DEFAULT_GLYPH_RADIUS );
172
170
  const labelColor = theme?.htmlLabel?.color ?? FALLBACK_COLOR;
173
171
  // visx colours a lone nearest-datum glyph like the gridlines and series glyphs like labels.
174
- const fallbackColor = showSeriesGlyphs ? labelColor : theme?.gridStyles?.stroke ?? labelColor;
172
+ const fallbackColor = showSeriesGlyphs
173
+ ? labelColor
174
+ : ( theme?.gridStyles?.stroke ?? labelColor );
175
175
  let entries: Array< { key: string; datum: Datum; index: number } > = [];
176
176
  if ( showSeriesGlyphs ) {
177
177
  entries = Object.values( tooltipContext.tooltipData?.datumByKey ?? {} );
@@ -214,8 +214,7 @@ const XyChartTooltipContent = < Datum extends object >( {
214
214
  const marginTop = margin?.top ?? 0;
215
215
  const marginLeft = margin?.left ?? 0;
216
216
 
217
- const TooltipComponent =
218
- detectBounds || tooltipPlacement === 'below-axis' ? BoundedTooltip : Tooltip;
217
+ const TooltipComponent = detectBounds || tooltipPlacement !== 'auto' ? BoundedTooltip : Tooltip;
219
218
  const boxStyle: CSSProperties = {
220
219
  ...defaultStyles,
221
220
  zIndex,
@@ -265,12 +264,12 @@ const XyChartTooltipContent = < Datum extends object >( {
265
264
  top={
266
265
  tooltipPlacement === 'below-axis'
267
266
  ? marginTop + innerHeight + ( margin?.bottom ?? 0 )
268
- : tooltipTop
267
+ : ( tooltipAnchorTop ?? tooltipTop )
269
268
  }
270
269
  style={ boxStyle }
271
270
  applyPositionStyle
272
271
  { ...tooltipProps }
273
- { ...( tooltipPlacement === 'below-axis' && { placement: tooltipPlacement } ) }
272
+ { ...( tooltipPlacement !== 'auto' && { placement: tooltipPlacement } ) }
274
273
  >
275
274
  { tooltipContent }
276
275
  </TooltipComponent>,
@@ -1,4 +1,4 @@
1
- import { renderHook, waitFor } from '@testing-library/react';
1
+ import { act, renderHook, waitFor } from '@testing-library/react';
2
2
  import { useElementSize } from '../use-element-size';
3
3
 
4
4
  // Mock ResizeObserver
@@ -66,7 +66,7 @@ describe( 'useElementSize', () => {
66
66
  const [ refCallback ] = result.current;
67
67
 
68
68
  // Attach the element
69
- refCallback( mockElement as unknown as HTMLDivElement );
69
+ act( () => refCallback( mockElement as unknown as HTMLDivElement ) );
70
70
 
71
71
  await waitFor( () => {
72
72
  expect( result.current[ 1 ] ).toBe( 300 );
@@ -84,7 +84,7 @@ describe( 'useElementSize', () => {
84
84
  const { result } = renderHook( () => useElementSize() );
85
85
  const [ refCallback ] = result.current;
86
86
 
87
- refCallback( mockElement as unknown as HTMLDivElement );
87
+ act( () => refCallback( mockElement as unknown as HTMLDivElement ) );
88
88
 
89
89
  await waitFor( () => {
90
90
  expect( result.current[ 1 ] ).toBe( 0 );
@@ -100,7 +100,7 @@ describe( 'useElementSize', () => {
100
100
  const { result } = renderHook( () => useElementSize() );
101
101
  const [ refCallback ] = result.current;
102
102
 
103
- refCallback( mockElement as unknown as HTMLDivElement );
103
+ act( () => refCallback( mockElement as unknown as HTMLDivElement ) );
104
104
 
105
105
  await waitFor( () => {
106
106
  expect( result.current[ 1 ] ).toBe( 0 );
@@ -129,10 +129,10 @@ describe( 'useElementSize', () => {
129
129
  const [ refCallback ] = result.current;
130
130
 
131
131
  // Attach first element
132
- refCallback( mockElement1 as unknown as HTMLDivElement );
132
+ act( () => refCallback( mockElement1 as unknown as HTMLDivElement ) );
133
133
 
134
134
  // Attach second element
135
- refCallback( mockElement2 as unknown as HTMLDivElement );
135
+ act( () => refCallback( mockElement2 as unknown as HTMLDivElement ) );
136
136
 
137
137
  expect( disconnectSpy ).toHaveBeenCalled();
138
138
  } );
@@ -155,10 +155,10 @@ describe( 'useElementSize', () => {
155
155
  const [ refCallback ] = result.current;
156
156
 
157
157
  // Attach element
158
- refCallback( mockElement as unknown as HTMLDivElement );
158
+ act( () => refCallback( mockElement as unknown as HTMLDivElement ) );
159
159
 
160
160
  // Remove element
161
- refCallback( null as unknown as HTMLDivElement );
161
+ act( () => refCallback( null as unknown as HTMLDivElement ) );
162
162
 
163
163
  expect( disconnectSpy ).toHaveBeenCalled();
164
164
  } );
@@ -180,7 +180,7 @@ describe( 'useElementSize', () => {
180
180
  const { result } = renderHook( () => useElementSize() );
181
181
  const [ refCallback ] = result.current;
182
182
 
183
- refCallback( mockElement as unknown as HTMLDivElement );
183
+ act( () => refCallback( mockElement as unknown as HTMLDivElement ) );
184
184
 
185
185
  expect( globalThis.ResizeObserver ).toHaveBeenCalled();
186
186
  expect( observeSpy ).toHaveBeenCalledWith( mockElement );
@@ -207,7 +207,7 @@ describe( 'useElementSize', () => {
207
207
  const { result } = renderHook( () => useElementSize() );
208
208
  const [ refCallback ] = result.current;
209
209
 
210
- refCallback( mockSpanElement as unknown as HTMLDivElement );
210
+ act( () => refCallback( mockSpanElement as unknown as HTMLDivElement ) );
211
211
 
212
212
  await waitFor( () => {
213
213
  expect( result.current[ 1 ] ).toBe( 75 );
@@ -236,7 +236,7 @@ describe( 'useElementSize', () => {
236
236
  const { result } = renderHook( () => useElementSize() );
237
237
  const [ refCallback ] = result.current;
238
238
 
239
- refCallback( mockElement as unknown as HTMLDivElement );
239
+ act( () => refCallback( mockElement as unknown as HTMLDivElement ) );
240
240
 
241
241
  await waitFor( () => {
242
242
  expect( result.current[ 1 ] ).toBe( 100 );
@@ -244,7 +244,7 @@ describe( 'useElementSize', () => {
244
244
  } );
245
245
 
246
246
  // Simulate resize
247
- resizeCallback();
247
+ act( () => resizeCallback() );
248
248
 
249
249
  await waitFor( () => {
250
250
  expect( result.current[ 1 ] ).toBe( 200 );
@@ -269,7 +269,7 @@ describe( 'useElementSize', () => {
269
269
  const { result, unmount } = renderHook( () => useElementSize() );
270
270
  const [ refCallback ] = result.current;
271
271
 
272
- refCallback( mockElement as unknown as HTMLDivElement );
272
+ act( () => refCallback( mockElement as unknown as HTMLDivElement ) );
273
273
  unmount();
274
274
 
275
275
  // The observer should be cleaned up when the hook unmounts
@@ -23,7 +23,7 @@ export const useXYChartTheme = ( data: SeriesData[] ) => {
23
23
  // One resolver for all three, so they share a single getComputedStyle call.
24
24
  const resolve = createCssVariableResolver( scopeElement );
25
25
  const resolveColor = ( value?: string ): string | undefined =>
26
- value ? resolve( value ) ?? value : value;
26
+ value ? ( resolve( value ) ?? value ) : value;
27
27
 
28
28
  const seriesColors: string[] = JSON.parse( seriesColorKey );
29
29
 
package/src/index.ts CHANGED
@@ -10,7 +10,9 @@ export {
10
10
  HeatmapChart,
11
11
  HeatmapChartUnresponsive,
12
12
  buildCalendarHeatmapData,
13
+ buildMonthCalendarHeatmapData,
13
14
  useCalendarHeatmapData,
15
+ useMonthCalendarHeatmapData,
14
16
  } from './charts/heatmap-chart';
15
17
  export { LeaderboardChart, LeaderboardChartUnresponsive } from './charts/leaderboard-chart';
16
18
  export { LineChart, LineChartUnresponsive } from './charts/line-chart';
@@ -95,7 +97,7 @@ export type { LegendProps, BaseLegendProps, ChartLegendOptions } from './compone
95
97
 
96
98
  // Previously available via '@automattic/charts/bar-chart', '@automattic/charts/line-chart', etc.
97
99
  export type { AreaChartProps } from './charts/area-chart';
98
- export type { BarChartProps } from './charts/bar-chart';
100
+ export type { BarChartProps, BandHighlightSelection } from './charts/bar-chart';
99
101
  export type {
100
102
  BarListChartProps,
101
103
  RenderLabelProps,
@@ -112,10 +114,14 @@ export type {
112
114
  export type {
113
115
  HeatmapChartProps,
114
116
  HeatmapColumn,
117
+ HeatmapColumnGroup,
115
118
  HeatmapCell,
116
119
  HeatmapTooltipData,
117
120
  CalendarHeatmapOptions,
118
121
  CalendarHeatmapResult,
122
+ MonthCalendarHeatmapOptions,
123
+ MonthCalendarHeatmapRange,
124
+ MonthCalendarHeatmapResult,
119
125
  } from './charts/heatmap-chart';
120
126
  export type { LeaderboardChartProps } from './charts/leaderboard-chart';
121
127
  export type {
@@ -61,6 +61,7 @@ const defaultTheme: CompleteChartTheme = {
61
61
  heatmapChart: {
62
62
  compactCellGap: 2,
63
63
  compactCellSize: 11,
64
+ groupGap: 24,
64
65
  },
65
66
  };
66
67
 
@@ -101,7 +101,7 @@ function parseTokensDoc(): Map< string, Entry > {
101
101
  const token = /(--wp[\w-]+)/.exec( mapping );
102
102
 
103
103
  entries.set( role, {
104
- reads: unmapped ? null : derives?.[ 1 ] ?? token?.[ 1 ] ?? null,
104
+ reads: unmapped ? null : ( derives?.[ 1 ] ?? token?.[ 1 ] ?? null ),
105
105
  fallback: fallback === '—' ? null : normalize( fallback ),
106
106
  } );
107
107
  }
package/src/types.ts CHANGED
@@ -53,12 +53,7 @@ export type LegendShape< Data, Output > =
53
53
  | ComponentClass< LegendShapeRenderProps< Data, Output > >;
54
54
 
55
55
  export type GoogleDataTableColumnType =
56
- | 'string'
57
- | 'number'
58
- | 'boolean'
59
- | 'date'
60
- | 'datetime'
61
- | 'timeofday';
56
+ 'string' | 'number' | 'boolean' | 'date' | 'datetime' | 'timeofday';
62
57
 
63
58
  export enum GoogleDataTableColumnRoleType {
64
59
  annotation = 'annotation',
@@ -98,13 +93,7 @@ export type GoogleDataTableCell =
98
93
  export type GoogleDataTableRow = GoogleDataTableCell[];
99
94
 
100
95
  export type ChartType =
101
- | 'area'
102
- | 'bar'
103
- | 'conversion-funnel'
104
- | 'leaderboard'
105
- | 'line'
106
- | 'pie'
107
- | 'pie-semi-circle';
96
+ 'area' | 'bar' | 'conversion-funnel' | 'leaderboard' | 'line' | 'pie' | 'pie-semi-circle';
108
97
 
109
98
  export type OrientationType = ValueOf< typeof Orientation >;
110
99
 
@@ -145,6 +134,7 @@ export type ThemeAnnotationStyles = {
145
134
  export type DataPoint = {
146
135
  label: string;
147
136
  value: number;
137
+ color?: string;
148
138
  };
149
139
 
150
140
  /**
@@ -196,6 +186,7 @@ export type DataPointDate = {
196
186
  dateString?: string;
197
187
  value: number | null;
198
188
  label?: string;
189
+ color?: string;
199
190
  };
200
191
 
201
192
  export type LeaderboardEntry = {
@@ -424,6 +415,8 @@ export type ChartTheme = {
424
415
  compactCellGap?: number;
425
416
  /** Fixed square cell size in px for compact mode */
426
417
  compactCellSize?: number;
418
+ /** Gap in px between adjacent column groups; in compact mode the minimum, as the gaps share leftover width */
419
+ groupGap?: number;
427
420
  };
428
421
  };
429
422
 
@@ -47,13 +47,13 @@ export const formatMetricValue = (
47
47
  maximumFractionDigits: decimals ?? 2,
48
48
  signDisplay,
49
49
  },
50
- } )
50
+ } )
51
51
  : formatNumber( numericValue, {
52
52
  decimals: decimals ?? 2,
53
53
  numberFormatOptions: {
54
54
  signDisplay,
55
55
  },
56
- } );
56
+ } );
57
57
  return `$${ formatted }`;
58
58
  }
59
59
 
@@ -80,13 +80,13 @@ export const formatMetricValue = (
80
80
  maximumFractionDigits: decimals ?? 0,
81
81
  signDisplay,
82
82
  },
83
- } )
83
+ } )
84
84
  : formatNumber( numericValue, {
85
85
  decimals: decimals ?? 0,
86
86
  numberFormatOptions: {
87
87
  signDisplay,
88
88
  },
89
- } );
89
+ } );
90
90
  }
91
91
  }
92
92
  };
@@ -24,7 +24,7 @@ export const getEdgeTickWidths = < T extends AnyD3Scale >(
24
24
 
25
25
  const lastIndex = ticks.length - 1;
26
26
  const label = ( tick: ScaleInput< T >, index: number ) =>
27
- String( formatTick ? formatTick( tick, index, [] ) ?? '' : tick );
27
+ String( formatTick ? ( formatTick( tick, index, [] ) ?? '' ) : tick );
28
28
 
29
29
  return {
30
30
  first: getStringWidth( label( ticks[ 0 ], 0 ), labelStyle ) ?? 0,
@@ -103,7 +103,7 @@ export function getItemShapeStyles(
103
103
  const hasExplicitStyles = Object.values( explicitStyles ).some(
104
104
  value => value !== undefined && value !== null && value !== ''
105
105
  );
106
- const baseShapeStyles = hasExplicitStyles ? explicitStyles : themeShapeStyles ?? {};
106
+ const baseShapeStyles = hasExplicitStyles ? explicitStyles : ( themeShapeStyles ?? {} );
107
107
 
108
108
  // Layer the comparison bar opacity on top so the swatch matches the translucent bar
109
109
  // without discarding the base (custom or theme) shape styles.
package/src/visx/types.ts CHANGED
@@ -12,15 +12,10 @@ export interface RenderTooltipGlyphProps< Datum extends object > extends GlyphPr
12
12
  isNearestDatum: boolean;
13
13
  }
14
14
 
15
- export type TooltipPlacement = 'auto' | 'below-axis';
15
+ export type TooltipPlacement = 'auto' | 'below-axis' | 'beside';
16
16
 
17
17
  type CrosshairPaintProperty =
18
- | 'stroke'
19
- | 'strokeWidth'
20
- | 'strokeOpacity'
21
- | 'strokeDasharray'
22
- | 'strokeLinecap'
23
- | 'opacity';
18
+ 'stroke' | 'strokeWidth' | 'strokeOpacity' | 'strokeDasharray' | 'strokeLinecap' | 'opacity';
24
19
 
25
20
  export type CrosshairStyle = Pick< SVGProps< SVGLineElement >, CrosshairPaintProperty > & {
26
21
  className?: string;
@@ -31,11 +26,13 @@ export type XyChartTooltipProps< Datum extends object > = {
31
26
  renderTooltip: ( params: RenderTooltipParams< Datum > ) => ReactNode;
32
27
  renderGlyph?: ( params: RenderTooltipGlyphProps< Datum > ) => ReactNode;
33
28
  /**
34
- * Keep the panel below the x-axis label band, centered at the datum x and horizontally clamped.
35
- * Vertical bounds do not move this placement; clipping ancestors can still cut it off.
29
+ * Use below-axis placement for centered axis anchoring, or beside placement to avoid vertical flipping.
30
+ * Below-axis ignores vertical bounds; beside placement clamps to them.
36
31
  * @default 'auto'
37
32
  */
38
33
  tooltipPlacement?: TooltipPlacement;
34
+ /** Override the tooltip top anchor in SVG coordinates, including negative offsets. */
35
+ tooltipAnchorTop?: number;
39
36
  /** Merge overrides with the default box styles; use `unstyled` to strip the box styling. */
40
37
  style?: VisxTooltipProps[ 'style' ];
41
38
  snapTooltipToDatumX?: boolean;
@@ -52,7 +49,7 @@ export type XyChartTooltipProps< Datum extends object > = {
52
49
  * that clips its overflow, or the viewport when there is none. The box may
53
50
  * leave the chart wrapper. (It used to keep a body-level portal inside the
54
51
  * viewport.)
55
- * Ignored by `below-axis`.
52
+ * Non-auto placements always apply their own bounds handling.
56
53
  * @default true
57
54
  */
58
55
  detectBounds?: boolean;