Skip to content

Commit ec75091

Browse files
Translations for TagGroup (#6890)
* Translations for TagGroup * add number of tags * Revert " fix/bug useTablist #5996 (#6023)" This reverts commit c4a783e. * Revert "Extract `ToggleStateProps` type to use only what is needed in `useToggleState` (#3836)" This reverts commit 81e3804. --------- Co-authored-by: Daniel Lu <[email protected]>
1 parent 7e10448 commit ec75091

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+186
-105
lines changed

packages/@react-aria/selection/src/useSelectableCollection.ts

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -164,57 +164,49 @@ export function useSelectableCollection(options: AriaSelectableCollectionOptions
164164
switch (e.key) {
165165
case 'ArrowDown': {
166166
if (delegate.getKeyBelow) {
167+
e.preventDefault();
167168
let nextKey = manager.focusedKey != null
168-
? delegate.getKeyBelow?.(manager.focusedKey)
169+
? delegate.getKeyBelow(manager.focusedKey)
169170
: delegate.getFirstKey?.();
170171
if (nextKey == null && shouldFocusWrap) {
171172
nextKey = delegate.getFirstKey?.(manager.focusedKey);
172173
}
173-
if (nextKey != null) {
174-
e.preventDefault();
175-
navigateToKey(nextKey);
176-
}
174+
navigateToKey(nextKey);
177175
}
178176
break;
179177
}
180178
case 'ArrowUp': {
181179
if (delegate.getKeyAbove) {
180+
e.preventDefault();
182181
let nextKey = manager.focusedKey != null
183-
? delegate.getKeyAbove?.(manager.focusedKey)
182+
? delegate.getKeyAbove(manager.focusedKey)
184183
: delegate.getLastKey?.();
185184
if (nextKey == null && shouldFocusWrap) {
186185
nextKey = delegate.getLastKey?.(manager.focusedKey);
187186
}
188-
if (nextKey != null) {
189-
e.preventDefault();
190-
navigateToKey(nextKey);
191-
}
187+
navigateToKey(nextKey);
192188
}
193189
break;
194190
}
195191
case 'ArrowLeft': {
196192
if (delegate.getKeyLeftOf) {
197-
let nextKey = delegate.getKeyLeftOf?.(manager.focusedKey);
193+
e.preventDefault();
194+
let nextKey = delegate.getKeyLeftOf(manager.focusedKey);
198195
if (nextKey == null && shouldFocusWrap) {
199196
nextKey = direction === 'rtl' ? delegate.getFirstKey?.(manager.focusedKey) : delegate.getLastKey?.(manager.focusedKey);
200197
}
201-
if (nextKey != null) {
202-
e.preventDefault();
203-
navigateToKey(nextKey, direction === 'rtl' ? 'first' : 'last');
204-
}
198+
navigateToKey(nextKey, direction === 'rtl' ? 'first' : 'last');
205199
}
206200
break;
207201
}
208202
case 'ArrowRight': {
209203
if (delegate.getKeyRightOf) {
210-
let nextKey = delegate.getKeyRightOf?.(manager.focusedKey);
204+
e.preventDefault();
205+
let nextKey = delegate.getKeyRightOf(manager.focusedKey);
211206
if (nextKey == null && shouldFocusWrap) {
212207
nextKey = direction === 'rtl' ? delegate.getLastKey?.(manager.focusedKey) : delegate.getFirstKey?.(manager.focusedKey);
213208
}
214-
if (nextKey != null) {
215-
e.preventDefault();
216-
navigateToKey(nextKey, direction === 'rtl' ? 'last' : 'first');
217-
}
209+
navigateToKey(nextKey, direction === 'rtl' ? 'last' : 'first');
218210
}
219211
break;
220212
}
@@ -244,20 +236,16 @@ export function useSelectableCollection(options: AriaSelectableCollectionOptions
244236
break;
245237
case 'PageDown':
246238
if (delegate.getKeyPageBelow) {
239+
e.preventDefault();
247240
let nextKey = delegate.getKeyPageBelow(manager.focusedKey);
248-
if (nextKey != null) {
249-
e.preventDefault();
250-
navigateToKey(nextKey);
251-
}
241+
navigateToKey(nextKey);
252242
}
253243
break;
254244
case 'PageUp':
255245
if (delegate.getKeyPageAbove) {
246+
e.preventDefault();
256247
let nextKey = delegate.getKeyPageAbove(manager.focusedKey);
257-
if (nextKey != null) {
258-
e.preventDefault();
259-
navigateToKey(nextKey);
260-
}
248+
navigateToKey(nextKey);
261249
}
262250
break;
263251
case 'a':

packages/@react-aria/tabs/src/TabsKeyboardDelegate.ts

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,11 @@ export class TabsKeyboardDelegate<T> implements KeyboardDelegate {
1616
private collection: Collection<Node<T>>;
1717
private flipDirection: boolean;
1818
private disabledKeys: Set<Key>;
19-
private tabDirection: boolean;
2019

2120
constructor(collection: Collection<Node<T>>, direction: Direction, orientation: Orientation, disabledKeys: Set<Key> = new Set()) {
2221
this.collection = collection;
2322
this.flipDirection = direction === 'rtl' && orientation === 'horizontal';
2423
this.disabledKeys = disabledKeys;
25-
this.tabDirection = orientation === 'horizontal';
2624
}
2725

2826
getKeyLeftOf(key: Key) {
@@ -39,6 +37,13 @@ export class TabsKeyboardDelegate<T> implements KeyboardDelegate {
3937
return this.getNextKey(key);
4038
}
4139

40+
getKeyAbove(key: Key) {
41+
return this.getPreviousKey(key);
42+
}
43+
44+
getKeyBelow(key: Key) {
45+
return this.getNextKey(key);
46+
}
4247

4348
private isDisabled(key: Key) {
4449
return this.disabledKeys.has(key) || !!this.collection.getItem(key)?.props?.isDisabled;
@@ -59,20 +64,6 @@ export class TabsKeyboardDelegate<T> implements KeyboardDelegate {
5964
}
6065
return key;
6166
}
62-
63-
getKeyAbove(key: Key) {
64-
if (this.tabDirection) {
65-
return null;
66-
}
67-
return this.getPreviousKey(key);
68-
}
69-
70-
getKeyBelow(key: Key) {
71-
if (this.tabDirection) {
72-
return null;
73-
}
74-
return this.getNextKey(key);
75-
}
7667

7768
getNextKey(key) {
7869
do {

packages/@react-spectrum/s2/intl/ar-AE.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,8 @@
1414
"picker.placeholder": "حدد خيارًا...",
1515
"slider.maximum": "أقصى",
1616
"slider.minimum": "أدنى",
17-
"tag.noTags": "بدون"
17+
"tag.actions": "الإجراءات",
18+
"tag.hideButtonLabel": "إظهار أقل",
19+
"tag.noTags": "بدون",
20+
"tag.showAllButtonLabel": "عرض الكل ({tagCount, number})"
1821
}

packages/@react-spectrum/s2/intl/bg-BG.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,8 @@
1414
"picker.placeholder": "Изберете опция",
1515
"slider.maximum": "Максимум",
1616
"slider.minimum": "Минимум",
17-
"tag.noTags": "Нито един"
17+
"tag.actions": "Действия",
18+
"tag.hideButtonLabel": "Показване на по-малко",
19+
"tag.noTags": "Нито един",
20+
"tag.showAllButtonLabel": "Показване на всички ({tagCount, number})"
1821
}

packages/@react-spectrum/s2/intl/cs-CZ.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,8 @@
1414
"picker.placeholder": "Vyberte vhodnou možnost...",
1515
"slider.maximum": "Maximum",
1616
"slider.minimum": "Minimum",
17-
"tag.noTags": "Žádný"
17+
"tag.actions": "Akce",
18+
"tag.hideButtonLabel": "Zobrazit méně",
19+
"tag.noTags": "Žádný",
20+
"tag.showAllButtonLabel": "Zobrazit vše ({tagCount, number})"
1821
}

packages/@react-spectrum/s2/intl/da-DK.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,8 @@
1414
"picker.placeholder": "Vælg en mulighed ...",
1515
"slider.maximum": "Maksimum",
1616
"slider.minimum": "Minimum",
17-
"tag.noTags": "Ingen"
17+
"tag.actions": "Handlinger",
18+
"tag.hideButtonLabel": "Vis mindre",
19+
"tag.noTags": "Ingen",
20+
"tag.showAllButtonLabel": "Vis alle ({tagCount, number})"
1821
}

packages/@react-spectrum/s2/intl/de-DE.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,8 @@
1414
"picker.placeholder": "Option auswählen...",
1515
"slider.maximum": "Maximum",
1616
"slider.minimum": "Minimum",
17-
"tag.noTags": "Keine"
17+
"tag.actions": "Aktionen",
18+
"tag.hideButtonLabel": "Weniger zeigen",
19+
"tag.noTags": "Keine",
20+
"tag.showAllButtonLabel": "Alle anzeigen ({tagCount, number})"
1821
}

packages/@react-spectrum/s2/intl/el-GR.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,8 @@
1414
"picker.placeholder": "Επιλέξτε…",
1515
"slider.maximum": "Μέγιστο",
1616
"slider.minimum": "Ελάχιστο",
17-
"tag.noTags": "Κανένα"
17+
"tag.actions": "Ενέργειες",
18+
"tag.hideButtonLabel": "Εμφάνιση λιγότερων",
19+
"tag.noTags": "Κανένα",
20+
"tag.showAllButtonLabel": "Εμφάνιση όλων ({tagCount, number})"
1821
}

packages/@react-spectrum/s2/intl/en-US.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,8 @@
1414
"picker.placeholder": "Select…",
1515
"slider.minimum": "Minimum",
1616
"slider.maximum": "Maximum",
17+
"tag.showAllButtonLabel": "Show all ({tagCount, number})",
18+
"tag.hideButtonLabel": "Show less",
19+
"tag.actions": "Actions",
1720
"tag.noTags": "None"
1821
}

packages/@react-spectrum/s2/intl/es-ES.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,8 @@
1414
"picker.placeholder": "Seleccione una opción…",
1515
"slider.maximum": "Máximo",
1616
"slider.minimum": "Mínimo",
17-
"tag.noTags": "Ninguno"
17+
"tag.actions": "Acciones",
18+
"tag.hideButtonLabel": "Mostrar menos",
19+
"tag.noTags": "Ninguno",
20+
"tag.showAllButtonLabel": "Mostrar todo ({tagCount, number})"
1821
}

0 commit comments

Comments
 (0)