diff --git a/README.md b/README.md index 004a8107..7ba55b56 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ Several quick start options are available: -- [Download the latest release](https://github.com/coreui/coreui-react/archive/v5.1.0.zip) +- [Download the latest release](https://github.com/coreui/coreui-react/archive/v5.2.0.zip) - Clone the repo: `git clone https://github.com/coreui/coreui-react.git` - Install with [npm](https://www.npmjs.com/): `npm install @coreui/react` - Install with [yarn](https://yarnpkg.com/): `yarn add @coreui/react` diff --git a/lerna.json b/lerna.json index 5ceaf54d..f19238c5 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "npmClient": "yarn", "packages": ["packages/*"], - "version": "5.1.0", + "version": "5.2.0", "$schema": "node_modules/lerna/schemas/lerna-schema.json" } diff --git a/package.json b/package.json index 109914f1..2b78740b 100644 --- a/package.json +++ b/package.json @@ -22,17 +22,17 @@ "test:update": "npm-run-all charts:test:update icons:test:update lib:test:update" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^7.10.0", - "@typescript-eslint/parser": "^7.10.0", + "@typescript-eslint/eslint-plugin": "^7.15.0", + "@typescript-eslint/parser": "^7.15.0", "eslint": "8.57.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.1.3", - "eslint-plugin-react": "^7.34.1", + "eslint-plugin-react": "^7.34.3", "eslint-plugin-react-hooks": "^4.6.2", - "eslint-plugin-unicorn": "^51.0.1", - "lerna": "^8.1.3", + "eslint-plugin-unicorn": "^54.0.0", + "lerna": "^8.1.6", "npm-run-all": "^4.1.5", - "prettier": "^3.2.5" + "prettier": "^3.3.2" }, "overrides": { "gatsby-remark-external-links": { diff --git a/packages/coreui-icons-react b/packages/coreui-icons-react index bcbe37d7..aad2d31c 160000 --- a/packages/coreui-icons-react +++ b/packages/coreui-icons-react @@ -1 +1 @@ -Subproject commit bcbe37d75c46bfa18e8c1b3c903d60fe8f0b1222 +Subproject commit aad2d31c3cd8ca4d3ed7457ef02730f60038b6e8 diff --git a/packages/coreui-react/README.md b/packages/coreui-react/README.md index 21e4dc6a..13a31f8e 100644 --- a/packages/coreui-react/README.md +++ b/packages/coreui-react/README.md @@ -46,7 +46,7 @@ Several quick start options are available: -- [Download the latest release](https://github.com/coreui/coreui-react/archive/v5.1.0.zip) +- [Download the latest release](https://github.com/coreui/coreui-react/archive/v5.2.0.zip) - Clone the repo: `git clone https://github.com/coreui/coreui-react.git` - Install with [npm](https://www.npmjs.com/): `npm install @coreui/react` - Install with [yarn](https://yarnpkg.com/): `yarn add @coreui/react` diff --git a/packages/coreui-react/package.json b/packages/coreui-react/package.json index 7037b5a5..74f11789 100644 --- a/packages/coreui-react/package.json +++ b/packages/coreui-react/package.json @@ -1,6 +1,6 @@ { "name": "@coreui/react", - "version": "5.1.0", + "version": "5.2.0", "description": "UI Components Library for React.js", "keywords": [ "react", @@ -41,16 +41,16 @@ "test:update": "jest --coverage --updateSnapshot" }, "dependencies": { - "@coreui/coreui": "^5.0.2", + "@coreui/coreui": "^5.1.0", "@popperjs/core": "^2.11.8", "prop-types": "^15.8.1" }, "devDependencies": { - "@rollup/plugin-commonjs": "^25.0.8", + "@rollup/plugin-commonjs": "^26.0.1", "@rollup/plugin-node-resolve": "^15.2.3", "@rollup/plugin-typescript": "^11.1.6", - "@testing-library/jest-dom": "^6.4.5", - "@testing-library/react": "^14.3.1", + "@testing-library/jest-dom": "^6.4.6", + "@testing-library/react": "^16.0.0", "@types/jest": "^29.5.12", "@types/react": "18.3.3", "@types/react-dom": "^18.3.0", @@ -63,9 +63,9 @@ "react-dom": "^18.3.1", "react-transition-group": "^4.4.5", "rollup": "^4.18.0", - "ts-jest": "^29.1.3", - "tslib": "^2.6.2", - "typescript": "^5.4.5" + "ts-jest": "^29.1.5", + "tslib": "^2.6.3", + "typescript": "^5.5.3" }, "peerDependencies": { "react": ">=17", diff --git a/packages/coreui-react/src/components/button-group/__tests__/CButtonGroup.spec.tsx b/packages/coreui-react/src/components/button-group/__tests__/CButtonGroup.spec.tsx index 6e286f65..84671690 100644 --- a/packages/coreui-react/src/components/button-group/__tests__/CButtonGroup.spec.tsx +++ b/packages/coreui-react/src/components/button-group/__tests__/CButtonGroup.spec.tsx @@ -11,9 +11,9 @@ test('loads and displays CButtonGroup component', async () => { test('CButtonGroup customize', async () => { const { container } = render( - Test A - Test B - Test C + Test A + Test B + Test C , ) expect(container).toMatchSnapshot() @@ -25,9 +25,9 @@ test('CButtonGroup customize', async () => { test('CButtonGroup customize vertical', async () => { const { container } = render( - Test A - Test B - Test C + Test A + Test B + Test C , ) expect(container).toMatchSnapshot() diff --git a/packages/coreui-react/src/components/button-group/__tests__/CButtonToolbar.spec.tsx b/packages/coreui-react/src/components/button-group/__tests__/CButtonToolbar.spec.tsx index 5f59d423..f90c74cc 100644 --- a/packages/coreui-react/src/components/button-group/__tests__/CButtonToolbar.spec.tsx +++ b/packages/coreui-react/src/components/button-group/__tests__/CButtonToolbar.spec.tsx @@ -12,14 +12,14 @@ test('CButtonToolbar customize', async () => { const { container } = render( - 1 - 2 - 3 + 1 + 2 + 3 - A - B - C + A + B + C , ) diff --git a/packages/coreui-react/src/components/button/CButton.tsx b/packages/coreui-react/src/components/button/CButton.tsx index 01efb820..f8f5e17a 100644 --- a/packages/coreui-react/src/components/button/CButton.tsx +++ b/packages/coreui-react/src/components/button/CButton.tsx @@ -74,8 +74,11 @@ export const CButton: PolymorphicRefForwardingComponent<'button', CButtonProps> {...(!rest.href && { type: type })} className={classNames( 'btn', - variant ? `btn-${variant}-${color}` : `btn-${color}`, - { [`btn-${size}`]: size }, + { + [`btn-${color}`]: color && !variant, + [`btn-${variant}-${color}`]: color && variant, + [`btn-${size}`]: size, + }, shape, className, )} diff --git a/packages/coreui-react/src/components/button/__tests__/CButton.spec.tsx b/packages/coreui-react/src/components/button/__tests__/CButton.spec.tsx index a547189a..27f3f8ce 100644 --- a/packages/coreui-react/src/components/button/__tests__/CButton.spec.tsx +++ b/packages/coreui-react/src/components/button/__tests__/CButton.spec.tsx @@ -4,7 +4,7 @@ import '@testing-library/jest-dom' import { CButton } from '../../../index' test('loads and displays CButton component', async () => { - const { container } = render(Test) + const { container } = render(Test) expect(container).toMatchSnapshot() }) diff --git a/packages/coreui-react/src/components/dropdown/__tests__/CDropdownToggle.spec.tsx b/packages/coreui-react/src/components/dropdown/__tests__/CDropdownToggle.spec.tsx index 99c20985..5d9db7e7 100644 --- a/packages/coreui-react/src/components/dropdown/__tests__/CDropdownToggle.spec.tsx +++ b/packages/coreui-react/src/components/dropdown/__tests__/CDropdownToggle.spec.tsx @@ -10,7 +10,7 @@ test('loads and displays CDropdownToggle component', async () => { test('CDropdownToggle customize', async () => { const { container } = render( - + Test , ) diff --git a/packages/coreui-react/src/components/dropdown/__tests__/__snapshots__/CDropdown.spec.tsx.snap b/packages/coreui-react/src/components/dropdown/__tests__/__snapshots__/CDropdown.spec.tsx.snap index 315f0287..f6741bfd 100644 --- a/packages/coreui-react/src/components/dropdown/__tests__/__snapshots__/CDropdown.spec.tsx.snap +++ b/packages/coreui-react/src/components/dropdown/__tests__/__snapshots__/CDropdown.spec.tsx.snap @@ -17,7 +17,7 @@ exports[`CDropdown example 1`] = ` > +