diff options
author | David Yip <yipdw@member.fsf.org> | 2018-01-18 09:14:28 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-01-18 09:14:28 -0600 |
commit | e27eedbd08c7d6191531783f662d576ea940a337 (patch) | |
tree | 06ec271b921b19339d2c5ea68c87b49d2d4f835f /app/javascript/flavours/glitch/components/collapsable.js | |
parent | 201e82686f86d06e10afb62184a091417b09d5ad (diff) | |
parent | 708ec07e27dd02d03f2d155bcc61ae8de4c10c4a (diff) |
Merge branch 'gs-master' into merge-upstream
Diffstat (limited to 'app/javascript/flavours/glitch/components/collapsable.js')
-rw-r--r-- | app/javascript/flavours/glitch/components/collapsable.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/components/collapsable.js b/app/javascript/flavours/glitch/components/collapsable.js index fe125a729..0e8b04033 100644 --- a/app/javascript/flavours/glitch/components/collapsable.js +++ b/app/javascript/flavours/glitch/components/collapsable.js @@ -6,9 +6,9 @@ import PropTypes from 'prop-types'; const Collapsable = ({ fullHeight, isVisible, children }) => ( <Motion defaultStyle={{ opacity: !isVisible ? 0 : 100, height: isVisible ? fullHeight : 0 }} style={{ opacity: spring(!isVisible ? 0 : 100), height: spring(!isVisible ? 0 : fullHeight) }}> {({ opacity, height }) => - <div style={{ height: `${height}px`, overflow: 'hidden', opacity: opacity / 100, display: Math.floor(opacity) === 0 ? 'none' : 'block' }}> + (<div style={{ height: `${height}px`, overflow: 'hidden', opacity: opacity / 100, display: Math.floor(opacity) === 0 ? 'none' : 'block' }}> {children} - </div> + </div>) } </Motion> ); |