Skip to content

Commit 0508ac6

Browse files
author
Krzysztof Wilk
committed
Generate v. 3.0.0
1 parent 68e22c8 commit 0508ac6

File tree

204 files changed

+1981
-2347
lines changed

Some content is hidden

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

204 files changed

+1981
-2347
lines changed

README.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MDB 5 React
22

3-
Version: FREE 2.4.0
3+
Version: FREE 3.0.0
44

55
Documentation:
66
https://mdbootstrap.com/docs/b5/react/

app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "mdb-react-ui-kit-demo",
3-
"version": "2.4.0",
3+
"version": "3.0.0",
44
"main": "index.js",
55
"repository": {
66
"type": "git",

app/src/components/Accordion/Accordion.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ const MDBAccordion: React.FC<AccordionProps> = React.forwardRef<HTMLAllCollectio
1919
}
2020
);
2121

22-
MDBAccordion.defaultProps = { tag: 'div', initialActive: '' };
22+
MDBAccordion.defaultProps = { tag: 'div', initialActive: 0 };
2323

2424
export default MDBAccordion;
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import React from 'react';
22

33
interface AccordionProps {
4-
activeItem: string | undefined;
4+
activeItem?: number;
55
setActiveItem: React.SetStateAction<any>;
6-
alwaysOpen: boolean | undefined;
7-
initialActive: string | undefined;
6+
alwaysOpen?: boolean;
7+
initialActive?: number;
88
}
99

1010
const AccordionContext = React.createContext<AccordionProps>({
11-
activeItem: '',
11+
activeItem: 0,
1212
setActiveItem: null,
1313
alwaysOpen: false,
14-
initialActive: '',
14+
initialActive: 0,
1515
});
1616

1717
export { AccordionContext };

app/src/components/Accordion/AccordionItem/AccordionItem.tsx

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,21 @@ import type { AccordionItemProps } from './types';
55
import MDBCollapse from '../../Collapse/Collapse';
66

77
const MDBAccordionItem: React.FC<AccordionItemProps> = React.forwardRef<HTMLAllCollection, AccordionItemProps>(
8-
({ className, bodyClassName, headerClassName, collapseId, headerTitle, tag: Tag, children, ...props }, ref) => {
8+
(
9+
{
10+
className,
11+
bodyClassName,
12+
bodyStyle,
13+
headerClassName,
14+
collapseId,
15+
headerTitle,
16+
headerStyle,
17+
tag: Tag,
18+
children,
19+
...props
20+
},
21+
ref
22+
) => {
923
const { activeItem, setActiveItem, alwaysOpen, initialActive } = useContext(AccordionContext);
1024

1125
const [openState, setOpenState] = useState(initialActive);
@@ -18,23 +32,28 @@ const MDBAccordionItem: React.FC<AccordionItemProps> = React.forwardRef<HTMLAllC
1832
alwaysOpen ? collapseId !== openState && 'collapsed' : collapseId !== activeItem && 'collapsed'
1933
);
2034

21-
const toggleAccordion = (value: string) => {
35+
const toggleAccordion = (value: number) => {
2236
if (alwaysOpen) {
23-
value !== openState ? setOpenState(value) : setOpenState('');
37+
value !== openState ? setOpenState(value) : setOpenState(0);
2438
} else {
25-
value !== activeItem ? setActiveItem(value) : setActiveItem('');
39+
value !== activeItem ? setActiveItem(value) : setActiveItem(0);
2640
}
2741
};
2842

2943
return (
3044
<Tag className={classes} ref={ref} {...props}>
31-
<h2 className={headerClasses}>
45+
<h2 className={headerClasses} style={headerStyle}>
3246
<button onClick={() => toggleAccordion(collapseId)} className={buttonClasses} type='button'>
3347
{headerTitle}
3448
</button>
3549
</h2>
36-
<MDBCollapse id={collapseId} show={alwaysOpen ? openState : activeItem}>
37-
<div className={bodyClasses}>{children}</div>
50+
<MDBCollapse
51+
id={collapseId.toString()}
52+
show={alwaysOpen ? openState === collapseId : activeItem === collapseId}
53+
>
54+
<div className={bodyClasses} style={bodyStyle}>
55+
{children}
56+
</div>
3857
</MDBCollapse>
3958
</Tag>
4059
);
Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
import * as React from 'react';
2+
import { AccordionItemProps } from './types';
23

3-
declare const MDBAccordionItem: React.FunctionComponent<{
4-
className?: string;
5-
bodyClassName?: string;
6-
headerClassName?: string;
7-
collapseId: string;
8-
headerTitle?: string;
9-
tag?: React.ComponentProps<any>;
10-
[rest: string]: any;
11-
}>;
4+
declare const MDBAccordionItem: React.FunctionComponent<AccordionItemProps>;
125

136
export default MDBAccordionItem;
Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import React from 'react';
22

3-
type AccordionItemProps = {
4-
className?: string;
3+
interface AccordionItemProps extends React.HTMLAttributes<HTMLElement> {
54
bodyClassName?: string;
5+
bodyStyle?: React.CSSProperties;
6+
collapseId: number;
67
headerClassName?: string;
7-
collapseId: string;
8-
headerTitle?: string;
8+
headerStyle?: React.CSSProperties;
9+
headerTitle?: React.ReactNode;
10+
ref?: React.ForwardedRef<HTMLAllCollection>;
911
tag?: React.ComponentProps<any>;
10-
[rest: string]: any;
11-
};
12+
}
1213

1314
export { AccordionItemProps };
Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
import * as React from 'react';
2+
import { AccordionProps } from './types';
23

3-
declare const MDBAccordion: React.FunctionComponent<{
4-
alwaysOpen?: boolean;
5-
className?: string;
6-
flush?: boolean;
7-
initialActive?: string;
8-
tag?: React.ComponentProps<any>;
9-
[rest: string]: any;
10-
}>;
4+
declare const MDBAccordion: React.FunctionComponent<AccordionProps>;
115

126
export default MDBAccordion;
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import React from 'react';
22

3-
type AccordionProps = {
3+
interface AccordionProps extends React.HTMLAttributes<HTMLElement> {
44
alwaysOpen?: boolean;
5-
className?: string;
65
flush?: boolean;
7-
initialActive?: string;
6+
initialActive?: number;
7+
ref?: React.ForwardedRef<HTMLAllCollection>;
88
tag?: React.ComponentProps<any>;
9-
[rest: string]: any;
10-
};
9+
}
1110

1211
export { AccordionProps };

app/src/components/Badge/index.d.ts

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
import * as React from 'react';
2+
import { BadgeProps } from './types';
23

3-
declare const MDBBadge: React.FunctionComponent<{
4-
className?: string;
5-
pill?: boolean;
6-
dot?: boolean;
7-
notification?: boolean;
8-
color?: string;
9-
tag?: React.ComponentProps<any>;
10-
[rest: string]: any;
11-
}>;
4+
declare const MDBBadge: React.FunctionComponent<BadgeProps>;
125

136
export default MDBBadge;

0 commit comments

Comments
 (0)