Skip to content

Commit

Permalink
Merge branch 'main' into rename-slug-to-ai-label
Browse files Browse the repository at this point in the history
  • Loading branch information
tw15egan authored Jul 16, 2024
2 parents d342655 + b12ac2e commit 22be730
Show file tree
Hide file tree
Showing 70 changed files with 892 additions and 453 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
uses: github/codeql-action/init@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
with:
languages: javascript

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
uses: github/codeql-action/analyze@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
Binary file not shown.
16 changes: 6 additions & 10 deletions docs/guides/support.md
Original file line number Diff line number Diff line change
Expand Up @@ -346,16 +346,12 @@ business impact that the feature will bring with future research done.

### Severity

There are 4 levels of severity for bugs in the Carbon core repositories:

- https://github.com/carbon-design-system/carbon/labels/severity%3A%201 - _"Must
be fixed ASAP"_
- https://github.com/carbon-design-system/carbon/labels/severity%3A%202 - _"User
cannot complete task, and/or no workaround"_
- https://github.com/carbon-design-system/carbon/labels/severity%3A%203 - _"User
can complete task, and/or has a workaround"_
- https://github.com/carbon-design-system/carbon/labels/severity%3A%204 -
_"Unrelated to a user task, has a workaround or does not need a workaround"_
| Level | Description | Kit | Docs | Code | Release |
| :-------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------: | ---------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| https://github.com/carbon-design-system/carbon/labels/severity%3A%201 | Affects major functionality. Blocks users from completing tasks, exposes intellectual property or damages the brand. No workaround. | The kit is has major functionality defects, designers can’t design and there is no workaround | The documentation damages the brand or exposes intellectual property. | The code has major functionality defects, breaking builds and can’t be worked around. | If the problem is in production, it must be fixed as soon as possible in a patch.   |
| https://github.com/carbon-design-system/carbon/labels/severity%3A%202 | Affects major functionality. Does not block users from completing tasks. Has a workaround. | The kit has a major functionality defect, but it doesn't block users from completing tasks. It has a workaround. | The documentation is wrong or missing major details. It conflicts with what we are saying in another part of the system. | The code has a major functionality defect, but it doesn't block users from completing tasks. It has a workaround | A release will be moved into Production with defects at this severity level included. These defects will have priority in future sprints to be resolved ASAP. |
| https://github.com/carbon-design-system/carbon/labels/severity%3A%203 | Affects minor functionality. Does not block users from completing tasks. Has a workaround. | The kit has a minor functionality defect. It doesn't block users from completing tasks. Has a workaround. | The documentation is mis-leading, somewhat true, missing minor details, or grammatically incorrect. It doesn't present conflicts with other parts of the design system. | The code has a minor functionality defect. It doesn’t block users from completing tasks. Has a workaround. | A release will be moved into Production with defects at this severity level included. These defects will have priority in future sprints after sev2’s. |
| https://github.com/carbon-design-system/carbon/labels/severity%3A%204 | Unrelated to a user task. Does not need a workaround. | Unrelated to a user task. Does not need a workaround. | Unrelated to a user task. Content has a typo. | Unrelated to a user task. Does not need a workaround. | A release will be moved into Production with defects at this severity level included. These will often not be addressed by the maintainer team as a priority in future releases. |

Workarounds can be described as either of the following:

