Skip to content

Commit

Permalink
Merge branch 'main' into fix_16916_switcher_fragment
Browse files Browse the repository at this point in the history
  • Loading branch information
2nikhiltom authored Sep 12, 2024
2 parents c9536c8 + a6f1b23 commit 4f3ae85
Show file tree
Hide file tree
Showing 88 changed files with 1,359 additions and 799 deletions.
62 changes: 62 additions & 0 deletions .github/codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
coverage:
status:
project:
default:
informational: true
patch:
default:
informational: true

component_management:
default_rules: # default rules that will be inherited by all components
statuses:
- type: project # in this case every component that doens't have a status defined will have a project type one
target: auto
threshold: 1%
branches:
- '!main'
individual_components:
- component_id: colors
name: colors
paths:
- ../packages/colors/**
- component_id: feature-flags
name: feature-flags
paths:
- ../packages/feature-flags/**
- component_id: icon-build-helpers
name: icon-build-helpers
paths:
- ../packages/icon-build-helpers/**
- component_id: layout
name: layout
paths:
- ../packages/layout/**
- component_id: motion
name: motion
paths:
- ../packages/motion/**
- component_id: react # this is an identifier that should not be changed
name: react # this is a display name, and can be changed freely
paths:
- ../packages/react/**
- component_id: scss-generator
name: scss-generator
paths:
- ../packages/scss-generator/**
- component_id: test-utils
name: test-utils
paths:
- ../packages/test-utils/**
- component_id: themes
name: themes
paths:
- ../packages/themes/**
- component_id: type
name: type
paths:
- ../packages/type/**
- component_id: upgrade
name: upgrade
paths:
- ../packages/upgrade/**
7 changes: 5 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,11 @@ jobs:
run: |
yarn carbon-cli check --ignore '**/@(node_modules|examples|components|react|fixtures|compat)/**' 'packages/**/*.scss'
- name: Run tests
run: yarn test --ci

run: yarn test --ci --collectCoverage
- name: Upload coverage reports to Codecov with GitHub Action
uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
e2e:
name: 'test:e2e'
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/slack-office-hours-design.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
"emoji": true
},
"value": "click_me_123",
"url": "https://ec.yourlearning.ibm.com/w3/event/10408782",
"url": "https://ec.yourlearning.ibm.com/w3/event/10463103",
"action_id": "button-action"
}
},
Expand Down
95 changes: 94 additions & 1 deletion .github/workflows/slack-office-hours-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,100 @@ jobs:
"emoji": true
},
"value": "click_me_123",
"url": "https://ec.yourlearning.ibm.com/w3/enrollment/event/10322733",
"url": "https://ec.yourlearning.ibm.com/w3/enrollment/event/10408799",
"action_id": "button-action"
}
},
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": ":memo: *Sign up to get help in a future session* :ibm-arrow-right::ibm-arrow-right::ibm-arrow-right:"
},
"accessory": {
"type": "button",
"text": {
"type": "plain_text",
"text": "View the agenda",
"emoji": true
},
"value": "click_me_123",
"url": "https://ibm.biz/carbon-dev-office-hours",
"action_id": "button-action"
}
},
{
"type": "divider"
}
]
}
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK

