Skip to content

Commit f9933ff

Browse files
ariellalgilmoreariellalgilmore
authored
Merge branch 'main' into fix/data-table-ai-header
2 parents cbd00f3 + eacd2b7 commit f9933ff

File tree

166 files changed

+2271
-1260
lines changed

Some content is hidden

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

166 files changed

+2271
-1260
lines changed

‎.all-contributorsrc

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1857,6 +1857,24 @@
18571857
"contributions": [
18581858
"code"
18591859
]
1860+
},
1861+
{
1862+
"login": "Code-Suji",
1863+
"name": "SUJITH C S",
1864+
"avatar_url": "https://avatars.githubusercontent.com/u/43125517?v=4",
1865+
"profile": "https://www.linkedin.com/in/sujithcs",
1866+
"contributions": [
1867+
"code"
1868+
]
1869+
},
1870+
{
1871+
"login": "mariyageorge01",
1872+
"name": "Mariya George",
1873+
"avatar_url": "https://avatars.githubusercontent.com/u/166684108?v=4",
1874+
"profile": "https://github.com/mariyageorge01",
1875+
"contributions": [
1876+
"code"
1877+
]
18601878
}
18611879
],
18621880
"commitConvention": "none"

‎.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ jobs:
2424

2525
# Initializes the CodeQL tools for scanning.
2626
- name: Initialize CodeQL
27-
uses: github/codeql-action/init@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
27+
uses: github/codeql-action/init@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
2828
with:
2929
languages: javascript-typescript
3030
config: |
3131
paths-ignore:
3232
- 'packages/cli/src/component/templates/**'
3333
3434
- name: Perform CodeQL Analysis
35-
uses: github/codeql-action/analyze@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
35+
uses: github/codeql-action/analyze@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17

‎.yarn/cache/@rollup-rollup-darwin-arm64-npm-4.40.0-ecf87e5237-10.zip

-968 KB
Binary file not shown.

‎.yarn/cache/@rollup-rollup-darwin-arm64-npm-4.40.1-e921da81dd-10.zip

975 KB
Binary file not shown.

‎.yarn/cache/@rollup-rollup-darwin-x64-npm-4.40.0-ce74926f0f-10.zip

-1.03 MB
Binary file not shown.

‎.yarn/cache/@rollup-rollup-darwin-x64-npm-4.40.1-3f1b34eb64-10.zip

1.04 MB
Binary file not shown.

‎.yarn/cache/@rollup-rollup-linux-arm64-gnu-npm-4.40.0-5c086b8fa9-10.zip

-961 KB
Binary file not shown.

‎.yarn/cache/@rollup-rollup-linux-arm64-gnu-npm-4.40.1-6bc85ccfc9-10.zip

963 KB
Binary file not shown.

‎.yarn/cache/@rollup-rollup-linux-x64-gnu-npm-4.40.0-d8de197c1c-10.zip

-1.02 MB
Binary file not shown.

‎.yarn/cache/@rollup-rollup-linux-x64-gnu-npm-4.40.1-7dde71b7d9-10.zip

1.02 MB
Binary file not shown.

‎.yarn/cache/@rollup-rollup-win32-arm64-msvc-npm-4.40.0-abb4d0ab4b-10.zip

-1.01 MB
Binary file not shown.

‎.yarn/cache/@rollup-rollup-win32-arm64-msvc-npm-4.40.1-62a57c3e1b-10.zip

1.03 MB
Binary file not shown.

‎.yarn/cache/@rollup-rollup-win32-x64-msvc-npm-4.40.0-0261999477-10.zip

-1.17 MB
Binary file not shown.

‎.yarn/cache/@rollup-rollup-win32-x64-msvc-npm-4.40.1-2ff5da5c9b-10.zip

1.19 MB
Binary file not shown.

‎.yarn/cache/fdir-npm-6.4.2-83cd21b34c-5ff80d1d20.zip renamed to ‎.yarn/cache/fdir-npm-6.4.4-ac98cf8d06-d0000d6b79.zip

24.5 KB
Binary file not shown.

‎.yarn/cache/rollup-npm-4.40.0-5ee51badc3-59976247cd.zip

-546 KB
Binary file not shown.

‎.yarn/cache/rollup-npm-4.40.1-3f996d9e6d-35d5e83a69.zip

546 KB
Binary file not shown.

‎.yarn/cache/tinyglobby-npm-0.2.13-13dba315b3-b04557ee58.zip

10.9 KB
Binary file not shown.

‎.yarn/cache/vite-npm-6.2.6-19e4bde6cc-d8fb01a190.zip

-670 KB
Binary file not shown.

‎.yarn/cache/vite-npm-6.3.5-244c1b4d55-7bc3a1c5ef.zip

