Skip to content

Commit e79b196

Browse files
bminglesbmingles
authored
chore: Upgraded React Spectrum to ^3.41.1 (#1834)
Upgraded React Spectrum to ^3.41.1 resolves #1832
1 parent e50f0f6 commit e79b196

9 files changed

Lines changed: 3250 additions & 3280 deletions

File tree

‎package-lock.json‎

Lines changed: 3218 additions & 3248 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/app-utils/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"redux": "^4.x"
2929
},
3030
"dependencies": {
31-
"@adobe/react-spectrum": "^3.29.0",
31+
"@adobe/react-spectrum": "^3.34.1",
3232
"@deephaven/auth-plugins": "file:../auth-plugins",
3333
"@deephaven/chart": "file:../chart",
3434
"@deephaven/components": "file:../components",

‎packages/code-studio/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"directory": "packages/code-studio"
1212
},
1313
"dependencies": {
14-
"@adobe/react-spectrum": "^3.29.0",
14+
"@adobe/react-spectrum": "^3.34.1",
1515
"@deephaven/app-utils": "file:../app-utils",
1616
"@deephaven/auth-plugins": "file:../auth-plugins",
1717
"@deephaven/chart": "file:../chart",

‎packages/components/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"build:theme": "sass --embed-sources --style=compressed --load-path=../../node_modules ./src/theme:./dist/theme"
2525
},
2626
"dependencies": {
27-
"@adobe/react-spectrum": "^3.29.0",
27+
"@adobe/react-spectrum": "^3.34.1",
2828
"@deephaven/icons": "file:../icons",
2929
"@deephaven/log": "file:../log",
3030
"@deephaven/react-hooks": "file:../react-hooks",

‎packages/components/scss/BaseStyleSheet.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
color: var(--dh-color-text);
1010

1111
.spectrum-theme-provider,
12-
[class^='spectrum_'] {
12+
[class*='_spectrum--'] {
1313
color: var(--dh-color-text);
1414
}
1515
}

‎packages/components/src/__snapshots__/SpectrumUtils.test.ts.snap‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,29 @@
33
exports[`themeDHDefault should merge Spectrum default with DH custom styles 1`] = `
44
{
55
"dark": {
6-
"spectrum--darkest": "spectrum--darkest_256eeb",
6+
"spectrum--darkest": "gP7gvq_spectrum--darkest",
77
"theme-spectrum-alias": "theme-spectrum-alias",
88
"theme-spectrum-palette": "theme-spectrum-palette",
99
},
1010
"global": {
11-
"spectrum": "spectrum_9e130c",
12-
"spectrum--dark": "spectrum--dark_9e130c",
13-
"spectrum--darkest": "spectrum--darkest_9e130c",
14-
"spectrum--large": "spectrum--large_9e130c",
15-
"spectrum--light": "spectrum--light_9e130c",
16-
"spectrum--lightest": "spectrum--lightest_9e130c",
17-
"spectrum--medium": "spectrum--medium_9e130c",
11+
"spectrum": "zA6MfG_spectrum",
12+
"spectrum--dark": "zA6MfG_spectrum--dark",
13+
"spectrum--darkest": "zA6MfG_spectrum--darkest",
14+
"spectrum--large": "zA6MfG_spectrum--large",
15+
"spectrum--light": "zA6MfG_spectrum--light",
16+
"spectrum--lightest": "zA6MfG_spectrum--lightest",
17+
"spectrum--medium": "zA6MfG_spectrum--medium",
1818
},
1919
"large": {
20-
"spectrum--large": "spectrum--large_c40598",
20+
"spectrum--large": "HAZavG_spectrum--large",
2121
},
2222
"light": {
23-
"spectrum--light": "spectrum--light_a40724",
23+
"spectrum--light": "PFjRbG_spectrum--light",
2424
"theme-spectrum-alias": "theme-spectrum-alias",
2525
"theme-spectrum-palette": "theme-spectrum-palette",
2626
},
2727
"medium": {
28-
"spectrum--medium": "spectrum--medium_4b172c",
28+
"spectrum--medium": "xSyFOq_spectrum--medium",
2929
},
3030
}
3131
`;

‎packages/components/src/theme/__snapshots__/ThemeProvider.test.tsx.snap‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ exports[`ThemeProvider setSelectedThemeKey: [ [Object] ] should change selected
1414
./theme-light-components.css?raw
1515
</style>
1616
<div
17-
class="spectrum-theme-provider spectrum_b37d53 spectrum_2a241c spectrum--light_a40724 theme-spectrum-palette theme-spectrum-alias spectrum--large_c40598 spectrum_9e130c spectrum--medium_9e130c spectrum--large_9e130c spectrum--darkest_9e130c spectrum--dark_9e130c spectrum--light_9e130c spectrum--lightest_9e130c"
17+
class="spectrum-theme-provider JuTe6q_spectrum _5QszkG_spectrum _5QszkG_i18nFontFamily PFjRbG_spectrum--light theme-spectrum-palette theme-spectrum-alias HAZavG_spectrum--large zA6MfG_spectrum zA6MfG_spectrum--dark zA6MfG_spectrum--darkest zA6MfG_spectrum--large zA6MfG_spectrum--light zA6MfG_spectrum--lightest zA6MfG_spectrum--medium"
1818
dir="ltr"
1919
lang="en-US"
2020
style="isolation: isolate; color-scheme: light;"
@@ -44,7 +44,7 @@ exports[`ThemeProvider setSelectedThemeKey: [ [Object] ] should change selected
4444
data-theme-key="themeA"
4545
/>
4646
<div
47-
class="spectrum-theme-provider spectrum_b37d53 spectrum_2a241c spectrum--light_a40724 theme-spectrum-palette theme-spectrum-alias spectrum--large_c40598 spectrum_9e130c spectrum--medium_9e130c spectrum--large_9e130c spectrum--darkest_9e130c spectrum--dark_9e130c spectrum--light_9e130c spectrum--lightest_9e130c"
47+
class="spectrum-theme-provider JuTe6q_spectrum _5QszkG_spectrum _5QszkG_i18nFontFamily PFjRbG_spectrum--light theme-spectrum-palette theme-spectrum-alias HAZavG_spectrum--large zA6MfG_spectrum zA6MfG_spectrum--dark zA6MfG_spectrum--darkest zA6MfG_spectrum--large zA6MfG_spectrum--light zA6MfG_spectrum--lightest zA6MfG_spectrum--medium"
4848
dir="ltr"
4949
lang="en-US"
5050
style="isolation: isolate; color-scheme: light;"
@@ -61,7 +61,7 @@ exports[`ThemeProvider setSelectedThemeKey: null should change selected theme: d
6161
<body>
6262
<div>
6363
<div
64-
class="spectrum-theme-provider spectrum_b37d53 spectrum_2a241c spectrum--light_a40724 theme-spectrum-palette theme-spectrum-alias spectrum--large_c40598 spectrum_9e130c spectrum--medium_9e130c spectrum--large_9e130c spectrum--darkest_9e130c spectrum--dark_9e130c spectrum--light_9e130c spectrum--lightest_9e130c"
64+
class="spectrum-theme-provider JuTe6q_spectrum _5QszkG_spectrum _5QszkG_i18nFontFamily PFjRbG_spectrum--light theme-spectrum-palette theme-spectrum-alias HAZavG_spectrum--large zA6MfG_spectrum zA6MfG_spectrum--dark zA6MfG_spectrum--darkest zA6MfG_spectrum--large zA6MfG_spectrum--light zA6MfG_spectrum--lightest zA6MfG_spectrum--medium"
6565
dir="ltr"
6666
lang="en-US"
6767
style="isolation: isolate; color-scheme: light;"
@@ -78,7 +78,7 @@ exports[`ThemeProvider setSelectedThemeKey: null should change selected theme: t
7878
<body>
7979
<div>
8080
<div
81-
class="spectrum-theme-provider spectrum_b37d53 spectrum_2a241c spectrum--light_a40724 theme-spectrum-palette theme-spectrum-alias spectrum--large_c40598 spectrum_9e130c spectrum--medium_9e130c spectrum--large_9e130c spectrum--darkest_9e130c spectrum--dark_9e130c spectrum--light_9e130c spectrum--lightest_9e130c"
81+
class="spectrum-theme-provider JuTe6q_spectrum _5QszkG_spectrum _5QszkG_i18nFontFamily PFjRbG_spectrum--light theme-spectrum-palette theme-spectrum-alias HAZavG_spectrum--large zA6MfG_spectrum zA6MfG_spectrum--dark zA6MfG_spectrum--darkest zA6MfG_spectrum--large zA6MfG_spectrum--light zA6MfG_spectrum--lightest zA6MfG_spectrum--medium"
8282
dir="ltr"
8383
lang="en-US"
8484
style="isolation: isolate; color-scheme: light;"
@@ -108,7 +108,7 @@ exports[`ThemeProvider should load themes based on preload data or default: [ [O
108108
data-theme-key="themeA"
109109
/>
110110
<div
111-
class="spectrum-theme-provider spectrum_b37d53 spectrum_2a241c spectrum--light_a40724 theme-spectrum-palette theme-spectrum-alias spectrum--large_c40598 spectrum_9e130c spectrum--medium_9e130c spectrum--large_9e130c spectrum--darkest_9e130c spectrum--dark_9e130c spectrum--light_9e130c spectrum--lightest_9e130c"
111+
class="spectrum-theme-provider JuTe6q_spectrum _5QszkG_spectrum _5QszkG_i18nFontFamily PFjRbG_spectrum--light theme-spectrum-palette theme-spectrum-alias HAZavG_spectrum--large zA6MfG_spectrum zA6MfG_spectrum--dark zA6MfG_spectrum--darkest zA6MfG_spectrum--large zA6MfG_spectrum--light zA6MfG_spectrum--lightest zA6MfG_spectrum--medium"
112112
dir="ltr"
113113
lang="en-US"
114114
style="isolation: isolate; color-scheme: light;"
@@ -135,7 +135,7 @@ exports[`ThemeProvider should load themes based on preload data or default: [ [O
135135
./theme-dark-components.css?raw
136136
</style>
137137
<div
138-
class="spectrum-theme-provider spectrum_b37d53 spectrum_2a241c spectrum--light_a40724 theme-spectrum-palette theme-spectrum-alias spectrum--large_c40598 spectrum_9e130c spectrum--medium_9e130c spectrum--large_9e130c spectrum--darkest_9e130c spectrum--dark_9e130c spectrum--light_9e130c spectrum--lightest_9e130c"
138+
class="spectrum-theme-provider JuTe6q_spectrum _5QszkG_spectrum _5QszkG_i18nFontFamily PFjRbG_spectrum--light theme-spectrum-palette theme-spectrum-alias HAZavG_spectrum--large zA6MfG_spectrum zA6MfG_spectrum--dark zA6MfG_spectrum--darkest zA6MfG_spectrum--large zA6MfG_spectrum--light zA6MfG_spectrum--lightest zA6MfG_spectrum--medium"
139139
dir="ltr"
140140
lang="en-US"
141141
style="isolation: isolate; color-scheme: light;"
@@ -152,7 +152,7 @@ exports[`ThemeProvider should load themes based on preload data or default: null
152152
<body>
153153
<div>
154154
<div
155-
class="spectrum-theme-provider spectrum_b37d53 spectrum_2a241c spectrum--light_a40724 theme-spectrum-palette theme-spectrum-alias spectrum--large_c40598 spectrum_9e130c spectrum--medium_9e130c spectrum--large_9e130c spectrum--darkest_9e130c spectrum--dark_9e130c spectrum--light_9e130c spectrum--lightest_9e130c"
155+
class="spectrum-theme-provider JuTe6q_spectrum _5QszkG_spectrum _5QszkG_i18nFontFamily PFjRbG_spectrum--light theme-spectrum-palette theme-spectrum-alias HAZavG_spectrum--large zA6MfG_spectrum zA6MfG_spectrum--dark zA6MfG_spectrum--darkest zA6MfG_spectrum--large zA6MfG_spectrum--light zA6MfG_spectrum--lightest zA6MfG_spectrum--medium"
156156
dir="ltr"
157157
lang="en-US"
158158
style="isolation: isolate; color-scheme: light;"
@@ -169,7 +169,7 @@ exports[`ThemeProvider should load themes based on preload data or default: null
169169
<body>
170170
<div>
171171
<div
172-
class="spectrum-theme-provider spectrum_b37d53 spectrum_2a241c spectrum--light_a40724 theme-spectrum-palette theme-spectrum-alias spectrum--large_c40598 spectrum_9e130c spectrum--medium_9e130c spectrum--large_9e130c spectrum--darkest_9e130c spectrum--dark_9e130c spectrum--light_9e130c spectrum--lightest_9e130c"
172+
class="spectrum-theme-provider JuTe6q_spectrum _5QszkG_spectrum _5QszkG_i18nFontFamily PFjRbG_spectrum--light theme-spectrum-palette theme-spectrum-alias HAZavG_spectrum--large zA6MfG_spectrum zA6MfG_spectrum--dark zA6MfG_spectrum--darkest zA6MfG_spectrum--large zA6MfG_spectrum--light zA6MfG_spectrum--lightest zA6MfG_spectrum--medium"
173173
dir="ltr"
174174
lang="en-US"
175175
style="isolation: isolate; color-scheme: light;"

‎packages/components/src/theme/theme-spectrum/theme-spectrum-overrides.css‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
[class^='spectrum'] {
1+
[class*='spectrum'] {
22
/* --font-family-sans-serif is defined in Bootstrap's _root.scss. We want
33
Spectrum to use the same default font-family */
44
font-family: var(--font-family-sans-serif) !important;
55
}
66

77
/* Override _reboot.scss */
8-
label[class^='spectrum-'] {
8+
label[class*='spectrum-'] {
99
margin-bottom: 0;
1010
}
1111

@@ -35,7 +35,7 @@ svg[class*='spectrum-Textfield-validationIcon'] {
3535
}
3636

3737
/* Table */
38-
[class^='spectrum-Table-headCell'] {
38+
[class*='spectrum-Table-headCell'] {
3939
/*
4040
Tables are styled with the assumption that the header is the same color as the bg
4141
which means they look bad against any other background color, instead just inherit the bg.
@@ -46,7 +46,7 @@ svg[class*='spectrum-Textfield-validationIcon'] {
4646
background: var(--dh-table-header-cell-background-color);
4747
}
4848

49-
[class^='spectrum-Table-row'] {
49+
[class*='spectrum-Table-row'] {
5050
/* border of selected color is hard-coded as blue rather than accent color */
5151
--spectrum-table-row-border-color-selected: var(
5252
--dh-color-item-list-selected-border
@@ -65,7 +65,7 @@ svg[class*='spectrum-Textfield-validationIcon'] {
6565
);
6666
}
6767

68-
button[class^='spectrum-Button'] {
68+
button[class*='spectrum-Button'] {
6969
/* make the icon closer to the text */
7070
--spectrum-button-primary-text-gap: var(--spectrum-global-dimension-size-75);
7171

@@ -74,13 +74,13 @@ button[class^='spectrum-Button'] {
7474
padding-top: calc(var(--spectrum-global-dimension-size-50));
7575
}
7676

77-
button[class^='spectrum-Button'] svg {
77+
button[class*='spectrum-Button'] svg {
7878
/* our icons are smaller, center them too */
7979
padding-bottom: var(--spectrum-global-dimension-size-25);
8080
}
8181

82-
span[class^='spectrum-Checkbox-label'],
83-
span[class^='spectrum-Radio-label'] {
82+
span[class*='spectrum-Checkbox-label'],
83+
span[class*='spectrum-Radio-label'] {
8484
/* I have no idea why these spectrum labels aren't centered,
8585
but this fixes it. Maybe difference in font baselines.
8686
*/

‎packages/react-hooks/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"build:babel": "babel ./src --out-dir ./dist --extensions \".ts,.tsx,.js,.jsx\" --source-maps --root-mode upward"
2222
},
2323
"dependencies": {
24-
"@adobe/react-spectrum": "^3.29.0",
24+
"@adobe/react-spectrum": "^3.34.1",
2525
"@deephaven/log": "file:../log",
2626
"@deephaven/utils": "file:../utils",
2727
"lodash.debounce": "^4.0.8",

0 commit comments

Comments
 (0)
⚡