Skip to content

Commit a815327

Browse files
committed
Merge branch 'main' into feat-blocks
2 parents a8de3d3 + 9d74c9c commit a815327

File tree

810 files changed

+28209
-16716
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

810 files changed

+28209
-16716
lines changed

.eslintignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

.eslintrc.js

Lines changed: 0 additions & 72 deletions
This file was deleted.

.prettierrc.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2024 creativeLabs Łukasz Holeczek
3+
Copyright (c) 2025 creativeLabs Łukasz Holeczek
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646

4747
Several quick start options are available:
4848

49-
- [Download the latest release](https://github.com/coreui/coreui-react/archive/v5.1.0.zip)
49+
- [Download the latest release](https://github.com/coreui/coreui-react/archive/v5.5.0.zip)
5050
- Clone the repo: `git clone https://github.com/coreui/coreui-react.git`
5151
- Install with [npm](https://www.npmjs.com/): `npm install @coreui/react`
5252
- Install with [yarn](https://yarnpkg.com/): `yarn add @coreui/react`
@@ -134,6 +134,7 @@ import "bootstrap/dist/css/bootstrap.min.css";
134134
- [React Progress](https://coreui.io/react/docs/components/progress/)
135135
- [React Radio](https://coreui.io/react/docs/forms/radio/)
136136
- [React Range](https://coreui.io/react/docs/forms/range/)
137+
- [React Rating](https://coreui.io/react/docs/forms/rating/)
137138
- [React Select](https://coreui.io/react/docs/forms/select/)
138139
- [React Sidebar](https://coreui.io/react/docs/components/sidebar/)
139140
- [React Smart Pagination](https://coreui.io/react/docs/components/smart-pagination/) **PRO**
@@ -226,4 +227,4 @@ CoreUI is an MIT-licensed open source project and is completely free to use. How
226227

227228
## Copyright and license
228229

229-
Copyright 2024 creativeLabs Łukasz Holeczek. Code released under the [MIT License](https://github.com/coreui/coreui-react/blob/main/LICENSE). Docs released under [Creative Commons](https://creativecommons.org/licenses/by/3.0/).
230+
Copyright 2025 creativeLabs Łukasz Holeczek. Code released under the [MIT License](https://github.com/coreui/coreui-react/blob/main/LICENSE). Docs released under [Creative Commons](https://creativecommons.org/licenses/by/3.0/).

eslint.config.mjs

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
import eslint from '@eslint/js'
2+
import tsParser from '@typescript-eslint/parser'
3+
import eslintPluginUnicorn from 'eslint-plugin-unicorn'
4+
import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended'
5+
import eslintPluginReact from 'eslint-plugin-react'
6+
import eslintPluginReactHooks from 'eslint-plugin-react-hooks'
7+
import globals from 'globals'
8+
import typescriptEslint from 'typescript-eslint'
9+
10+
export default typescriptEslint.config(
11+
{ ignores: ['**/*.d.ts', '**/coverage', '**/dist', 'eslint.config.mjs'] },
12+
{
13+
extends: [
14+
eslint.configs.recommended,
15+
...typescriptEslint.configs.recommended,
16+
eslintPluginUnicorn.configs['flat/recommended'],
17+
eslintPluginReact.configs.flat.recommended,
18+
eslintPluginReact.configs.flat['jsx-runtime'],
19+
],
20+
plugins: {
21+
'react-hooks': eslintPluginReactHooks,
22+
},
23+
files: ['packages/**/src/**/*.{js,ts,tsx}'],
24+
languageOptions: {
25+
globals: {
26+
...globals.browser,
27+
...globals.node,
28+
},
29+
parser: tsParser,
30+
ecmaVersion: 'latest',
31+
sourceType: 'module',
32+
parserOptions: {
33+
ecmaFeatures: {
34+
jsx: true,
35+
},
36+
},
37+
},
38+
settings: {
39+
react: {
40+
pragma: 'React',
41+
version: 'detect',
42+
},
43+
},
44+
rules: {
45+
...eslintPluginReactHooks.configs.recommended.rules,
46+
'no-console': 'off',
47+
'no-debugger': 'off',
48+
'unicorn/filename-case': 'off',
49+
'unicorn/no-array-for-each': 'off',
50+
'unicorn/no-null': 'off',
51+
'unicorn/prefer-dom-node-append': 'off',
52+
'unicorn/prefer-export-from': 'off',
53+
'unicorn/prefer-query-selector': 'off',
54+
'unicorn/prevent-abbreviations': 'off',
55+
'vue/require-default-prop': 'off',
56+
},
57+
},
58+
{
59+
files: ['**/*.mjs'],
60+
languageOptions: {
61+
globals: {
62+
...Object.fromEntries(Object.entries(globals.browser).map(([key]) => [key, 'off'])),
63+
...globals.node,
64+
},
65+
66+
ecmaVersion: 5,
67+
sourceType: 'module',
68+
},
69+
},
70+
{
71+
files: ['**/__tests__/*.{j,t}s?(x)', '**/tests/unit/**/*.spec.{j,t}s?(x)'],
72+
languageOptions: {
73+
globals: {
74+
...globals.jest,
75+
},
76+
},
77+
},
78+
{
79+
files: ['packages/docs/build/**'],
80+
languageOptions: {
81+
globals: {
82+
...Object.fromEntries(Object.entries(globals.browser).map(([key]) => [key, 'off'])),
83+
...globals.node,
84+
},
85+
86+
ecmaVersion: 5,
87+
sourceType: 'commonjs',
88+
},
89+
rules: {
90+
'@typescript-eslint/no-var-requires': 'off',
91+
'no-console': 'off',
92+
'unicorn/prefer-module': 'off',
93+
'unicorn/prefer-top-level-await': 'off',
94+
},
95+
},
96+
{
97+
files: ['packages/docs/**'],
98+
rules: {
99+
'@typescript-eslint/no-var-requires': 'off',
100+
'unicorn/prefer-module': 'off',
101+
},
102+
},
103+
eslintPluginPrettierRecommended,
104+
)

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"npmClient": "yarn",
33
"packages": ["packages/*"],
4-
"version": "5.1.0",
4+
"version": "5.5.0",
55
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
66
}

package.json

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,18 @@
2222
"test:update": "npm-run-all charts:test:update icons:test:update lib:test:update"
2323
},
2424
"devDependencies": {
25-
"@typescript-eslint/eslint-plugin": "^7.15.0",
26-
"@typescript-eslint/parser": "^7.15.0",
27-
"eslint": "8.57.0",
28-
"eslint-config-prettier": "^9.1.0",
29-
"eslint-plugin-prettier": "^5.1.3",
30-
"eslint-plugin-react": "^7.34.3",
31-
"eslint-plugin-react-hooks": "^4.6.2",
32-
"eslint-plugin-unicorn": "^54.0.0",
33-
"lerna": "^8.1.6",
25+
"@typescript-eslint/parser": "^8.24.0",
26+
"eslint": "^9.20.1",
27+
"eslint-config-prettier": "^10.0.1",
28+
"eslint-plugin-prettier": "^5.2.3",
29+
"eslint-plugin-react": "^7.37.4",
30+
"eslint-plugin-react-hooks": "^5.1.0",
31+
"eslint-plugin-unicorn": "^56.0.1",
32+
"globals": "^15.15.0",
33+
"lerna": "^8.1.9",
3434
"npm-run-all": "^4.1.5",
35-
"prettier": "^3.3.2"
35+
"prettier": "^3.5.1",
36+
"typescript-eslint": "^8.24.0"
3637
},
3738
"overrides": {
3839
"gatsby-remark-external-links": {

packages/coreui-react/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2024 creativeLabs Łukasz Holeczek
3+
Copyright (c) 2025 creativeLabs Łukasz Holeczek
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

packages/coreui-react/README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646

4747
Several quick start options are available:
4848

49-
- [Download the latest release](https://github.com/coreui/coreui-react/archive/v5.1.0.zip)
49+
- [Download the latest release](https://github.com/coreui/coreui-react/archive/v5.5.0.zip)
5050
- Clone the repo: `git clone https://github.com/coreui/coreui-react.git`
5151
- Install with [npm](https://www.npmjs.com/): `npm install @coreui/react`
5252
- Install with [yarn](https://yarnpkg.com/): `yarn add @coreui/react`
@@ -134,6 +134,7 @@ import "bootstrap/dist/css/bootstrap.min.css";
134134
- [React Progress](https://coreui.io/react/docs/components/progress/)
135135
- [React Radio](https://coreui.io/react/docs/forms/radio/)
136136
- [React Range](https://coreui.io/react/docs/forms/range/)
137+
- [React Rating](https://coreui.io/react/docs/forms/rating/)
137138
- [React Select](https://coreui.io/react/docs/forms/select/)
138139
- [React Sidebar](https://coreui.io/react/docs/components/sidebar/)
139140
- [React Smart Pagination](https://coreui.io/react/docs/components/smart-pagination/) **PRO**
@@ -258,4 +259,4 @@ Thanks to all the backers and sponsors! Support this project by [becoming a back
258259

259260
## Copyright and license
260261

261-
Copyright 2024 creativeLabs Łukasz Holeczek. Code released under the [MIT License](https://github.com/coreui/coreui-react/blob/main/LICENSE). Docs released under [Creative Commons](https://creativecommons.org/licenses/by/3.0/).
262+
Copyright 2025 creativeLabs Łukasz Holeczek. Code released under the [MIT License](https://github.com/coreui/coreui-react/blob/main/LICENSE). Docs released under [Creative Commons](https://creativecommons.org/licenses/by/3.0/).

packages/coreui-react/package.json

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coreui/react",
3-
"version": "5.1.0",
3+
"version": "5.5.0",
44
"description": "UI Components Library for React.js",
55
"keywords": [
66
"react",
@@ -41,31 +41,33 @@
4141
"test:update": "jest --coverage --updateSnapshot"
4242
},
4343
"dependencies": {
44-
"@coreui/coreui": "^5.0.2",
44+
"@coreui/coreui": "^5.3.1",
4545
"@popperjs/core": "^2.11.8",
4646
"prop-types": "^15.8.1"
4747
},
4848
"devDependencies": {
49-
"@rollup/plugin-commonjs": "^26.0.1",
50-
"@rollup/plugin-node-resolve": "^15.2.3",
51-
"@rollup/plugin-typescript": "^11.1.6",
52-
"@testing-library/jest-dom": "^6.4.6",
53-
"@testing-library/react": "^16.0.0",
54-
"@types/jest": "^29.5.12",
55-
"@types/react": "18.3.3",
56-
"@types/react-dom": "^18.3.0",
57-
"@types/react-transition-group": "^4.4.10",
49+
"@rollup/plugin-commonjs": "^28.0.2",
50+
"@rollup/plugin-node-resolve": "^16.0.0",
51+
"@rollup/plugin-typescript": "^12.1.2",
52+
"@testing-library/dom": "^10.4.0",
53+
"@testing-library/jest-dom": "^6.6.3",
54+
"@testing-library/react": "^16.2.0",
55+
"@types/jest": "^29.5.14",
56+
"@types/prop-types": "15.7.14",
57+
"@types/react": "^18.3.18",
58+
"@types/react-dom": "^18.3.5",
59+
"@types/react-transition-group": "^4.4.12",
5860
"classnames": "^2.5.1",
5961
"cross-env": "^7.0.3",
6062
"jest": "^29.7.0",
6163
"jest-environment-jsdom": "^29.7.0",
6264
"react": "^18.3.1",
6365
"react-dom": "^18.3.1",
6466
"react-transition-group": "^4.4.5",
65-
"rollup": "^4.18.0",
66-
"ts-jest": "^29.1.5",
67-
"tslib": "^2.6.3",
68-
"typescript": "^5.5.3"
67+
"rollup": "^4.34.7",
68+
"ts-jest": "^29.2.5",
69+
"tslib": "^2.8.1",
70+
"typescript": "^5.7.3"
6971
},
7072
"peerDependencies": {
7173
"react": ">=17",

packages/coreui-react/src/components/accordion/CAccordionBody.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ export interface CAccordionBodyProps extends HTMLAttributes<HTMLDivElement> {
1515

1616
export const CAccordionBody = forwardRef<HTMLDivElement, CAccordionBodyProps>(
1717
({ children, className, ...rest }, ref) => {
18-
const { visible } = useContext(CAccordionItemContext)
18+
const { id, visible } = useContext(CAccordionItemContext)
1919

2020
return (
21-
<CCollapse className="accordion-collapse" visible={visible}>
21+
<CCollapse className="accordion-collapse" id={id} visible={visible}>
2222
<div className={classNames('accordion-body', className)} {...rest} ref={ref}>
2323
{children}
2424
</div>
2525
</CCollapse>
2626
)
27-
},
27+
}
2828
)
2929

3030
CAccordionBody.propTypes = {

packages/coreui-react/src/components/accordion/CAccordionButton.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@ export interface CAccordionButtonProps extends HTMLAttributes<HTMLButtonElement>
1313

1414
export const CAccordionButton = forwardRef<HTMLButtonElement, CAccordionButtonProps>(
1515
({ children, className, ...rest }, ref) => {
16-
const { visible, setVisible } = useContext(CAccordionItemContext)
16+
const { id, visible, setVisible } = useContext(CAccordionItemContext)
1717

1818
return (
1919
<button
2020
type="button"
2121
className={classNames('accordion-button', { collapsed: !visible }, className)}
22-
aria-expanded={!visible}
22+
aria-controls={id}
23+
aria-expanded={visible}
2324
onClick={() => setVisible(!visible)}
2425
{...rest}
2526
ref={ref}

0 commit comments

Comments
 (0)