@proyecto-viviana/solidaria 0.4.2 → 0.6.0-rc.0

package/src/grid/intl/ja-JP.json

@@ -0,0 +1,8 @@
+{
+  "deselectedItem": "{item} が選択されていません。",
+  "longPressToSelect": "長押しして選択モードを開きます。",
+  "select": "選択",
+  "selectedAll": "すべての項目を選択しました。",
+  "selectedCount": "{count, plural, =0 {項目が選択されていません} one {# 項目を選択しました} other {# 項目を選択しました}}。",
+  "selectedItem": "{item} を選択しました。"
+}

package/src/grid/intl/ko-KR.json

@@ -0,0 +1,8 @@
+{
+  "deselectedItem": "{item}이(가) 선택되지 않았습니다.",
+  "longPressToSelect": "선택 모드로 들어가려면 길게 누르십시오.",
+  "select": "선택",
+  "selectedAll": "모든 항목이 선택되었습니다.",
+  "selectedCount": "{count, plural, =0 {선택된 항목이 없습니다} one {#개 항목이 선택되었습니다} other {#개 항목이 선택되었습니다}}.",
+  "selectedItem": "{item}이(가) 선택되었습니다."
+}

package/src/grid/intl/lt-LT.json

@@ -0,0 +1,8 @@
+{
+  "deselectedItem": "{item} nepasirinkta.",
+  "longPressToSelect": "Norėdami įjungti pasirinkimo režimą, paspauskite ir palaikykite.",
+  "select": "Pasirinkti",
+  "selectedAll": "Pasirinkti visi elementai.",
+  "selectedCount": "{count, plural, =0 {Nepasirinktas nė vienas elementas} one {Pasirinktas # elementas} other {Pasirinkta elementų: #}}.",
+  "selectedItem": "Pasirinkta: {item}."
+}

package/src/grid/intl/lv-LV.json

@@ -0,0 +1,8 @@
+{
+  "deselectedItem": "Vienums {item} nav atlasīts.",
+  "longPressToSelect": "Ilgi turiet nospiestu. lai ieslēgtu atlases režīmu.",
+  "select": "Atlasīt",
+  "selectedAll": "Atlasīti visi vienumi.",
+  "selectedCount": "{count, plural, =0 {Nav atlasīts neviens vienums} one {Atlasīto vienumu skaits: #} other {Atlasīto vienumu skaits: #}}.",
+  "selectedItem": "Atlasīts vienums {item}."
+}

package/src/grid/intl/nb-NO.json

@@ -0,0 +1,8 @@
+{
+  "deselectedItem": "{item} er ikke valgt.",
+  "longPressToSelect": "Bruk et langt trykk for å gå inn i valgmodus.",
+  "select": "Velg",
+  "selectedAll": "Alle elementer er valgt.",
+  "selectedCount": "{count, plural, =0 {Ingen elementer er valgt} one {# element er valgt} other {# elementer er valgt}}.",
+  "selectedItem": "{item} er valgt."
+}

package/src/grid/intl/nl-NL.json

@@ -0,0 +1,8 @@
+{
+  "deselectedItem": "{item} niet geselecteerd.",
+  "longPressToSelect": "Druk lang om de selectiemodus te openen.",
+  "select": "Selecteren",
+  "selectedAll": "Alle items geselecteerd.",
+  "selectedCount": "{count, plural, =0 {Geen items geselecteerd} one {# item geselecteerd} other {# items geselecteerd}}.",
+  "selectedItem": "{item} geselecteerd."
+}

package/src/grid/intl/pl-PL.json

@@ -0,0 +1,8 @@
+{
+  "deselectedItem": "Nie zaznaczono {item}.",
+  "longPressToSelect": "Naciśnij i przytrzymaj, aby wejść do trybu wyboru.",
+  "select": "Zaznacz",
+  "selectedAll": "Wszystkie zaznaczone elementy.",
+  "selectedCount": "{count, plural, =0 {Nie zaznaczono żadnych elementów} one {# zaznaczony element} other {# zaznaczonych elementów}}.",
+  "selectedItem": "Zaznaczono {item}."
+}

package/src/grid/intl/pt-BR.json

