[PLT-6745] Fix action of SHIFT+UP by fixing latest replay-able post (#6738)
* fix latest replayable post * use PostUtils.isSystemMessage instead of checkin that post.type is empty
Этот коммит содержится в:
коммит произвёл
Joram Wilander
родитель
e2daa425fa
Коммит
0b62078712
@@ -496,9 +496,9 @@ export default class CreatePost extends React.Component {
|
||||
return;
|
||||
}
|
||||
|
||||
const latestNonEphemeralPost = PostStore.getLatestNonEphemeralPost(this.state.channelId);
|
||||
const latestNonEphemeralPostId = latestNonEphemeralPost == null ? '' : latestNonEphemeralPost.id;
|
||||
const lastPostEl = document.getElementById(`commentIcon_${this.state.channelId}_${latestNonEphemeralPostId}`);
|
||||
const latestReplyablePost = PostStore.getLatestReplyablePost(this.state.channelId);
|
||||
const latestReplyablePostId = latestReplyablePost == null ? '' : latestReplyablePost.id;
|
||||
const lastPostEl = document.getElementById(`commentIcon_${this.state.channelId}_${latestReplyablePostId}`);
|
||||
|
||||
if (!e.ctrlKey && !e.metaKey && !e.altKey && !e.shiftKey && e.keyCode === KeyCodes.UP && this.state.message === '') {
|
||||
e.preventDefault();
|
||||
|
||||
@@ -8,6 +8,7 @@ import ChannelStore from 'stores/channel_store.jsx';
|
||||
import BrowserStore from 'stores/browser_store.jsx';
|
||||
import UserStore from 'stores/user_store.jsx';
|
||||
|
||||
import * as PostUtils from 'utils/post_utils.jsx';
|
||||
import {Constants} from 'utils/constants.jsx';
|
||||
const ActionTypes = Constants.ActionTypes;
|
||||
|
||||
@@ -69,13 +70,13 @@ class PostStoreClass extends EventEmitter {
|
||||
return postsInChannel[0];
|
||||
}
|
||||
|
||||
getLatestNonEphemeralPost(channelId) {
|
||||
getLatestReplyablePost(channelId) {
|
||||
const postIds = getState().entities.posts.postsInChannel[channelId];
|
||||
const posts = getState().entities.posts.posts;
|
||||
|
||||
for (const postId of postIds) {
|
||||
const post = posts[postId] || {};
|
||||
if (post.state !== Constants.POST_DELETED && post.type !== Constants.PostTypes.EPHEMERAL) {
|
||||
if (post.state !== Constants.POST_DELETED && !PostUtils.isSystemMessage(post)) {
|
||||
return post;
|
||||
}
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user