adobe · devongovett · Aug 28, 2021 · Jul 30, 2021 · Aug 2, 2021 · Aug 20, 2021
diff --git a/packages/@react-aria/grid/intl/ar-AE.json b/packages/@react-aria/grid/intl/ar-AE.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "{item} غير المحدد",
+  "select": "تحديد",
   "selectedAll": "جميع العناصر المحددة.",
   "selectedCount": "{count, plural, =0 {لم يتم تحديد عناصر} one {# عنصر محدد} other {# عنصر محدد}}.",
   "selectedItem": "{item} المحدد"

diff --git a/packages/@react-aria/grid/intl/bg-BG.json b/packages/@react-aria/grid/intl/bg-BG.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "{item} не е избран.",
+  "select": "Изберете",
   "selectedAll": "Всички елементи са избрани.",
   "selectedCount": "{count, plural, =0 {Няма избрани елементи} one {# избран елемент} other {# избрани елементи}}.",
   "selectedItem": "{item} избран."

diff --git a/packages/@react-aria/grid/intl/cs-CZ.json b/packages/@react-aria/grid/intl/cs-CZ.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "Položka {item} není vybrána.",
+  "select": "Vybrat",
   "selectedAll": "Vybrány všechny položky.",
   "selectedCount": "{count, plural, =0 {Nevybrány žádné položky} one {Vybrána # položka} other {Vybráno # položek}}.",
   "selectedItem": "Vybrána položka {item}."

diff --git a/packages/@react-aria/grid/intl/da-DK.json b/packages/@react-aria/grid/intl/da-DK.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "{item} ikke valgt.",
+  "select": "Vælg",
   "selectedAll": "Alle elementer valgt.",
   "selectedCount": "{count, plural, =0 {Ingen elementer valgt} one {# element valgt} other {# elementer valgt}}.",
   "selectedItem": "{item} valgt."

diff --git a/packages/@react-aria/grid/intl/de-DE.json b/packages/@react-aria/grid/intl/de-DE.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "{item} nicht ausgewählt.",
+  "select": "Auswählen",
   "selectedAll": "Alle Elemente ausgewählt.",
   "selectedCount": "{count, plural, =0 {Keine Elemente ausgewählt} one {# Element ausgewählt} other {# Elemente ausgewählt}}.",
   "selectedItem": "{item} ausgewählt."

diff --git a/packages/@react-aria/grid/intl/el-GR.json b/packages/@react-aria/grid/intl/el-GR.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "Δεν επιλέχθηκε το στοιχείο {item}.",
+  "select": "Επιλογή",
   "selectedAll": "Επιλέχθηκαν όλα τα στοιχεία.",
   "selectedCount": "{count, plural, =0 {Δεν επιλέχθηκαν στοιχεία} one {Επιλέχθηκε # στοιχείο} other {Επιλέχθηκαν # στοιχεία}}.",
   "selectedItem": "Επιλέχθηκε το στοιχείο {item}."

diff --git a/packages/@react-aria/grid/intl/en-US.json b/packages/@react-aria/grid/intl/en-US.json
@@ -1,6 +1,7 @@
 {
+  "deselectedItem": "{item} not selected.",
+  "select": "Select",
   "selectedCount": "{count, plural, =0 {No items selected} one {# item selected} other {# items selected}}.",
   "selectedAll": "All items selected.",
-  "selectedItem": "{item} selected.",
-  "deselectedItem": "{item} not selected."
+  "selectedItem": "{item} selected."
 }
diff --git a/packages/@react-aria/grid/intl/es-ES.json b/packages/@react-aria/grid/intl/es-ES.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "{item} no seleccionado.",
+  "select": "Seleccionar",
   "selectedAll": "Todos los elementos seleccionados.",
   "selectedCount": "{count, plural, =0 {Ningún elemento seleccionado} one {# elemento seleccionado} other {# elementos seleccionados}}.",
   "selectedItem": "{item} seleccionado."

diff --git a/packages/@react-aria/grid/intl/et-EE.json b/packages/@react-aria/grid/intl/et-EE.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "{item} pole valitud.",
+  "select": "Vali",
   "selectedAll": "Kõik üksused valitud.",
   "selectedCount": "{count, plural, =0 {Üksusi pole valitud} one {# üksus valitud} other {# üksust valitud}}.",
   "selectedItem": "{item} valitud."

