diff --git a/Makefile b/Makefile index e72170a0147..ffd71f5e5a1 100644 --- a/Makefile +++ b/Makefile @@ -156,6 +156,7 @@ build-s2-docs: yarn workspace @react-spectrum/s2-docs generate:og REGISTRY_URL=$(PUBLIC_URL)/registry node scripts/buildRegistry.mjs REGISTRY_URL=$(PUBLIC_URL)/registry yarn build:s2-docs --public-url $(PUBLIC_URL) + node scripts/createFeedS2.mjs mkdir -p $(DIST_DIR) mv packages/dev/s2-docs/dist/* $(DIST_DIR) mkdir -p $(DIST_DIR)/registry diff --git a/package.json b/package.json index f77ecdaec3e..d3420e1df55 100644 --- a/package.json +++ b/package.json @@ -185,6 +185,7 @@ "recast": "^0.23", "recursive-readdir": "^2.2.2", "regenerator-runtime": "0.13.3", + "rehype-stringify": "^9.0.4", "rimraf": "^6.0.1", "sharp": "^0.33.5", "storybook": "^8.6.14", diff --git a/packages/@react-aria/dnd/intl/es-ES.json b/packages/@react-aria/dnd/intl/es-ES.json index 797bb4886e9..489c6f15c47 100644 --- a/packages/@react-aria/dnd/intl/es-ES.json +++ b/packages/@react-aria/dnd/intl/es-ES.json @@ -9,9 +9,9 @@ "dragSelectedKeyboard": "Pulse Intro para arrastrar {count, plural, one {# elemento seleccionado} other {# elementos seleccionados}}.", "dragSelectedKeyboardAlt": "Pulse Alt + Intro para arrastrar {count, plural, one {# elemento seleccionado} other {# elementos seleccionados}}.", "dragSelectedLongPress": "Mantenga pulsado para arrastrar {count, plural, one {# elemento seleccionado} other {# elementos seleccionados}}.", - "dragStartedKeyboard": "Se ha empezado a arrastrar. Pulse el tabulador para ir al público destinatario donde se vaya a colocar y, a continuación, pulse Intro para soltar, o pulse Escape para cancelar.", - "dragStartedTouch": "Se ha empezado a arrastrar. Vaya al público destinatario donde se vaya a colocar y, a continuación, pulse dos veces para soltar.", - "dragStartedVirtual": "Se ha empezado a arrastrar. Vaya al público destinatario donde se vaya a colocar y, a continuación, haga clic o pulse Intro para soltar.", + "dragStartedKeyboard": "Se ha empezado a arrastrar. Pulse el tabulador para ir al destino donde se vaya a colocar y, a continuación, pulse Intro para soltar, o pulse Escape para cancelar.", + "dragStartedTouch": "Se ha empezado a arrastrar. Vaya al destino donde se vaya a colocar y, a continuación, pulse dos veces para soltar.", + "dragStartedVirtual": "Se ha empezado a arrastrar. Vaya al destino donde se vaya a colocar y, a continuación, haga clic o pulse Intro para soltar.", "dropCanceled": "Se ha cancelado la colocación.", "dropComplete": "Colocación finalizada.", "dropDescriptionKeyboard": "Pulse Intro para soltar. Pulse Escape para cancelar el arrastre.", diff --git a/packages/@react-aria/menu/intl/it-IT.json b/packages/@react-aria/menu/intl/it-IT.json index 3e0f7886700..f689d27d88f 100644 --- a/packages/@react-aria/menu/intl/it-IT.json +++ b/packages/@react-aria/menu/intl/it-IT.json @@ -1,3 +1,3 @@ { - "longPressMessage": "Premere a lungo o premere Alt + Freccia giù per aprire il menu" + "longPressMessage": "Premi a lungo o premi Alt + Freccia giù per aprire il menu" } diff --git a/packages/@react-spectrum/s2/chromatic/Accordion.stories.tsx b/packages/@react-spectrum/s2/chromatic/Accordion.stories.tsx index 3ac77693a82..34feeb88b57 100644 --- a/packages/@react-spectrum/s2/chromatic/Accordion.stories.tsx +++ b/packages/@react-spectrum/s2/chromatic/Accordion.stories.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {Accordion, ActionButton, Disclosure, DisclosureHeader, DisclosurePanel, DisclosureTitle, TextField} from '../src'; +import {Accordion, AccordionItem, AccordionItemHeader, AccordionItemPanel, AccordionItemTitle, ActionButton, TextField} from '../src'; import type {Meta, StoryObj} from '@storybook/react'; import NewIcon from '../s2wf-icons/S2_Icon_New_20_N.svg'; import React from 'react'; @@ -32,22 +32,22 @@ export const Example: Story = { return (
- - + + Files - - + + Files content - - - - + + + + People - - + + - - + +
); @@ -59,57 +59,57 @@ export const WithLongTitle: Story = { return (
- - + + Files - - + + Files content - - - - + + + + People - - + + People content - - - - + + + + Very very very very very long title that wraps - - + + Accordion content - - + +
); } }; -export const WithDisabledDisclosure: Story = { +export const WithDisabledItem: Story = { render: (args) => { return (
- - + + Files - - + + Files content - - - - + + + + People - - + + - - + +
); @@ -122,7 +122,7 @@ WithLongTitle.parameters = { } }; -WithDisabledDisclosure.parameters = { +WithDisabledItem.parameters = { docs: { disable: true } @@ -133,28 +133,28 @@ export const WithActionButton: Story = { return (
- - - + + + Files - + - - + + Files content - - - - - + + + + + People - + - - + + - - + +
); diff --git a/packages/@react-spectrum/s2/intl/ar-AE.json b/packages/@react-spectrum/s2/intl/ar-AE.json index 977a05e0096..8545d91acfd 100644 --- a/packages/@react-spectrum/s2/intl/ar-AE.json +++ b/packages/@react-spectrum/s2/intl/ar-AE.json @@ -26,7 +26,7 @@ "notificationbadge.indicatorOnly": "نشاط جديد", "notificationbadge.plus": "{notifications}+", "picker.placeholder": "تحديد…", - "picker.selectedCount": "{count, plural, =0 {لم يتم تحديد عناصر} one {# عنصر محدد} other {# عنصر محدد}}", + "picker.selectedCount": "{count, plural, =0 {لم يتم تحديد أي عنصر} one {تم تحديد عنصر واحد} two {تم تحديد عنصرين} few {تم تحديد # عناصر} other {تم تحديد # عنصر}}", "slider.maximum": "أقصى", "slider.minimum": "أدنى", "table.cancel": "إلغاء", diff --git a/packages/@react-spectrum/s2/intl/bg-BG.json b/packages/@react-spectrum/s2/intl/bg-BG.json index 57a159b530a..02ecdbc3019 100644 --- a/packages/@react-spectrum/s2/intl/bg-BG.json +++ b/packages/@react-spectrum/s2/intl/bg-BG.json @@ -26,12 +26,15 @@ "notificationbadge.indicatorOnly": "Нова дейност", "notificationbadge.plus": "{notifications}+", "picker.placeholder": "Изберете…", - "picker.selectedCount": "{count, plural, =0 {Няма избрани елементи} one {# избран елемент} other {# избрани елементи}}", + "picker.selectedCount": "{count, plural, =0 {Няма избрани елементи} one {# избран елемент} other {# избрани елемента}}", "slider.maximum": "Максимум", "slider.minimum": "Минимум", + "table.cancel": "Отказ", + "table.editCell": "Редактиране на клетка", "table.loading": "Зареждане...", "table.loadingMore": "Зареждане на още...", "table.resizeColumn": "Преоразмеряване на колона", + "table.save": "Запазване", "table.sortAscending": "Възходящо сортиране", "table.sortDescending": "Низходящо сортиране ", "tag.actions": "Действия", diff --git a/packages/@react-spectrum/s2/intl/cs-CZ.json b/packages/@react-spectrum/s2/intl/cs-CZ.json index cafc3d9afbb..daa436a2556 100644 --- a/packages/@react-spectrum/s2/intl/cs-CZ.json +++ b/packages/@react-spectrum/s2/intl/cs-CZ.json @@ -26,12 +26,15 @@ "notificationbadge.indicatorOnly": "Nová aktivita", "notificationbadge.plus": "{notifications}+", "picker.placeholder": "Vybrat…", - "picker.selectedCount": "{count, plural, =0 {Nevybrány žádné položky} one {Vybrána # položka} other {Vybráno # položek}}", + "picker.selectedCount": "{count, plural, =0 {Nevybrány žádné položky} one {Vybrána # položka} few {Vybrány # položky} other {Vybráno # položek}}", "slider.maximum": "Maximum", "slider.minimum": "Minimum", + "table.cancel": "Zrušit", + "table.editCell": "Upravit buňku", "table.loading": "Načítání...", "table.loadingMore": "Načítání dalších...", "table.resizeColumn": "Změnit velikost sloupce", + "table.save": "Uložit", "table.sortAscending": "Seřadit vzestupně", "table.sortDescending": "Seřadit sestupně", "tag.actions": "Akce", diff --git a/packages/@react-spectrum/s2/intl/da-DK.json b/packages/@react-spectrum/s2/intl/da-DK.json index 796047f0199..e6f272123a3 100644 --- a/packages/@react-spectrum/s2/intl/da-DK.json +++ b/packages/@react-spectrum/s2/intl/da-DK.json @@ -29,9 +29,12 @@ "picker.selectedCount": "{count, plural, =0 {Ingen elementer valgt} one {# element valgt} other {# elementer valgt}}", "slider.maximum": "Maksimum", "slider.minimum": "Minimum", + "table.cancel": "Annuller", + "table.editCell": "Rediger celle", "table.loading": "Indlæser...", "table.loadingMore": "Indlæser flere...", "table.resizeColumn": "Tilpas størrelse på kolonne", + "table.save": "Gem", "table.sortAscending": "Sorter stigende", "table.sortDescending": "Sorter faldende", "tag.actions": "Handlinger", diff --git a/packages/@react-spectrum/s2/intl/de-DE.json b/packages/@react-spectrum/s2/intl/de-DE.json index df797d68c2e..7256c4790e7 100644 --- a/packages/@react-spectrum/s2/intl/de-DE.json +++ b/packages/@react-spectrum/s2/intl/de-DE.json @@ -29,9 +29,12 @@ "picker.selectedCount": "{count, plural, =0 {Keine Elemente ausgewählt} one {# Element ausgewählt} other {# Elemente ausgewählt}}", "slider.maximum": "Maximum", "slider.minimum": "Minimum", + "table.cancel": "Abbrechen", + "table.editCell": "Zelle bearbeiten", "table.loading": "Laden...", "table.loadingMore": "Mehr laden ...", "table.resizeColumn": "Spaltengröße ändern", + "table.save": "Speichern", "table.sortAscending": "Aufsteigend sortieren", "table.sortDescending": "Absteigend sortieren", "tag.actions": "Aktionen", diff --git a/packages/@react-spectrum/s2/intl/el-GR.json b/packages/@react-spectrum/s2/intl/el-GR.json index a1381bae42d..90a98fb862e 100644 --- a/packages/@react-spectrum/s2/intl/el-GR.json +++ b/packages/@react-spectrum/s2/intl/el-GR.json @@ -29,9 +29,12 @@ "picker.selectedCount": "{count, plural, =0 {Δεν επιλέχθηκαν στοιχεία} one {Επιλέχθηκε # στοιχείο} other {Επιλέχθηκαν # στοιχεία}}", "slider.maximum": "Μέγιστο", "slider.minimum": "Ελάχιστο", + "table.cancel": "Ακύρωση", + "table.editCell": "Επεξεργασία κελιού", "table.loading": "Φόρτωση...", "table.loadingMore": "Φόρτωση περισσότερων...", "table.resizeColumn": "Αλλαγή μεγέθους στήλης", + "table.save": "Αποθήκευση", "table.sortAscending": "Ταξινόμηση κατά αύξουσα σειρά", "table.sortDescending": "Ταξινόμηση κατά φθίνουσα σειρά", "tag.actions": "Ενέργειες", diff --git a/packages/@react-spectrum/s2/intl/es-ES.json b/packages/@react-spectrum/s2/intl/es-ES.json index 2dfcc26a3f7..feffd69320b 100644 --- a/packages/@react-spectrum/s2/intl/es-ES.json +++ b/packages/@react-spectrum/s2/intl/es-ES.json @@ -29,9 +29,12 @@ "picker.selectedCount": "{count, plural, =0 {Ningún elemento seleccionado} one {# elemento seleccionado} other {# elementos seleccionados}}", "slider.maximum": "Máximo", "slider.minimum": "Mínimo", + "table.cancel": "Cancelar", + "table.editCell": "Editar celda", "table.loading": "Cargando…", "table.loadingMore": "Cargando más…", "table.resizeColumn": "Cambiar el tamaño de la columna", + "table.save": "Guardar", "table.sortAscending": "Orden ascendente", "table.sortDescending": "Orden descendente", "tag.actions": "Acciones", diff --git a/packages/@react-spectrum/s2/intl/et-EE.json b/packages/@react-spectrum/s2/intl/et-EE.json index 0961526bc2c..3ee0a81aa6e 100644 --- a/packages/@react-spectrum/s2/intl/et-EE.json +++ b/packages/@react-spectrum/s2/intl/et-EE.json @@ -26,12 +26,15 @@ "notificationbadge.indicatorOnly": "Uus tegevus", "notificationbadge.plus": "{notifications}+", "picker.placeholder": "Valige…", - "picker.selectedCount": "{count, plural, =0 {Üksusi pole valitud} one {# üksus valitud} other {# üksust valitud}}", + "picker.selectedCount": "{count, plural, =0 {üksuseid pole valitud} one {# üksus valitud} other {# üksust valitud}}", "slider.maximum": "Maksimaalne", "slider.minimum": "Minimaalne", + "table.cancel": "Tühista", + "table.editCell": "Muuda lahtrit", "table.loading": "Laadimine...", "table.loadingMore": "Laadi rohkem...", "table.resizeColumn": "Muuda veeru suurust", + "table.save": "Salvesta", "table.sortAscending": "Sordi kasvavalt", "table.sortDescending": "Sordi kahanevalt", "tag.actions": "Toimingud", diff --git a/packages/@react-spectrum/s2/intl/fi-FI.json b/packages/@react-spectrum/s2/intl/fi-FI.json index 3c841a3fe38..e541ada653f 100644 --- a/packages/@react-spectrum/s2/intl/fi-FI.json +++ b/packages/@react-spectrum/s2/intl/fi-FI.json @@ -26,12 +26,15 @@ "notificationbadge.indicatorOnly": "Uusi toiminta", "notificationbadge.plus": "{notifications}+", "picker.placeholder": "Valitse…", - "picker.selectedCount": "{count, plural, =0 {Ei yhtään kohdetta valittu} one {# kohde valittu} other {# kohdetta valittu}}", + "picker.selectedCount": "{count, plural, =0 {Kohteita ei ole valittu} one {# kohde valittu} other {# kohdetta valittu}}", "slider.maximum": "Maksimi", "slider.minimum": "Minimi", + "table.cancel": "Peruuta", + "table.editCell": "Muokkaa solua", "table.loading": "Ladataan…", "table.loadingMore": "Ladataan lisää…", "table.resizeColumn": "Muuta sarakkeen kokoa", + "table.save": "Tallenna", "table.sortAscending": "Lajittelujärjestys: nouseva", "table.sortDescending": "Lajittelujärjestys: laskeva", "tag.actions": "Toiminnot", diff --git a/packages/@react-spectrum/s2/intl/fr-FR.json b/packages/@react-spectrum/s2/intl/fr-FR.json index e67742c73a6..e298543e539 100644 --- a/packages/@react-spectrum/s2/intl/fr-FR.json +++ b/packages/@react-spectrum/s2/intl/fr-FR.json @@ -29,9 +29,12 @@ "picker.selectedCount": "{count, plural, =0 {Aucun élément sélectionné} one {# élément sélectionné} other {# éléments sélectionnés}}", "slider.maximum": "Maximum", "slider.minimum": "Minimum", + "table.cancel": "Annuler", + "table.editCell": "Modifier la cellule", "table.loading": "Chargement...", "table.loadingMore": "Chargement supplémentaire...", "table.resizeColumn": "Redimensionner la colonne", + "table.save": "Enregistrer", "table.sortAscending": "Trier par ordre croissant", "table.sortDescending": "Trier par ordre décroissant", "tag.actions": "Actions", diff --git a/packages/@react-spectrum/s2/intl/he-IL.json b/packages/@react-spectrum/s2/intl/he-IL.json index caae5e3ac7d..cac33237926 100644 --- a/packages/@react-spectrum/s2/intl/he-IL.json +++ b/packages/@react-spectrum/s2/intl/he-IL.json @@ -29,9 +29,12 @@ "picker.selectedCount": "{count, plural, =0 {לא נבחרו פריטים} one {פריט # נבחר} other {# פריטים נבחרו}}", "slider.maximum": "מקסימום", "slider.minimum": "מינימום", + "table.cancel": "ביטול", + "table.editCell": "עריכת תא", "table.loading": "טוען...", "table.loadingMore": "טוען עוד...", "table.resizeColumn": "שנה את גודל העמודה", + "table.save": "שמירה", "table.sortAscending": "מיין בסדר עולה", "table.sortDescending": "מיין בסדר יורד", "tag.actions": "פעולות", diff --git a/packages/@react-spectrum/s2/intl/hr-HR.json b/packages/@react-spectrum/s2/intl/hr-HR.json index 3b98a57760d..d785dc1390b 100644 --- a/packages/@react-spectrum/s2/intl/hr-HR.json +++ b/packages/@react-spectrum/s2/intl/hr-HR.json @@ -29,9 +29,12 @@ "picker.selectedCount": "{count, plural, =0 {Nije odabrana nijedna stavka} one {Odabrana je # stavka} other {Odabrano je # stavki}}", "slider.maximum": "Najviše", "slider.minimum": "Najmanje", + "table.cancel": "Poništi", + "table.editCell": "Uredi ćeliju", "table.loading": "Učitavam...", "table.loadingMore": "Učitavam još...", "table.resizeColumn": "Promijeni veličinu stupca", + "table.save": "Spremi", "table.sortAscending": "Sortiraj uzlazno", "table.sortDescending": "Sortiraj silazno", "tag.actions": "Radnje", diff --git a/packages/@react-spectrum/s2/intl/hu-HU.json b/packages/@react-spectrum/s2/intl/hu-HU.json index 3c2e6052c59..6d826f1259e 100644 --- a/packages/@react-spectrum/s2/intl/hu-HU.json +++ b/packages/@react-spectrum/s2/intl/hu-HU.json @@ -26,12 +26,15 @@ "notificationbadge.indicatorOnly": "Új tevékenység", "notificationbadge.plus": "{notifications}+", "picker.placeholder": "Kiválasztás…", - "picker.selectedCount": "{count, plural, =0 {Egy elem sincs kijelölve} one {# elem kijelölve} other {# elem kijelölve}}", + "picker.selectedCount": "{count, plural, =0 {Nincs kijelölve elem} one {# elem kijelölve} other {# elem kijelölve}}", "slider.maximum": "Maximum", "slider.minimum": "Minimum", + "table.cancel": "Mégse", + "table.editCell": "Cella szerkesztése", "table.loading": "Betöltés folyamatban…", "table.loadingMore": "Továbbiak betöltése folyamatban…", "table.resizeColumn": "Oszlop átméretezése", + "table.save": "Mentés", "table.sortAscending": "Növekvő rendezés", "table.sortDescending": "Csökkenő rendezés", "tag.actions": "Műveletek", diff --git a/packages/@react-spectrum/s2/intl/it-IT.json b/packages/@react-spectrum/s2/intl/it-IT.json index c2995e56129..87cb218475e 100644 --- a/packages/@react-spectrum/s2/intl/it-IT.json +++ b/packages/@react-spectrum/s2/intl/it-IT.json @@ -29,9 +29,12 @@ "picker.selectedCount": "{count, plural, =0 {Nessun elemento selezionato} one {# elemento selezionato} other {# elementi selezionati}}", "slider.maximum": "Massimo", "slider.minimum": "Minimo", + "table.cancel": "Annulla", + "table.editCell": "Modifica cella", "table.loading": "Caricamento...", "table.loadingMore": "Caricamento altri...", "table.resizeColumn": "Ridimensiona colonna", + "table.save": "Salva", "table.sortAscending": "Ordinamento crescente", "table.sortDescending": "Ordinamento decrescente", "tag.actions": "Azioni", diff --git a/packages/@react-spectrum/s2/intl/ja-JP.json b/packages/@react-spectrum/s2/intl/ja-JP.json index e62d9e3cdc1..4f7c3e0e6e2 100644 --- a/packages/@react-spectrum/s2/intl/ja-JP.json +++ b/packages/@react-spectrum/s2/intl/ja-JP.json @@ -29,9 +29,12 @@ "picker.selectedCount": "{count, plural, =0 {項目が選択されていません} one {# 項目を選択しました} other {# 項目を選択しました}}", "slider.maximum": "最大", "slider.minimum": "最小", + "table.cancel": "キャンセル", + "table.editCell": "セルを編集", "table.loading": "読み込み中...", "table.loadingMore": "さらに読み込み中...", "table.resizeColumn": "列幅を変更", + "table.save": "保存", "table.sortAscending": "昇順に並べ替え", "table.sortDescending": "降順に並べ替え", "tag.actions": "アクション", diff --git a/packages/@react-spectrum/s2/intl/ko-KR.json b/packages/@react-spectrum/s2/intl/ko-KR.json index 0b73bddd9ed..2d5e859ba29 100644 --- a/packages/@react-spectrum/s2/intl/ko-KR.json +++ b/packages/@react-spectrum/s2/intl/ko-KR.json @@ -26,12 +26,15 @@ "notificationbadge.indicatorOnly": "새로운 활동", "notificationbadge.plus": "{notifications}+", "picker.placeholder": "선택…", - "picker.selectedCount": "{count, plural, =0 {선택된 항목이 없습니다} one {#개 항목이 선택되었습니다} other {#개 항목이 선택되었습니다}}", + "picker.selectedCount": "{count, plural, =0 {선택한 항목 없음} one {#개 항목 선택됨} other {#개 항목 선택됨}}", "slider.maximum": "최대", "slider.minimum": "최소", + "table.cancel": "취소", + "table.editCell": "셀 편집", "table.loading": "로드 중…", "table.loadingMore": "추가 로드 중…", "table.resizeColumn": "열 크기 조정", + "table.save": "저장", "table.sortAscending": "오름차순 정렬", "table.sortDescending": "내림차순 정렬", "tag.actions": "액션", diff --git a/packages/@react-spectrum/s2/intl/lt-LT.json b/packages/@react-spectrum/s2/intl/lt-LT.json index b51bce6380b..7429827c18b 100644 --- a/packages/@react-spectrum/s2/intl/lt-LT.json +++ b/packages/@react-spectrum/s2/intl/lt-LT.json @@ -29,9 +29,12 @@ "picker.selectedCount": "{count, plural, =0 {Nepasirinktas nė vienas elementas} one {Pasirinktas # elementas} other {Pasirinkta elementų: #}}", "slider.maximum": "Daugiausia", "slider.minimum": "Mažiausia", + "table.cancel": "Atšaukti", + "table.editCell": "Redaguoti langelį", "table.loading": "Įkeliama...", "table.loadingMore": "Įkeliama daugiau...", "table.resizeColumn": "Keisti stulpelio dydį", + "table.save": "Įrašyti", "table.sortAscending": "Rikiuoti didėjimo tvarka", "table.sortDescending": "Rikiuoti mažėjimo tvarka", "tag.actions": "Veiksmai", diff --git a/packages/@react-spectrum/s2/intl/lv-LV.json b/packages/@react-spectrum/s2/intl/lv-LV.json index e3f7a7ea231..d8ebbec139d 100644 --- a/packages/@react-spectrum/s2/intl/lv-LV.json +++ b/packages/@react-spectrum/s2/intl/lv-LV.json @@ -26,12 +26,15 @@ "notificationbadge.indicatorOnly": "Jauna aktivitāte", "notificationbadge.plus": "{notifications}+", "picker.placeholder": "Izvēlēties…", - "picker.selectedCount": "{count, plural, =0 {Nav atlasīts neviens vienums} one {Atlasīto vienumu skaits: #} other {Atlasīto vienumu skaits: #}}", + "picker.selectedCount": "{count, plural, =0 {Nav atlasīts neviens vienums} one {# vienums atlasīts} other {# ieraksti vienumi}}", "slider.maximum": "Maksimālā vērtība", "slider.minimum": "Minimālā vērtība", + "table.cancel": "Atcelt", + "table.editCell": "Rediģēt šūnu", "table.loading": "Notiek ielāde...", "table.loadingMore": "Tiek ielādēts vēl...", "table.resizeColumn": "Mainīt kolonnas lielumu", + "table.save": "Saglabāt", "table.sortAscending": "Kārtot augošā secībā", "table.sortDescending": "Kārtot dilstošā secībā", "tag.actions": "Darbības", diff --git a/packages/@react-spectrum/s2/intl/nb-NO.json b/packages/@react-spectrum/s2/intl/nb-NO.json index 74a143762ca..22f1735a94a 100644 --- a/packages/@react-spectrum/s2/intl/nb-NO.json +++ b/packages/@react-spectrum/s2/intl/nb-NO.json @@ -29,9 +29,12 @@ "picker.selectedCount": "{count, plural, =0 {Ingen elementer er valgt} one {# element er valgt} other {# elementer er valgt}}", "slider.maximum": "Maksimum", "slider.minimum": "Minimum", + "table.cancel": "Avbryt", + "table.editCell": "Rediger celle", "table.loading": "Laster inn...", "table.loadingMore": "Laster inn flere...", "table.resizeColumn": "Endre størrelse på kolonne", + "table.save": "Lagre", "table.sortAscending": "Sorter stigende", "table.sortDescending": "Sorter synkende", "tag.actions": "Handlinger", diff --git a/packages/@react-spectrum/s2/intl/nl-NL.json b/packages/@react-spectrum/s2/intl/nl-NL.json index 0db747b6997..ecf1ac9e266 100644 --- a/packages/@react-spectrum/s2/intl/nl-NL.json +++ b/packages/@react-spectrum/s2/intl/nl-NL.json @@ -29,9 +29,12 @@ "picker.selectedCount": "{count, plural, =0 {Geen items geselecteerd} one {# item geselecteerd} other {# items geselecteerd}}", "slider.maximum": "Maximum", "slider.minimum": "Minimum", + "table.cancel": "Annuleren", + "table.editCell": "Cel bewerken", "table.loading": "Laden...", "table.loadingMore": "Meer laden...", "table.resizeColumn": "Kolomgrootte wijzigen", + "table.save": "Opslaan", "table.sortAscending": "Oplopend sorteren", "table.sortDescending": "Aflopend sorteren", "tag.actions": "Acties", diff --git a/packages/@react-spectrum/s2/intl/pl-PL.json b/packages/@react-spectrum/s2/intl/pl-PL.json index 66d29db7d34..f32cae48324 100644 --- a/packages/@react-spectrum/s2/intl/pl-PL.json +++ b/packages/@react-spectrum/s2/intl/pl-PL.json @@ -26,12 +26,15 @@ "notificationbadge.indicatorOnly": "Nowa aktywność", "notificationbadge.plus": "{notifications}+", "picker.placeholder": "Zaznacz…", - "picker.selectedCount": "{count, plural, =0 {Nie zaznaczono żadnych elementów} one {# zaznaczony element} other {# zaznaczonych elementów}}", + "picker.selectedCount": "{count, plural, =0 {Nie zaznaczono żadnych elementów} one {# zaznaczony element} few {# zaznaczone elementy} many {# zaznaczonych elementów} other {# zaznaczonych elementów}}", "slider.maximum": "Maksimum", "slider.minimum": "Minimum", + "table.cancel": "Anuluj", + "table.editCell": "Edytuj komórkę", "table.loading": "Wczytywanie...", "table.loadingMore": "Wczytywanie większej liczby...", "table.resizeColumn": "Zmień rozmiar kolumny", + "table.save": "Zapisz", "table.sortAscending": "Sortuj rosnąco", "table.sortDescending": "Sortuj malejąco", "tag.actions": "Działania", diff --git a/packages/@react-spectrum/s2/intl/pt-BR.json b/packages/@react-spectrum/s2/intl/pt-BR.json index ac628a96544..cad34acb6ba 100644 --- a/packages/@react-spectrum/s2/intl/pt-BR.json +++ b/packages/@react-spectrum/s2/intl/pt-BR.json @@ -29,9 +29,12 @@ "picker.selectedCount": "{count, plural, =0 {Nenhum item selecionado} one {# item selecionado} other {# itens selecionados}}", "slider.maximum": "Máximo", "slider.minimum": "Mínimo", + "table.cancel": "Cancelar", + "table.editCell": "Editar célula", "table.loading": "Carregando...", "table.loadingMore": "Carregando mais...", "table.resizeColumn": "Redimensionar coluna", + "table.save": "Salvar", "table.sortAscending": "Ordenar por ordem crescente", "table.sortDescending": "Ordenar por ordem decrescente", "tag.actions": "Ações", diff --git a/packages/@react-spectrum/s2/intl/pt-PT.json b/packages/@react-spectrum/s2/intl/pt-PT.json index 4678701584b..5d688a911fe 100644 --- a/packages/@react-spectrum/s2/intl/pt-PT.json +++ b/packages/@react-spectrum/s2/intl/pt-PT.json @@ -26,12 +26,15 @@ "notificationbadge.indicatorOnly": "Nova atividade", "notificationbadge.plus": "{notifications}+", "picker.placeholder": "Selecionar…", - "picker.selectedCount": "{count, plural, =0 {Nenhum item selecionado} one {# item selecionado} other {# itens selecionados}}", + "picker.selectedCount": "{count, plural, =0 {Nenhum item selecionado} one {# item selecionado} other {# itens selecionados}}.", "slider.maximum": "Máximo", "slider.minimum": "Mínimo", + "table.cancel": "Cancelar", + "table.editCell": "Editar célula", "table.loading": "A carregar...", "table.loadingMore": "A carregar mais...", "table.resizeColumn": "Redimensionar coluna", + "table.save": "Guardar", "table.sortAscending": "Ordenar por ordem ascendente", "table.sortDescending": "Ordenar por ordem decrescente", "tag.actions": "Ações", diff --git a/packages/@react-spectrum/s2/intl/ro-RO.json b/packages/@react-spectrum/s2/intl/ro-RO.json index df2a88359ce..2ac95333790 100644 --- a/packages/@react-spectrum/s2/intl/ro-RO.json +++ b/packages/@react-spectrum/s2/intl/ro-RO.json @@ -26,12 +26,15 @@ "notificationbadge.indicatorOnly": "Activitate nouă", "notificationbadge.plus": "{notifications}+", "picker.placeholder": "Selectați…", - "picker.selectedCount": "{count, plural, =0 {Niciun element selectat} one {# element selectat} other {# elemente selectate}}", + "picker.selectedCount": "{count, plural, =0 {Niciun articol selectat} one {# articol selectat} other {# articole selectate}}", "slider.maximum": "Maximum", "slider.minimum": "Minimum", + "table.cancel": "Anulare", + "table.editCell": "Editați celula", "table.loading": "Se încarcă...", "table.loadingMore": "Se încarcă mai multe...", "table.resizeColumn": "Redimensionați coloana", + "table.save": "Salvați", "table.sortAscending": "Sortați crescător", "table.sortDescending": "Sortați descrescător", "tag.actions": "Acțiuni", diff --git a/packages/@react-spectrum/s2/intl/ru-RU.json b/packages/@react-spectrum/s2/intl/ru-RU.json index dd877691be5..e6548526d1a 100644 --- a/packages/@react-spectrum/s2/intl/ru-RU.json +++ b/packages/@react-spectrum/s2/intl/ru-RU.json @@ -2,11 +2,11 @@ "actionbar.actions": "Действия", "actionbar.actionsAvailable": "Действия доступны.", "actionbar.clearSelection": "Очистить выбор", - "actionbar.selected": "Выбрано: {count}", + "actionbar.selected": "{count, plural, =0 {Не выбрано} other {Выбрано #}}", "actionbar.selectedAll": "Выбрано все", "breadcrumbs.more": "Дополнительные элементы", "button.pending": "в ожидании", - "calendar.invalidSelection": "Выбранные {selectedCount, plural, one {дата} other {даты}} недоступны.", + "calendar.invalidSelection": "{selectedCount, plural, one {Выбранная дата недоступна} other {Выбранные даты недоступны}}.", "combobox.noResults": "Результаты отсутствуют", "contextualhelp.help": "Справка", "contextualhelp.info": "Информация", @@ -26,12 +26,15 @@ "notificationbadge.indicatorOnly": "Новая активность", "notificationbadge.plus": "{notifications}+", "picker.placeholder": "Выбрать…", - "picker.selectedCount": "{count, plural, =0 {Нет выбранных элементов} one {# элемент выбран} other {# элементов выбрано}}", + "picker.selectedCount": "{count, plural, =0 {Нет выбранных элементов} one {# элемент выбран} other {# эл. выбрано}}", "slider.maximum": "Максимум", "slider.minimum": "Минимум", + "table.cancel": "Отмена", + "table.editCell": "Редактировать ячейку", "table.loading": "Загрузка...", "table.loadingMore": "Дополнительная загрузка...", "table.resizeColumn": "Изменить размер столбца", + "table.save": "Сохранить", "table.sortAscending": "Сортировать по возрастанию", "table.sortDescending": "Сортировать по убыванию", "tag.actions": "Действия", diff --git a/packages/@react-spectrum/s2/intl/sk-SK.json b/packages/@react-spectrum/s2/intl/sk-SK.json index 35616f124e2..001ccfea64d 100644 --- a/packages/@react-spectrum/s2/intl/sk-SK.json +++ b/packages/@react-spectrum/s2/intl/sk-SK.json @@ -26,12 +26,15 @@ "notificationbadge.indicatorOnly": "Nová aktivita", "notificationbadge.plus": "{notifications}+", "picker.placeholder": "Vybrať…", - "picker.selectedCount": "{count, plural, =0 {Žiadne vybraté položky} one {# vybratá položka} other {Počet vybratých položiek:#}}", + "picker.selectedCount": "{count, plural, =0 {Žiadne vybraté položky} one {# vybratá položka} other {Počet vybratých položiek #}}", "slider.maximum": "Maximum", "slider.minimum": "Minimum", + "table.cancel": "Zrušiť", + "table.editCell": "Upraviť bunku", "table.loading": "Načítava sa...", "table.loadingMore": "Načítava sa viac...", "table.resizeColumn": "Zmeniť veľkosť stĺpca", + "table.save": "Uložiť", "table.sortAscending": "Zoradiť vzostupne", "table.sortDescending": "Zoradiť zostupne", "tag.actions": "Akcie", diff --git a/packages/@react-spectrum/s2/intl/sl-SI.json b/packages/@react-spectrum/s2/intl/sl-SI.json index 83336132f92..f48cd9f05fa 100644 --- a/packages/@react-spectrum/s2/intl/sl-SI.json +++ b/packages/@react-spectrum/s2/intl/sl-SI.json @@ -26,12 +26,15 @@ "notificationbadge.indicatorOnly": "Nova dejavnost", "notificationbadge.plus": "{notifications}+", "picker.placeholder": "Izberite…", - "picker.selectedCount": "{count, plural, =0 {Noben element ni izbran} one {# element je izbran} other {# elementov je izbranih}}", + "picker.selectedCount": "{count, plural, =0 {Ni izbranih elementov} one {izbran je # element} other {izbranih je # elementov}}.", "slider.maximum": "Največji", "slider.minimum": "Najmanj", + "table.cancel": "Prekliči", + "table.editCell": "Uredi celico", "table.loading": "Nalaganje...", "table.loadingMore": "Nalaganje več vsebine...", "table.resizeColumn": "Spremeni velikost stolpca", + "table.save": "Shrani", "table.sortAscending": "Razvrsti naraščajoče", "table.sortDescending": "Razvrsti padajoče", "tag.actions": "Dejanja", diff --git a/packages/@react-spectrum/s2/intl/sr-SP.json b/packages/@react-spectrum/s2/intl/sr-SP.json index cad130e5cb4..70fa7c74cb5 100644 --- a/packages/@react-spectrum/s2/intl/sr-SP.json +++ b/packages/@react-spectrum/s2/intl/sr-SP.json @@ -26,12 +26,15 @@ "notificationbadge.indicatorOnly": "Nova aktivnost", "notificationbadge.plus": "{notifications}+", "picker.placeholder": "Izaberite...", - "picker.selectedCount": "{count, plural, =0 {Nije izabrana nijedna stavka} one {Izabrana je # stavka} other {Izabrano je # stavki}}", + "picker.selectedCount": "{count, plural, =0 {No items selected} one {# item selected} other {# items selected}}", "slider.maximum": "Najviše", "slider.minimum": "Najmanje", + "table.cancel": "Otkaži", + "table.editCell": "Uredi ćeliju", "table.loading": "Učitavam...", "table.loadingMore": "Učitavam još...", "table.resizeColumn": "Promeni veličinu kolone", + "table.save": "Sačuvaj", "table.sortAscending": "Sortiraj po rastućem redosledu", "table.sortDescending": "Sortiraj po opadajućem redosledu", "tag.actions": "Radnje", diff --git a/packages/@react-spectrum/s2/intl/sv-SE.json b/packages/@react-spectrum/s2/intl/sv-SE.json index a7d5a894872..2caf584ba88 100644 --- a/packages/@react-spectrum/s2/intl/sv-SE.json +++ b/packages/@react-spectrum/s2/intl/sv-SE.json @@ -26,12 +26,15 @@ "notificationbadge.indicatorOnly": "Ny aktivitet", "notificationbadge.plus": "{notifications}+", "picker.placeholder": "Välj…", - "picker.selectedCount": "{count, plural, =0 {Inga markerade objekt} one {# markerat objekt} other {# markerade objekt}}", + "picker.selectedCount": "{count, plural, =0 {Inga objekt markerade} one {# objekt markerat} other {# objekt markerade}}.", "slider.maximum": "Maximum", "slider.minimum": "Minimum", + "table.cancel": "Avbryt", + "table.editCell": "Redigera cell", "table.loading": "Läser in...", "table.loadingMore": "Läser in mer...", "table.resizeColumn": "Ändra storlek på kolumn", + "table.save": "Spara", "table.sortAscending": "Sortera i stigande ordning", "table.sortDescending": "Sortera i fallande ordning", "tag.actions": "Åtgärder", diff --git a/packages/@react-spectrum/s2/intl/tr-TR.json b/packages/@react-spectrum/s2/intl/tr-TR.json index f9aa48680a0..cbb84153287 100644 --- a/packages/@react-spectrum/s2/intl/tr-TR.json +++ b/packages/@react-spectrum/s2/intl/tr-TR.json @@ -29,9 +29,12 @@ "picker.selectedCount": "{count, plural, =0 {Hiçbir öge seçilmedi} one {# öge seçildi} other {# öge seçildi}}", "slider.maximum": "Maksimum", "slider.minimum": "Minimum", + "table.cancel": "İptal et", + "table.editCell": "Hücreyi düzenle", "table.loading": "Yükleniyor...", "table.loadingMore": "Daha fazla yükleniyor...", "table.resizeColumn": "Sütunu yeniden boyutlandır", + "table.save": "Kaydet", "table.sortAscending": "Artan Sıralama", "table.sortDescending": "Azalan Sıralama", "tag.actions": "Eylemler", diff --git a/packages/@react-spectrum/s2/intl/uk-UA.json b/packages/@react-spectrum/s2/intl/uk-UA.json index c78c03d9ce6..ff7025bd7da 100644 --- a/packages/@react-spectrum/s2/intl/uk-UA.json +++ b/packages/@react-spectrum/s2/intl/uk-UA.json @@ -29,9 +29,12 @@ "picker.selectedCount": "{count, plural, =0 {Жодних елементів не вибрано} one {# елемент вибрано} other {Вибрано елементів: #}}", "slider.maximum": "Максимум", "slider.minimum": "Мінімум", + "table.cancel": "Скасувати", + "table.editCell": "Редагувати клітинку", "table.loading": "Завантаження…", "table.loadingMore": "Завантаження інших об’єктів...", "table.resizeColumn": "Змінити розмір стовпця", + "table.save": "Зберегти", "table.sortAscending": "Сортувати за зростанням", "table.sortDescending": "Сортувати за спаданням", "tag.actions": "Дії", diff --git a/packages/@react-spectrum/s2/intl/zh-CN.json b/packages/@react-spectrum/s2/intl/zh-CN.json index 83fb0898fb1..9c94e3a820a 100644 --- a/packages/@react-spectrum/s2/intl/zh-CN.json +++ b/packages/@react-spectrum/s2/intl/zh-CN.json @@ -26,12 +26,15 @@ "notificationbadge.indicatorOnly": "新活动", "notificationbadge.plus": "{notifications}+", "picker.placeholder": "选择...", - "picker.selectedCount": "{count, plural, =0 {未选择项目} one {已选择 # 个项目} other {已选择 # 个项目}}", + "picker.selectedCount": "{count, plural, =0 {未选择任何项} one {已选择 # 个项} other {已选择 # 个项}}", "slider.maximum": "最大", "slider.minimum": "最小", + "table.cancel": "取消", + "table.editCell": "编辑单元格", "table.loading": "正在加载...", "table.loadingMore": "正在加载更多...", "table.resizeColumn": "调整列大小", + "table.save": "保存", "table.sortAscending": "升序排序", "table.sortDescending": "降序排序", "tag.actions": "操作", diff --git a/packages/@react-spectrum/s2/intl/zh-TW.json b/packages/@react-spectrum/s2/intl/zh-TW.json index e098b8c221e..8496c287826 100644 --- a/packages/@react-spectrum/s2/intl/zh-TW.json +++ b/packages/@react-spectrum/s2/intl/zh-TW.json @@ -29,9 +29,12 @@ "picker.selectedCount": "{count, plural, =0 {未選取任何項目} one {已選取 # 個項目} other {已選取 # 個項目}}", "slider.maximum": "最大值", "slider.minimum": "最小值", + "table.cancel": "取消", + "table.editCell": "編輯儲存格", "table.loading": "載入中…", "table.loadingMore": "正在載入更多…", "table.resizeColumn": "調整欄大小", + "table.save": "儲存", "table.sortAscending": "升序排序", "table.sortDescending": "降序排序", "tag.actions": "動作", diff --git a/packages/@react-spectrum/s2/src/Accordion.tsx b/packages/@react-spectrum/s2/src/Accordion.tsx index 07f2763055b..554d6e5d482 100644 --- a/packages/@react-spectrum/s2/src/Accordion.tsx +++ b/packages/@react-spectrum/s2/src/Accordion.tsx @@ -11,10 +11,19 @@ */ import {ContextValue, DisclosureGroup, DisclosureGroupProps, SlotProps} from 'react-aria-components'; -import {DisclosureContext} from './Disclosure'; +import { + Disclosure, + DisclosureContext, + DisclosureHeader, + DisclosurePanel, + DisclosurePanelProps, + DisclosureProps, + DisclosureTitle, + DisclosureTitleProps +} from './Disclosure'; import {DOMProps, DOMRef, DOMRefValue, GlobalDOMAttributes} from '@react-types/shared'; import {getAllowedOverrides, StylesPropWithHeight, UnsafeStyles} from './style-utils' with { type: 'macro' }; -import React, {createContext, forwardRef} from 'react'; +import React, {createContext, forwardRef, ReactNode} from 'react'; import {style} from '../style' with { type: 'macro' }; import {useDOMRef} from '@react-spectrum/utils'; import {useSpectrumContextProps} from './useSpectrumContextProps'; @@ -70,3 +79,40 @@ export const Accordion = forwardRef(function Accordion(props: AccordionProps, re ); }); + +export interface AccordionItemProps extends DisclosureProps { + /** The contents of the accordion, consisting of a AccordionItemTitle and AccordionItemPanel. */ + children: ReactNode +} +/** + * A accordion item is a collapsible section of content. It is composed of a header with a heading and trigger button, and a panel that contains the content. + */ +export const AccordionItem = forwardRef(function AccordionItem(props: AccordionItemProps, ref: DOMRef) { + return ; +}); + +export interface AccordionItemTitleProps extends DisclosureTitleProps {} +/** + * An accordion item title consisting of a heading and a trigger button to expand/collapse the panel. + */ +export const AccordionItemTitle = forwardRef(function AccordionItemTitle(props: AccordionItemTitleProps, ref: DOMRef) { + return ; +}); + +export interface AccordionItemHeaderProps extends UnsafeStyles, DOMProps { + children: React.ReactNode +} +/** + * A wrapper element for the accordion item title that can contain other elements not part of the trigger. + */ +export const AccordionItemHeader = forwardRef(function AccordionItemHeader(props: AccordionItemHeaderProps, ref: DOMRef) { + return ; +}); + +export interface AccordionItemPanelProps extends DisclosurePanelProps {} +/** + * An accordion item panel is a collapsible section of content that is hidden until the accordion item is expanded. + */ +export const AccordionItemPanel = forwardRef(function AccordionItemPanel(props: AccordionItemPanelProps, ref: DOMRef) { + return ; +}); diff --git a/packages/@react-spectrum/s2/src/Content.tsx b/packages/@react-spectrum/s2/src/Content.tsx index e7086d4a568..662dff0a2a2 100644 --- a/packages/@react-spectrum/s2/src/Content.tsx +++ b/packages/@react-spectrum/s2/src/Content.tsx @@ -24,7 +24,12 @@ interface ContentProps extends UnsafeStyles, SlotProps { children: ReactNode, styles?: StyleString, isHidden?: boolean, - id?: string + id?: string, + itemProp?: string, + itemScope?: boolean, + itemType?: string, + itemID?: string, + itemRef?: string } interface HeadingProps extends Omit { diff --git a/packages/@react-spectrum/s2/src/Disclosure.tsx b/packages/@react-spectrum/s2/src/Disclosure.tsx index 08a1d6cab8d..be518872495 100644 --- a/packages/@react-spectrum/s2/src/Disclosure.tsx +++ b/packages/@react-spectrum/s2/src/Disclosure.tsx @@ -66,7 +66,7 @@ const disclosure = style({ }, getAllowedOverrides()); /** - * A disclosure is a collapsible section of content. It is composed of a a header with a heading and trigger button, and a panel that contains the content. + * A disclosure is a collapsible section of content. It is composed of a header with a heading and trigger button, and a panel that contains the content. */ export const Disclosure = forwardRef(function Disclosure(props: DisclosureProps, ref: DOMRef) { [props, ref] = useSpectrumContextProps(props, ref, DisclosureContext); @@ -99,7 +99,7 @@ export const Disclosure = forwardRef(function Disclosure(props: DisclosureProps, export interface DisclosureTitleProps extends UnsafeStyles, DOMProps { /** The heading level of the disclosure header. - * + * * @default 3 */ level?: number, @@ -342,4 +342,3 @@ export const DisclosurePanel = forwardRef(function DisclosurePanel(props: Disclo ); }); - diff --git a/packages/@react-spectrum/s2/src/index.ts b/packages/@react-spectrum/s2/src/index.ts index 25629e375f2..9543dc1fc2b 100644 --- a/packages/@react-spectrum/s2/src/index.ts +++ b/packages/@react-spectrum/s2/src/index.ts @@ -12,7 +12,7 @@ 'use client'; -export {Accordion, AccordionContext} from './Accordion'; +export {Accordion, AccordionContext, AccordionItem, AccordionItemHeader, AccordionItemTitle, AccordionItemPanel} from './Accordion'; export {ActionBar, ActionBarContext} from './ActionBar'; export {ActionButton, ActionButtonContext} from './ActionButton'; export {ActionButtonGroup, ActionButtonGroupContext} from './ActionButtonGroup'; @@ -96,7 +96,7 @@ export {Collection} from 'react-aria-components'; export {FileTrigger} from 'react-aria-components'; export {parseColor} from 'react-aria-components'; -export type {AccordionProps} from './Accordion'; +export type {AccordionProps, AccordionItemProps, AccordionItemHeaderProps, AccordionItemTitleProps, AccordionItemPanelProps} from './Accordion'; export type {ActionBarProps} from './ActionBar'; export type {ActionButtonProps} from './ActionButton'; export type {ActionButtonGroupProps} from './ActionButtonGroup'; diff --git a/packages/@react-spectrum/s2/stories/Accordion.stories.tsx b/packages/@react-spectrum/s2/stories/Accordion.stories.tsx index a655b90d5a6..2d38fedbec3 100644 --- a/packages/@react-spectrum/s2/stories/Accordion.stories.tsx +++ b/packages/@react-spectrum/s2/stories/Accordion.stories.tsx @@ -10,7 +10,7 @@ * governing permissions and limitations under the License. */ -import {Accordion, ActionButton, Disclosure, DisclosureHeader, DisclosurePanel, DisclosureTitle, TextField} from '../src'; +import {Accordion, AccordionItem, AccordionItemHeader, AccordionItemPanel, AccordionItemTitle, ActionButton, TextField} from '../src'; import {Key} from 'react-aria'; import type {Meta, StoryObj} from '@storybook/react'; import NewIcon from '../s2wf-icons/S2_Icon_New_20_N.svg'; @@ -38,22 +38,22 @@ export const Example: Story = { return (
- - + + Files - - + + Files content - - - - + + + + People - - + + - - + +
); @@ -65,57 +65,57 @@ export const WithLongTitle: Story = { return (
- - + + Files - - + + Files content - - - - + + + + People - - + + People content - - - - + + + + Very very very very very long title that wraps - - + + Accordion content - - + +
); } }; -export const WithDisabledDisclosure: Story = { +export const WithDisabledItem: Story = { render: (args) => { return (
- - + + Files - - + + Files content - - - - + + + + People - - + + - - + +
); @@ -128,7 +128,7 @@ WithLongTitle.parameters = { } }; -WithDisabledDisclosure.parameters = { +WithDisabledItem.parameters = { docs: { disable: true } @@ -142,22 +142,22 @@ function ControlledAccordion(props) { onExpandedChange={setExpandedKeys} expandedKeys={expandedKeys} {...props}> - - + + Files - - + + Files content - - - - + + + + People - - + + - - + +
Expanded keys: {expandedKeys.size ? Array.from(expandedKeys).join(', ') : 'none'}
@@ -180,22 +180,22 @@ export const ControlledOpen: Story = { - - + + Files - - + + Files content - - - - + + + + People - - + + - - + + ); } @@ -212,28 +212,28 @@ export const WithActionButton: Story = { return (
- - - + + + Files - + - - + + Files content - - - - - + + + + + People - + - - + + - - + +
); diff --git a/packages/@react-spectrum/s2/style/spectrum-theme.ts b/packages/@react-spectrum/s2/style/spectrum-theme.ts index 2db0fe14fa6..e38a203845d 100644 --- a/packages/@react-spectrum/s2/style/spectrum-theme.ts +++ b/packages/@react-spectrum/s2/style/spectrum-theme.ts @@ -395,7 +395,7 @@ const radius = { }; type GridTrack = 'none' | 'subgrid' | (string & {}) | readonly GridTrackSize[]; -type GridTrackSize = 'auto' | 'min-content' | 'max-content' | `${number}fr` | `minmax(${string}, ${string})` | keyof typeof baseSpacing | (string & {}); +type GridTrackSize = 'auto' | 'min-content' | 'max-content' | `${number}fr` | `minmax(${string}, ${string})` | number | (string & {}); let gridTrack = (value: GridTrack) => { if (typeof value === 'string') { @@ -405,7 +405,7 @@ let gridTrack = (value: GridTrack) => { }; let gridTrackSize = (value: GridTrackSize) => { - return value in baseSpacing ? baseSpacing[value] : value; + return typeof value === 'number' ? size(value) : value; }; const transitionProperty = { diff --git a/packages/@react-stately/datepicker/intl/ko-KR.json b/packages/@react-stately/datepicker/intl/ko-KR.json index c676bc10a3d..4b813ba32d0 100644 --- a/packages/@react-stately/datepicker/intl/ko-KR.json +++ b/packages/@react-stately/datepicker/intl/ko-KR.json @@ -1,6 +1,6 @@ { "rangeOverflow": "값은 {maxValue} 이전이어야 합니다.", "rangeReversed": "시작일은 종료일 이전이어야 합니다.", - "rangeUnderflow": "값은 {minValue} 이상이어야 합니다.", + "rangeUnderflow": "값은 {minValue} 이후여야 합니다.", "unavailableDate": "선택한 날짜를 사용할 수 없습니다." } diff --git a/packages/dev/docs/pages/assets/rtl-actual-placeholder.svg b/packages/dev/docs/pages/assets/rtl-actual-placeholder.svg index f5ff855aafb..3cbbf951f0b 100644 --- a/packages/dev/docs/pages/assets/rtl-actual-placeholder.svg +++ b/packages/dev/docs/pages/assets/rtl-actual-placeholder.svg @@ -1,4 +1,4 @@ - + diff --git a/packages/dev/docs/pages/assets/rtl-timefield.svg b/packages/dev/docs/pages/assets/rtl-timefield.svg index ea621765b97..35ab77640e8 100644 --- a/packages/dev/docs/pages/assets/rtl-timefield.svg +++ b/packages/dev/docs/pages/assets/rtl-timefield.svg @@ -1,4 +1,4 @@ - + Incorrect (he-IL) diff --git a/packages/dev/docs/pages/react-aria/home/ExampleApp.tsx b/packages/dev/docs/pages/react-aria/home/ExampleApp.tsx index c7b0ccf8594..5fdeae863f8 100644 --- a/packages/dev/docs/pages/react-aria/home/ExampleApp.tsx +++ b/packages/dev/docs/pages/react-aria/home/ExampleApp.tsx @@ -174,11 +174,11 @@ export function ExampleApp(): React.ReactNode { return (
- + - Filters @@ -186,7 +186,7 @@ export function ExampleApp(): React.ReactNode { Filters - {filters > 0 && } + {filters > 0 && }
Favorite @@ -209,7 +209,7 @@ export function ExampleApp(): React.ReactNode { - Columns @@ -222,7 +222,7 @@ export function ExampleApp(): React.ReactNode { - @@ -237,9 +237,9 @@ export function ExampleApp(): React.ReactNode {
{item.common_name} - {item.scientific_name} + {item.scientific_name} - + onAction(item, action)}> {item.isFavorite ? 'Unfavorite' : 'Favorite'} Edit… @@ -283,7 +283,7 @@ export function ExampleApp(): React.ReactNode {
{item.common_name} - {item.scientific_name} + {item.scientific_name}
); @@ -297,7 +297,7 @@ export function ExampleApp(): React.ReactNode { return ( - onAction(item, action)}> @@ -340,7 +340,7 @@ export function ExampleApp(): React.ReactNode { } const labelStyles = { - gray: 'bg-gray-100 text-gray-600 border-gray-200 dark:bg-zinc-700 dark:text-zinc-300 dark:border-zinc-600', + gray: 'bg-neutral-100 text-neutral-600 border-neutral-200 dark:bg-neutral-700 dark:text-neutral-300 dark:border-neutral-600', green: 'bg-green-100 text-green-700 border-green-200 dark:bg-green-300/20 dark:text-green-400 dark:border-green-300/10', yellow: 'bg-yellow-100 text-yellow-700 border-yellow-200 dark:bg-yellow-300/20 dark:text-yellow-400 dark:border-yellow-300/10', blue: 'bg-blue-100 text-blue-700 border-blue-200 dark:bg-blue-400/20 dark:text-blue-300 dark:border-blue-400/10' @@ -399,7 +399,7 @@ function PlantDialog({item, onSave}: {item?: Plant | null, onSave: (item: Plant) <> + className="text-2xl font-semibold leading-6 my-0 text-neutral-700 dark:text-neutral-300"> {item ? 'Edit Plant' : 'Add Plant'}
+ className="w-24 sm:w-32 p-2 box-border flex items-center justify-center shrink-0 border-2 border-neutral-400 border-dashed rounded-xl text-neutral-500 dark:text-neutral-300 focus-visible:border-blue-600 forced-colors:focus-visible:border-[Highlight] focus-visible:border-solid drop-target:border-blue-600 forced-colors:drop-target:border-[Highlight] drop-target:border-solid drop-target:bg-blue-200 dark:drop-target:bg-blue-800/60 drop-target:text-blue-600 dark:drop-target:text-blue-300"> {droppedImage ? : Drop or paste image here @@ -432,10 +432,10 @@ function PlantDialog({item, onSave}: {item?: Plant | null, onSave: (item: Plant)
- + {plant => {plant.common_name}} - +
- + {plant => {plant.common_name}} - +