Skip to content

Commit 2216274

Browse files
mofojedmofojed
authored
fix: Update react-spectrum packages (#2303)
- 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 ab4c02f commit 2216274

14 files changed

Lines changed: 3904 additions & 5874 deletions

File tree

‎package-lock.json‎

Lines changed: 3867 additions & 5848 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
@@ -29,7 +29,7 @@
2929
"redux": "^4.x"
3030
},
3131
"dependencies": {
32-
"@adobe/react-spectrum": "3.35.1",
32+
"@adobe/react-spectrum": "3.38.0",
3333
"@deephaven/auth-plugins": "file:../auth-plugins",
3434
"@deephaven/chart": "file:../chart",
3535
"@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: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,10 @@ export function isNormalizedItemsWithKeysList<
257257
}
258258

259259
return (
260-
!isItemOrSection(node[0]) && typeof node[0] === 'object' && 'key' in node[0]
260+
!isItemOrSection(node[0]) &&
261+
node[0] != null &&
262+
typeof node[0] === 'object' &&
263+
'key' in node[0]
261264
);
262265
}
263266

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ exports[`ThemeProvider setSelectedThemeKey: [
1818
./theme-light-components.css?raw
1919
</style>
2020
<div
21-
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"
21+
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"
2222
dir="ltr"
2323
lang="en-US"
2424
style="isolation: isolate; color-scheme: light;"
@@ -52,7 +52,7 @@ exports[`ThemeProvider setSelectedThemeKey: [
5252
data-theme-key="themeA"
5353
/>
5454
<div
55-
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"
55+
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"
5656
dir="ltr"
5757
lang="en-US"
5858
style="isolation: isolate; color-scheme: light;"
@@ -69,7 +69,7 @@ exports[`ThemeProvider setSelectedThemeKey: null should change selected theme: d
6969
<body>
7070
<div>
7171
<div
72-
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"
72+
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"
7373
dir="ltr"
7474
lang="en-US"
7575
style="isolation: isolate; color-scheme: light;"
@@ -86,7 +86,7 @@ exports[`ThemeProvider setSelectedThemeKey: null should change selected theme: t
8686
<body>
8787
<div>
8888
<div
89-
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"
89+
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"
9090
dir="ltr"
9191
lang="en-US"
9292
style="isolation: isolate; color-scheme: light;"
@@ -120,7 +120,7 @@ exports[`ThemeProvider should load themes based on default selected theme key. c
120120
data-theme-key="mockDefaultSelectedThemeKey"
121121
/>
122122
<div
123-
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"
123+
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"
124124
dir="ltr"
125125
lang="en-US"
126126
style="isolation: isolate; color-scheme: light;"
@@ -137,7 +137,7 @@ exports[`ThemeProvider should load themes based on default selected theme key. c
137137
<body>
138138
<div>
139139
<div
140-
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"
140+
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"
141141
dir="ltr"
142142
lang="en-US"
143143
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
@@ -41,7 +41,7 @@ export function extractSpectrumHTMLElement<
4141
export function extractSpectrumLastChildHTMLElement<
4242
THtml extends HTMLElement = HTMLElement,
4343
>(ref: DOMRefValue<THtml> | null): HTMLElement | null {
44-
const maybeHTMLElement = ref?.UNSAFE_getDOMNode().lastElementChild;
44+
const maybeHTMLElement = ref?.UNSAFE_getDOMNode()?.lastElementChild;
4545
return identityExtractHTMLElement(maybeHTMLElement);
4646
}
4747

0 commit comments

Comments
 (0)
⚡