Merge branch 'main' into fix/combo-box-ai-label-close-icon

Author: ariellalgilmore

.percy.yml

@@ -8,3 +8,4 @@ snapshot:
 discovery:
   allowed-hostnames:
     - 1.www.s81c.com
+  network-idle-timeout: 1000

config/eslint-config-carbon/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eslint-config-carbon",
   "description": "ESLint configuration for Carbon",
-  "version": "3.18.0",
+  "version": "3.19.0-rc.0",
   "license": "Apache-2.0",
   "main": "index.js",
   "repository": {

e2e/test-utils/snapshot.js

@@ -26,7 +26,7 @@ async function snapshot(page, context) {
    * This configuration overrides any global setting for `widths` in .percy.yml or otherwise.
    * See https://github.com/carbon-design-system/carbon/issues/14779
    */
-  const widths = context.themes === 'white' ? [1366, 360] : [1366];
+  const widths = context.theme === 'white' ? [1366, 360] : [1366];
 
   if (process.env.ENABLE_LOCAL_SNAPSHOTS) {
     expect(await page.screenshot()).toMatchSnapshot(`${id}.png`);

examples/class-prefix/package.json

@@ -1,15 +1,15 @@
 {
   "name": "class-prefix",
   "private": true,
-  "version": "0.71.0",
+  "version": "0.72.0-rc.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview"
   },
   "dependencies": {
-    "@carbon/react": "^1.74.0",
+    "@carbon/react": "^1.75.0-rc.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },

examples/codesandbox-styles/package.json

@@ -1,7 +1,7 @@
 {
   "name": "codesandbox-styles",
   "private": true,
-  "version": "0.76.0",
+  "version": "0.77.0-rc.0",
   "type": "module",
   "scripts": {
     "dev": "vite"
@@ -11,6 +11,6 @@
     "vite": "^4.3.8"
   },
   "dependencies": {
-    "@carbon/styles": "^1.73.0"
+    "@carbon/styles": "^1.74.0-rc.0"
   }
 }

examples/custom-theme/package.json

@@ -1,15 +1,15 @@
 {
   "name": "custom-theme",
   "private": true,
-  "version": "0.72.0",
+  "version": "0.73.0-rc.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview"
   },
   "dependencies": {
-    "@carbon/react": "^1.74.0",
+    "@carbon/react": "^1.75.0-rc.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },

examples/id-prefix/package.json

@@ -1,15 +1,15 @@
 {
   "name": "id-prefix",
   "private": true,
-  "version": "0.71.0",
+  "version": "0.72.0-rc.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview"
   },
   "dependencies": {
-    "@carbon/react": "^1.74.0",
+    "@carbon/react": "^1.75.0-rc.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },

examples/light-dark-mode/package.json

@@ -1,15 +1,15 @@
 {
   "name": "examples-light-dark",
   "private": true,
-  "version": "0.72.0",
+  "version": "0.73.0-rc.0",
   "scripts": {
     "build": "next build",
     "dev": "next dev",
     "lint": "next lint",
     "start": "next start"
   },
   "dependencies": {
-    "@carbon/react": "^1.74.0",
+    "@carbon/react": "^1.75.0-rc.0",
     "next": "14.1.1",
     "react": "18.2.0",
     "react-dom": "18.2.0"

examples/nextjs/package.json

@@ -1,15 +1,15 @@
 {
   "name": "examples-nextjs",
   "private": true,
-  "version": "0.74.0",
+  "version": "0.75.0-rc.0",
   "scripts": {
     "build": "next build",
     "dev": "next dev",
     "lint": "next lint",
     "start": "next start"
   },
   "dependencies": {
-    "@carbon/react": "^1.74.0",
+    "@carbon/react": "^1.75.0-rc.0",
     "next": "14.1.1",
     "react": "18.2.0",
     "react-dom": "18.2.0"

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

@@ -1,15 +1,15 @@
 {
   "name": "v10-token-compat-in-v11",
   "private": true,
-  "version": "0.72.0",
+  "version": "0.73.0-rc.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview"
   },
   "dependencies": {
-    "@carbon/react": "^1.74.0",
+    "@carbon/react": "^1.75.0-rc.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },

examples/vite/package.json

@@ -1,15 +1,15 @@
 {
   "name": "vite",
   "private": true,
-  "version": "0.72.0",
+  "version": "0.73.0-rc.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview"
   },
   "dependencies": {
-    "@carbon/react": "^1.74.0",
+    "@carbon/react": "^1.75.0-rc.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },

packages/carbon-components-react/package.json

@@ -2,7 +2,7 @@
   "name": "carbon-components-react",
   "private": true,
   "description": "The Carbon Design System is IBM’s open-source design system for products and experiences. This package reached end of support on September 30, 2024 and will not receive any more updates.",
-  "version": "8.74.0",
+  "version": "8.75.0-rc.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -43,8 +43,8 @@
     "sass": "^1.33.0"
   },
   "dependencies": {
-    "@carbon/react": "^1.74.0",
-    "@carbon/styles": "^1.73.0",
+    "@carbon/react": "^1.75.0-rc.0",
+    "@carbon/styles": "^1.74.0-rc.0",
     "@ibm/telemetry-js": "^1.5.0",
     "chalk": "1.1.3"
   },

packages/carbon-components/package.json

@@ -2,7 +2,7 @@
   "name": "carbon-components",
   "private": true,
   "description": "The Carbon Design System is IBM’s open-source design system for products and experiences. This package reached end of support on September 30, 2024 and will not receive any more updates.",
-  "version": "11.73.0",
+  "version": "11.74.0-rc.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -44,7 +44,7 @@
     "sass": "^1.33.0"
   },
   "dependencies": {
-    "@carbon/styles": "^1.73.0",
+    "@carbon/styles": "^1.74.0-rc.0",
     "@ibm/telemetry-js": "^1.5.0",
     "chalk": "1.1.3"
   },

packages/elements/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/elements",
   "description": "A collection of design elements in code for the IBM Design Language",
-  "version": "11.59.0",
+  "version": "11.60.0-rc.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -40,7 +40,7 @@
   "dependencies": {
     "@carbon/colors": "^11.28.0",
     "@carbon/grid": "^11.30.0",
-    "@carbon/icons": "^11.53.0",
+    "@carbon/icons": "^11.54.0-rc.0",
     "@carbon/layout": "^11.28.0",
     "@carbon/motion": "^11.24.0",
     "@carbon/themes": "^11.45.0",

packages/icons-react/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/icons-react",
   "description": "React components for icons in digital and software products using the Carbon Design System",
-  "version": "11.53.0",
+  "version": "11.54.0-rc.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -44,7 +44,7 @@
   },
   "devDependencies": {
     "@carbon/icon-build-helpers": "^1.32.0",
-    "@carbon/icons": "^11.53.0",
+    "@carbon/icons": "^11.54.0-rc.0",
     "rimraf": "^6.0.0"
   },
   "sideEffects": false

packages/icons-vue/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/icons-vue",
   "description": "Vue components for icons in digital and software products using the Carbon Design System",
-  "version": "10.102.0",
+  "version": "10.103.0-rc.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -35,7 +35,7 @@
   },
   "devDependencies": {
     "@carbon/cli-reporter": "^10.7.0",
-    "@carbon/icons": "^11.53.0",
+    "@carbon/icons": "^11.54.0-rc.0",
     "fs-extra": "^11.0.0",
     "prettier": "^3.3.3",
     "rimraf": "^6.0.0",

packages/icons/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/icons",
   "description": "Icons for digital and software products using the Carbon Design System",
-  "version": "11.53.0",
+  "version": "11.54.0-rc.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",

packages/react/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/react",
   "description": "React components for the Carbon Design System",
-  "version": "1.74.0",
+  "version": "1.75.0-rc.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -51,9 +51,9 @@
   "dependencies": {
     "@babel/runtime": "^7.24.7",
     "@carbon/feature-flags": "^0.24.0",
-    "@carbon/icons-react": "^11.53.0",
+    "@carbon/icons-react": "^11.54.0-rc.0",
     "@carbon/layout": "^11.28.0",
-    "@carbon/styles": "^1.73.0",
+    "@carbon/styles": "^1.74.0-rc.0",
     "@floating-ui/react": "^0.26.0",
     "@ibm/telemetry-js": "^1.5.0",
     "classnames": "2.5.1",

packages/react/src/components/AILabel/__tests__/AILabel-test.js

@@ -157,4 +157,25 @@ describe('AILabelActions', () => {
 
     expect(screen.getByText('View details')).toBeInTheDocument();
   });
+  describe('Labels and kind prop', () => {
+    it('should use empty label for inline kind', () => {
+      render(<AILabel kind="inline" aiText="AI" textLabel="Text goes here" />);
+      expect(screen.getByRole('button')).toHaveAttribute('aria-label', '');
+    });
+
+    it('should set aria-label when kind is default', () => {
+      render(<AILabel aiText="AI" />);
+      expect(screen.getByRole('button')).toHaveAttribute(
+        'aria-label',
+        'AI Show information'
+      );
+    });
+
+    it('should let visible text serve as accessible name in inline mode', () => {
+      render(<AILabel kind="inline" aiText="AI" textLabel="Text goes here" />);
+      expect(
+        screen.getByRole('button', { name: 'AI Text goes here' })
+      ).toBeInTheDocument();
+    });
+  });
 });

packages/react/src/components/AILabel/index.tsx

@@ -214,7 +214,7 @@ export const AILabel = React.forwardRef<HTMLDivElement, AILabelProps>(
             {...rest}>
             <ToggletipButton
               className={aiLabelButtonClasses}
-              label={ariaLabelText}>
+              label={kind === 'inline' ? '' : ariaLabelText}>
               <span className={`${prefix}--ai-label__text`}>{aiText}</span>
               {kind === 'inline' && (aiTextLabel || textLabel) && (
                 <span className={`${prefix}--ai-label__additional-text`}>