diff --git a/src/Flows.js b/src/Flows.js index d7c797b..382a306 100644 --- a/src/Flows.js +++ b/src/Flows.js @@ -247,11 +247,11 @@ class FlowItem extends PureComponent {
- {props.info.type === 'image' && !props.fold && ( + {props.info.type === 'image' && (

{props.img_clickable ? ( -1 && + (props.search_param === '热榜' || !props.search_param) && + window.config.fold; this.state = { replies: [], reply_status: 'done', @@ -645,7 +648,7 @@ class FlowItemRow extends PureComponent { info: Object.assign({}, props.info, { variant: {} }), hidden: window.config.block_words.some((word) => props.info.text.includes(word), - ), + ) || needFold, attention: props.attention_override === null ? false : props.attention_override, cached: true, // default no display anything @@ -764,10 +767,6 @@ class FlowItemRow extends PureComponent { break; } } - let needFold = - FOLD_TAGS.indexOf(this.state.info.tag) > -1 && - (this.props.search_param === '热榜' || !this.props.search_param) && - window.config.fold; let res = (

- {!needFold && ( -
- {this.state.reply_status === 'loading' && ( -
加载中
- )} - {this.state.reply_status === 'failed' && ( -
-

- { - this.load_replies(); - }} - > - 重新加载评论 - -

-

{this.state.reply_error}

-
- )} - {this.state.replies.slice(0, PREVIEW_REPLY_COUNT).map((reply) => ( - - ))} - {this.state.replies.length > PREVIEW_REPLY_COUNT && ( -
- 还有 {this.state.replies.length - PREVIEW_REPLY_COUNT} 条 -
- )} -
- )} +
+ {this.state.reply_status === 'loading' && ( +
加载中
+ )} + {this.state.reply_status === 'failed' && ( +
+

+ { + this.load_replies(); + }} + > + 重新加载评论 + +

+

{this.state.reply_error}

+
+ )} + {this.state.replies.slice(0, PREVIEW_REPLY_COUNT).map((reply) => ( + + ))} + {this.state.replies.length > PREVIEW_REPLY_COUNT && ( +
+ 还有 {this.state.replies.length - PREVIEW_REPLY_COUNT} 条 +
+ )} +
); @@ -877,7 +873,7 @@ class FlowItemRow extends PureComponent { ); } - return !needFold && quote_id ? ( + return quote_id ? (
{res}