diff --git a/packages/@react-aria/grid/intl/fi-FI.json b/packages/@react-aria/grid/intl/fi-FI.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "Kohdetta {item} ei valittu.",
+  "select": "Valitse",
   "selectedAll": "Kaikki kohteet valittu.",
   "selectedCount": "{count, plural, =0 {Ei yhtään kohdetta valittu} one {# kohde valittu} other {# kohdetta valittu}}.",
   "selectedItem": "{item} valittu."

diff --git a/packages/@react-aria/grid/intl/fr-FR.json b/packages/@react-aria/grid/intl/fr-FR.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "{item} non sélectionné.",
+  "select": "Sélectionner",
   "selectedAll": "Tous les éléments sélectionnés.",
   "selectedCount": "{count, plural, =0 {Aucun élément sélectionné} one {# élément sélectionné} other {# éléments sélectionnés}}.",
   "selectedItem": "{item} sélectionné."

diff --git a/packages/@react-aria/grid/intl/he-IL.json b/packages/@react-aria/grid/intl/he-IL.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "{item} לא נבחר.",
+  "select": "בחר",
   "selectedAll": "כל הפריטים נבחרו.",
   "selectedCount": "{count, plural, =0 {לא נבחרו פריטים} one {פריט # נבחר} other {# פריטים נבחרו}}.",
   "selectedItem": "{item} נבחר."

diff --git a/packages/@react-aria/grid/intl/hr-HR.json b/packages/@react-aria/grid/intl/hr-HR.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "Stavka {item} nije odabrana.",
+  "select": "Odaberite",
   "selectedAll": "Odabrane su sve stavke.",
   "selectedCount": "{count, plural, =0 {Nije odabrana nijedna stavka} one {Odabrana je # stavka} other {Odabrano je # stavki}}.",
   "selectedItem": "Stavka {item} je odabrana."

diff --git a/packages/@react-aria/grid/intl/hu-HU.json b/packages/@react-aria/grid/intl/hu-HU.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "{item} nincs kijelölve.",
+  "select": "Kijelölés",
   "selectedAll": "Az összes elem kijelölve.",
   "selectedCount": "{count, plural, =0 {Egy elem sincs kijelölve} one {# elem kijelölve} other {# elem kijelölve}}.",
   "selectedItem": "{item} kijelölve."

diff --git a/packages/@react-aria/grid/intl/it-IT.json b/packages/@react-aria/grid/intl/it-IT.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "{item} non selezionato.",
+  "select": "Seleziona",
   "selectedAll": "Tutti gli elementi selezionati.",
   "selectedCount": "{count, plural, =0 {Nessun elemento selezionato} one {# elemento selezionato} other {# elementi selezionati}}.",
   "selectedItem": "{item} selezionato."

diff --git a/packages/@react-aria/grid/intl/ja-JP.json b/packages/@react-aria/grid/intl/ja-JP.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "{item} が選択されていません。",
+  "select": "選択",
   "selectedAll": "すべての項目を選択しました。",
   "selectedCount": "{count, plural, =0 {項目が選択されていません} one {# 項目を選択しました} other {# 項目を選択しました}}。",
   "selectedItem": "{item} を選択しました。"

diff --git a/packages/@react-aria/grid/intl/ko-KR.json b/packages/@react-aria/grid/intl/ko-KR.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "{item}이(가) 선택되지 않았습니다.",
+  "select": "선택",
   "selectedAll": "모든 항목이 선택되었습니다.",
   "selectedCount": "{count, plural, =0 {선택된 항목이 없습니다} one {#개 항목이 선택되었습니다} other {#개 항목이 선택되었습니다}}.",
   "selectedItem": "{item}이(가) 선택되었습니다."

diff --git a/packages/@react-aria/grid/intl/lt-LT.json b/packages/@react-aria/grid/intl/lt-LT.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "{item} nepasirinkta.",
+  "select": "Pasirinkti",
   "selectedAll": "Pasirinkti visi elementai.",
   "selectedCount": "{count, plural, =0 {Nepasirinktas nė vienas elementas} one {Pasirinktas # elementas} other {Pasirinkta elementų: #}}.",
   "selectedItem": "Pasirinkta: {item}."

diff --git a/packages/@react-aria/grid/intl/lv-LV.json b/packages/@react-aria/grid/intl/lv-LV.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "Vienums {item} nav atlasīts.",
+  "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}."

diff --git a/packages/@react-aria/grid/intl/nb-NO.json b/packages/@react-aria/grid/intl/nb-NO.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "{item} er ikke valgt.",
+  "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."

