Skip to content

Commit 8ba86d8

Browse files
majornistamajornista
authored
Merge branch 'main' into 1999
2 parents 42e258b + 4a076b3 commit 8ba86d8

File tree

311 files changed

+2763
-1945
lines changed

Some content is hidden

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

311 files changed

+2763
-1945
lines changed

‎package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
"devDependencies": {
5252
"@actions/core": "^1.1.0",
5353
"@actions/github": "^1.1.0",
54-
"@adobe/spectrum-css-workflow-icons": "^1.0.0",
5554
"@babel/cli": "^7.12.10",
5655
"@babel/core": "^7.12.10",
5756
"@babel/node": "^7.12.10",

‎packages/@adobe/react-spectrum/package.json

Lines changed: 46 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@adobe/react-spectrum",
3-
"version": "3.20.0",
3+
"version": "3.21.1",
44
"description": "Spectrum UI components in React",
55
"license": "Apache-2.0",
66
"main": "dist/main.js",
@@ -19,51 +19,52 @@
1919
"url": "https://github.com/adobe/react-spectrum"
2020
},
2121
"dependencies": {
22-
"@react-aria/i18n": "^3.5.0",
22+
"@react-aria/i18n": "^3.6.0",
2323
"@react-aria/ssr": "^3.3.0",
24-
"@react-aria/visually-hidden": "^3.4.0",
25-
"@react-spectrum/actiongroup": "^3.6.0",
26-
"@react-spectrum/breadcrumbs": "^3.5.0",
27-
"@react-spectrum/button": "^3.9.0",
28-
"@react-spectrum/buttongroup": "^3.4.0",
29-
"@react-spectrum/calendar": "^3.1.0",
30-
"@react-spectrum/checkbox": "^3.5.0",
31-
"@react-spectrum/combobox": "^3.5.0",
32-
"@react-spectrum/contextualhelp": "^3.2.0",
33-
"@react-spectrum/datepicker": "^3.1.0",
34-
"@react-spectrum/dialog": "^3.5.0",
35-
"@react-spectrum/divider": "^3.4.0",
36-
"@react-spectrum/form": "^3.4.0",
37-
"@react-spectrum/icon": "^3.5.0",
38-
"@react-spectrum/illustratedmessage": "^3.3.0",
39-
"@react-spectrum/image": "^3.3.0",
40-
"@react-spectrum/layout": "^3.4.0",
41-
"@react-spectrum/link": "^3.4.0",
42-
"@react-spectrum/listbox": "^3.7.0",
43-
"@react-spectrum/menu": "^3.8.0",
44-
"@react-spectrum/meter": "^3.3.0",
45-
"@react-spectrum/numberfield": "^3.4.0",
46-
"@react-spectrum/overlays": "^3.7.0",
47-
"@react-spectrum/picker": "^3.7.0",
48-
"@react-spectrum/progress": "^3.3.0",
49-
"@react-spectrum/provider": "^3.5.0",
50-
"@react-spectrum/radio": "^3.3.0",
51-
"@react-spectrum/searchfield": "^3.5.0",
52-
"@react-spectrum/slider": "^3.2.0",
53-
"@react-spectrum/statuslight": "^3.4.0",
54-
"@react-spectrum/switch": "^3.3.0",
55-
"@react-spectrum/table": "^3.3.0",
56-
"@react-spectrum/tabs": "^3.3.0",
57-
"@react-spectrum/text": "^3.3.0",
58-
"@react-spectrum/textfield": "^3.6.0",
59-
"@react-spectrum/theme-dark": "^3.3.2",
60-
"@react-spectrum/theme-default": "^3.3.2",
61-
"@react-spectrum/theme-light": "^3.2.2",
62-
"@react-spectrum/tooltip": "^3.3.0",
63-
"@react-spectrum/view": "^3.3.0",
64-
"@react-spectrum/well": "^3.3.0",
65-
"@react-stately/collections": "^3.4.2",
66-
"@react-stately/data": "^3.6.0"
24+
"@react-aria/visually-hidden": "^3.4.1",
25+
"@react-spectrum/actiongroup": "^3.6.1",
26+
"@react-spectrum/breadcrumbs": "^3.5.1",
27+
"@react-spectrum/button": "^3.9.1",
28+
"@react-spectrum/buttongroup": "^3.4.1",
29+
"@react-spectrum/calendar": "^3.1.1",
30+
"@react-spectrum/checkbox": "^3.5.1",
31+
"@react-spectrum/combobox": "^3.5.1",
32+
"@react-spectrum/contextualhelp": "^3.2.1",
33+
"@react-spectrum/datepicker": "^3.1.2",
34+
"@react-spectrum/dialog": "^3.5.1",
35+
"@react-spectrum/divider": "^3.4.1",
36+
"@react-spectrum/form": "^3.4.1",
37+
"@react-spectrum/icon": "^3.6.0",
38+
"@react-spectrum/illustratedmessage": "^3.3.1",
39+
"@react-spectrum/image": "^3.3.1",
40+
"@react-spectrum/layout": "^3.4.1",
41+
"@react-spectrum/link": "^3.4.1",
42+
"@react-spectrum/list": "^3.0.0",
43+
"@react-spectrum/listbox": "^3.7.1",
44+
"@react-spectrum/menu": "^3.8.1",
45+
"@react-spectrum/meter": "^3.3.1",
46+
"@react-spectrum/numberfield": "^3.4.1",
47+
"@react-spectrum/overlays": "^3.7.1",
48+
"@react-spectrum/picker": "^3.7.1",
49+
"@react-spectrum/progress": "^3.3.1",
50+
"@react-spectrum/provider": "^3.5.1",
51+
"@react-spectrum/radio": "^3.3.1",
52+
"@react-spectrum/searchfield": "^3.5.1",
53+
"@react-spectrum/slider": "^3.2.1",
54+
"@react-spectrum/statuslight": "^3.4.1",
55+
"@react-spectrum/switch": "^3.3.1",
56+
"@react-spectrum/table": "^3.3.1",
57+
"@react-spectrum/tabs": "^3.3.1",
58+
"@react-spectrum/text": "^3.3.1",
59+
"@react-spectrum/textfield": "^3.7.0",
60+
"@react-spectrum/theme-dark": "^3.3.3",
61+
"@react-spectrum/theme-default": "^3.3.3",
62+
"@react-spectrum/theme-light": "^3.2.3",
63+
"@react-spectrum/tooltip": "^3.3.1",
64+
"@react-spectrum/view": "^3.3.1",
65+
"@react-spectrum/well": "^3.3.1",
66+
"@react-stately/collections": "^3.4.3",
67+
"@react-stately/data": "^3.6.1"
6768
},
6869
"publishConfig": {
6970
"access": "public"

‎packages/@adobe/react-spectrum/src/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ export {Image} from '@react-spectrum/image';
2828
export {Flex, Grid, fitContent, minmax, repeat} from '@react-spectrum/layout';
2929
export {Link} from '@react-spectrum/link';
3030
export {ListBox} from '@react-spectrum/listbox';
31+
export {ListView} from '@react-spectrum/list';
3132
export {ActionMenu, Menu, MenuTrigger} from '@react-spectrum/menu';
3233
export {Meter} from '@react-spectrum/meter';
3334
export {NumberField} from '@react-spectrum/numberfield';
@@ -73,6 +74,7 @@ export type {SpectrumImageProps} from '@react-spectrum/image';
7374
export type {DimensionValue, FlexProps, GridProps} from '@react-spectrum/layout';
7475
export type {SpectrumLinkProps} from '@react-spectrum/link';
7576
export type {SpectrumListBoxProps} from '@react-spectrum/listbox';
77+
export type {SpectrumListViewProps} from '@react-spectrum/list';
7678
export type {SpectrumActionMenuProps, SpectrumMenuProps, SpectrumMenuTriggerProps} from '@react-spectrum/menu';
7779
export type {SpectrumMeterProps} from '@react-spectrum/meter';
7880
export type {SpectrumNumberFieldProps} from '@react-spectrum/numberfield';

‎packages/@adobe/spectrum-css-temp/components/button/index.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,11 @@ governing permissions and limitations under the License.
170170
.spectrum-Button-label + .spectrum-Icon {
171171
margin-inline-end: var(--spectrum-button-primary-text-gap);
172172
}
173+
174+
&.spectrum-Button--iconOnly {
175+
min-inline-size: unset;
176+
padding: var(--spectrum-global-dimension-size-65);
177+
}
173178
}
174179

