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

package/src/gridlist/createGridListItem.ts

@@ -1,10 +1,26 @@
+/*
+ * 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/useGridListItem.ts
+
 /**
  * createGridListItem - Provides accessibility for a grid list item.
  * Based on @react-aria/gridlist/useGridListItem.
  */
 
-import { createMemo, type Accessor } from "solid-js";
-import type { JSX } from "solid-js";
+import { createMemo } from "solid-js";
+import { bindCapture } from "../utils/capture";
+import type { Accessor } from "solid-js";
+import type { JSX } from "@solidjs/web";
 import type {
   Collection,
   GridState,
@@ -12,6 +28,7 @@ import type {
   Key,
   Selection,
 } from "@proyecto-viviana/solid-stately";
+import { createId } from "@proyecto-viviana/solid-stately";
 import type { AriaGridListItemProps, GridListItemAria } from "./types";
 import { getGridListData } from "./createGridList";
 import { createSelectableItem, type SelectableItemState } from "../selection/createSelectableItem";
@@ -29,6 +46,8 @@ export function createGridListItem<
   state: Accessor<GridState<T, C>>,
   ref: Accessor<HTMLElement | null>,
 ): GridListItemAria {
+  const descriptionId = createId();
+
   const isSelected = createMemo(() => {
     const s = state();
     const p = props();
@@ -48,24 +67,23 @@ export function createGridListItem<
     selectedKeys: () => state().selectedKeys as Selection,
     disabledKeys: () => state().disabledKeys,
     disabledBehavior: () => state().disabledBehavior,
-    isEmpty: () => {
-      const keys = state().selectedKeys;
-      return keys !== "all" && keys.size === 0;
-    },
-    isSelectAll: () => state().selectedKeys === "all",
+    isEmpty: () => state().isEmpty,
+    isSelectAll: () => state().isSelectAll,
     isSelected: (key: Key) => state().isSelected(key),
     isDisabled: (key: Key) => {
       const s = state();
+      const p = props();
       const item = s.collection.getItem(key);
+      const disabled = s.isDisabled(key) || !!item?.isDisabled || !!p.isDisabled;
       return (
-        s.disabledBehavior === "all" &&
-        s.isDisabled(key) &&
-        item?.props?.disabledBehavior !== "selection"
+        s.disabledBehavior === "all" && disabled && item?.props?.disabledBehavior !== "selection"
       );
     },
     canSelectItem: (key: Key) => {
       const s = state();
-      return s.selectionMode !== "none" && !s.isDisabled(key);
+      const p = props();
+      const item = s.collection.getItem(key);
+      return s.selectionMode !== "none" && !s.isDisabled(key) && !item?.isDisabled && !p.isDisabled;
     },
     setSelectionBehavior: (behavior) => state().setSelectionBehavior(behavior),
     toggleSelection: (key: Key) => state().toggleSelection(key),
@@ -106,11 +124,19 @@ export function createGridListItem<
     const s = state();
     const p = props();
     const node = p.node;
+    const gridListData = getGridListData(s);
+    const rowId = `${gridListData?.gridListId ?? "gridlist"}-row-${String(node.key)}`;
+    const label = p.textValue || node["aria-label"] || node.textValue || undefined;
 
     const baseProps: Record<string, unknown> = {
       role: "row",
-      "aria-selected": s.selectionMode !== "none" ? isSelected() : undefined,
+      // RAC only exposes aria-selected when the row can be selected, so a
+      // disabled selected key does not stay [disabled][selected].
+      "aria-selected":
+        s.selectionMode !== "none" && !s.isDisabled(node.key) ? isSelected() : undefined,
       "aria-disabled": selectableItem.isDisabled() || undefined,
+      "aria-label": label,
+      "aria-labelledby": label ? `${rowId} ${descriptionId}` : undefined,
     };
 
     // Add aria-rowindex for virtualized lists
@@ -118,7 +144,6 @@ export function createGridListItem<
       baseProps["aria-rowindex"] = node.rowIndex + 1; // 1-based
     }
 
-    const gridListData = getGridListData(s);
     const mergedProps = mergeProps<JSX.HTMLAttributes<HTMLElement>>(
       selectableItem.itemProps,
       baseProps,
@@ -128,12 +153,22 @@ export function createGridListItem<
       ref,
       keyboardNavigationBehavior: () => gridListData?.keyboardNavigationBehavior ?? "arrow",
       direction: () => gridListData?.direction ?? "ltr",
+      layout: () => gridListData?.layout ?? "stack",
     });
   });
 
