Skip to content

Commit 881d0ca

Browse files
authored
feat: Add support for nested table rows (adobe#9740)
* feat: Add support for nested table rows * Add tests * Fix S1 tests * Add stories and chromatic for S2 * fix types * fix version * review comments
1 parent e241402 commit 881d0ca

Some content is hidden

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

63 files changed

+1929
-313
lines changed

packages/@react-aria/collections/src/useCachedChildren.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export function useCachedChildren<T extends object>(props: CachedChildrenOptions
5050
throw new Error('Could not determine key for item');
5151
}
5252

53-
if (idScope != null) {
53+
if (idScope != null && rendered.props.id == null) {
5454
key = idScope + ':' + key;
5555
}
5656
// Note: only works if wrapped Item passes through id...

packages/@react-aria/table/intl/ar-AE.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,7 @@
77
"resizerDescription": "اضغط على مفتاح Enter لبدء تغيير الحجم",
88
"select": "تحديد",
99
"selectAll": "تحديد الكل",
10-
"sortable": "عمود قابل للترتيب"
10+
"sortable": "عمود قابل للترتيب",
11+
"collapse": "طي",
12+
"expand": "تمديد"
1113
}

packages/@react-aria/table/intl/bg-BG.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,7 @@
77
"resizerDescription": "Натиснете „Enter“, за да започнете да преоразмерявате",
88
"select": "Изберете",
99
"selectAll": "Изберете всичко",
10-
"sortable": "сортираща колона"
10+
"sortable": "сортираща колона",
11+
"collapse": "Свиване",
12+
"expand": "Разширяване"
1113
}

packages/@react-aria/table/intl/cs-CZ.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,7 @@
77
"resizerDescription": "Stisknutím klávesy Enter začnete měnit velikost",
88
"select": "Vybrat",
99
"selectAll": "Vybrat vše",
10-
"sortable": "sloupec s možností řazení"
10+
"sortable": "sloupec s možností řazení",
11+
"collapse": "Sbalit",
12+
"expand": "Roztáhnout"
1113
}

packages/@react-aria/table/intl/da-DK.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,7 @@
77
"resizerDescription": "Tryk på Enter for at ændre størrelse",
88
"select": "Vælg",
99
"selectAll": "Vælg alle",
10-
"sortable": "sorterbar kolonne"
10+
"sortable": "sorterbar kolonne",
11+
"collapse": "Skjul",
12+
"expand": "Udvid"
1113
}

packages/@react-aria/table/intl/de-DE.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,7 @@
77
"resizerDescription": "Eingabetaste zum Starten der Größenänderung drücken",
88
"select": "Auswählen",
99
"selectAll": "Alles auswählen",
10-
"sortable": "sortierbare Spalte"
10+
"sortable": "sortierbare Spalte",
11+
"collapse": "Reduzieren",
12+
"expand": "Erweitern"
1113
}

packages/@react-aria/table/intl/el-GR.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,7 @@
77
"resizerDescription": "Πατήστε Enter για έναρξη της αλλαγής μεγέθους",
88
"select": "Επιλογή",
99
"selectAll": "Επιλογή όλων",
10-
"sortable": "Στήλη διαλογής"
10+
"sortable": "Στήλη διαλογής",
11+
"collapse": "Σύμπτυξη",
12+
"expand": "Ανάπτυξη"
1113
}

packages/@react-aria/table/intl/en-US.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,7 @@
77
"ascendingSort": "sorted by column {columnName} in ascending order",
88
"descendingSort": "sorted by column {columnName} in descending order",
99
"columnSize": "{value} pixels",
10-
"resizerDescription": "Press Enter to start resizing"
10+
"resizerDescription": "Press Enter to start resizing",
11+
"expand": "Expand",
12+
"collapse": "Collapse"
1113
}

packages/@react-aria/table/intl/es-ES.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,7 @@
77
"resizerDescription": "Pulse Intro para empezar a redimensionar",
88
"select": "Seleccionar",
99
"selectAll": "Seleccionar todos",
10-
"sortable": "columna ordenable"
10+
"sortable": "columna ordenable",
11+
"collapse": "Contraer",
12+
"expand": "Ampliar"
1113
}

packages/@react-aria/table/intl/et-EE.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,7 @@
77
"resizerDescription": "Suuruse muutmise alustamiseks vajutage klahvi Enter",
88
"select": "Vali",
99
"selectAll": "Vali kõik",
10-
"sortable": "sorditav veerg"
10+
"sortable": "sorditav veerg",
11+
"collapse": "Ahenda",
12+
"expand": "Laienda"
1113
}

0 commit comments

Comments
 (0)