Skip to content

Commit 04e93b8

Browse files
committed
Merge branch 'main' of github.com:adobe/react-spectrum into color-area
2 parents 3178823 + 86a966c commit 04e93b8

File tree

130 files changed

+2080
-869
lines changed

Some content is hidden

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

130 files changed

+2080
-869
lines changed

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@adobe/react-spectrum",
3-
"version": "3.14.1",
3+
"version": "3.15.0",
44
"description": "Spectrum UI components in React",
55
"license": "Apache-2.0",
66
"main": "dist/main.js",
@@ -19,18 +19,18 @@
1919
"url": "https://github.com/adobe/react-spectrum"
2020
},
2121
"dependencies": {
22-
"@react-aria/i18n": "^3.3.2",
22+
"@react-aria/i18n": "^3.3.3",
2323
"@react-aria/ssr": "^3.1.0",
2424
"@react-aria/visually-hidden": "^3.2.3",
25-
"@react-spectrum/actiongroup": "^3.3.0",
26-
"@react-spectrum/breadcrumbs": "^3.2.3",
25+
"@react-spectrum/actiongroup": "^3.3.1",
26+
"@react-spectrum/breadcrumbs": "^3.2.4",
2727
"@react-spectrum/button": "^3.6.0",
28-
"@react-spectrum/buttongroup": "^3.2.2",
28+
"@react-spectrum/buttongroup": "^3.2.3",
2929
"@react-spectrum/checkbox": "^3.2.4",
30-
"@react-spectrum/combobox": "^3.1.1",
30+
"@react-spectrum/combobox": "^3.2.0",
3131
"@react-spectrum/dialog": "^3.3.4",
3232
"@react-spectrum/divider": "^3.1.3",
33-
"@react-spectrum/form": "^3.2.3",
33+
"@react-spectrum/form": "^3.2.4",
3434
"@react-spectrum/icon": "^3.3.2",
3535
"@react-spectrum/illustratedmessage": "^3.1.4",
3636
"@react-spectrum/image": "^3.1.4",
@@ -39,28 +39,28 @@
3939
"@react-spectrum/listbox": "^3.5.3",
4040
"@react-spectrum/menu": "^3.5.1",
4141
"@react-spectrum/meter": "^3.1.3",
42-
"@react-spectrum/numberfield": "^3.1.0",
42+
"@react-spectrum/numberfield": "^3.1.1",
4343
"@react-spectrum/overlays": "^3.4.4",
44-
"@react-spectrum/picker": "^3.4.1",
44+
"@react-spectrum/picker": "^3.5.0",
4545
"@react-spectrum/progress": "^3.1.3",
4646
"@react-spectrum/provider": "^3.2.2",
47-
"@react-spectrum/radio": "^3.1.4",
48-
"@react-spectrum/searchfield": "^3.2.0",
47+
"@react-spectrum/radio": "^3.1.5",
48+
"@react-spectrum/searchfield": "^3.2.1",
4949
"@react-spectrum/slider": "^3.0.4",
5050
"@react-spectrum/statuslight": "^3.2.2",
5151
"@react-spectrum/switch": "^3.1.3",
52-
"@react-spectrum/table": "^3.0.1",
53-
"@react-spectrum/tabs": "^3.0.2",
52+
"@react-spectrum/table": "^3.1.0",
53+
"@react-spectrum/tabs": "^3.1.0",
5454
"@react-spectrum/text": "^3.1.3",
55-
"@react-spectrum/textfield": "^3.2.0",
55+
"@react-spectrum/textfield": "^3.3.0",
5656
"@react-spectrum/theme-dark": "^3.2.3",
5757
"@react-spectrum/theme-default": "^3.2.3",
5858
"@react-spectrum/theme-light": "^3.1.3",
5959
"@react-spectrum/tooltip": "^3.1.4",
6060
"@react-spectrum/view": "^3.1.3",
6161
"@react-spectrum/well": "^3.1.3",
6262
"@react-stately/collections": "^3.3.4",
63-
"@react-stately/data": "^3.4.2"
63+
"@react-stately/data": "^3.4.3"
6464
},
6565
"publishConfig": {
6666
"access": "public"

packages/@adobe/spectrum-css-temp/components/card/index.css

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -828,7 +828,7 @@ user-provided
828828
block-size: 100%;
829829
display: grid;
830830
grid-template-columns: minmax(0, auto) minmax(30px, 1fr) minmax(0, auto);
831-
grid-template-rows: auto var(--spectrum-card-quiet-body-header-margin-top) minmax(var(--spectrum-actionbutton-height), auto) 1fr var(--spectrum-card-body-padding-bottom);
831+
grid-template-rows: auto var(--spectrum-card-quiet-body-header-margin-top) minmax(var(--spectrum-actionbutton-height), auto) var(--spectrum-alias-single-line-height) 1fr;
832832
grid-template-areas:
833833
"preview preview preview"
834834
". . ."
@@ -1241,3 +1241,20 @@ For now working around it with a useLayoutEffect in CardBase.
12411241
}
12421242
}
12431243
/** END Standard Horizontal **/
1244+
1245+
/* CardView styles */
1246+
.spectrum-CardView {
1247+
outline: none;
1248+
1249+
.spectrum-CardView-centeredWrapper {
1250+
display: flex;
1251+
align-items: center;
1252+
justify-content: center;
1253+
width: 100%;
1254+
height: 100%;
1255+
}
1256+
.spectrum-CardView-row {
1257+
outline: none;
1258+
height: 100%
1259+
}
1260+
}

