Skip to content

Commit

Permalink
Fix className conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
mkxml committed Jan 10, 2020
1 parent 30251f9 commit 8c838c7
Showing 1 changed file with 15 additions and 4 deletions.
19 changes: 15 additions & 4 deletions src/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,18 @@ const classnames = {
};

export function card(e) {
return ({ header, content, footer, flat, bordered, animated, elevation, children, ...props }) => {
return ({
header,
content,
footer,
flat,
bordered,
animated,
elevation,
children,
className,
...props
}) => {
const headerElement = (header) ? e('div', { className: classnames.header }, header) : null;
let contentElement = (content) ? e('div', { className: classnames.content }, content) : null;
if (children) contentElement = e('div', { className: classnames.content }, children);
Expand All @@ -38,9 +49,9 @@ export function card(e) {
if (bordered) modifiers.push(classnames.bordered);
if (animated) modifiers.push(classnames.animated);
if (elevation) modifiers.push(classnames.elevationLevels[elevation]);
const additionalClasses = props.class || props.className || '';
const className = block.concat(modifiers).join(' ') + additionalClasses;
return e('div', { className, ...props }, [
const additionalClasses = className || '';
const classes = block.concat(modifiers).join(' ') + additionalClasses;
return e('div', { className: classes, ...props }, [
headerElement,
contentElement,
footerElement,
Expand Down

0 comments on commit 8c838c7

Please sign in to comment.