grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Change action sizes. Add better tippy updating.

Browse source
This commit is contained in:
Dessalines 2020-03-03 11:07:07 -05:00
parent b3b4b79775
commit 48594537c0
2 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ui/src/components/comment-node.tsx vendored
View file

@ -103,8 +103,16 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
this.handleCommentDownvote = this.handleCommentDownvote.bind(this); this.handleCommentDownvote = this.handleCommentDownvote.bind(this);
} }
componentDidUpdate() { componentDidUpdate(prevProps: CommentNodeProps) {
setupTippy(); let prevComment = prevProps.node.comment;
let comment = this.props.node.comment;
if (
prevComment.saved !== comment.saved ||
prevComment.deleted !== comment.deleted ||
prevComment.read !== comment.read
) {
setupTippy();
}
} }
componentWillReceiveProps(nextProps: CommentNodeProps) { componentWillReceiveProps(nextProps: CommentNodeProps) {
@ -256,7 +264,7 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
dangerouslySetInnerHTML={mdToHtml(this.commentUnlessRemoved)} dangerouslySetInnerHTML={mdToHtml(this.commentUnlessRemoved)}
/> />
)} )}
<ul class="list-inline mb-1 text-muted font-weight-bold h6"> <ul class="list-inline mb-1 text-muted font-weight-bold h5">
{this.props.markable && ( {this.props.markable && (
<li className="list-inline-item-action"> <li className="list-inline-item-action">
<span <span
@ -1110,5 +1118,6 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
handleShowAdvanced(i: CommentNode) { handleShowAdvanced(i: CommentNode) {
i.state.showAdvanced = !i.state.showAdvanced; i.state.showAdvanced = !i.state.showAdvanced;
i.setState(i.state); i.setState(i.state);
setupTippy();
} }
} }

16
ui/src/components/post-listing.tsx vendored
View file

@ -102,8 +102,17 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
} }
} }
componentDidUpdate() { componentDidUpdate(prevProps: PostListingProps) {
setupTippy(); let prevPost = prevProps.post;
let post = this.props.post;
if (
prevPost.saved !== post.saved ||
prevPost.deleted !== post.deleted ||
prevPost.locked !== post.locked ||
prevPost.stickied !== post.stickied
) {
setupTippy();
}
} }
componentWillReceiveProps(nextProps: PostListingProps) { componentWillReceiveProps(nextProps: PostListingProps) {
@ -492,7 +501,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
</> </>
)} )}
</ul> </ul>
<ul class="list-inline mb-1 text-muted h6 font-weight-bold"> <ul class="list-inline mb-1 text-muted h5 font-weight-bold">
{UserService.Instance.user && ( {UserService.Instance.user && (
<> <>
{this.props.showBody && ( {this.props.showBody && (
@ -1305,5 +1314,6 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
handleShowAdvanced(i: PostListing) { handleShowAdvanced(i: PostListing) {
i.state.showAdvanced = !i.state.showAdvanced; i.state.showAdvanced = !i.state.showAdvanced;
i.setState(i.state); i.setState(i.state);
setupTippy();
} }
} }