Ported updates from #64

This commit is contained in:
kibigo!
2017-07-15 15:10:06 -07:00
parent 09cfc079b0
commit bc4202d00b
6 changed files with 51 additions and 29 deletions

View File

@@ -507,6 +507,7 @@ applicable.
const { router } = this.context;
const { status } = this.props;
const { isExpanded } = this.state;
if (!router) return;
if (destination === undefined) {
destination = `/statuses/${
status.getIn(['reblog', 'id'], status.get('id'))
@@ -532,7 +533,13 @@ this operation are further explained in the code below.
*/
render () {
const { parseClick, setExpansion, handleRef } = this;
const {
parseClick,
setExpansion,
saveHeight,
handleRef,
} = this;
const { router } = this.context;
const {
status,
account,
@@ -706,9 +713,10 @@ collapsed.
media={media}
mediaIcon={mediaIcon}
expanded={isExpanded}
setExpansion={this.setExpansion}
onHeightUpdate={this.saveHeight}
setExpansion={setExpansion}
onHeightUpdate={saveHeight}
parseClick={parseClick}
disabled={!router}
/>
{isExpanded !== false ? (
<StatusActionBar