diff --git a/packages/@react-aria/grid/intl/nl-NL.json b/packages/@react-aria/grid/intl/nl-NL.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "{item} niet geselecteerd.",
+  "select": "Selecteren",
   "selectedAll": "Alle items geselecteerd.",
   "selectedCount": "{count, plural, =0 {Geen items geselecteerd} one {# item geselecteerd} other {# items geselecteerd}}.",
   "selectedItem": "{item} geselecteerd."

diff --git a/packages/@react-aria/grid/intl/pl-PL.json b/packages/@react-aria/grid/intl/pl-PL.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "Nie zaznaczono {item}.",
+  "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}."

diff --git a/packages/@react-aria/grid/intl/pt-BR.json b/packages/@react-aria/grid/intl/pt-BR.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "{item} não selecionado.",
+  "select": "Selecionar",
   "selectedAll": "Todos os itens selecionados.",
   "selectedCount": "{count, plural, =0 {Nenhum item selecionado} one {# item selecionado} other {# itens selecionados}}.",
   "selectedItem": "{item} selecionado."

diff --git a/packages/@react-aria/grid/intl/pt-PT.json b/packages/@react-aria/grid/intl/pt-PT.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "{item} não selecionado.",
+  "select": "Selecionar",
   "selectedAll": "Todos os itens selecionados.",
   "selectedCount": "{count, plural, =0 {Nenhum item selecionado} one {# item selecionado} other {# itens selecionados}}.",
   "selectedItem": "{item} selecionado."

diff --git a/packages/@react-aria/grid/intl/ro-RO.json b/packages/@react-aria/grid/intl/ro-RO.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "{item} neselectat.",
+  "select": "Selectare",
   "selectedAll": "Toate elementele selectate.",
   "selectedCount": "{count, plural, =0 {Niciun element selectat} one {# element selectat} other {# elemente selectate}}.",
   "selectedItem": "{item} selectat."

diff --git a/packages/@react-aria/grid/intl/ru-RU.json b/packages/@react-aria/grid/intl/ru-RU.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "{Item} не выбрано.",
+  "select": "Выбрать",
   "selectedAll": "Выбраны все элементы.",
   "selectedCount": "{count, plural, =0 {Нет выбранных элементов} one {# элемент выбран} other {# элементов выбрано}}.",
   "selectedItem": "{Item} выбрано."

diff --git a/packages/@react-aria/grid/intl/sk-SK.json b/packages/@react-aria/grid/intl/sk-SK.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "Nevybraté položky: {item}.",
+  "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}."

diff --git a/packages/@react-aria/grid/intl/sl-SI.json b/packages/@react-aria/grid/intl/sl-SI.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "Element {item} ni izbran.",
+  "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."

diff --git a/packages/@react-aria/grid/intl/sr-SP.json b/packages/@react-aria/grid/intl/sr-SP.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "{item} nije izabrano.",
+  "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."

diff --git a/packages/@react-aria/grid/intl/sv-SE.json b/packages/@react-aria/grid/intl/sv-SE.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "{item} ej markerat.",
+  "select": "Markera",
   "selectedAll": "Alla markerade objekt.",
   "selectedCount": "{count, plural, =0 {Inga markerade objekt} one {# markerat objekt} other {# markerade objekt}}.",
   "selectedItem": "{item} markerat."

diff --git a/packages/@react-aria/grid/intl/tr-TR.json b/packages/@react-aria/grid/intl/tr-TR.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "{item} seçilmedi.",
+  "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."

diff --git a/packages/@react-aria/grid/intl/uk-UA.json b/packages/@react-aria/grid/intl/uk-UA.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "{item} не вибрано.",
+  "select": "Вибрати",
   "selectedAll": "Усі елементи вибрано.",
   "selectedCount": "{count, plural, =0 {Жодних елементів не вибрано} one {# елемент вибрано} other {Вибрано елементів: #}}.",
   "selectedItem": "{item} вибрано."

diff --git a/packages/@react-aria/grid/intl/zh-CN.json b/packages/@react-aria/grid/intl/zh-CN.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "未选择 {item}。",
+  "select": "选择",
   "selectedAll": "已选择所有项目。",
   "selectedCount": "{count, plural, =0 {未选择项目} one {已选择 # 个项目} other {已选择 # 个项目}}。",
   "selectedItem": "已选择 {item}。"

