Skip to content

Commit 3c4b88a

Browse files
mofojedmofojed
authored
fix: Update react-spectrum packages (#2303) (#2422)
- Fixes a bug with Meter not displaying it's variant correctly - Needed to resolve issue with `ListData` now allowing `undefined` to be returned from `getItem` - Just throw an error in this case, which should be the same behaviour as before
1 parent 868caa4 commit 3c4b88a

14 files changed

Lines changed: 4311 additions & 4526 deletions

File tree

‎package-lock.json‎

Lines changed: 4270 additions & 4498 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.35.1",
31+
"@adobe/react-spectrum": "3.38.0",
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.35.1",
14+
"@adobe/react-spectrum": "3.38.0",
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.35.1",
27+
"@adobe/react-spectrum": "3.38.0",
2828
"@deephaven/icons": "file:../icons",
2929
"@deephaven/log": "file:../log",
3030
"@deephaven/react-hooks": "file:../react-hooks",

‎packages/components/src/spectrum/utils/__snapshots__/themeUtils.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": "gP7gvq_spectrum--darkest",
6+
"spectrum--darkest": "R-l9gW_spectrum--darkest",
77
"theme-spectrum-alias": "theme-spectrum-alias",
88
"theme-spectrum-palette": "theme-spectrum-palette",
99
},
1010
"global": {
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",
11+
"spectrum": "XhWg9q_spectrum",
12+
"spectrum--dark": "XhWg9q_spectrum--dark",
13+
"spectrum--darkest": "XhWg9q_spectrum--darkest",
14+
"spectrum--large": "XhWg9q_spectrum--large",
15+
"spectrum--light": "XhWg9q_spectrum--light",
16+
"spectrum--lightest": "XhWg9q_spectrum--lightest",
17+
"spectrum--medium": "XhWg9q_spectrum--medium",
1818
},
1919
"large": {
20-
"spectrum--large": "HAZavG_spectrum--large",
20+
"spectrum--large": "_1DrGeG_spectrum--large",
2121
},
2222
"light": {
23-
"spectrum--light": "PFjRbG_spectrum--light",
23+
"spectrum--light": "YqfL3a_spectrum--light",
2424
"theme-spectrum-alias": "theme-spectrum-alias",
2525
"theme-spectrum-palette": "theme-spectrum-palette",
2626
},
2727
"medium": {
28-
"spectrum--medium": "xSyFOq_spectrum--medium",
28+
"spectrum--medium": "rfm_fq_spectrum--medium",
2929
},
3030
}
3131
`;

‎packages/components/src/spectrum/utils/itemUtils.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,12 @@ export function isNormalizedItemsWithKeysList<
256256
return true;
257257
}
258258

259-
return !isItemOrSection(node[0]) && 'key' in node[0];
259+
return (
260+
!isItemOrSection(node[0]) &&
261+
node[0] != null &&
262+
typeof node[0] === 'object' &&
263+
'key' in node[0]
264+
);
260265
}
261266

262267
/**

‎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 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"
17+
class="spectrum-theme-provider _t8qIa_spectrum kDKRXa_spectrum kDKRXa_i18nFontFamily YqfL3a_spectrum--light theme-spectrum-palette theme-spectrum-alias _1DrGeG_spectrum--large XhWg9q_spectrum XhWg9q_spectrum--dark XhWg9q_spectrum--darkest XhWg9q_spectrum--large XhWg9q_spectrum--light XhWg9q_spectrum--lightest XhWg9q_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 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"
47+
class="spectrum-theme-provider _t8qIa_spectrum kDKRXa_spectrum kDKRXa_i18nFontFamily YqfL3a_spectrum--light theme-spectrum-palette theme-spectrum-alias _1DrGeG_spectrum--large XhWg9q_spectrum XhWg9q_spectrum--dark XhWg9q_spectrum--darkest XhWg9q_spectrum--large XhWg9q_spectrum--light XhWg9q_spectrum--lightest XhWg9q_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 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"
64+
class="spectrum-theme-provider _t8qIa_spectrum kDKRXa_spectrum kDKRXa_i18nFontFamily YqfL3a_spectrum--light theme-spectrum-palette theme-spectrum-alias _1DrGeG_spectrum--large XhWg9q_spectrum XhWg9q_spectrum--dark XhWg9q_spectrum--darkest XhWg9q_spectrum--large XhWg9q_spectrum--light XhWg9q_spectrum--lightest XhWg9q_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 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"
81+
class="spectrum-theme-provider _t8qIa_spectrum kDKRXa_spectrum kDKRXa_i18nFontFamily YqfL3a_spectrum--light theme-spectrum-palette theme-spectrum-alias _1DrGeG_spectrum--large XhWg9q_spectrum XhWg9q_spectrum--dark XhWg9q_spectrum--darkest XhWg9q_spectrum--large XhWg9q_spectrum--light XhWg9q_spectrum--lightest XhWg9q_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 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"
111+
class="spectrum-theme-provider _t8qIa_spectrum kDKRXa_spectrum kDKRXa_i18nFontFamily YqfL3a_spectrum--light theme-spectrum-palette theme-spectrum-alias _1DrGeG_spectrum--large XhWg9q_spectrum XhWg9q_spectrum--dark XhWg9q_spectrum--darkest XhWg9q_spectrum--large XhWg9q_spectrum--light XhWg9q_spectrum--lightest XhWg9q_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 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"
138+
class="spectrum-theme-provider _t8qIa_spectrum kDKRXa_spectrum kDKRXa_i18nFontFamily YqfL3a_spectrum--light theme-spectrum-palette theme-spectrum-alias _1DrGeG_spectrum--large XhWg9q_spectrum XhWg9q_spectrum--dark XhWg9q_spectrum--darkest XhWg9q_spectrum--large XhWg9q_spectrum--light XhWg9q_spectrum--lightest XhWg9q_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 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"
155+
class="spectrum-theme-provider _t8qIa_spectrum kDKRXa_spectrum kDKRXa_i18nFontFamily YqfL3a_spectrum--light theme-spectrum-palette theme-spectrum-alias _1DrGeG_spectrum--large XhWg9q_spectrum XhWg9q_spectrum--dark XhWg9q_spectrum--darkest XhWg9q_spectrum--large XhWg9q_spectrum--light XhWg9q_spectrum--lightest XhWg9q_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 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"
172+
class="spectrum-theme-provider _t8qIa_spectrum kDKRXa_spectrum kDKRXa_i18nFontFamily YqfL3a_spectrum--light theme-spectrum-palette theme-spectrum-alias _1DrGeG_spectrum--large XhWg9q_spectrum XhWg9q_spectrum--dark XhWg9q_spectrum--darkest XhWg9q_spectrum--large XhWg9q_spectrum--light XhWg9q_spectrum--lightest XhWg9q_spectrum--medium"
173173
dir="ltr"
174174
lang="en-US"
175175
style="isolation: isolate; color-scheme: light;"

‎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.35.1",
24+
"@adobe/react-spectrum": "3.38.0",
2525
"@deephaven/log": "file:../log",
2626
"@deephaven/utils": "file:../utils",
2727
"lodash.debounce": "^4.0.8",

‎packages/react-hooks/src/SelectionUtils.ts‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ export function isSelectionMaybeInvertedEqual<T>(
7474
*/
7575
export function mapSelection<TItem, TMap>(
7676
selectedItemKeys: Selection,
77-
getItem: (key: React.Key) => KeyedItem<TItem>,
77+
getItem: (key: React.Key) => KeyedItem<TItem> | undefined,
7878
mapItem: (item: KeyedItem<TItem>) => TMap
7979
): SelectionT<TMap> {
8080
if (selectedItemKeys === 'all') {
@@ -83,7 +83,15 @@ export function mapSelection<TItem, TMap>(
8383

8484
const keys = [...selectedItemKeys.keys()];
8585

86-
return new Set(keys.map(key => mapItem(getItem(key))));
86+
return new Set(
87+
keys.map(key => {
88+
const item = getItem(key);
89+
if (item === undefined) {
90+
throw new Error(`Could not find item with key ${key}`);
91+
}
92+
return mapItem(item);
93+
})
94+
);
8795
}
8896

8997
/**

‎packages/react-hooks/src/SpectrumUtils.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export function extractSpectrumHTMLElement<
4040
export function extractSpectrumLastChildHTMLElement<
4141
THtml extends HTMLElement = HTMLElement,
4242
>(ref: DOMRefValue<THtml> | null): HTMLElement | null {
43-
const maybeHTMLElement = ref?.UNSAFE_getDOMNode().lastElementChild;
43+
const maybeHTMLElement = ref?.UNSAFE_getDOMNode()?.lastElementChild;
4444
return identityExtractHTMLElement(maybeHTMLElement);
4545
}
4646

0 commit comments

Comments
 (0)
⚡