Fix CW auto-expanding if collapsed toots are disabled

7 years ago · ae6cd75053
parent 5b4bcb7e3d
commit ae6cd75053
1 changed files with 3 additions and 1 deletions
--- a/app/javascript/glitch/components/status/index.js
+++ b/app/javascript/glitch/components/status/index.js
@ -233,7 +233,9 @@ uncollapse our status accordingly.

  componentWillReceiveProps (nextProps) {
    if (!nextProps.settings.getIn(['collapsed', 'enabled'])) {
-      this.setExpansion(true);
+      if (this.state.isExpanded === false) {
+        this.setExpansion(null);
+      }
    } else if (
      nextProps.collapse !== this.props.collapse &&
      nextProps.collapse !== undefined