Improve interaction between out-of-CW attachments and collapsed toots

2022-07-24 13:16:03 +02:00
parent db5b44330d
commit a5f81e1abd
3 changed files with 8 additions and 4 deletions
--- a/app/javascript/flavours/glitch/components/status.js
+++ b/app/javascript/flavours/glitch/components/status.js
@ -771,6 +771,7 @@ class Status extends ImmutablePureComponent {
          <StatusContent
            status={status}
            media={contentMedia}
+            extraMedia={extraMedia}
            mediaIcons={contentMediaIcons}
            expanded={isExpanded}
            onExpandedToggle={this.handleExpandedToggle}
@ -780,8 +781,6 @@ class Status extends ImmutablePureComponent {
            rewriteMentions={settings.get('rewrite_mentions')}
          />

-          {extraMedia}
-
          {!isCollapsed || !(muted || !settings.getIn(['collapsed', 'show_action_bar'])) ? (
            <StatusActionBar
              {...other}