From f0928d6e66027a91765302052e92ed6e9c74a1bb Mon Sep 17 00:00:00 2001 From: Simon Knox Date: Tue, 10 May 2016 21:50:10 +1000 Subject: [PATCH] don't set initial max-height for item-body or content can overflow check for expandedClassName to fix undefined class on item-body --- src/AccordionItem/index.jsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/AccordionItem/index.jsx b/src/AccordionItem/index.jsx index 8685fe0..551cdd4 100644 --- a/src/AccordionItem/index.jsx +++ b/src/AccordionItem/index.jsx @@ -23,7 +23,6 @@ export default class AccordionItem extends Component { } componentDidMount() { - this.setMaxHeight(); // allow overflow for absolute positioned elements inside // the item body, but only after animation is complete ReactDOM.findDOMNode(this).addEventListener('transitionend', () => { @@ -90,12 +89,12 @@ export default class AccordionItem extends Component { getProps() { var props = { - className: className([ + className: className( 'react-sanfona-item', this.props.className, { 'react-sanfona-item-expanded': this.props.expanded }, - { [this.props.expandedClassName]: this.props.expanded } - ]), + this.props.expandedClassName && { [this.props.expandedClassName]: this.props.expanded } + ), role: 'tabpanel', style: this.props.style };