diff --git a/examples/class-prefix/package.json b/examples/class-prefix/package.json index 4a8ebb6e8a34..e0f55f3681a4 100644 --- a/examples/class-prefix/package.json +++ b/examples/class-prefix/package.json @@ -1,7 +1,7 @@ { "name": "class-prefix", "private": true, - "version": "0.59.0", + "version": "0.59.1", "type": "module", "scripts": { "dev": "vite", @@ -9,7 +9,7 @@ "preview": "vite preview" }, "dependencies": { - "@carbon/react": "^1.62.0", + "@carbon/react": "^1.62.1", "react": "^18.2.0", "react-dom": "^18.2.0" }, diff --git a/examples/custom-theme/package.json b/examples/custom-theme/package.json index 98ece33db686..7826d93d5c2d 100644 --- a/examples/custom-theme/package.json +++ b/examples/custom-theme/package.json @@ -1,7 +1,7 @@ { "name": "custom-theme", "private": true, - "version": "0.60.0", + "version": "0.60.1", "type": "module", "scripts": { "dev": "vite", @@ -9,7 +9,7 @@ "preview": "vite preview" }, "dependencies": { - "@carbon/react": "^1.62.0", + "@carbon/react": "^1.62.1", "react": "^18.2.0", "react-dom": "^18.2.0" }, diff --git a/examples/id-prefix/package.json b/examples/id-prefix/package.json index 6566f532c21f..62dae6383a85 100644 --- a/examples/id-prefix/package.json +++ b/examples/id-prefix/package.json @@ -1,7 +1,7 @@ { "name": "id-prefix", "private": true, - "version": "0.59.0", + "version": "0.59.1", "type": "module", "scripts": { "dev": "vite", @@ -9,7 +9,7 @@ "preview": "vite preview" }, "dependencies": { - "@carbon/react": "^1.62.0", + "@carbon/react": "^1.62.1", "react": "^18.2.0", "react-dom": "^18.2.0" }, diff --git a/examples/light-dark-mode/package.json b/examples/light-dark-mode/package.json index 1c66d04d1308..4776ae9d26e6 100644 --- a/examples/light-dark-mode/package.json +++ b/examples/light-dark-mode/package.json @@ -1,7 +1,7 @@ { "name": "examples-light-dark", "private": true, - "version": "0.60.0", + "version": "0.60.1", "scripts": { "build": "next build", "dev": "next dev", @@ -9,7 +9,7 @@ "start": "next start" }, "dependencies": { - "@carbon/react": "^1.62.0", + "@carbon/react": "^1.62.1", "next": "14.1.1", "react": "18.2.0", "react-dom": "18.2.0" diff --git a/examples/nextjs/package.json b/examples/nextjs/package.json index 1374bc0051cc..6cbc0bf3e3ad 100644 --- a/examples/nextjs/package.json +++ b/examples/nextjs/package.json @@ -1,7 +1,7 @@ { "name": "examples-nextjs", "private": true, - "version": "0.62.0", + "version": "0.62.1", "scripts": { "build": "next build", "dev": "next dev", @@ -9,7 +9,7 @@ "start": "next start" }, "dependencies": { - "@carbon/react": "^1.62.0", + "@carbon/react": "^1.62.1", "next": "14.1.1", "react": "18.2.0", "react-dom": "18.2.0" diff --git a/examples/v10-token-compat-in-v11/package.json b/examples/v10-token-compat-in-v11/package.json index 92bef6915905..0dbcde86890b 100644 --- a/examples/v10-token-compat-in-v11/package.json +++ b/examples/v10-token-compat-in-v11/package.json @@ -1,7 +1,7 @@ { "name": "v10-token-compat-in-v11", "private": true, - "version": "0.60.0", + "version": "0.60.1", "type": "module", "scripts": { "dev": "vite", @@ -9,7 +9,7 @@ "preview": "vite preview" }, "dependencies": { - "@carbon/react": "^1.62.0", + "@carbon/react": "^1.62.1", "react": "^18.2.0", "react-dom": "^18.2.0" }, diff --git a/examples/vite/package.json b/examples/vite/package.json index 387c3692927f..03418f362f47 100644 --- a/examples/vite/package.json +++ b/examples/vite/package.json @@ -1,7 +1,7 @@ { "name": "vite", "private": true, - "version": "0.60.0", + "version": "0.60.1", "type": "module", "scripts": { "dev": "vite", @@ -9,7 +9,7 @@ "preview": "vite preview" }, "dependencies": { - "@carbon/react": "^1.62.0", + "@carbon/react": "^1.62.1", "react": "^18.2.0", "react-dom": "^18.2.0" }, diff --git a/packages/carbon-components-react/package.json b/packages/carbon-components-react/package.json index d78137ffb0b3..1766bffef12b 100644 --- a/packages/carbon-components-react/package.json +++ b/packages/carbon-components-react/package.json @@ -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.62.0", + "version": "8.62.1", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -42,7 +42,7 @@ "sass": "^1.33.0" }, "dependencies": { - "@carbon/react": "^1.62.0", + "@carbon/react": "^1.62.1", "@carbon/styles": "^1.61.0", "@ibm/telemetry-js": "^1.5.0", "chalk": "1.1.3" diff --git a/packages/react/package.json b/packages/react/package.json index 9f23cec19115..77945cb91417 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/react", "description": "React components for the Carbon Design System", - "version": "1.62.0", + "version": "1.62.1", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", diff --git a/packages/react/src/components/Dropdown/Dropdown.tsx b/packages/react/src/components/Dropdown/Dropdown.tsx index 172db2034886..848075bf1f2e 100644 --- a/packages/react/src/components/Dropdown/Dropdown.tsx +++ b/packages/react/src/components/Dropdown/Dropdown.tsx @@ -14,6 +14,7 @@ import React, { MouseEvent, ReactNode, useEffect, + useMemo, } from 'react'; import { useSelect, @@ -497,8 +498,13 @@ const Dropdown = React.forwardRef( }, }; - const menuProps = getMenuProps(); - const menuRef = mergeRefs(menuProps.ref, refs.setFloating); + const menuProps = useMemo( + () => + getMenuProps({ + ref: autoAlign ? refs.setFloating : null, + }), + [autoAlign] + ); // Slug is always size `mini` let normalizedSlug; @@ -527,7 +533,7 @@ const Dropdown = React.forwardRef( warnText={warnText} light={light} isOpen={isOpen} - ref={refs.setReference} + ref={autoAlign ? refs.setReference : null} id={id}> {invalid && ( @@ -567,7 +573,7 @@ const Dropdown = React.forwardRef( /> {normalizedSlug} - + {isOpen && items.map((item, index) => { const isObject = item !== null && typeof item === 'object'; diff --git a/packages/react/src/components/Menu/Menu.tsx b/packages/react/src/components/Menu/Menu.tsx index 595a7a5fd4fd..4fa06990c035 100644 --- a/packages/react/src/components/Menu/Menu.tsx +++ b/packages/react/src/components/Menu/Menu.tsx @@ -237,6 +237,7 @@ const Menu = forwardRef(function Menu( } function focusItem(e?: React.KeyboardEvent) { + e?.preventDefault(); const currentItem = focusableItems.findIndex((item) => item.ref?.current?.contains(document.activeElement) ); diff --git a/packages/react/src/components/Tabs/Tabs.tsx b/packages/react/src/components/Tabs/Tabs.tsx index b98a1e4a3026..122ec3ae315b 100644 --- a/packages/react/src/components/Tabs/Tabs.tsx +++ b/packages/react/src/components/Tabs/Tabs.tsx @@ -1217,10 +1217,12 @@ const Tab = forwardRef(function Tab( useLayoutEffect(() => { function handler() { const elementTabId = document.getElementById(`${id}`) || tabRef.current; - const newElement = elementTabId?.getElementsByClassName( - `${prefix}--tabs__nav-item-label` - )[0]; - isEllipsisActive(newElement); + if (elementTabId?.closest(`.${prefix}--tabs--vertical`)) { + const newElement = elementTabId?.getElementsByClassName( + `${prefix}--tabs__nav-item-label` + )[0]; + isEllipsisActive(newElement); + } } handler(); window.addEventListener('resize', handler); diff --git a/www/package.json b/www/package.json index 3d287624bbf0..e92e8fa113f5 100644 --- a/www/package.json +++ b/www/package.json @@ -1,7 +1,7 @@ { "name": "www", "private": true, - "version": "0.71.0", + "version": "0.71.1", "license": "Apache-2.0", "repository": { "type": "git", @@ -22,7 +22,7 @@ "start": "next start" }, "dependencies": { - "@carbon/react": "^1.62.0", + "@carbon/react": "^1.62.1", "@octokit/core": "^4.0.0", "@octokit/plugin-retry": "^3.0.9", "@octokit/plugin-throttling": "^4.0.0", diff --git a/yarn.lock b/yarn.lock index ba9bb2d49ca5..a846381ca736 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2016,7 +2016,7 @@ __metadata: languageName: unknown linkType: soft -"@carbon/react@npm:^1.62.0, @carbon/react@workspace:packages/react": +"@carbon/react@npm:^1.62.1, @carbon/react@workspace:packages/react": version: 0.0.0-use.local resolution: "@carbon/react@workspace:packages/react" dependencies: @@ -9907,7 +9907,7 @@ __metadata: "@babel/plugin-transform-react-constant-elements": "npm:^7.17.12" "@babel/preset-env": "npm:^7.18.2" "@babel/preset-react": "npm:^7.17.12" - "@carbon/react": "npm:^1.62.0" + "@carbon/react": "npm:^1.62.1" "@carbon/styles": "npm:^1.61.0" "@carbon/test-utils": "npm:^10.30.0" "@ibm/telemetry-js": "npm:^1.5.0" @@ -10279,7 +10279,7 @@ __metadata: version: 0.0.0-use.local resolution: "class-prefix@workspace:examples/class-prefix" dependencies: - "@carbon/react": "npm:^1.62.0" + "@carbon/react": "npm:^1.62.1" "@vitejs/plugin-react": "npm:4.0.0" react: "npm:^18.2.0" react-dom: "npm:^18.2.0" @@ -11652,7 +11652,7 @@ __metadata: version: 0.0.0-use.local resolution: "custom-theme@workspace:examples/custom-theme" dependencies: - "@carbon/react": "npm:^1.62.0" + "@carbon/react": "npm:^1.62.1" "@vitejs/plugin-react": "npm:4.0.0" react: "npm:^18.2.0" react-dom: "npm:^18.2.0" @@ -13826,7 +13826,7 @@ __metadata: version: 0.0.0-use.local resolution: "examples-light-dark@workspace:examples/light-dark-mode" dependencies: - "@carbon/react": "npm:^1.62.0" + "@carbon/react": "npm:^1.62.1" eslint: "npm:8.40.0" next: "npm:14.1.1" react: "npm:18.2.0" @@ -13839,7 +13839,7 @@ __metadata: version: 0.0.0-use.local resolution: "examples-nextjs@workspace:examples/nextjs" dependencies: - "@carbon/react": "npm:^1.62.0" + "@carbon/react": "npm:^1.62.1" eslint: "npm:8.40.0" eslint-config-next: "npm:13.4.7" next: "npm:14.1.1" @@ -16026,7 +16026,7 @@ __metadata: version: 0.0.0-use.local resolution: "id-prefix@workspace:examples/id-prefix" dependencies: - "@carbon/react": "npm:^1.62.0" + "@carbon/react": "npm:^1.62.1" "@vitejs/plugin-react": "npm:4.0.0" react: "npm:^18.2.0" react-dom: "npm:^18.2.0" @@ -27752,7 +27752,7 @@ __metadata: version: 0.0.0-use.local resolution: "v10-token-compat-in-v11@workspace:examples/v10-token-compat-in-v11" dependencies: - "@carbon/react": "npm:^1.62.0" + "@carbon/react": "npm:^1.62.1" "@vitejs/plugin-react": "npm:4.0.0" react: "npm:^18.2.0" react-dom: "npm:^18.2.0" @@ -28038,7 +28038,7 @@ __metadata: version: 0.0.0-use.local resolution: "vite@workspace:examples/vite" dependencies: - "@carbon/react": "npm:^1.62.0" + "@carbon/react": "npm:^1.62.1" "@vitejs/plugin-react": "npm:4.0.0" react: "npm:^18.2.0" react-dom: "npm:^18.2.0" @@ -28592,7 +28592,7 @@ __metadata: version: 0.0.0-use.local resolution: "www@workspace:www" dependencies: - "@carbon/react": "npm:^1.62.0" + "@carbon/react": "npm:^1.62.1" "@octokit/core": "npm:^4.0.0" "@octokit/plugin-retry": "npm:^3.0.9" "@octokit/plugin-throttling": "npm:^4.0.0"