packages/@adobe/spectrum-css-temp/components/icon/icons.css

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,10 @@ governing permissions and limitations under the License.
2828
/* Don't catch clicks or hover, otherwise they may not escape the SVG */
2929
pointer-events: none;
3030
}
31+
@media (forced-colors: active) {
32+
.spectrum-Icon,
33+
.spectrum-UIIcon {
34+
/* Automatically adjust the SVG to pick up the text color for High Contrast mode */
35+
forced-color-adjust: auto;
36+
}
37+
}

packages/@adobe/spectrum-css-temp/components/searchwithin/index.css

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,6 @@ governing permissions and limitations under the License.
5757
flex: 1;
5858
box-sizing: border-box;
5959
min-inline-size: inherit;
60-
61-
&:hover,
62-
&:focus {
63-
position: relative; /* shows right border */
64-
}
6560
}
6661
}
6762

packages/@internationalized/date/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
"types": "dist/types.d.ts",
99
"source": "src/index.ts",
1010
"files": [
11-
"dist"
11+
"dist",
12+
"src"
1213
],
1314
"sideEffects": false,
1415
"repository": {

packages/@internationalized/message/src/MessageFormatter.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,14 @@ export class MessageFormatter {
3939
message = new IntlMessageFormat(msg, this.locale);
4040
this.cache[key] = message;
4141
}
42+
let varCopy: Record<string, PrimitiveType | T | FormatXMLElementFn<T, string | T | (string | T)[]>> | undefined;
43+
if (variables) {
44+
varCopy = Object.keys(variables).reduce((acc, key) => {
45+
acc[key] = variables[key] == null ? false : variables[key];
46+
return acc;
47+
}, {});
48+
}
4249

43-
return message.format(variables);
50+
return message.format(varCopy);
4451
}
4552
}

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