624 KB
Binary file not shown.

‎README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,8 @@ check out our [Contributing Guide](/.github/CONTRIBUTING.md) and our
337337
<td align="center"><a href="https://github.com/warrenmblood"><img src="https://avatars.githubusercontent.com/u/69060697?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Warren Blood</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=warrenmblood" title="Code">💻</a></td>
338338
<td align="center"><a href="https://github.com/vcherneny"><img src="https://avatars.githubusercontent.com/u/11604315?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vlad Cherneny</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=vcherneny" title="Code">💻</a></td>
339339
<td align="center"><a href="https://github.com/murito"><img src="https://avatars.githubusercontent.com/u/2628140?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Francisco Alcalá</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=murito" title="Code">💻</a></td>
340+
<td align="center"><a href="https://www.linkedin.com/in/sujithcs"><img src="https://avatars.githubusercontent.com/u/43125517?v=4?s=100" width="100px;" alt=""/><br /><sub><b>SUJITH C S</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=Code-Suji" title="Code">💻</a></td>
341+
<td align="center"><a href="https://github.com/mariyageorge01"><img src="https://avatars.githubusercontent.com/u/166684108?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mariya George</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=mariyageorge01" title="Code">💻</a></td>
340342
</tr>
341343
</table>
342344

‎docs/experimental-code.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ All breaking changes will be shipped as `enable-v12-*` flags within the current
101101
major release (v11). This enables projects to opt-in to breaking changes earlier
102102
and at their own pace avoiding one huge changeset when upgrading to the next
103103
major release. In theory, if all `enable-v12-*` flags are enabled within your
104-
project before the v12 release, no changes should need to be made when updating
105-
to v12.
104+
project before the v12 release, no changes should need to be made to the
105+
affected components when updating to v12.
106106

107107
For a flag to be committed to a release and renamed to `enable-v#-*` it must:
108108

‎docs/release-schedule.md

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,33 @@ major versions of the Carbon Design System.
77
| ------- | ----------- | --------------- | ------------ | ----------------- | ----------- |
88
| `main` | unstable | unstable | unstable | unstable | unstable |
99
| v9 | End of life | 2018-06-04 | 2018-06-04 | 2019-03-29 | 2022-03-31 |
10-
| v10 | Maintenance | 2019-03-29 | 2019-03-29 | 2022-03-31 | 2024-09-30 |
11-
| v11 | Active | 2021-08-06 | 2022-03-31 | 2026-03-31 | 2028-03-31 |
12-
| v12 | Unreleased | 2025-08-01 | 2026-03-31 | 2028-03-31 | 2029-03-31 |
10+
| v10 | End of life | 2019-03-29 | 2019-03-29 | 2022-03-31 | 2024-09-30 |
11+
| v11 | Active | 2021-08-06 | 2022-03-31 | TBD | TBD |
12+
| v12 | Preview | 2023-05-25 | TBD | TBD | TBD |
1313

1414
> Dates are subject to change
1515
16-
![schedule](https://github.com/carbon-design-system/carbon/assets/3360588/b8014b83-a743-4ace-83a3-ff1c96eef194)
16+
![schedule](https://github.com/user-attachments/assets/bc5ccd5a-8781-4ba5-9024-2aaaf0a53121)
1717

1818
## Release phases
1919

20+
### Preview
21+
22+
The preview phase allows consumers to incrementally opt in to changes that will
23+
be present in the next major, but through the current active release. This phase
24+
begins when the first feature flag is "committed" to be on-by-default in a
25+
future major version.
26+
27+
Once committed, flag names contain the version they've been committed to with
28+
the prefix `enable-v#-*`. At this point the API or functionality behind this
29+
flag is now fixed and won't change. We intend to ship this flag as "on by
30+
default" in the major version indicated in the name. e.g.
31+
`enable-v12-tile-default-icons`
32+
33+
In theory, if all `enable-v12-*` flags are enabled within your project before
34+
the v12 release, no changes should need to be made to the affected components
35+
when updating to v12.
36+
2037
### Prerelease
2138

2239
The prerelease phase is intended to be the opportunity for early adopters,

‎examples/class-prefix/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
"devDependencies": {
1717
"@vitejs/plugin-react": "4.0.0",
1818
"sass": "^1.77.7",
19-
"vite": "^6.2.3"
19+
"vite": "^6.3.5"
2020
}
2121
}

‎examples/codesandbox-styles/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"devDependencies": {
1010
"sass": "^1.77.7",
11-
"vite": "^6.2.3"
11+
"vite": "^6.3.5"
1212
},
1313
"dependencies": {
1414
"@carbon/styles": "^1.80.0"

‎examples/custom-theme/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
"devDependencies": {
1717
"@vitejs/plugin-react": "4.0.0",
1818
"sass": "^1.77.7",
19-
"vite": "^6.2.3"
19+
"vite": "^6.3.5"
2020
}
2121
}

‎examples/id-prefix/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
"devDependencies": {
1717
"@vitejs/plugin-react": "4.0.0",
1818
"sass": "^1.77.7",
19-
"vite": "^6.2.3"
19+
"vite": "^6.3.5"
2020
}
2121
}

