From ab67f6e257f6e8f08145a02a7b93550f99641be4 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Sun, 18 Jun 2017 14:42:32 -0400 Subject: PLT-6215 Major post list refactor (#6501) * Major post list refactor * Fix post and thread deletion * Fix preferences not selecting correctly * Fix military time displaying * Fix UP key for editing posts * Fix ESLint error * Various fixes and updates per feedback * Fix for permalink view * Revert to old scrolling method and various fixes * Add floating timestamp, new message indicator, scroll arrows * Update post loading for focus mode and add visibility limit * Fix pinning posts and a react warning * Add loading UI updates from Asaad * Fix refreshing loop * Temporarily bump post visibility limit * Update infinite scrolling * Remove infinite scrolling --- webapp/components/post_view/post_info/index.js | 31 +++ .../components/post_view/post_info/post_info.jsx | 243 +++++++++++++++++++++ 2 files changed, 274 insertions(+) create mode 100644 webapp/components/post_view/post_info/index.js create mode 100644 webapp/components/post_view/post_info/post_info.jsx (limited to 'webapp/components/post_view/post_info') diff --git a/webapp/components/post_view/post_info/index.js b/webapp/components/post_view/post_info/index.js new file mode 100644 index 000000000..749ec5aba --- /dev/null +++ b/webapp/components/post_view/post_info/index.js @@ -0,0 +1,31 @@ +// Copyright (c) 2017 Mattermost, Inc. All Rights Reserved. +// See License.txt for license information. + +import {connect} from 'react-redux'; +import {bindActionCreators} from 'redux'; +import {removePost, addReaction} from 'mattermost-redux/actions/posts'; + +import {getBool} from 'mattermost-redux/selectors/entities/preferences'; + +import {Preferences} from 'utils/constants.jsx'; + +import PostInfo from './post_info.jsx'; + +function mapStateToProps(state, ownProps) { + return { + ...ownProps, + useMilitaryTime: getBool(state, Preferences.CATEGORY_DISPLAY_SETTINGS, Preferences.USE_MILITARY_TIME, false), + isFlagged: getBool(state, Preferences.CATEGORY_FLAGGED_POST, ownProps.post.id) + }; +} + +function mapDispatchToProps(dispatch) { + return { + actions: bindActionCreators({ + removePost, + addReaction + }, dispatch) + }; +} + +export default connect(mapStateToProps, mapDispatchToProps)(PostInfo); diff --git a/webapp/components/post_view/post_info/post_info.jsx b/webapp/components/post_view/post_info/post_info.jsx new file mode 100644 index 000000000..f037bf03b --- /dev/null +++ b/webapp/components/post_view/post_info/post_info.jsx @@ -0,0 +1,243 @@ +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See License.txt for license information. + +import PostTime from 'components/post_view/post_time.jsx'; +import PostFlagIcon from 'components/post_view/post_flag_icon.jsx'; +import CommentIcon from 'components/common/comment_icon.jsx'; +import EmojiPickerOverlay from 'components/emoji_picker/emoji_picker_overlay.jsx'; +import DotMenu from 'components/dot_menu'; + +import * as Utils from 'utils/utils.jsx'; +import * as PostUtils from 'utils/post_utils.jsx'; +import Constants from 'utils/constants.jsx'; + +import React from 'react'; +import PropTypes from 'prop-types'; +import {FormattedMessage} from 'react-intl'; + +export default class PostInfo extends React.PureComponent { + static propTypes = { + + /* + * The post to render the info for + */ + post: PropTypes.object.isRequired, + + /* + * Function called when the comment icon is clicked + */ + handleCommentClick: PropTypes.func.isRequired, + + /* + * Funciton called when the post options dropdown is opened + */ + handleDropdownOpened: PropTypes.func.isRequired, + + /* + * Set to display in 24 hour format + */ + useMilitaryTime: PropTypes.bool.isRequired, + + /* + * Set to mark the post as flagged + */ + isFlagged: PropTypes.bool, + + /* + * The number of replies in the same thread as this post + */ + replyCount: PropTypes.number, + + /* + * Post identifiers for selenium tests + */ + lastPostCount: PropTypes.number, + + /** + * Function to get the post list HTML element + */ + getPostList: PropTypes.func.isRequired, + + actions: PropTypes.shape({ + + /* + * Function to remove the post + */ + removePost: PropTypes.func.isRequired, + + /* + * Function to add a reaction to the post + */ + addReaction: PropTypes.func.isRequired + }).isRequired + } + + constructor(props) { + super(props); + + this.removePost = this.removePost.bind(this); + this.reactEmojiClick = this.reactEmojiClick.bind(this); + + this.state = { + showEmojiPicker: false, + reactionPickerOffset: 21, + canEdit: PostUtils.canEditPost(props.post, this.editDisableAction) + }; + } + + toggleEmojiPicker = () => { + const showEmojiPicker = !this.state.showEmojiPicker; + + this.setState({showEmojiPicker}); + this.props.handleDropdownOpened(showEmojiPicker); + } + + hideEmojiPicker = () => { + this.setState({showEmojiPicker: false}); + this.props.handleDropdownOpened(false); + } + + removePost() { + this.props.actions.removePost(this.props.post); + } + + createRemovePostButton() { + return ( + + {'×'} + + ); + } + + reactEmojiClick(emoji) { + const pickerOffset = 21; + this.setState({showEmojiPicker: false, reactionPickerOffset: pickerOffset}); + const emojiName = emoji.name || emoji.aliases[0]; + this.props.actions.addReaction(this.props.post.id, emojiName); + } + + getDotMenu = () => { + return this.refs.dotMenu; + } + + render() { + const post = this.props.post; + + let idCount = -1; + if (this.props.lastPostCount >= 0 && this.props.lastPostCount < Constants.TEST_ID_COUNT) { + idCount = this.props.lastPostCount; + } + + const isEphemeral = Utils.isPostEphemeral(post); + const isSystemMessage = PostUtils.isSystemMessage(post); + + let comments = null; + let react = null; + if (!isEphemeral && !post.failed && !isSystemMessage) { + comments = ( + + ); + + if (Utils.isFeatureEnabled(Constants.PRE_RELEASE_FEATURES.EMOJI_PICKER_PREVIEW)) { + react = ( + + + + + + + + ); + } + } + + let options; + if (isEphemeral) { + options = ( +
+ {this.createRemovePostButton()} +
+ ); + } else if (!post.failed) { + const dotMenu = ( + + ); + + if (dotMenu) { + options = ( +
+ {dotMenu} + {react} + {comments} +
+ ); + } + } + + let pinnedBadge; + if (post.is_pinned) { + pinnedBadge = ( + + + + ); + } + + return ( +
+
+ + {pinnedBadge} + {this.state.showEmojiPicker} + +
+ {options} +
+ ); + } +} -- cgit v1.2.3-1-g7c22