Skip to content

Commit

Permalink
Merge branch 'main' into 3805-add-labelledby
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Jul 12, 2022
2 parents 2878174 + aec3c2a commit 2474619
Show file tree
Hide file tree
Showing 34 changed files with 178 additions and 758 deletions.
13 changes: 11 additions & 2 deletions .github/workflows/issue-triage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@ on:
types: [opened]
issue_comment:
types: [created]
workflow_call:
secrets:
APP_ID:
required: true
APP_PRIVATE_KEY:
required: true
ADD_TO_PROJECT_PAT:
required: true

jobs:
comment:
runs-on: ubuntu-latest
Expand All @@ -15,15 +24,15 @@ jobs:
with:
app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.APP_PRIVATE_KEY }}
- uses: ./actions/issues
- uses: carbon-design-system/carbon/actions/issues@main
with:
GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
enabled: true
add-to-project:
name: Add issue to Design System project
runs-on: ubuntu-latest
steps:
- uses: actions/add-to-project@v0.0.5
- uses: actions/add-to-project@v0.1.0
with:
project-url: https://github.com/orgs/carbon-design-system/projects/39
github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion config/eslint-config-carbon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-react": "^7.24.0",
"eslint-plugin-react-hooks": "^4.2.0",
"eslint-plugin-storybook": "^0.5.7",
"eslint-plugin-storybook": "^0.6.0",
"eslint-restricted-globals": "^0.2.0"
},
"devDependencies": {
Expand Down
1 change: 1 addition & 0 deletions docs/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ checkpoints:
| [Prerelease](#prerelease) | Publish a prerelease that will be used to test out the release candidate before becoming stabilized |
| [Stable release](#stablerelease) | Graduate the prerelease into a stable release that is available through packages on NPM |
| [Post release](#postrelease) | Support the latest stable release and address any issues that may come up as a result of promoting the release to stable |
| [Previous release](#postrelease) | Determine if new changes to v10 are present and need published, and do so if needed. |

### Prerelease

Expand Down
4 changes: 2 additions & 2 deletions examples/codesandbox-styles/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "codesandbox-styles",
"private": true,
"version": "0.9.0",
"version": "0.10.0",
"scripts": {
"develop": "vite"
},
"devDependencies": {
"vite": "^2.8.0"
},
"dependencies": {
"@carbon/styles": "^1.6.0",
"@carbon/styles": "^1.7.0",
"sass": "^1.51.0"
}
}
4 changes: 2 additions & 2 deletions examples/codesandbox-with-sass-compilation/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "codesandbox-with-sass-compilation",
"version": "0.8.0-rc.0",
"version": "0.8.0",
"private": true,
"dependencies": {
"@carbon/react": "^1.7.0-rc.0",
"@carbon/react": "^1.7.0",
"react": "^17.0.0",
"react-dom": "^17.0.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/codesandbox/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "codesandbox",
"version": "0.8.0-rc.0",
"version": "0.8.0",
"private": true,
"dependencies": {
"@carbon/react": "^1.7.0-rc.0",
"@carbon/react": "^1.7.0",
"react": "^17.0.0",
"react-dom": "^17.0.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.5.0-rc.0",
"version": "0.5.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.7.0-rc.0",
"@carbon/react": "^1.7.0",
"next": "12.1.4",
"react": "18.0.0",
"react-dom": "18.0.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.7.0-rc.0",
"version": "0.7.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.7.0-rc.0",
"@carbon/react": "^1.7.0",
"next": "12.1.4",
"react": "18.0.0",
"react-dom": "18.0.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/vite/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "vite",
"private": true,
"version": "0.5.0-rc.0",
"version": "0.5.0",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.7.0-rc.0",
"@carbon/react": "^1.7.0",
"react": "^17.0.0",
"react-dom": "^17.0.0"
},
Expand Down
6 changes: 3 additions & 3 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.7.0-rc.0",
"version": "8.7.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -39,8 +39,8 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/react": "^1.7.0-rc.0",
"@carbon/styles": "^1.6.0",
"@carbon/react": "^1.7.0",
"@carbon/styles": "^1.7.0",
"@carbon/telemetry": "0.1.0"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/carbon-components/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "carbon-components",
"description": "The Carbon Design System is IBM’s open-source design system for products and experiences.",
"version": "11.6.0",
"version": "11.7.0",
"license": "Apache-2.0",
"repository": {
"type": "git",
Expand Down Expand Up @@ -40,7 +40,7 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/styles": "^1.6.0",
"@carbon/styles": "^1.7.0",
"@carbon/telemetry": "0.1.0"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/react/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/react",
"description": "React components for the Carbon Design System",
"version": "1.7.0-rc.0",
"version": "1.7.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -46,7 +46,7 @@
"@carbon/feature-flags": "^0.8.0",
"@carbon/icons-react": "^11.5.0",
"@carbon/layout": "^11.3.0",
"@carbon/styles": "^1.6.0",
"@carbon/styles": "^1.7.0",
"@carbon/telemetry": "0.1.0",
"classnames": "2.3.1",
"copy-to-clipboard": "^3.3.1",
Expand Down Expand Up @@ -111,7 +111,7 @@
"rollup-plugin-strip-banner": "^2.0.0",
"rtlcss": "^3.5.0",
"sass": "^1.51.0",
"sass-loader": "^12.4.0",
"sass-loader": "^13.0.0",
"storybook-readme": "^5.0.9",
"stream-browserify": "^3.0.0",
"style-loader": "^3.3.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export const BreadcrumbWithOverflowMenu = () => (
</BreadcrumbItem>
<BreadcrumbItem href="#">Breadcrumb 2</BreadcrumbItem>
<BreadcrumbItem data-floating-menu-container>
<OverflowMenu>
<OverflowMenu ariaLabel="Overflow menu in a breadcrumb">
<OverflowMenuItem itemText="Breadcrumb 3" />
<OverflowMenuItem itemText="Breadcrumb 4" />
</OverflowMenu>
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ within the same space on screen. Only one content section is shown at a time.
Create Switch components for each section in the content switcher.

<Preview>
<Story id="components-contentswitcher--default" />
<Story id="components-contentswitcher--playground" />
</Preview>

## Component API
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
*/

import React from 'react';
import ContentSwitcher from '../ContentSwitcher';
import Switch from '../../Switch';
import { Layer } from '../../Layer';
import mdx from '../ContentSwitcher.mdx';
import ContentSwitcher from './ContentSwitcher';
import Switch from '../Switch';
import { Layer } from '../Layer';
import mdx from './ContentSwitcher.mdx';

export default {
title: 'Components/ContentSwitcher',
Expand Down Expand Up @@ -64,3 +64,30 @@ export const WithLayer = () => {
</>
);
};

export const Playground = (args) => (
<ContentSwitcher {...args}>
<Switch name="one" text="First section" />
<Switch name="two" text="Second section" />
<Switch name="three" text="Third section" />
</ContentSwitcher>
);

Playground.argTypes = {
children: {
table: {
disable: true,
},
},
className: {
table: {
disable: true,
},
},
onChange: {
action: 'onChange',
},
size: {
options: ['sm', 'md', 'lg'],
},
};
45 changes: 0 additions & 45 deletions packages/react/src/components/CopyButton/CopyButton-story.js

This file was deleted.

Loading

0 comments on commit 2474619

Please sign in to comment.