175180
a.spectrum-Button,

‎packages/@react-aria/accordion/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-aria/accordion",
3-
"version": "3.0.0-alpha.10",
3+
"version": "3.0.0-alpha.11",
44
"description": "Spectrum UI components in React",
55
"license": "Apache-2.0",
66
"main": "dist/main.js",
@@ -18,14 +18,14 @@
1818
},
1919
"dependencies": {
2020
"@babel/runtime": "^7.6.2",
21-
"@react-aria/button": "^3.6.0",
22-
"@react-aria/interactions": "^3.10.0",
23-
"@react-aria/selection": "^3.10.0",
24-
"@react-aria/utils": "^3.13.2",
25-
"@react-stately/tree": "^3.3.2",
26-
"@react-types/accordion": "3.0.0-alpha.8",
27-
"@react-types/button": "^3.6.0",
28-
"@react-types/shared": "^3.14.0"
21+
"@react-aria/button": "^3.6.1",
22+
"@react-aria/interactions": "^3.11.0",
23+
"@react-aria/selection": "^3.10.1",
24+
"@react-aria/utils": "^3.13.3",
25+
"@react-stately/tree": "^3.3.3",
26+
"@react-types/accordion": "3.0.0-alpha.9",
27+
"@react-types/button": "^3.6.1",
28+
"@react-types/shared": "^3.14.1"
2929
},
3030
"peerDependencies": {
3131
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0"

‎packages/@react-aria/actiongroup/package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-aria/actiongroup",
3-
"version": "3.4.0",
3+
"version": "3.4.1",
44
"description": "Spectrum UI components in React",
55
"license": "Apache-2.0",
66
"main": "dist/main.js",
@@ -18,15 +18,15 @@
1818
},
1919
"dependencies": {
2020
"@babel/runtime": "^7.6.2",
21-
"@react-aria/focus": "^3.7.0",
22-
"@react-aria/i18n": "^3.5.0",
23-
"@react-aria/interactions": "^3.10.0",
24-
"@react-aria/selection": "^3.10.0",
25-
"@react-aria/utils": "^3.13.2",
26-
"@react-stately/collections": "^3.4.2",
27-
"@react-stately/list": "^3.5.2",
28-
"@react-types/actiongroup": "^3.3.2",
29-
"@react-types/shared": "^3.14.0"
21+
"@react-aria/focus": "^3.8.0",
22+
"@react-aria/i18n": "^3.6.0",
23+
"@react-aria/interactions": "^3.11.0",
24+
"@react-aria/selection": "^3.10.1",
25+
"@react-aria/utils": "^3.13.3",
26+
"@react-stately/collections": "^3.4.3",
27+
"@react-stately/list": "^3.5.3",
28+
"@react-types/actiongroup": "^3.3.3",
29+
"@react-types/shared": "^3.14.1"
3030
},
3131
"peerDependencies": {
3232
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0"

‎packages/@react-aria/aria-modal-polyfill/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-aria/aria-modal-polyfill",
3-
"version": "3.5.2",
3+
"version": "3.5.3",
44
"description": "Spectrum UI components in React",
55
"license": "Apache-2.0",
66
"main": "dist/main.js",
@@ -18,7 +18,7 @@
1818
},
1919
"dependencies": {
2020
"@babel/runtime": "^7.6.2",
21-
"@react-types/shared": "^3.14.0",
21+
"@react-types/shared": "^3.14.1",
2222
"aria-hidden": "^1.1.1"
2323
},
2424
"peerDependencies": {

‎packages/@react-aria/autocomplete/package.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-aria/autocomplete",
3-
"version": "3.0.0-alpha.9",
3+
"version": "3.0.0-alpha.10",
44
"description": "Spectrum UI components in React",
55
"license": "Apache-2.0",
66
"main": "dist/main.js",
@@ -18,23 +18,23 @@
1818
},
1919
"dependencies": {
2020
"@babel/runtime": "^7.6.2",
21-
"@react-aria/combobox": "^3.4.0",
22-
"@react-aria/i18n": "^3.5.0",
23-
"@react-aria/listbox": "^3.6.0",
21+
"@react-aria/combobox": "^3.4.1",
22+
"@react-aria/i18n": "^3.6.0",
23+
"@react-aria/listbox": "^3.6.1",
2424
"@react-aria/live-announcer": "^3.1.1",
25-
"@react-aria/menu": "^3.6.0",
26-
"@react-aria/overlays": "^3.10.0",
27-
"@react-aria/searchfield": "^3.4.0",
28-
"@react-aria/selection": "^3.10.0",
29-
"@react-aria/textfield": "^3.7.0",
30-
"@react-aria/utils": "^3.13.2",
31-
"@react-stately/collections": "^3.4.2",
32-
"@react-stately/combobox": "^3.2.0",
33-
"@react-types/autocomplete": "3.0.0-alpha.7",
34-
"@react-types/button": "^3.6.0",
35-
"@react-types/combobox": "^3.5.2",
36-
"@react-types/searchfield": "^3.3.2",
37-
"@react-types/shared": "^3.14.0"
25+
"@react-aria/menu": "^3.6.1",
26+
"@react-aria/overlays": "^3.10.1",
27+
"@react-aria/searchfield": "^3.4.1",
28+
"@react-aria/selection": "^3.10.1",
29+
"@react-aria/textfield": "^3.7.1",
30+
"@react-aria/utils": "^3.13.3",
31+
"@react-stately/collections": "^3.4.3",
32+
"@react-stately/combobox": "^3.2.1",
33+
"@react-types/autocomplete": "3.0.0-alpha.8",
34+
"@react-types/button": "^3.6.1",
35+
"@react-types/combobox": "^3.5.3",
36+
"@react-types/searchfield": "^3.3.3",
37+
"@react-types/shared": "^3.14.1"
3838
},
3939
"peerDependencies": {
4040
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0"

‎packages/@react-aria/breadcrumbs/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-aria/breadcrumbs",
3-
"version": "3.3.0",
3+
"version": "3.3.1",
44
"description": "Spectrum UI components in React",
55
"license": "Apache-2.0",
66
"main": "dist/main.js",
@@ -18,12 +18,12 @@
1818
},
1919
"dependencies": {
2020
"@babel/runtime": "^7.6.2",
21-
"@react-aria/i18n": "^3.5.0",
22-
"@react-aria/interactions": "^3.10.0",
23-
"@react-aria/link": "^3.3.2",
24-
"@react-aria/utils": "^3.13.2",
25-
"@react-types/breadcrumbs": "^3.4.2",
26-
"@react-types/shared": "^3.14.0"
21+
"@react-aria/i18n": "^3.6.0",
22+
"@react-aria/interactions": "^3.11.0",
23+
"@react-aria/link": "^3.3.3",
24+
"@react-aria/utils": "^3.13.3",
25+
"@react-types/breadcrumbs": "^3.4.3",
26+
"@react-types/shared": "^3.14.1"
2727
},
2828
"peerDependencies": {
2929
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0"

‎packages/@react-aria/button/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-aria/button",
3-
"version": "3.6.0",
3+
"version": "3.6.1",
44
"description": "Spectrum UI components in React",
55
"license": "Apache-2.0",
66
"main": "dist/main.js",
@@ -18,12 +18,12 @@
1818
},
1919
"dependencies": {
2020
"@babel/runtime": "^7.6.2",
21-
"@react-aria/focus": "^3.7.0",
22-
"@react-aria/interactions": "^3.10.0",
23-
"@react-aria/utils": "^3.13.2",
24-
"@react-stately/toggle": "^3.4.0",
25-
"@react-types/button": "^3.6.0",
26-
"@react-types/shared": "^3.14.0"
21+
"@react-aria/focus": "^3.8.0",
22+
"@react-aria/interactions": "^3.11.0",
23+
"@react-aria/utils": "^3.13.3",
24+
"@react-stately/toggle": "^3.4.1",
25+
"@react-types/button": "^3.6.1",
26+
"@react-types/shared": "^3.14.1"
2727
},
2828
"peerDependencies": {
2929
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0"

‎packages/@react-aria/calendar/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-aria/calendar",
3-
"version": "3.0.1",
3+
"version": "3.0.2",
44
"description": "Spectrum UI components in React",
55
"license": "Apache-2.0",
66
"main": "dist/main.js",
@@ -19,14 +19,14 @@
1919
"dependencies": {
2020
"@babel/runtime": "^7.6.2",
2121
"@internationalized/date": "^3.0.1",
22-
"@react-aria/i18n": "^3.5.0",
23-
"@react-aria/interactions": "^3.10.0",
22+
"@react-aria/i18n": "^3.6.0",
23+
"@react-aria/interactions": "^3.11.0",
2424
"@react-aria/live-announcer": "^3.1.1",
25-
"@react-aria/utils": "^3.13.2",
26-
"@react-stately/calendar": "^3.0.1",
27-
"@react-types/button": "^3.6.0",
28-
"@react-types/calendar": "^3.0.1",
29-
"@react-types/shared": "^3.14.0"
25+
"@react-aria/utils": "^3.13.3",
26+
"@react-stately/calendar": "^3.0.2",
27+
"@react-types/button": "^3.6.1",
28+
"@react-types/calendar": "^3.0.2",
29+
"@react-types/shared": "^3.14.1"
3030
},
3131
"peerDependencies": {
3232
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0",

‎packages/@react-aria/calendar/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export {useRangeCalendar} from './useRangeCalendar';
1515
export {useCalendarGrid} from './useCalendarGrid';
1616
export {useCalendarCell} from './useCalendarCell';
1717

18-
export type {CalendarProps, RangeCalendarProps} from '@react-types/calendar';
18+
export type {AriaCalendarProps, AriaRangeCalendarProps, CalendarProps, RangeCalendarProps} from '@react-types/calendar';
1919
export type {CalendarAria} from './useCalendarBase';
2020
export type {AriaCalendarGridProps, CalendarGridAria} from './useCalendarGrid';
2121
export type {AriaCalendarCellProps, CalendarCellAria} from './useCalendarCell';

‎packages/@react-aria/calendar/src/useCalendar.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
* governing permissions and limitations under the License.
1111
*/
1212

13+
import {AriaCalendarProps, DateValue} from '@react-types/calendar';
1314
import {CalendarAria, useCalendarBase} from './useCalendarBase';
14-
import {CalendarProps, DateValue} from '@react-types/calendar';
1515
import {CalendarState} from '@react-stately/calendar';
1616

1717
/**
1818
* Provides the behavior and accessibility implementation for a calendar component.
1919
* A calendar displays one or more date grids and allows users to select a single date.
2020
*/
21-
export function useCalendar<T extends DateValue>(props: CalendarProps<T>, state: CalendarState): CalendarAria {
21+
export function useCalendar<T extends DateValue>(props: AriaCalendarProps<T>, state: CalendarState): CalendarAria {
2222
return useCalendarBase(props, state);
2323
}

‎packages/@react-aria/calendar/src/useCalendarBase.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212

1313
import {announce} from '@react-aria/live-announcer';
1414
import {AriaButtonProps} from '@react-types/button';
15+
import {AriaLabelingProps, DOMAttributes} from '@react-types/shared';
1516
import {CalendarPropsBase} from '@react-types/calendar';
1617
import {CalendarState, RangeCalendarState} from '@react-stately/calendar';
17-
import {DOMAttributes} from '@react-types/shared';
1818
import {DOMProps} from '@react-types/shared';
1919
import {filterDOMProps, mergeProps, useLabels, useSlotId, useUpdateEffect} from '@react-aria/utils';
2020
import {hookData, useSelectedDateDescription, useVisibleRangeDescription} from './utils';
@@ -36,7 +36,7 @@ export interface CalendarAria {
3636
title: string
3737
}
3838

39-
export function useCalendarBase(props: CalendarPropsBase & DOMProps, state: CalendarState | RangeCalendarState): CalendarAria {
39+
export function useCalendarBase(props: CalendarPropsBase & DOMProps & AriaLabelingProps, state: CalendarState | RangeCalendarState): CalendarAria {
4040
let stringFormatter = useLocalizedStringFormatter(intlMessages);
4141
let domProps = filterDOMProps(props);
4242

0 commit comments

Comments
 (0)