@@ -0,0 +1,8 @@
+{
+  "deselectedItem": "{item} não selecionado.",
+  "longPressToSelect": "Mantenha pressionado para entrar no modo de seleção.",
+  "select": "Selecionar",
+  "selectedAll": "Todos os itens selecionados.",
+  "selectedCount": "{count, plural, =0 {Nenhum item selecionado} one {# item selecionado} other {# itens selecionados}}.",
+  "selectedItem": "{item} selecionado."
+}

package/src/grid/intl/pt-PT.json

@@ -0,0 +1,8 @@
+{
+  "deselectedItem": "{item} não selecionado.",
+  "longPressToSelect": "Prima continuamente para entrar no modo de seleção.",
+  "select": "Selecionar",
+  "selectedAll": "Todos os itens selecionados.",
+  "selectedCount": "{count, plural, =0 {Nenhum item selecionado} one {# item selecionado} other {# itens selecionados}}.",
+  "selectedItem": "{item} selecionado."
+}

package/src/grid/intl/ro-RO.json

@@ -0,0 +1,8 @@
+{
+  "deselectedItem": "{item} neselectat.",
+  "longPressToSelect": "Apăsați lung pentru a intra în modul de selectare.",
+  "select": "Selectare",
+  "selectedAll": "Toate elementele selectate.",
+  "selectedCount": "{count, plural, =0 {Niciun element selectat} one {# element selectat} other {# elemente selectate}}.",
+  "selectedItem": "{item} selectat."
+}

package/src/grid/intl/ru-RU.json

@@ -0,0 +1,8 @@
+{
+  "deselectedItem": "{item} не выбрано.",
+  "longPressToSelect": "Нажмите и удерживайте для входа в режим выбора.",
+  "select": "Выбрать",
+  "selectedAll": "Выбраны все элементы.",
+  "selectedCount": "{count, plural, =0 {Нет выбранных элементов} one {# элемент выбран} other {# элементов выбрано}}.",
+  "selectedItem": "{item} выбрано."
+}

package/src/grid/intl/sk-SK.json

@@ -0,0 +1,8 @@
+{
+  "deselectedItem": "Nevybraté položky: {item}.",
+  "longPressToSelect": "Dlhším stlačením prejdite do režimu výberu.",
+  "select": "Vybrať",
+  "selectedAll": "Všetky vybraté položky.",
+  "selectedCount": "{count, plural, =0 {Žiadne vybraté položky} one {# vybratá položka} other {Počet vybratých položiek:#}}.",
+  "selectedItem": "Vybraté položky: {item}."
+}

package/src/grid/intl/sl-SI.json

@@ -0,0 +1,8 @@
+{
+  "deselectedItem": "Element {item} ni izbran.",
+  "longPressToSelect": "Za izbirni način pritisnite in dlje časa držite.",
+  "select": "Izberite",
+  "selectedAll": "Vsi elementi so izbrani.",
+  "selectedCount": "{count, plural, =0 {Noben element ni izbran} one {# element je izbran} other {# elementov je izbranih}}.",
+  "selectedItem": "Element {item} je izbran."
+}

package/src/grid/intl/sr-SP.json

@@ -0,0 +1,8 @@
+{
+  "deselectedItem": "{item} nije izabrano.",
+  "longPressToSelect": "Dugo pritisnite za ulazak u režim biranja.",
+  "select": "Izaberite",
+  "selectedAll": "Izabrane su sve stavke.",
+  "selectedCount": "{count, plural, =0 {Nije izabrana nijedna stavka} one {Izabrana je # stavka} other {Izabrano je # stavki}}.",
+  "selectedItem": "{item} je izabrano."
+}

package/src/grid/intl/sv-SE.json

@@ -0,0 +1,8 @@
+{
+  "deselectedItem": "{item} ej markerat.",
+  "longPressToSelect": "Tryck länge när du vill öppna väljarläge.",
+  "select": "Markera",
+  "selectedAll": "Alla markerade objekt.",
+  "selectedCount": "{count, plural, =0 {Inga markerade objekt} one {# markerat objekt} other {# markerade objekt}}.",
+  "selectedItem": "{item} markerat."
+}

package/src/grid/intl/tr-TR.json