‎examples/v10-token-compat-in-v11/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
"devDependencies": {
1717
"@vitejs/plugin-react": "4.0.0",
1818
"sass": "^1.77.7",
19-
"vite": "^6.2.3"
19+
"vite": "^6.3.5"
2020
}
2121
}

‎examples/vite/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
"devDependencies": {
1717
"@vitejs/plugin-react": "4.0.0",
1818
"sass": "^1.77.7",
19-
"vite": "^6.2.3"
19+
"vite": "^6.3.5"
2020
}
2121
}

‎packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap

Lines changed: 84 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11149,8 +11149,49 @@ Map {
1114911149
},
1115011150
"render": [Function],
1115111151
},
11152+
"ContentPageActions": Object {
11153+
"displayName": "PageHeaderContentPageActions",
11154+
"propTypes": Object {
11155+
"children": Object {
11156+
"type": "node",
11157+
},
11158+
"className": Object {
11159+
"type": "string",
11160+
},
11161+
"menuButtonLabel": Object {
11162+
"type": "string",
11163+
},
11164+
"pageActions": Object {
11165+
"args": Array [
11166+
Array [
11167+
Object {
11168+
"type": "node",
11169+
},
11170+
Object {
11171+
"type": "array",
11172+
},
11173+
],
11174+
],
11175+
"type": "oneOfType",
11176+
},
11177+
},
11178+
},
11179+
"ContentText": Object {
11180+
"displayName": "PageHeaderContentText",
11181+
"propTypes": Object {
11182+
"children": Object {
11183+
"type": "node",
11184+
},
11185+
"className": Object {
11186+
"type": "string",
11187+
},
11188+
"subtitle": Object {
11189+
"type": "string",
11190+
},
11191+
},
11192+
},
1115211193
"HeroImage": Object {
11153-
"$$typeof": Symbol(react.forward_ref),
11194+
"displayName": "PageHeaderHeroImage",
1115411195
"propTypes": Object {
1115511196
"children": Object {
1115611197
"type": "node",
@@ -11159,7 +11200,6 @@ Map {
1115911200
"type": "string",
1116011201
},
1116111202
},
11162-
"render": [Function],
1116311203
},
1116411204
"PageHeader": Object {
1116511205
"$$typeof": Symbol(react.forward_ref),
@@ -11207,8 +11247,49 @@ Map {
1120711247
},
1120811248
"render": [Function],
1120911249
},
11250+
"PageHeaderContentPageActions": Object {
11251+
"displayName": "PageHeaderContentPageActions",
11252+
"propTypes": Object {
11253+
"children": Object {
11254+
"type": "node",
11255+
},
11256+
"className": Object {
11257+
"type": "string",
11258+
},
11259+
"menuButtonLabel": Object {
11260+
"type": "string",
11261+
},
11262+
"pageActions": Object {
11263+
"args": Array [
11264+
Array [
11265+
Object {
11266+
"type": "node",
11267+
},
11268+
Object {
11269+
"type": "array",
11270+
},
11271+
],
11272+
],
11273+
"type": "oneOfType",
11274+
},
11275+
},
11276+
},
11277+
"PageHeaderContentText": Object {
11278+
"displayName": "PageHeaderContentText",
11279+
"propTypes": Object {
11280+
"children": Object {
11281+
"type": "node",
11282+
},
11283+
"className": Object {
11284+
"type": "string",
11285+
},
11286+
"subtitle": Object {
11287+
"type": "string",
11288+
},
11289+
},
11290+
},
1121011291
"PageHeaderHeroImage": Object {
11211-
"$$typeof": Symbol(react.forward_ref),
11292+
"displayName": "PageHeaderHeroImage",
1121211293
"propTypes": Object {
1121311294
"children": Object {
1121411295
"type": "node",
@@ -11217,7 +11298,6 @@ Map {
1121711298
"type": "string",
1121811299
},
1121911300
},
11220-
"render": [Function],
1122111301
},
1122211302
"PageHeaderTabBar": Object {
1122311303
"$$typeof": Symbol(react.forward_ref),

‎packages/react/examples/custom-data-table-state-manager-vite/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
"eslint-plugin-react-hooks": "^4.6.0",
2525
"eslint-plugin-react-refresh": "^0.4.6",
2626
"sass": "1.69.5",
27-
"vite": "^5.2.14"
27+
"vite": "^6.3.5"
2828
}
2929
}

‎packages/react/examples/drag-and-drop-file-uploader-vite/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
"eslint-plugin-react-hooks": "^4.6.0",
2424
"eslint-plugin-react-refresh": "^0.4.4",
2525
"sass": "1.63.6",
26-
"vite": "^5.4.18"
26+
"vite": "^6.3.5"
2727
}
2828
}

