aaa

Ember-ruby · Jun 30, 2024 · 47e1b2f · 47e1b2f
1 parent f5acbbd
commit 47e1b2f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/app/javascript/flavours/blobfox/components/status.jsx b/app/javascript/flavours/blobfox/components/status.jsx
@@ -851,7 +851,7 @@ class Status extends ImmutablePureComponent {
             mediaIcons={contentMediaIcons}
             expanded={isExpanded}
             collapsed={isCollapsed}
-            toggleCollapse={this.handleHotkeyCollapse}
+            collapseHeight={settings.getIn(['collapsed', 'auto', 'height'])}
             onExpandedToggle={this.handleExpandedToggle}
             onTranslate={this.handleTranslate}
             parseClick={parseClick}

diff --git a/app/javascript/flavours/blobfox/components/status_content.jsx b/app/javascript/flavours/blobfox/components/status_content.jsx
@@ -156,6 +156,7 @@ class StatusContent extends PureComponent {
 
   state = {
     hidden: true,
+    collapsed: false,
   };
 
   _updateStatusLinks () {
@@ -333,16 +334,16 @@ class StatusContent extends PureComponent {
       media,
       extraMedia,
       mediaIcons,
-      collapsed,
+      collapseHeight,
       muted,
-      settings,
       parseClick,
       disabled,
       tagLinks,
       rewriteMentions,
       intl,
       statusContent,
     } = this.props;
+    const { collapsed } = this.state;
 
     const hidden = this.props.onExpandedToggle ? !this.props.expanded : this.state.hidden;
     const contentLocale = intl.locale.replace(/[_-].*/, '');
@@ -361,12 +362,10 @@ class StatusContent extends PureComponent {
       <TranslateButton onClick={this.handleTranslate} translation={status.get('translation')} />
     );
 
-    let collapsedHeight = null;
-
-    const autoCollapseSettings = settings.getIn(['collapsed', 'auto']);
+    let collapsedHeight = 0;
 
     collapsedHeight = (
-      parseInt(autoCollapseSettings.get('height'))
+      parseInt(collapseHeight)
     )
 
     if (status.get('media_attachments').size && !muted) {