+  bindCapture(ref, {
+    keydown: (event) => {
+      const handler = (rowProps() as { onKeyDownCapture?: (event: KeyboardEvent) => void })
+        .onKeyDownCapture;
+      handler?.(event as KeyboardEvent);
+    },
+  });
+
   const gridCellProps = createMemo(() => {
     return {
       role: "gridcell",
+      "aria-colindex": 1,
     } as JSX.HTMLAttributes<HTMLDivElement>;
   });
 
@@ -144,6 +179,9 @@ export function createGridListItem<
     get gridCellProps() {
       return gridCellProps();
     },
+    get descriptionProps() {
+      return { id: descriptionId };
+    },
     get isSelected() {
       return isSelected();
     },

package/src/gridlist/createGridListSection.ts

@@ -1,3 +1,17 @@
+/*
+ * 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-aria/src/gridlist/useGridListSection.ts
+
 /**
  * createGridListSection - Provides accessibility for a grid list section.
  * Based on @react-aria/gridlist/useGridListSection.

package/src/gridlist/createGridListSelectionCheckbox.ts

@@ -1,13 +1,31 @@
+/*
+ * 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/useGridListSelectionCheckbox.ts
+
 /**
  * createGridListSelectionCheckbox - Provides accessibility for a grid list item selection checkbox.
- * Based on @react-aria/gridlist.
+ * Ported from packages/react-aria/src/gridlist/useGridListSelectionCheckbox.ts.
  */
 
-import { createMemo, type Accessor } from "solid-js";
-import type { JSX } from "solid-js";
+import { createMemo } 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 } from "@proyecto-viviana/solid-stately";
 import type { AriaGridListSelectionCheckboxProps, GridListSelectionCheckboxAria } from "./types";
