Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Repo: upgrade Carbon to 10.53 #3300

Merged
merged 14 commits into from
Mar 14, 2022
Merged

Repo: upgrade Carbon to 10.53 #3300

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2774857
feat(repo): upgrade to carbon 10.50
kevinsperrine Feb 17, 2022
c7ec393
chore(repo): upgrade carbon to 10.51
kevinsperrine Feb 17, 2022
81ee374
chore(repo): upgrade carbon to 10.52
kevinsperrine Feb 17, 2022
98e2be4
chore(repo): upgrade carbon to 10.53
kevinsperrine Feb 17, 2022
4d0cda3
fix(table): pass ref directly to pagination now
kevinsperrine Feb 17, 2022
a225c72
fix(color-dropdown): replace dropdownTitleFixer hook
kevinsperrine Feb 17, 2022
2715b06
fix(icon-dropdown): replace dropdownTitleFixer hook
kevinsperrine Feb 17, 2022
313a98c
fix(simple-icon-dropdown): replace dropdownTitleFixer hook
kevinsperrine Feb 17, 2022
c41feae
fix(simple-icon-dropdown): add title to items in open dropdown
kevinsperrine Feb 17, 2022
3b8ba1f
fix(table): remove dropdownTitleFixer from TableViewDropdown
kevinsperrine Feb 17, 2022
95ae36b
feat(repo): remove dropdownHooks
kevinsperrine Feb 17, 2022
f766123
Merge remote-tracking branch 'origin/next' into carbon-upgrade-10.53
kevinsperrine Feb 23, 2022
0c8466f
Merge remote-tracking branch 'origin/next' into carbon-upgrade-10.53
kevinsperrine Feb 24, 2022
337767b
Merge remote-tracking branch 'origin/next' into carbon-upgrade-10.53
kevinsperrine Mar 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
937 changes: 521 additions & 416 deletions packages/react/.storybook/__snapshots__/Welcome.story.storyshot
View file
Open in desktop

Large diffs are not rendered by default.

19 changes: 18 additions & 1 deletion packages/react/config/jest/setupTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,23 @@ beforeEach(() => {
// Review this for more context: https://github.com/carbon-design-system/carbon-addons-iot-react/issues/1143#issuecomment-623577505
expect.hasAssertions();

// Ensure that downshift's internal ID is always 0, otherwise snapshots will change unecessarily when unrelated snaps are regenerated.
// Ensure that downshift's internal ID is always 0, otherwise snapshots will change unnecessarily when unrelated snaps are regenerated.
resetIdCounter();

// carbon v10.52 adds matchMedia which needs to be mocked in tests, wrapped in if otherwise breaks ssr test
if (typeof window !== 'undefined') {
Object.defineProperty(window, 'matchMedia', {
writable: true,
value: jest.fn().mockImplementation((query) => ({
matches: false,
media: query,
onchange: null,
addListener: jest.fn(), // Deprecated
removeListener: jest.fn(), // Deprecated
addEventListener: jest.fn(),
removeEventListener: jest.fn(),
dispatchEvent: jest.fn(),
})),
});
}
});
16 changes: 8 additions & 8 deletions packages/react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,16 +171,16 @@
"@babel/runtime": "^7.10.2",
"@carbon/charts": "0.54.2",
"@carbon/charts-react": "0.54.2",
"@carbon/colors": "10.34.0",
"@carbon/icons-react": "10.44.0",
"@carbon/layout": "10.34.0",
"@carbon/motion": "10.26.0",
"@carbon/pictograms-react": "11.20.0",
"@carbon/colors": "10.35.0",
"@carbon/icons-react": "10.46.0",
"@carbon/layout": "10.36.0",
"@carbon/motion": "10.28.0",
"@carbon/pictograms-react": "11.22.0",
"@carbon/telemetry": "^0.0.0-alpha.6",
"@carbon/themes": "10.47.0",
"@carbon/themes": "10.51.0",
"@monaco-editor/react": "^3.6.2",
"carbon-components": "10.49.0",
"carbon-components-react": "7.49.1",
"carbon-components": "10.53.0",
"carbon-components-react": "7.53.0",
"carbon-icons": "^7.0.7",
"classnames": "^2.2.5",
"core-js": "3.6.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/components/Accordion/__snapshots__/AccordionItemDefer.story.storyshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/A
}
>
<ul
className="bx--accordion bx--accordion--end"
className="bx--accordion bx--accordion--end bx--accordion--md"
>
<li
className="bx--accordion__item"
Expand Down
7 changes: 6 additions & 1 deletion packages/react/src/components/Card/__snapshots__/Card.story.storyshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,9 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/C
<p
className="bx--batch-summary__para"
>
<span>
<span
dir="auto"
>
0 items selected
</span>
</p>
Expand Down Expand Up @@ -1662,6 +1664,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/C
className="iot--flyout-menu--tooltip-anchor"
>
<div
aria-describedby={null}
aria-expanded={false}
aria-label="Calendar"
className="bx--tooltip__label"
Expand Down Expand Up @@ -1813,6 +1816,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/C
className="iot--flyout-menu--tooltip-anchor"
>
<div
aria-describedby={null}
aria-expanded={false}
aria-label="Calendar"
className="bx--tooltip__label"
Expand Down Expand Up @@ -1895,6 +1899,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 1 - Watson IoT/C
>