@@ -0,0 +1,8 @@
+{
+  "deselectedItem": "{item} seçilmedi.",
+  "longPressToSelect": "Seçim moduna girmek için uzun basın.",
+  "select": "Seç",
+  "selectedAll": "Tüm ögeler seçildi.",
+  "selectedCount": "{count, plural, =0 {Hiçbir öge seçilmedi} one {# öge seçildi} other {# öge seçildi}}.",
+  "selectedItem": "{item} seçildi."
+}

package/src/grid/intl/uk-UA.json

@@ -0,0 +1,8 @@
+{
+  "deselectedItem": "{item} не вибрано.",
+  "longPressToSelect": "Виконайте довге натиснення, щоб перейти в режим вибору.",
+  "select": "Вибрати",
+  "selectedAll": "Усі елементи вибрано.",
+  "selectedCount": "{count, plural, =0 {Жодних елементів не вибрано} one {# елемент вибрано} other {Вибрано елементів: #}}.",
+  "selectedItem": "{item} вибрано."
+}

package/src/grid/intl/zh-CN.json

@@ -0,0 +1,8 @@
+{
+  "deselectedItem": "未选择 {item}。",
+  "longPressToSelect": "长按以进入选择模式。",
+  "select": "选择",
+  "selectedAll": "已选择所有项目。",
+  "selectedCount": "{count, plural, =0 {未选择项目} one {已选择 # 个项目} other {已选择 # 个项目}}。",
+  "selectedItem": "已选择 {item}。"
+}

package/src/grid/intl/zh-TW.json

@@ -0,0 +1,8 @@
+{
+  "deselectedItem": "未選取「{item}」。",
+  "longPressToSelect": "長按以進入選擇模式。",
+  "select": "選取",
+  "selectedAll": "已選取所有項目。",
+  "selectedCount": "{count, plural, =0 {未選取任何項目} one {已選取 # 個項目} other {已選取 # 個項目}}。",
+  "selectedItem": "已選取「{item}」。"
+}

package/src/grid/types.ts

@@ -1,9 +1,32 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Ported to SolidJS for Proyecto Viviana; based on packages/@react-types/shared/src/collections.d.ts
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/src/grid/useGrid.ts
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/src/grid/useGridCell.ts
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/src/grid/useGridRow.ts
+
 /**
  * Grid ARIA types for Table and GridList components.
- * Based on @react-aria/grid types.
+ * Based on these pinned React Aria sources:
+ * - packages/@react-types/shared/src/collections.d.ts
+ * - packages/react-aria/src/grid/useGrid.ts
+ * - packages/react-aria/src/grid/useGridRow.ts
+ * - packages/react-aria/src/grid/useGridCell.ts
+ *
+ * The key-based row and cell props adapt the upstream node-based API to Solid state.
  */
 
-import type { JSX } from "solid-js";
+import type { JSX } from "@solidjs/web";
 import type { Key } from "@proyecto-viviana/solid-stately";
 
 /**

package/src/gridlist/createGridList.ts

@@ -1,15 +1,33 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/src/gridlist/useGridList.ts
+
 /**
  * createGridList - Provides accessibility for a grid list.
  * Based on @react-aria/gridlist/useGridList.
  */
 
-import { createMemo, createEffect, type Accessor } from "solid-js";
-import type { JSX } from "solid-js";
+import { createMemo, createTrackedEffect } from "solid-js";
+import type { Accessor } from "solid-js";
+import type { JSX } from "@solidjs/web";
 import { createId } from "@proyecto-viviana/solid-stately";
-import type { GridState, GridCollection, Key } from "@proyecto-viviana/solid-stately";
+import type { GridState, GridCollection, Key, Collection } from "@proyecto-viviana/solid-stately";
 import type { AriaGridListProps, GridListAria } from "./types";
 import { scrollIntoViewport } from "../utils";
 import { getInteractionModality } from "../interactions/createInteractionModality";
+import { mergeProps } from "../utils/mergeProps";
+import { createTypeSelect } from "../selection/createTypeSelect";
+import { isNonContiguousSelectionModifier } from "../selection/utils";
 
 /**
  * Metadata stored for a grid list instance.
@@ -25,6 +43,8 @@ interface GridListData {
   keyboardNavigationBehavior: "arrow" | "tab";
   /** Text direction for row-child arrow navigation. */
   direction: "ltr" | "rtl";