+import { getGridListData } from "./createGridList";
+import { createStringFormatter } from "../i18n";
+import { gridIntlStrings } from "../grid/intl";
 
 /**
  * Creates accessibility props for a grid list item selection checkbox.
@@ -19,6 +37,7 @@ export function createGridListSelectionCheckbox<
   props: Accessor<AriaGridListSelectionCheckboxProps>,
   state: Accessor<GridState<T, C>>,
 ): GridListSelectionCheckboxAria {
+  const stringFormatter = createStringFormatter(gridIntlStrings, "@react-aria/grid");
   const checkboxId = createId();
 
   const isSelected = createMemo(() => {
@@ -42,13 +61,21 @@ export function createGridListSelectionCheckbox<
   };
 
   const checkboxProps = createMemo(() => {
+    const s = state();
+    const p = props();
+    const gridListData = getGridListData(s);
+    const rowId = `${gridListData?.gridListId ?? "gridlist"}-row-${String(p.key)}`;
+
     const baseProps: Record<string, unknown> = {
       id: checkboxId,
       type: "checkbox",
       checked: isSelected(),
       disabled: isDisabled(),
       onChange,
-      "aria-label": "Select",
+      "aria-label": stringFormatter().format("select"),
+      // Mirrors useGridListSelectionCheckbox: "Select" plus the row so the
+      // checkbox name is "Select {item}" rather than a bare "Select".
+      "aria-labelledby": `${checkboxId} ${rowId}`,
     };
 
     return baseProps as JSX.InputHTMLAttributes<HTMLInputElement>;

package/src/gridlist/intl/ar-AE.json

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "يحتوي الصف على إجراء",
+  "hasLinkAnnouncement": "يحتوي الصف على رابط: {link}"
+}

package/src/gridlist/intl/bg-BG.json

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "редът има действие",
+  "hasLinkAnnouncement": "редът има връзка: {link}"
+}

package/src/gridlist/intl/cs-CZ.json

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "řádek obsahuje akci",
+  "hasLinkAnnouncement": "řádek obsahuje odkaz: {link}"
+}

package/src/gridlist/intl/da-DK.json

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "række har handling",
+  "hasLinkAnnouncement": "række har link: {link}"
+}

package/src/gridlist/intl/de-DE.json

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "Zeile hat Aktion",
+  "hasLinkAnnouncement": "Zeile hat Link: {link}"
+}

package/src/gridlist/intl/el-GR.json

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "η σειρά έχει δράση",
+  "hasLinkAnnouncement": "η σειρά έχει σύνδεσμο: {link}"
+}

package/src/gridlist/intl/en-US.json

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "row has action",
+  "hasLinkAnnouncement": "row has link: {link}"
+}

package/src/gridlist/intl/es-ES.json

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "la fila tiene acción",
+  "hasLinkAnnouncement": "la fila tiene un vínculo: {link}"
+}

package/src/gridlist/intl/et-EE.json

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "real on tegevus",
+  "hasLinkAnnouncement": "real on link: {link}"
+}

package/src/gridlist/intl/fi-FI.json

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "rivillä on toimintaa",
+  "hasLinkAnnouncement": "rivillä on linkki: {link}"
+}

package/src/gridlist/intl/fr-FR.json

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "La ligne a une action.",
+  "hasLinkAnnouncement": "La ligne a un lien : {link}."
+}

package/src/gridlist/intl/he-IL.json

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "בשורה יש פעולה",
+  "hasLinkAnnouncement": "לשורה יש קישור: {link}"
+}

package/src/gridlist/intl/hr-HR.json

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "zadatak u redu",
+  "hasLinkAnnouncement": "veza u redu: {link}"
+}

package/src/gridlist/intl/hu-HU.json

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "a sorban művelet található",
+  "hasLinkAnnouncement": "a sorban link található: {link}"
+}

package/src/gridlist/intl/index.ts

@@ -0,0 +1,123 @@
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/ar-AE.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/bg-BG.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/cs-CZ.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/da-DK.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/de-DE.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/el-GR.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/en-US.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/es-ES.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/et-EE.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/fi-FI.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/fr-FR.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/he-IL.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/hr-HR.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/hu-HU.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/it-IT.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/ja-JP.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/ko-KR.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/lt-LT.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/lv-LV.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/nb-NO.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/nl-NL.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/pl-PL.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/pt-BR.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/pt-PT.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/ro-RO.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/ru-RU.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/sk-SK.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/sl-SI.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/sr-SP.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/sv-SE.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/tr-TR.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/uk-UA.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/zh-CN.json
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/intl/gridlist/zh-TW.json
+
+// Ported from @react-aria/gridlist intl catalog.
+
+/**
+ * gridlist internationalization strings.
+ *
+ * Copied verbatim from @react-aria/gridlist intl JSON (RAC 1.21.0 / react-aria pin f56660b).
+ * LocalizedStringDictionary resolves the locale fallback chain
+ * (locale → language → sibling region → en-US).
+ */
+
+import type { LocalizedStrings } from "@internationalized/string";
+
+import arAE from "./ar-AE.json" with { type: "json" };
+import bgBG from "./bg-BG.json" with { type: "json" };
+import csCZ from "./cs-CZ.json" with { type: "json" };
+import daDK from "./da-DK.json" with { type: "json" };
+import deDE from "./de-DE.json" with { type: "json" };
+import elGR from "./el-GR.json" with { type: "json" };
+import enUS from "./en-US.json" with { type: "json" };
+import esES from "./es-ES.json" with { type: "json" };
+import etEE from "./et-EE.json" with { type: "json" };
+import fiFI from "./fi-FI.json" with { type: "json" };
+import frFR from "./fr-FR.json" with { type: "json" };
+import heIL from "./he-IL.json" with { type: "json" };
+import hrHR from "./hr-HR.json" with { type: "json" };
+import huHU from "./hu-HU.json" with { type: "json" };
+import itIT from "./it-IT.json" with { type: "json" };
+import jaJP from "./ja-JP.json" with { type: "json" };
+import koKR from "./ko-KR.json" with { type: "json" };
+import ltLT from "./lt-LT.json" with { type: "json" };
+import lvLV from "./lv-LV.json" with { type: "json" };
+import nbNO from "./nb-NO.json" with { type: "json" };
+import nlNL from "./nl-NL.json" with { type: "json" };
+import plPL from "./pl-PL.json" with { type: "json" };
+import ptBR from "./pt-BR.json" with { type: "json" };
+import ptPT from "./pt-PT.json" with { type: "json" };
+import roRO from "./ro-RO.json" with { type: "json" };
+import ruRU from "./ru-RU.json" with { type: "json" };
+import skSK from "./sk-SK.json" with { type: "json" };
+import slSI from "./sl-SI.json" with { type: "json" };
+import srSP from "./sr-SP.json" with { type: "json" };
+import svSE from "./sv-SE.json" with { type: "json" };
+import trTR from "./tr-TR.json" with { type: "json" };
+import ukUA from "./uk-UA.json" with { type: "json" };
+import zhCN from "./zh-CN.json" with { type: "json" };
+import zhTW from "./zh-TW.json" with { type: "json" };
+
+export type GridListIntlStrings = {
+  hasActionAnnouncement: string;
+  hasLinkAnnouncement: string;
+};
+
+export const gridListIntlStrings: LocalizedStrings<keyof GridListIntlStrings, string> = {
+  "ar-AE": arAE,
+  "bg-BG": bgBG,
+  "cs-CZ": csCZ,
+  "da-DK": daDK,
+  "de-DE": deDE,
+  "el-GR": elGR,
+  "en-US": enUS,
+  "es-ES": esES,
+  "et-EE": etEE,
+  "fi-FI": fiFI,
+  "fr-FR": frFR,
+  "he-IL": heIL,
+  "hr-HR": hrHR,
+  "hu-HU": huHU,
+  "it-IT": itIT,
+  "ja-JP": jaJP,
+  "ko-KR": koKR,
+  "lt-LT": ltLT,
+  "lv-LV": lvLV,
+  "nb-NO": nbNO,
+  "nl-NL": nlNL,
+  "pl-PL": plPL,
+  "pt-BR": ptBR,
+  "pt-PT": ptPT,
+  "ro-RO": roRO,
+  "ru-RU": ruRU,
+  "sk-SK": skSK,
+  "sl-SI": slSI,
+  "sr-SP": srSP,
+  "sv-SE": svSE,
+  "tr-TR": trTR,
+  "uk-UA": ukUA,
+  "zh-CN": zhCN,
+  "zh-TW": zhTW,
+};