diff --git a/packages/@react-aria/grid/intl/zh-TW.json b/packages/@react-aria/grid/intl/zh-TW.json
@@ -1,5 +1,6 @@
 {
   "deselectedItem": "未選取「{item}」。",
+  "select": "選取",
   "selectedAll": "已選取所有項目。",
   "selectedCount": "{count, plural, =0 {未選取任何項目} one {已選取 # 個項目} other {已選取 # 個項目}}。",
   "selectedItem": "已選取「{item}」。"

diff --git a/packages/@react-aria/grid/package.json b/packages/@react-aria/grid/package.json
@@ -26,6 +26,7 @@
     "@react-aria/utils": "^3.8.2",
     "@react-stately/grid": "3.0.0-rc.0",
     "@react-stately/virtualizer": "^3.1.5",
+    "@react-types/checkbox": "^3.2.3",
     "@react-types/grid": "3.0.0-rc.0",
     "@react-types/shared": "^3.8.0"
   },

diff --git a/packages/@react-aria/grid/src/index.ts b/packages/@react-aria/grid/src/index.ts
@@ -15,3 +15,4 @@ export * from './useGrid';
 export * from './useGridRowGroup';
 export * from './useGridRow';
 export * from './useGridCell';
+export * from './useGridSelectionCheckbox';
diff --git a/packages/@react-aria/grid/src/useGridSelectionCheckbox.ts b/packages/@react-aria/grid/src/useGridSelectionCheckbox.ts
@@ -0,0 +1,47 @@
+import {AriaCheckboxProps} from '@react-types/checkbox';
+import {GridCollection} from '@react-types/grid';
+import {GridState} from '@react-stately/grid';
+// @ts-ignore
+import intlMessages from '../intl/*.json';
+import {Key} from 'react';
+import {useId} from '@react-aria/utils';
+import {useMessageFormatter} from '@react-aria/i18n';
+
+interface SelectionCheckboxProps {
+  /** A unique key for the checkbox. */
+  key: Key
+}
+
+interface SelectionCheckboxAria {
+  /** Props for the row selection checkbox element. */
+  checkboxProps: AriaCheckboxProps
+}
+
+
+/**
+ * Provides the behavior and accessibility implementation for a selection checkbox in a grid.
+ * @param props - Props for the selection checkbox.
+ * @param state - State of the grid, as returned by `useGridState`.
+ */
+export function useGridSelectionCheckbox<T, C extends GridCollection<T>>(props: SelectionCheckboxProps, state: GridState<T, C>): SelectionCheckboxAria {
+  let {key} = props;
+
+  let manager = state.selectionManager;
+  let checkboxId = useId();
+  let isDisabled = state.disabledKeys.has(key);
+  let isSelected = state.selectionManager.isSelected(key);
+
+  let onChange = () => manager.select(key);
+
+  const formatMessage = useMessageFormatter(intlMessages);
+
+  return {
+    checkboxProps: {
+      id: checkboxId,
+      'aria-label': formatMessage('select'),
+      isSelected,
+      isDisabled: isDisabled || manager.selectionMode === 'none',
+      onChange
+    }
+  };
+}
diff --git a/packages/@react-aria/table/src/useTableSelectionCheckbox.ts b/packages/@react-aria/table/src/useTableSelectionCheckbox.ts
@@ -16,7 +16,7 @@ import {getRowLabelledBy} from './utils';
 import intlMessages from '../intl/*.json';
 import {Key} from 'react';
 import {TableState} from '@react-stately/table';
-import {useId} from '@react-aria/utils';
+import {useGridSelectionCheckbox} from '@react-aria/grid';
 import {useMessageFormatter} from '@react-aria/i18n';
 
 interface SelectionCheckboxProps {
@@ -41,24 +41,12 @@ interface SelectAllCheckboxAria {
  */
 export function useTableSelectionCheckbox<T>(props: SelectionCheckboxProps, state: TableState<T>): SelectionCheckboxAria {
   let {key} = props;
-
-  let manager = state.selectionManager;
-  let checkboxId = useId();
-  let isDisabled = state.disabledKeys.has(key);
-  let isSelected = state.selectionManager.isSelected(key);
-
-  let onChange = () => manager.select(key);
-
-  const formatMessage = useMessageFormatter(intlMessages);
+  const {checkboxProps} = useGridSelectionCheckbox(props, state);
 
   return {
     checkboxProps: {
-      id: checkboxId,
-      'aria-label': formatMessage('select'),
-      'aria-labelledby': `${checkboxId} ${getRowLabelledBy(state, key)}`,
-      isSelected,
-      isDisabled: isDisabled || manager.selectionMode === 'none',
-      onChange
+      ...checkboxProps,
+      'aria-labelledby': `${checkboxProps.id} ${getRowLabelledBy(state, key)}`
     }
   };
 }