<div
aria-describedby={null}
className="bx--tooltip__trigger"
onBlur={[Function]}
onClick={[Function]}
Expand Down
120 changes: 10 additions & 110 deletions ...ardEditor/CardEditForm/CardEditFormItems/__snapshots__/ThresholdsFormItem.story.storyshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,22 +89,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
id="downshift-0-toggle-button"
onClick={[Function]}
onKeyDown={[Function]}
title={
<div
className="iot--icon-dropdown__item"
style={
Object {
"color": "#da1e28",
}
}
>
<div
className="iot--icon-dropdown__item-border"
>
<ForwardRef(Warning24) />
</div>
</div>
}
title="Warning"
type="button"
>
<span
Expand All @@ -117,6 +102,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
"color": "#da1e28",
}
}
title="Warning"
>
<div
className="iot--icon-dropdown__item-border"
Expand Down Expand Up @@ -203,26 +189,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
id="downshift-1-toggle-button"
onClick={[Function]}
onKeyDown={[Function]}
title={
<div
className="iot--color-dropdown__item"
title="red60"
>
<div
className="iot--color-dropdown__item-border"
>
<div
className="iot--color-dropdown__color-sample"
style={
Object {
"backgroundColor": "#da1e28",
}
}
title="#da1e28"
/>
</div>
</div>
}
title="red60"
type="button"
>
<span
Expand Down Expand Up @@ -508,22 +475,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
id="downshift-3-toggle-button"
onClick={[Function]}
onKeyDown={[Function]}
title={
<div
className="iot--icon-dropdown__item"
style={
Object {
"color": "#24a148",
}
}
>
<div
className="iot--icon-dropdown__item-border"
>
<ForwardRef(Warning24) />
</div>
</div>
}
title="Warning"
type="button"
>
<span
Expand All @@ -536,6 +488,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
"color": "#24a148",
}
}
title="Warning"
>
<div
className="iot--icon-dropdown__item-border"
Expand Down Expand Up @@ -622,26 +575,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
id="downshift-4-toggle-button"
onClick={[Function]}
onKeyDown={[Function]}
title={
<div
className="iot--color-dropdown__item"
title="green50"
>
<div
className="iot--color-dropdown__item-border"
>
<div
className="iot--color-dropdown__color-sample"
style={
Object {
"backgroundColor": "#24a148",
}
}
title="#24a148"
/>
</div>
</div>
}
title="green50"
type="button"
>
<span
Expand Down Expand Up @@ -927,22 +861,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
id="downshift-6-toggle-button"
onClick={[Function]}
onKeyDown={[Function]}
title={
<div
className="iot--icon-dropdown__item"
style={
Object {
"color": "#ff832b",
}
}
>
<div
className="iot--icon-dropdown__item-border"
>
<ForwardRef(Warning24) />
</div>
</div>
}
title="Warning"
type="button"
>
<span
Expand All @@ -955,6 +874,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
"color": "#ff832b",
}
}
title="Warning"
>
<div
className="iot--icon-dropdown__item-border"
Expand Down Expand Up @@ -1041,26 +961,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
id="downshift-7-toggle-button"
onClick={[Function]}
onKeyDown={[Function]}
title={
<div
className="iot--color-dropdown__item"
title="orange40"
>
<div
className="iot--color-dropdown__item-border"
>
<div
className="iot--color-dropdown__color-sample"
style={
Object {
"backgroundColor": "#ff832b",
}
}
title="#ff832b"
/>
</div>
</div>
}
title="orange40"
type="button"
>
<span
Expand Down Expand Up @@ -1204,8 +1105,7 @@ exports[`Storybook Snapshot tests and console checks Storyshots 2 - Watson IoT E
data-invalid={null}
>
<input
aria-describedby=""
className="bx--text-input"
className="bx--text-input bx--text-input--md"
data-testid="threshold-2-text-input"
disabled={false}
id="undefined_value-card-threshold-value_2"
Expand Down
Loading