package/src/gridlist/intl/it-IT.json

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "la riga ha un’azione",
+  "hasLinkAnnouncement": "la riga ha un collegamento: {link}"
+}

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

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "行にはアクションがあります",
+  "hasLinkAnnouncement": "行にリンクがあります : {link}"
+}

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

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "행에 액션이 있음",
+  "hasLinkAnnouncement": "행에 링크가 있음: {link}"
+}

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

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "eilutėje yra veiksmas",
+  "hasLinkAnnouncement": "eilutėje yra nuoroda: {link}"
+}

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

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "rindai ir darbība",
+  "hasLinkAnnouncement": "rindai ir saite: {link}"
+}

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

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "rad har handling",
+  "hasLinkAnnouncement": "rad har kobling: {link}"
+}

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

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "rij heeft actie",
+  "hasLinkAnnouncement": "rij heeft koppeling: {link}"
+}

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

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "wiersz zawiera działanie",
+  "hasLinkAnnouncement": "wiersz zawiera link: {link}"
+}

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

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "linha tem uma ação",
+  "hasLinkAnnouncement": "linha tem o link: {link}"
+}

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

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "linha com ação",
+  "hasLinkAnnouncement": "linha com ligação: {link}"
+}

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

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "rândul are acțiune",
+  "hasLinkAnnouncement": "rândul are link: {link}"
+}

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

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "в строке есть действие",
+  "hasLinkAnnouncement": "в строке есть ссылка: {link}"
+}

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

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "riadok obsahuje akciu",
+  "hasLinkAnnouncement": "riadok obsahuje odkaz: {link}"
+}

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

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "vrstica ima dejanje",
+  "hasLinkAnnouncement": "vrstica ima povezavo: {link}"
+}

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

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "red ima radnju",
+  "hasLinkAnnouncement": "red ima vezu: {veza}"
+}

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

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "rad har åtgärd",
+  "hasLinkAnnouncement": "rad har länk: {link}"
+}

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

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "satırdaki işlem",
+  "hasLinkAnnouncement": "satırdaki bağlantı: {link}"
+}

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

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "рядок містить дію",
+  "hasLinkAnnouncement": "рядок містить посилання: {link}"
+}

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

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "行有操作",
+  "hasLinkAnnouncement": "行有链接：{link}"
+}

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

