fix

Author: alexfauquette

packages/x-charts-premium/src/Map/seriesConfig/keyboardFocusHandler.ts

@@ -5,13 +5,16 @@ import {
 
 const mapShapeSeriesTypes = new Set(['mapShape'] as const);
 
+const allowCycles = false;
+const seriesMaxLength = true;
+
 /**
  * Move the focus across the shapes of the map series.
  *
  * `ArrowRight`/`ArrowLeft` move to the next/previous shape of the focused series,
  * while `ArrowUp`/`ArrowDown` move between series.
  */
 const keyboardFocusHandler: KeyboardFocusHandler<'mapShape', 'mapShape'> =
-  createCommonKeyboardFocusHandler(mapShapeSeriesTypes);
+  createCommonKeyboardFocusHandler(mapShapeSeriesTypes, allowCycles, seriesMaxLength);
 
 export default keyboardFocusHandler;

packages/x-charts/src/internals/commonNextFocusItem.ts

@@ -42,6 +42,10 @@ export function createGetNextIndexFocusedItem<
    * If true, allows cycling from the last item to the first one.
    */
   allowCycles: boolean = false,
+  /**
+   * If true, series max index is defined by the current series length and not all series.
+   */
+  seriesMaxLength: boolean = false,
 ) {
   return function getNextIndexFocusedItem(
     currentItem: FocusedItemIdentifier<InSeriesType> | null,
@@ -71,7 +75,9 @@ export function createGetNextIndexFocusedItem<
       seriesId = nextSeries.seriesId;
     }
 
-    const maxLength = getMaxSeriesLength(processedSeries, compatibleSeriesTypes);
+    const maxLength = seriesMaxLength
+      ? (processedSeries[type]?.series[seriesId]?.data.length ?? 0)
+      : getMaxSeriesLength(processedSeries, compatibleSeriesTypes);
 
     let dataIndex = currentItem?.dataIndex == null ? 0 : currentItem.dataIndex + 1;
     if (allowCycles) {
@@ -114,6 +120,10 @@ export function createGetPreviousIndexFocusedItem<
    * If true, allows cycling from the last item to the first one.
    */
   allowCycles: boolean = false,
+  /**
+   * If true, series max index is defined by the current series length and not all series.
+   */
+  seriesMaxLength: boolean = false,
 ) {
   return function getPreviousIndexFocusedItem(
     currentItem: FocusedItemIdentifier<InSeriesType> | null,
@@ -143,7 +153,9 @@ export function createGetPreviousIndexFocusedItem<
       seriesId = previousSeries.seriesId;
     }
 
-    const maxLength = getMaxSeriesLength(processedSeries, compatibleSeriesTypes);
+    const maxLength = seriesMaxLength
+      ? (processedSeries[type]?.series[seriesId]?.data.length ?? 0)
+      : getMaxSeriesLength(processedSeries, compatibleSeriesTypes);
 
     let dataIndex = currentItem?.dataIndex == null ? maxLength - 1 : currentItem.dataIndex - 1;
     if (allowCycles) {

packages/x-charts/src/internals/createCommonKeyboardFocusHandler.ts

@@ -12,18 +12,20 @@ import {
 export function createCommonKeyboardFocusHandler<
   SeriesType extends Exclude<ChartSeriesType, 'sankey' | 'heatmap'>,
   TInputSeriesType extends Exclude<ChartSeriesType, 'sankey' | 'heatmap'> = SeriesType,
->(outSeriesTypes: Set<SeriesType>, allowCycles?: boolean) {
+>(outSeriesTypes: Set<SeriesType>, allowCycles?: boolean, seriesMaxLength?: boolean) {
   const keyboardFocusHandler = (event: KeyboardEvent) => {
     switch (event.key) {
       case 'ArrowRight':
         return createGetNextIndexFocusedItem<TInputSeriesType, SeriesType>(
           outSeriesTypes,
           allowCycles,
+          seriesMaxLength,
         );
       case 'ArrowLeft':
         return createGetPreviousIndexFocusedItem<TInputSeriesType, SeriesType>(
           outSeriesTypes,
           allowCycles,
+          seriesMaxLength,
         );
       case 'ArrowDown':
         return createGetPreviousSeriesFocusedItem<TInputSeriesType, SeriesType>(outSeriesTypes);