post-reminder-to-carbon-ibmproducts-pal-dev:
name: Post dev reminder to ibmproducts-pal-dev
runs-on: ubuntu-latest
steps:
- name: Send custom JSON data to Slack workflow
id: slack
uses: slackapi/slack-github-action@37ebaef184d7626c5f204ab8d3baff4262dd30f0 # v1.27.0
with:
payload: |
{
"username": "Carbon Design System",
"icon_url": "https://user-images.githubusercontent.com/3360588/192045905-5d9705af-92e2-4432-805e-15db98571e8b.png",
"channel": "#ibmproducts-pal-dev",
"text": "Join us for Carbon Developer Office Hours!",
"blocks": [
{
"type": "header",
"text": {
"type": "plain_text",
"text": "Join us for Carbon Developer Office Hours!",
"emoji": true
}
},
{
"type": "divider"
},
{
"type": "image",
"image_url": "https://github.com/user-attachments/assets/e12fb5b9-9657-4e7b-b1a1-e1149cca8956",
"alt_text": "A terminal prompt symbol"
},
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": ":thinking_face: _Are you running into a weird bug you can’t resolve?_ \n\n_:question: Do you have questions about using Carbon?_ \n\n :rocket: _Would you like to discuss migrating from v10 to v11?_"
}
},
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": "*Carbon developer office hours* are a bi-weekly opportunity to discuss topics like these and get help from the team. Developers from the Carbon team will be available to help and answer questions. While it's very informal, please be prepared to screen share and show your issue!"
}
},
{
"type": "divider"
},
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": ":yourlearning: *Subscribe and add to your calendar* :ibm-arrow-right::ibm-arrow-right::ibm-arrow-right:"
},
"accessory": {
"type": "button",
"text": {
"type": "plain_text",
"text": "Subscribe",
"emoji": true
},
"value": "click_me_123",
"url": "https://ec.yourlearning.ibm.com/w3/enrollment/event/10408799",
"action_id": "button-action"
}
},
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
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
@@ -1,7 +1,7 @@
{
"name": "eslint-config-carbon",
"description": "ESLint configuration for Carbon",
"version": "3.16.0-rc.0",
"version": "3.16.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion config/jest-config-carbon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "jest-config-carbon",
"private": true,
"description": "Jest configuration and preset for Carbon",
"version": "1.15.0-rc.0",
"version": "1.15.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion config/stylelint-config-carbon/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "stylelint-config-carbon",
"description": "Stylelint configuration for Carbon",
"version": "1.18.0-rc.0",
"version": "1.18.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand Down
20 changes: 19 additions & 1 deletion e2e/components/InteractiveTag/InteractiveTag-test.avt.e2e.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,30 @@ test.describe('@avt InteractiveTag', () => {
theme: 'white',
},
});
await expect(
page.getByText('Tag content with a long text description').first()
).toBeVisible();

const tooltip = page.getByRole('tooltip');
const button = page.getByRole('button').first();
const button = page.getByRole('button').nth(1);
await expect(button).toBeVisible();
await page.keyboard.press('Tab');
await page.keyboard.press('Tab');
await expect(button).toBeFocused();
await expect(tooltip).toHaveAttribute('aria-hidden', 'false');

// Test dismissible functionality
await page.keyboard.press('Enter');
await expect(
page.getByText('Tag content with a long text description')
).not.toBeVisible();

// Reset button click
await page.keyboard.press('Shift+Tab');
await page.keyboard.press('Enter');
await expect(
page.getByText('Tag content with a long text description').first()
).toBeVisible();
});

test('@avt-keyboard-nav OperationalTag', async ({ page }) => {
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.63.0-rc.0",
"version": "0.63.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.66.0-rc.0",
"@carbon/react": "^1.66.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/codesandbox-styles/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "codesandbox-styles",
"private": true,
"version": "0.68.0-rc.0",
"version": "0.68.0",
"type": "module",
"scripts": {
"dev": "vite"
Expand All @@ -11,6 +11,6 @@
"vite": "^4.3.8"
},
"dependencies": {
"@carbon/styles": "^1.65.0-rc.0"
"@carbon/styles": "^1.65.0"
}
}
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.64.0-rc.0",
"version": "0.64.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.66.0-rc.0",
"@carbon/react": "^1.66.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.63.0-rc.0",
"version": "0.63.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.66.0-rc.0",
"@carbon/react": "^1.66.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.64.0-rc.0",
"version": "0.64.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.66.0-rc.0",
"@carbon/react": "^1.66.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.66.0-rc.0",
"version": "0.66.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.66.0-rc.0",
"@carbon/react": "^1.66.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.64.0-rc.0",
"version": "0.64.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.66.0-rc.0",
"@carbon/react": "^1.66.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.64.0-rc.0",
"version": "0.64.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.66.0-rc.0",
"@carbon/react": "^1.66.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
Loading

0 comments on commit 4f3ae85

Please sign in to comment.