Expand Down
4 changes: 2 additions & 2 deletions examples/class-prefix/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "class-prefix",
"private": true,
"version": "0.58.0",
"version": "0.59.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.61.0",
"@carbon/react": "^1.62.0-rc.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/custom-theme/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "custom-theme",
"private": true,
"version": "0.59.0",
"version": "0.60.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.61.0",
"@carbon/react": "^1.62.0-rc.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/id-prefix/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "id-prefix",
"private": true,
"version": "0.58.0",
"version": "0.59.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.61.0",
"@carbon/react": "^1.62.0-rc.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/light-dark-mode/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "examples-light-dark",
"private": true,
"version": "0.59.0",
"version": "0.60.0-rc.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.61.0",
"@carbon/react": "^1.62.0-rc.0",
"next": "14.1.1",
"react": "18.2.0",
"react-dom": "18.2.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/nextjs/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "examples-nextjs",
"private": true,
"version": "0.61.0",
"version": "0.62.0-rc.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.61.0",
"@carbon/react": "^1.62.0-rc.0",
"next": "14.1.1",
"react": "18.2.0",
"react-dom": "18.2.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/v10-token-compat-in-v11/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "v10-token-compat-in-v11",
"private": true,
"version": "0.59.0",
"version": "0.60.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.61.0",
"@carbon/react": "^1.62.0-rc.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/vite/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "vite",
"private": true,
"version": "0.59.0",
"version": "0.60.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.61.0",
"@carbon/react": "^1.62.0-rc.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/carbon-components-react/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "carbon-components-react",
"description": "The Carbon Design System is IBM’s open-source design system for products and experiences.",
"version": "8.61.0",
"version": "8.62.0-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -42,7 +42,7 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/react": "^1.61.0",
"@carbon/react": "^1.62.0-rc.0",
"@carbon/styles": "^1.61.0",
"@ibm/telemetry-js": "^1.5.0",
"chalk": "1.1.3"
Expand Down
42 changes: 42 additions & 0 deletions packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -7840,6 +7840,29 @@ Map {
},
},
},
"TabListVertical" => Object {
"propTypes": Object {
"activation": Object {
"args": Array [
Array [
"automatic",
"manual",
],
],
"type": "oneOf",
},
"aria-label": Object {
"isRequired": true,
"type": "string",
},
"children": Object {
"type": "node",
},
"className": Object {
"type": "string",
},
},
},
"TabPanel" => Object {
"$$typeof": Symbol(react.forward_ref),
"propTypes": Object {
Expand Down Expand Up @@ -8425,6 +8448,25 @@ Map {
},
},
},
"TabsVertical" => Object {
"propTypes": Object {
"children": Object {
"type": "node",
},
"defaultSelectedIndex": Object {
"type": "number",
},
"height": Object {
"type": "string",
},
"onChange": Object {
"type": "func",
},
"selectedIndex": Object {
"type": "number",
},
},
},
"Tag" => Object {
"$$typeof": Symbol(react.forward_ref),
"propTypes": Object {
Expand Down
3 changes: 0 additions & 3 deletions packages/react/code-connect/Accordion/Accordion.figma.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* LICENSE file in the root directory of this source tree.
*/

// @ts-nocheck
import React from 'react';
import { Accordion } from '@carbon/react';
import figma from '@figma/code-connect';
Expand All @@ -29,8 +28,6 @@ figma.connect(
}),
},
example: ({ children, accordionItem }) => (
// Disclaimer: Code Connect is currently in beta and integration with Carbon
// React is in an exploratory phase. Code sample below may be incomplete.
<Accordion
size={accordionItem.size}
align={accordionItem.align}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* LICENSE file in the root directory of this source tree.
*/

// @ts-nocheck
import React from 'react';
import { AccordionItem } from '@carbon/react';
import figma from '@figma/code-connect';
Expand Down
7 changes: 1 addition & 6 deletions packages/react/code-connect/Breadcrumb/Breadcrumb.figma.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* LICENSE file in the root directory of this source tree.
*/

// @ts-nocheck
import React from 'react';
import { Breadcrumb } from '@carbon/react';
import figma from '@figma/code-connect';
Expand All @@ -18,11 +17,7 @@ figma.connect(
//noTrailingSlash: needs to come from child item component in figma
children: figma.children(['_Breadcrumb item']),
},
example: ({ children }) => (
// Disclaimer: Code Connect is currently in beta and integration with Carbon
// React is in an exploratory phase. Code sample below may be incomplete.
<Breadcrumb>{children}</Breadcrumb>
),
example: ({ children }) => <Breadcrumb>{children}</Breadcrumb>,
}
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* LICENSE file in the root directory of this source tree.
*/

// @ts-nocheck
import React from 'react';
import { BreadcrumbItem, OverflowMenu, OverflowMenuItem } from '@carbon/react';
import figma from '@figma/code-connect';
Expand Down
31 changes: 3 additions & 28 deletions packages/react/code-connect/Button/Button.figma.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
*/

// @ts-nocheck
import React from 'react';
import { Button, ButtonSkeleton } from '@carbon/react';
Expand Down Expand Up @@ -43,28 +42,8 @@ figma.connect(
}),
renderIcon: figma.instance('Swap icon'),
},
example: ({
size,
kind,
isExpressive,
hasIconOnly,
renderIcon,
disabled,
buttonText,
}) => {
return (
// Disclaimer: Code Connect is currently in beta and integration with Carbon
// React is in an exploratory phase. Code sample below may be incomplete.
<Button
size={size}
kind={kind}
isExpressive={isExpressive}
hasIconOnly={hasIconOnly}
renderIcon={renderIcon}
disabled={disabled}>
{buttonText}
</Button>
);
example: ({ ...props, buttonText }) => {
return <Button {...props}>{buttonText}</Button>;
},
}
);
Expand All @@ -84,11 +63,7 @@ figma.connect(
}),
},
example: ({ size }) => {
return (
// Disclaimer: Code Connect is currently in beta and integration with Carbon
// React is in an exploratory phase. Code sample below may be incomplete.
<ButtonSkeleton size={size} />
);
return <ButtonSkeleton size={size} />;
},
}
);
36 changes: 2 additions & 34 deletions packages/react/code-connect/Checkbox/Checkbox.figma.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,34 +49,7 @@ figma.connect(
'Read-only': true,
}),
},
example: ({
helperText,
labelText,
indeterminate,
checked,
invalidText,
warnText,
disabled,
readOnly,
invalid,
warn,
hideLabel,
}) => (
<Checkbox
id="your_checkbox_id"
labelText={labelText}
helperText={helperText}
indeterminate={indeterminate}
checked={checked}
warnText={warnText}
invalidText={invalidText}
disabled={disabled}
readOnly={readOnly}
invalid={invalid}
warn={warn}
hideLabel={hideLabel}
/>
),
example: ({ ...props }) => <Checkbox id="your_checkbox_id" {...props} />,
}
);

Expand All @@ -85,11 +58,6 @@ figma.connect(
'https://www.figma.com/file/YAnB1jKx0yCUL29j6uSLpg/(v11)-All-themes---Carbon-Design-System?type=design&node-id=3193-29303&mode=design&t=QVE44xARq96HRr11-4',
{
variant: { State: 'Skeleton' },
example: () => (
// Disclaimer: Code Connect is currently in beta and
// integration with Carbon React is in an exploratory phase.
// Code sample below may be incomplete.
<CheckboxSkeleton />
),
example: () => <CheckboxSkeleton />,
}
);
Loading

0 comments on commit 22be730

Please sign in to comment.