‎packages/react/examples/react-router-vite/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@
2626
"eslint-plugin-react": "^7.33.2",
2727
"eslint-plugin-react-hooks": "^4.6.0",
2828
"eslint-plugin-react-refresh": "^0.4.4",
29-
"vite": "^6.2.3"
29+
"vite": "^6.3.5"
3030
}
3131
}

‎packages/react/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
"@carbon/icons-react": "^11.59.0",
5757
"@carbon/layout": "^11.33.0",
5858
"@carbon/styles": "^1.80.0",
59+
"@carbon/utilities": "^0.5.0",
5960
"@floating-ui/react": "^0.27.4",
6061
"@ibm/telemetry-js": "^1.5.0",
6162
"classnames": "2.5.1",

‎packages/react/previewer/configFiles.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export const packageJson: string = `{
2323
"devDependencies": {
2424
"@vitejs/plugin-react": "4.0.0",
2525
"sass": "^1.77.7",
26-
"vite": "^4.3.8"
26+
"vite": "^6.3.5"
2727
}
2828
}`;
2929

‎packages/react/src/components/Breadcrumb/Breadcrumb.tsx

Lines changed: 27 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
/**
2-
* Copyright IBM Corp. 2016, 2023
2+
* Copyright IBM Corp. 2016, 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.
66
*/
77

88
import PropTypes from 'prop-types';
9-
import React, { PropsWithChildren } from 'react';
9+
import React, { forwardRef } from 'react';
1010
import cx from 'classnames';
1111
import { usePrefix } from '../../internal/usePrefix';
12-
import { ForwardRefReturn } from '../../types/common';
1312

1413
export interface BreadcrumbProps extends React.HTMLAttributes<HTMLElement> {
1514
/**
@@ -34,36 +33,33 @@ export interface BreadcrumbProps extends React.HTMLAttributes<HTMLElement> {
3433
size?: 'sm' | 'md';
3534
}
3635

37-
const Breadcrumb: ForwardRefReturn<HTMLElement, BreadcrumbProps> =
38-
React.forwardRef(function Breadcrumb(
39-
{
40-
'aria-label': ariaLabel,
41-
children,
42-
className: customClassNameNav,
43-
noTrailingSlash,
44-
size,
45-
...rest
46-
}: PropsWithChildren<BreadcrumbProps>,
47-
ref: React.Ref<HTMLElement>
48-
) {
49-
const prefix = usePrefix();
50-
const className = cx({
51-
[`${prefix}--breadcrumb`]: true,
52-
[`${prefix}--breadcrumb--no-trailing-slash`]: noTrailingSlash,
53-
[`${prefix}--breadcrumb--sm`]: size === 'sm',
54-
});
55-
56-
return (
57-
<nav
58-
className={customClassNameNav}
59-
aria-label={ariaLabel ? ariaLabel : 'Breadcrumb'}
60-
ref={ref}
61-
{...rest}>
62-
<ol className={className}>{children}</ol>
63-
</nav>
64-
);
36+
const Breadcrumb = forwardRef<HTMLElement, BreadcrumbProps>((props, ref) => {
37+
const {
38+
'aria-label': ariaLabel,
39+
children,
40+
className: customClassNameNav,
41+
noTrailingSlash,
42+
size,
43+
...rest
44+
} = props;
45+
const prefix = usePrefix();
46+
const className = cx({
47+
[`${prefix}--breadcrumb`]: true,
48+
[`${prefix}--breadcrumb--no-trailing-slash`]: noTrailingSlash,
49+
[`${prefix}--breadcrumb--sm`]: size === 'sm',
6550
});
6651

52+
return (
53+
<nav
54+
className={customClassNameNav}
55+
aria-label={ariaLabel ? ariaLabel : 'Breadcrumb'}
56+
ref={ref}
57+
{...rest}>
58+
<ol className={className}>{children}</ol>
59+
</nav>
60+
);
61+
});
62+
6763
Breadcrumb.displayName = 'Breadcrumb';
6864
Breadcrumb.propTypes = {
6965
/**

0 commit comments

Comments
 (0)