+  /** `"grid"` lets Left/Right reach the collection for 2D navigation. */
+  layout: "stack" | "grid";
   /** Actions registered for the grid list. */
   actions: {
     onAction?: (key: Key) => void;
@@ -77,6 +97,64 @@ function findNextNavigableKey<T extends object, C extends GridCollection<T>>(
   return key;
 }
 
+function navigableKeys<T extends object, C extends GridCollection<T>>(
+  state: GridState<T, C>,
+): Key[] {
+  const keys: Key[] = [];
+  let key = state.collection.getFirstKey();
+  while (key != null) {
+    if (!isNavigationDisabled(state, key)) {
+      keys.push(key);
+    }
+    key = state.collection.getKeyAfter(key);
+  }
+  return keys;
+}
+
+function gridNeighborKey(
+  keys: Key[],
+  from: Key,
+  columns: number,
+  deltaCol: number,
+  deltaRow: number,
+): Key | null {
+  const index = keys.indexOf(from);
+  if (index < 0 || columns < 1) return null;
+  const row = Math.floor(index / columns);
+  const col = index % columns;
+  const nextCol = col + deltaCol;
+  const nextRow = row + deltaRow;
+  if (nextCol < 0 || nextCol >= columns || nextRow < 0) return null;
+  return keys[nextRow * columns + nextCol] ?? null;
+}
+
+function firstSelectedKey<T extends object, C extends GridCollection<T>>(
+  state: GridState<T, C>,
+): Key | null {
+  let key = state.collection.getFirstKey();
+  while (key != null) {
+    if (state.isSelected(key)) return key;
+    key = state.collection.getKeyAfter(key);
+  }
+  return null;
+}
+
+function lastSelectedKey<T extends object, C extends GridCollection<T>>(
+  state: GridState<T, C>,
+): Key | null {
+  let key = state.collection.getLastKey();
+  while (key != null) {
+    if (state.isSelected(key)) return key;
+    key = state.collection.getKeyBefore(key);
+  }
+  return null;
+}
+
+function queryCollectionItem(root: HTMLElement, key: Key): HTMLElement | null {
+  const escaped = typeof CSS !== "undefined" && CSS.escape ? CSS.escape(String(key)) : String(key);
+  return root.querySelector<HTMLElement>(`[data-key="${escaped}"]`);
+}
+
 /**
  * Creates accessibility props for a grid list.
  */
@@ -92,7 +170,7 @@ export function createGridList<T extends object, C extends GridCollection<T> = G
   const gridListData: GridListData = {
     gridListId,
     get selectionBehavior() {
-      return props().selectionBehavior ?? "replace";
+      return props().selectionBehavior ?? "toggle";
     },
     get shouldSelectOnPressUp() {
       return props().shouldSelectOnPressUp ?? false;
@@ -103,6 +181,9 @@ export function createGridList<T extends object, C extends GridCollection<T> = G
     get direction() {
       return props().direction ?? "ltr";
     },
+    get layout() {
+      return props().layout ?? "stack";
+    },
     actions: {
       get onAction() {
         return props().onAction;
@@ -113,6 +194,13 @@ export function createGridList<T extends object, C extends GridCollection<T> = G
   // Store in WeakMap using the state as key
   gridListDataMap.set(state(), gridListData);
 
+  const { typeSelectProps } = createTypeSelect({
+    collection: () => state().collection as unknown as Collection<T>,
+    focusedKey: () => state().focusedKey,
+    onFocusedKeyChange: (key) => state().setFocusedKey(key),
+    isKeyDisabled: (key) => isNavigationDisabled(state(), key),
+  });
+
   // Handle keyboard navigation
   const onKeyDown = (e: KeyboardEvent) => {
     const s = state();
@@ -122,35 +210,71 @@ export function createGridList<T extends object, C extends GridCollection<T> = G
 
     if (p.isDisabled) return;
 
+    const selectOnFocus =
+      (p.selectionBehavior ?? s.selectionBehavior) === "replace" && s.selectionMode !== "none";
+    const moveFocus = (nextKey: Key | null) => {
+      if (nextKey == null) return;
+      s.setFocusedKey(nextKey);
+      if (selectOnFocus && !e.shiftKey && !isNonContiguousSelectionModifier(e)) {
+        s.replaceSelection(nextKey);
+      }
+    };
+    const isGrid = p.layout === "grid";
+    const columns = Math.max(1, p.columnCount ?? 1);
+
     switch (e.key) {
       case "ArrowDown": {
         e.preventDefault();
+        if (isGrid) {
+          const keys = navigableKeys(s);
+          const from = focusedKey ?? keys[0];
+          if (from != null) {
+            moveFocus(gridNeighborKey(keys, from, columns, 0, 1));
+          }
+          break;
+        }
         const nextKey =
           focusedKey != null
             ? findNextNavigableKey(s, collection.getKeyAfter(focusedKey), (k) =>
                 collection.getKeyAfter(k),
               )
             : findNextNavigableKey(s, collection.getFirstKey(), (k) => collection.getKeyAfter(k));
-        if (nextKey != null) {
-          s.setFocusedKey(nextKey);
-        }
+        moveFocus(nextKey);
         break;
       }
       case "ArrowUp": {
         e.preventDefault();
+        if (isGrid) {
+          const keys = navigableKeys(s);
+          const from = focusedKey ?? keys[keys.length - 1];
+          if (from != null) {
+            moveFocus(gridNeighborKey(keys, from, columns, 0, -1));
+          }
+          break;
+        }
         const prevKey =
           focusedKey != null
             ? findNextNavigableKey(s, collection.getKeyBefore(focusedKey), (k) =>
                 collection.getKeyBefore(k),
               )
             : findNextNavigableKey(s, collection.getLastKey(), (k) => collection.getKeyBefore(k));
-        if (prevKey != null) {
-          s.setFocusedKey(prevKey);
-        }
+        moveFocus(prevKey);
         break;
       }
       case "ArrowRight":
       case "ArrowLeft": {
+        const behavior = p.keyboardNavigationBehavior ?? "arrow";
+        const isRtl = p.direction === "rtl";
+        if (isGrid) {
+          e.preventDefault();
+          const keys = navigableKeys(s);
+          const from = focusedKey ?? keys[0];
+          if (from != null) {
+            const forward = e.key === "ArrowRight" ? !isRtl : isRtl;
+            moveFocus(gridNeighborKey(keys, from, columns, forward ? 1 : -1, 0));
+          }
+          break;
+        }
         // The inline axis (Left/Right) belongs to the ROW under the default
         // "arrow" navigation behavior: createGridListItem's onKeyDownCapture
         // intercepts Left/Right for intra-row focus movement (a no-op for
@@ -164,10 +288,8 @@ export function createGridList<T extends object, C extends GridCollection<T> = G
         // (In Solid the row's capture-phase stopPropagation does not reliably
         // prevent the container's delegated onKeyDown, so this gate — not the
         // row's stopPropagation — is what keeps the axes from double-firing.)
-        const behavior = p.keyboardNavigationBehavior ?? "arrow";
         if (p.orientation !== "horizontal" || behavior !== "tab") break;
         e.preventDefault();
-        const isRtl = p.direction === "rtl";
         const forward = e.key === "ArrowRight" ? !isRtl : isRtl;
         const step = forward
           ? (k: Key) => collection.getKeyAfter(k)
@@ -176,9 +298,7 @@ export function createGridList<T extends object, C extends GridCollection<T> = G
           focusedKey != null
             ? findNextNavigableKey(s, step(focusedKey), step)
             : findNextNavigableKey(s, collection.getFirstKey(), (k) => collection.getKeyAfter(k));
-        if (nextKey != null) {
-          s.setFocusedKey(nextKey);
-        }
+        moveFocus(nextKey);
         break;
       }
       case "Home": {
@@ -186,9 +306,7 @@ export function createGridList<T extends object, C extends GridCollection<T> = G
         const firstKey = findNextNavigableKey(s, collection.getFirstKey(), (k) =>
           collection.getKeyAfter(k),
         );
-        if (firstKey != null) {
-          s.setFocusedKey(firstKey);
-        }
+        moveFocus(firstKey);
         break;
       }
       case "End": {
@@ -196,9 +314,7 @@ export function createGridList<T extends object, C extends GridCollection<T> = G
         const lastKey = findNextNavigableKey(s, collection.getLastKey(), (k) =>
           collection.getKeyBefore(k),
         );
-        if (lastKey != null) {
-          s.setFocusedKey(lastKey);
-        }
+        moveFocus(lastKey);
         break;
       }
       case "a":
@@ -257,8 +373,10 @@ export function createGridList<T extends object, C extends GridCollection<T> = G
       relatedTarget &&
       container &&
       container.compareDocumentPosition(relatedTarget) & Node.DOCUMENT_POSITION_FOLLOWING
-        ? findNextNavigableKey(s, collection.getLastKey(), (k) => collection.getKeyBefore(k))
-        : findNextNavigableKey(s, collection.getFirstKey(), (k) => collection.getKeyAfter(k));
+        ? (lastSelectedKey(s) ??
+          findNextNavigableKey(s, collection.getLastKey(), (k) => collection.getKeyBefore(k)))
+        : (firstSelectedKey(s) ??
+          findNextNavigableKey(s, collection.getFirstKey(), (k) => collection.getKeyAfter(k)));
     if (enterKey != null) {
       s.setFocusedKey(enterKey);
     }
@@ -275,7 +393,7 @@ export function createGridList<T extends object, C extends GridCollection<T> = G
   // transient tabindex. Selection and activation live on the row
   // (createGridListItem) to match upstream, so keyboard nav has to carry focus
   // there for the row's Space/Enter handlers to act on.
-  createEffect(() => {
+  createTrackedEffect(() => {
     const s = state();
     const key = s.focusedKey;
     const el = ref();
@@ -294,8 +412,13 @@ export function createGridList<T extends object, C extends GridCollection<T> = G
       return;
     }
 
-    const target = el.querySelector<HTMLElement>(`[data-key="${key}"]`);
+    const target = queryCollectionItem(el, key);
     if (target && target !== active) {
+      // A disabled selected key keeps logical focus on the collection (the
+      // row is not tabbable). Focusing it would steal Tab from the grid.
+      if (isNavigationDisabled(s, key)) {
+        return;
+      }
       target.focus();
 
       // Reveal the newly focused row when navigating with the keyboard, mirroring
@@ -311,23 +434,30 @@ export function createGridList<T extends object, C extends GridCollection<T> = G
     const p = props();
     const s = state();
 
-    const baseProps: Record<string, unknown> = {
-      role: "grid",
-      id: gridListId,
-      "aria-label": p["aria-label"],
-      "aria-labelledby": p["aria-labelledby"],
-      "aria-describedby": p["aria-describedby"],
-      "aria-multiselectable": s.selectionMode === "multiple" ? true : undefined,
-      "aria-disabled": p.isDisabled || undefined,
-      // Roving container tabIndex mirrors useSelectableCollection: the container
-      // is tabbable (0) only while nothing is focused, then rolls to -1 once a row
-      // takes focus so Tab exits the grid. A standalone grid drives AT through
-      // real row focus, so it never needs (nor emits) aria-activedescendant.
-      tabIndex: p.isDisabled ? undefined : s.focusedKey != null ? -1 : 0,
-      onKeyDown,
-      onFocus,
-      onBlur,
-    };
+    const baseProps: Record<string, unknown> = mergeProps(
+      typeSelectProps as Record<string, unknown>,
+      {
+        role: "grid",
+        id: gridListId,
+        "aria-label": p["aria-label"],
+        "aria-labelledby": p["aria-labelledby"],
+        "aria-describedby": p["aria-describedby"],
+        "aria-multiselectable": s.selectionMode === "multiple" ? true : undefined,
+        "aria-disabled": p.isDisabled || undefined,
+        // Roving container tabIndex mirrors useSelectableCollection: the container
+        // is tabbable (0) only while nothing is focused, then rolls to -1 once a row
+        // takes focus so Tab exits the grid. A standalone grid drives AT through
+        // real row focus, so it never needs (nor emits) aria-activedescendant.
+        tabIndex: p.isDisabled
+          ? undefined
+          : s.focusedKey != null && !isNavigationDisabled(s, s.focusedKey)
+            ? -1
+            : 0,
+        onKeyDown,
+        onFocus,
+        onBlur,
+      },
+    );
 
     // Add row count for virtualized lists
     if (p.isVirtualized) {