Lines changed: 12 additions & 12 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.0",
3+
"version": "3.0.0-alpha.1",
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.1.0",
22-
"@react-aria/i18n": "^3.3.2",
23-
"@react-aria/listbox": "^3.3.1",
21+
"@react-aria/combobox": "^3.2.0",
22+
"@react-aria/i18n": "^3.3.3",
23+
"@react-aria/listbox": "^3.4.0",
2424
"@react-aria/live-announcer": "^3.0.1",
25-
"@react-aria/menu": "^3.2.3",
26-
"@react-aria/overlays": "^3.7.2",
27-
"@react-aria/searchfield": "^3.2.0",
28-
"@react-aria/selection": "^3.6.0",
29-
"@react-aria/textfield": "^3.4.0",
30-
"@react-aria/utils": "^3.9.0",
25+
"@react-aria/menu": "^3.3.0",
26+
"@react-aria/overlays": "^3.7.3",
27+
"@react-aria/searchfield": "^3.2.1",
28+
"@react-aria/selection": "^3.7.0",
29+
"@react-aria/textfield": "^3.5.0",
30+
"@react-aria/utils": "^3.10.0",
3131
"@react-stately/collections": "^3.3.4",
3232
"@react-stately/combobox": "^3.0.1",
3333
"@react-types/autocomplete": "3.0.0-alpha.0",
3434
"@react-types/button": "^3.4.1",
35-
"@react-types/combobox": "^3.1.0",
35+
"@react-types/combobox": "^3.2.0",
3636
"@react-types/searchfield": "^3.1.2",
37-
"@react-types/shared": "^3.9.0"
37+
"@react-types/shared": "^3.10.0"
3838
},
3939
"peerDependencies": {
4040
"react": "^16.8.0 || ^17.0.0-rc.1"

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"version": "3.0.0-alpha.1",
44
"description": "Spectrum UI components in React",
55
"license": "Apache-2.0",
6-
"private": true,
76
"main": "dist/main.js",
87
"module": "dist/module.js",
98
"types": "dist/types.d.ts",
@@ -20,14 +19,14 @@
2019
"dependencies": {
2120
"@babel/runtime": "^7.6.2",
2221
"@internationalized/date": "3.0.0-alpha.1",
23-
"@react-aria/i18n": "^3.1.0",
24-
"@react-aria/interactions": "^3.1.0",
22+
"@react-aria/i18n": "^3.3.4",
23+
"@react-aria/interactions": "^3.7.0",
2524
"@react-aria/live-announcer": "^3.0.0",
26-
"@react-aria/utils": "^3.1.0",
25+
"@react-aria/utils": "^3.10.0",
2726
"@react-stately/calendar": "3.0.0-alpha.1",
2827
"@react-types/button": "^3.1.0",
2928
"@react-types/calendar": "3.0.0-alpha.1",
30-
"@react-types/shared": "^3.1.0",
29+
"@react-types/shared": "^3.10.0",
3130
"date-fns": "^1.30.1"
3231
},
3332
"peerDependencies": {

packages/@react-aria/color/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/color",
3-
"version": "3.0.0-beta.4",
3+
"version": "3.0.0-beta.5",
44
"description": "Spectrum UI components in React",
55
"license": "Apache-2.0",
66
"main": "dist/main.js",
@@ -19,16 +19,16 @@
1919
"dependencies": {
2020
"@babel/runtime": "^7.6.2",
2121
"@internationalized/message": "^3.0.2",
22-
"@react-aria/i18n": "^3.3.2",
23-
"@react-aria/interactions": "^3.6.0",
22+
"@react-aria/i18n": "^3.3.3",
23+
"@react-aria/interactions": "^3.7.0",
2424
"@react-aria/slider": "^3.0.3",
2525
"@react-aria/spinbutton": "^3.0.1",
26-
"@react-aria/textfield": "^3.4.0",
27-
"@react-aria/utils": "^3.9.0",
26+
"@react-aria/textfield": "^3.5.0",
27+
"@react-aria/utils": "^3.10.0",
2828
"@react-aria/visually-hidden": "^3.2.3",
29-
"@react-stately/color": "3.0.0-beta.4",
29+
"@react-stately/color": "3.0.0-beta.5",
3030
"@react-types/color": "3.0.0-beta.3",
31-
"@react-types/shared": "^3.9.0",
31+
"@react-types/shared": "^3.10.0",
3232
"@react-types/slider": "^3.0.2"
3333
},
3434
"peerDependencies": {

packages/@react-aria/color/src/useColorField.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ export function useColorField(
112112
'aria-valuenow': null,
113113
'aria-valuetext': null,
114114
autoCorrect: 'off',
115+
spellCheck: 'false',
115116
onBlur: commit
116117
})
117118
};

0 commit comments

Comments
 (0)