a

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

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/app/javascript/flavours/blobfox/components/status.jsx b/app/javascript/flavours/blobfox/components/status.jsx
@@ -850,7 +850,7 @@ class Status extends ImmutablePureComponent {
             extraMedia={extraMedia}
             mediaIcons={contentMediaIcons}
             expanded={isExpanded}
-            collapsed={collapsed}
+            collapsed={isCollapsed}
             toggleCollapse={this.handleHotkeyCollapse}
             onExpandedToggle={this.handleExpandedToggle}
             onTranslate={this.handleTranslate}

diff --git a/app/javascript/flavours/blobfox/components/status_content.jsx b/app/javascript/flavours/blobfox/components/status_content.jsx
@@ -129,6 +129,7 @@ class StatusContent extends PureComponent {
     status: ImmutablePropTypes.map.isRequired,
     statusContent: PropTypes.string,
     expanded: PropTypes.bool,
+    collapsed: PropTypes.bool,
     onExpandedToggle: PropTypes.func,
     onTranslate: PropTypes.func,
     media: PropTypes.node,
@@ -155,18 +156,8 @@ class StatusContent extends PureComponent {
 
   state = {
     hidden: true,
-    collapsed: false,
   };
 
-  updateOnProps = [
-    'settings',
-    'muted',
-  ];
-
-  updateOnStates = [
-    'collapsed',
-  ];
-
   _updateStatusLinks () {
     const node = this.contentsNode;
     const { tagLinks, rewriteMentions } = this.props;
@@ -342,6 +333,7 @@ class StatusContent extends PureComponent {
       media,
       extraMedia,
       mediaIcons,
+      collapsed,
       muted,
       settings,
       parseClick,
@@ -352,8 +344,6 @@ class StatusContent extends PureComponent {
       statusContent,
     } = this.props;
 
-    const collapsed = this.props.toggleCollapse ? this.props.collapsed : this.state.collapsed;
-
     const hidden = this.props.onExpandedToggle ? !this.props.expanded : this.state.hidden;
     const contentLocale = intl.locale.replace(/[_-].*/, '');
     const targetLanguages = this.props.languages?.get(status.get('language') || 'und');
@@ -434,7 +424,7 @@ class StatusContent extends PureComponent {
       }
 
       return (
-        <div className={classNames} tabIndex={0} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp} style={isCollapsed ? { height: `${collapsedHeight}px` } : null}>
+        <div className={classNames} tabIndex={0} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp} style={collapsed ? { height: `${collapsedHeight}px` } : null}>
           <p
             style={{ marginBottom: hidden && status.get('mentions').isEmpty() ? '0px' : null }}
           >
@@ -472,7 +462,7 @@ class StatusContent extends PureComponent {
           onMouseDown={this.handleMouseDown}
           onMouseUp={this.handleMouseUp}
           tabIndex={0}
-          style={isCollapsed ? { height: `${collapsedHeight}px` } : null}
+          style={collapsed ? { height: `${collapsedHeight}px` } : null}
         >
           <div
             ref={this.setContentsRef}