@@ -0,0 +1,4 @@
+{
+  "hasActionAnnouncement": "列有動作",
+  "hasLinkAnnouncement": "列有連結：{link}"
+}

package/src/gridlist/types.ts

@@ -1,9 +1,44 @@
+/*
+ * 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.
+ */
+
+/*
+ * 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-aria/src/gridlist/useGridList.ts
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/src/gridlist/useGridListItem.ts
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/src/gridlist/useGridListSection.ts
+// Ported to SolidJS for Proyecto Viviana; based on packages/react-aria/src/gridlist/useGridListSelectionCheckbox.ts
+
 /**
  * GridList ARIA types for GridList components.
- * Based on @react-aria/gridlist types.
+ * Based on these pinned React Aria sources:
+ * - packages/react-aria/src/gridlist/useGridList.ts
+ * - packages/react-aria/src/gridlist/useGridListItem.ts
+ * - packages/react-aria/src/gridlist/useGridListSelectionCheckbox.ts
+ * - packages/react-aria/src/gridlist/useGridListSection.ts
+ *
+ * The orientation, direction, and collection-disabled fields are Solid-specific adapters.
  */
 
-import type { JSX } from "solid-js";
+import type { JSX } from "@solidjs/web";
 import type { Key, GridNode } from "@proyecto-viviana/solid-stately";
 
 /**
@@ -50,6 +85,17 @@ export interface AriaGridListProps {
    * @default "ltr"
    */
   direction?: "ltr" | "rtl";
+  /**
+   * `"grid"` uses two-dimensional arrow keys (S2 CardView). `"stack"` keeps
+   * Left/Right on the row and Up/Down on the collection.
+   * @default "stack"
+   */
+  layout?: "stack" | "grid";
+  /**
+   * Column count for `layout="grid"` Down/Up. When omitted, Down/Up walk
+   * document order.
+   */
+  columnCount?: number;
 }
 
 /**
@@ -66,12 +112,16 @@ export interface GridListAria {
 export interface AriaGridListItemProps {
   /** The item node. */
   node: GridNode<unknown>;
+  /** Accessible name. Wins over the collection node's textValue (S2 Card textValue). */
+  textValue?: string;
   /** Whether the grid list is virtualized. */
   isVirtualized?: boolean;
   /** How selection should behave when pressing an item. */
   selectionBehavior?: "replace" | "toggle";
   /** Handler for item action. */
   onAction?: () => void;
+  /** Whether this item is disabled. */
+  isDisabled?: boolean;
 }
 
 /**
@@ -82,6 +132,8 @@ export interface GridListItemAria {
   rowProps: JSX.HTMLAttributes<HTMLElement>;
   /** Props to spread on the grid cell wrapper. */
   gridCellProps: JSX.HTMLAttributes<HTMLDivElement>;
+  /** Props for the item description element, if any. */
+  descriptionProps: { id: string };
   /** Whether the item is selected. */
   isSelected: boolean;
   /** Whether the item is disabled. */