Skip to content

Commit 1ac5848

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents 64f011c + 6d539ec commit 1ac5848

File tree

94 files changed

+1774
-428
lines changed

Some content is hidden

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

94 files changed

+1774
-428
lines changed

config/babel-preset-ibm-cloud-cognitive/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "babel-preset-ibm-cloud-cognitive",
33
"private": true,
4-
"version": "0.37.0",
4+
"version": "0.38.0-rc.0",
55
"license": "Apache-2.0",
66
"main": "index.js",
77
"repository": {

config/jest-config-ibm-cloud-cognitive/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "jest-config-ibm-cloud-cognitive",
33
"private": true,
4-
"version": "1.38.0",
4+
"version": "1.39.0-rc.0",
55
"license": "Apache-2.0",
66
"main": "index.js",
77
"repository": {
@@ -32,7 +32,7 @@
3232
"accessibility-checker": "^4.0.7",
3333
"axe-core": "^4.10.3",
3434
"babel-jest": "^29.7.0",
35-
"babel-preset-ibm-cloud-cognitive": "^0.37.0",
35+
"babel-preset-ibm-cloud-cognitive": "^0.38.0-rc.0",
3636
"identity-obj-proxy": "^3.0.0",
3737
"jest-circus": "^29.7.0",
3838
"jest-watch-typeahead": "^3.0.0",

config/storybook-addon-carbon-theme/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@carbon/storybook-addon-theme",
33
"description": "Carbon theme switcher for Storybook",
4-
"version": "2.28.0",
4+
"version": "2.29.0-rc.0",
55
"license": "Apache-2.0",
66
"main": "dist/react.js",
77
"private": true,

cspell.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@
120120
"homescreen",
121121
"httperror",
122122
"httperrorother",
123+
"icondescription",
123124
"importmodal",
124125
"influencers",
125126
"inlineedit",

e2e/components/Coachmark/next/Coachmark-test.avt.e2e.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright IBM Corp. 2025
2+
* Copyright IBM Corp. 2025, 2025
33
*
44
* This source code is licensed under the Apache-2.0 license found in the
55
* LICENSE file in the root directory of this source tree.
@@ -17,7 +17,7 @@ test.describe('Coachmark @avt', () => {
1717
test('@avt-default-state', async ({ page }) => {
1818
await visitStory(page, {
1919
component: 'Coachmark',
20-
id: 'preview-onboarding-coachmark-next--tooltip',
20+
id: 'preview-onboarding-coachmark--tooltip',
2121
globals: {
2222
carbonTheme: 'white',
2323
},
@@ -28,7 +28,7 @@ test.describe('Coachmark @avt', () => {
2828
test('@avt-initially-focus-done-button', async ({ page }) => {
2929
await visitStory(page, {
3030
component: 'Coachmark',
31-
id: 'preview-onboarding-coachmark-next--tooltip',
31+
id: 'preview-onboarding-coachmark--tooltip',
3232
globals: {
3333
carbonTheme: 'white',
3434
},
@@ -40,7 +40,7 @@ test.describe('Coachmark @avt', () => {
4040
test('@avt-dragging-happening-on-header', async ({ page }) => {
4141
await visitStory(page, {
4242
component: 'Coachmark',
43-
id: 'preview-onboarding-coachmark-next--floating',
43+
id: 'preview-onboarding-coachmark--floating',
4444
globals: {
4545
carbonTheme: 'white',
4646
},

e2e/components/CreateFlows/CreateTearsheet-test.avt.e2e.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,6 @@ test.describe('CreateTearsheet @avt', () => {
108108
await page.keyboard.press('Tab');
109109
await page.keyboard.press('Tab');
110110
await page.keyboard.press('Tab');
111-
await page.keyboard.press('Tab');
112-
await page.keyboard.press('Tab');
113111

114112
// Goto next step by pressing enter
115113
await page.keyboard.press('Enter');
@@ -132,8 +130,6 @@ test.describe('CreateTearsheet @avt', () => {
132130
// Switch focus to back button
133131
await page.keyboard.press('Tab');
134132
await page.keyboard.press('Tab');
135-
await page.keyboard.press('Tab');
136-
await page.keyboard.press('Tab');
137133

138134
// Goto previous step by pressing enter
139135
await expect(backButton).toBeFocused();
@@ -190,7 +186,7 @@ test.describe('CreateTearsheet @avt', () => {
190186

191187
await expect(errorToggle).toBeFocused();
192188
// Enable simulate error toggle
193-
await page.keyboard.press('Enter');
189+
await page.keyboard.press('Space');
194190

195191
// Navigate to next button
196192
await page.keyboard.press('Tab');

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"lint:license:staged": "scripts/check-license.cjs -w",
4343
"lint:js": "eslint packages --fix",
4444
"lint:styles": "stylelint '**/*.scss' --fix",
45-
"prepare": "husky install",
45+
"prepare": "husky",
4646
"postinstall": "husky",
4747
"run-all": "lerna run --stream --prefix --loglevel success",
4848
"release-telemetry": "cd packages/ibm-products && yarn telemetry-config && cd ../ibm-products-web-components && yarn telemetry-config",
@@ -67,12 +67,12 @@
6767
"@babel/core": "^7.26.10",
6868
"@babel/eslint-parser": "^7.26.10",
6969
"@babel/preset-react": "^7.26.3",
70-
"@carbon/grid": "^11.44.0",
71-
"@carbon/layout": "^11.42.0",
72-
"@carbon/motion": "^11.36.0",
73-
"@carbon/react": "^1.92.1",
74-
"@carbon/themes": "^11.61.0",
75-
"@carbon/type": "^11.48.0",
70+
"@carbon/grid": "^11.45.0",
71+
"@carbon/layout": "^11.43.0",
72+
"@carbon/motion": "^11.37.0",
73+
"@carbon/react": "^1.95.0",
74+
"@carbon/themes": "^11.62.0",
75+
"@carbon/type": "^11.49.0",
7676
"@commitlint/cli": "^20.0.0",
7777
"@commitlint/config-conventional": "^20.0.0",
7878
"@eslint/compat": "^1.2.7",

packages/ibm-products-styles/CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
## `@carbon/[email protected]`
2+
### Features :rocket:
3+
- feat(Tearsheet): stacking, unit test, design review changes and fixes (#8563)
4+
5+
### Bug fixes :bug:
6+
- fix: tearsheet entry and exit animations not working after carbon upgrade (#8674)
7+
- fix: replace uselayouteffect with isomorphic effect (#8630)
8+
9+
### Housekeeping :house:
10+
- build(deps): update Carbon 11 compatible versions to latest (#8638)
11+
112
## `@carbon/[email protected]`
213
### Features :rocket:
314
- feat: composable tearsheet initial implementation (#8337)

packages/ibm-products-styles/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@carbon/ibm-products-styles",
33
"description": "Carbon for IBM Products styles",
4-
"version": "2.75.0",
4+
"version": "2.76.0-rc.0",
55
"license": "Apache-2.0",
66
"installConfig": {
77
"hoistingLimits": "none"
@@ -49,19 +49,19 @@
4949
"cross-env": "^10.0.0",
5050
"glob": "^11.0.1",
5151
"jest": "^29.7.0",
52-
"jest-config-ibm-cloud-cognitive": "^1.38.0",
52+
"jest-config-ibm-cloud-cognitive": "^1.39.0-rc.0",
5353
"jest-environment-jsdom": "^29.7.0",
5454
"npm-run-all2": "^8.0.0",
5555
"rimraf": "^6.0.1",
5656
"sass": "^1.93.2",
5757
"yargs": "^18.0.0"
5858
},
5959
"peerDependencies": {
60-
"@carbon/grid": "^11.44.0",
61-
"@carbon/layout": "^11.42.0",
62-
"@carbon/motion": "^11.36.0",
63-
"@carbon/themes": "^11.61.0",
64-
"@carbon/type": "^11.48.0"
60+
"@carbon/grid": "^11.45.0",
61+
"@carbon/layout": "^11.43.0",
62+
"@carbon/motion": "^11.37.0",
63+
"@carbon/themes": "^11.62.0",
64+
"@carbon/type": "^11.49.0"
6565
},
6666
"dependencies": {
6767
"@ibm/telemetry-js": "^1.9.1"

packages/ibm-products-styles/src/components/Tearsheet/_tearsheet.scss

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,17 @@ $motion-duration: $duration-moderate-02;
5151
}
5252
}
5353

54+
&:not(.is-visible) {
55+
&.#{$block-class}.#{$block-class} .#{$block-class}__container {
56+
// we want the enter/leave animation to run up most of the height of the
57+
// viewport, capped at 500px to set an upper limit on the movement speed
58+
// For the reason for calc() see https://github.com/sass/sass/issues/2849
59+
// and https://github.com/sass/node-sass/issues/2815.
60+
// stylelint-disable-next-line carbon/layout-use
61+
transform: translate3d(0, calc(min(95vh, 500px)), 0);
62+
}
63+
}
64+
5465
&.#{$block-class}.#{$block-class} {
5566
/* tearsheet uses --overlay-color and --overlay-opacity in ::before */
5667
background: initial;
@@ -106,12 +117,6 @@ $motion-duration: $duration-moderate-02;
106117
block-size: 100%;
107118
inset-block-start: auto;
108119
max-block-size: calc(100% - #{$spacing-09});
109-
// we want the enter/leave animation to run up most of the height of the
110-
// viewport, capped at 500px to set an upper limit on the movement speed
111-
// For the reason for calc() see https://github.com/sass/sass/issues/2849
112-
// and https://github.com/sass/node-sass/issues/2815.
113-
// stylelint-disable-next-line carbon/layout-use
114-
transform: translate3d(0, calc(min(95vh, 500px)), 0);
115120
}
116121

117122
&.#{$block-class}.#{$block-class}.#{$block-class}.#{$block-class}--has-slug

0 commit comments

Comments
 (0)