From b3076e6ffc6151994c8c76f907a0dc6ad03e0902 Mon Sep 17 00:00:00 2001 From: KMY Date: Sun, 24 Sep 2023 12:27:28 +0900 Subject: [PATCH] Fix status is added bookmark category statuses list on bottom when bookmark --- .../mastodon/reducers/bookmark_categories.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/javascript/mastodon/reducers/bookmark_categories.js b/app/javascript/mastodon/reducers/bookmark_categories.js index ea9e4f4895..f39e1b4437 100644 --- a/app/javascript/mastodon/reducers/bookmark_categories.js +++ b/app/javascript/mastodon/reducers/bookmark_categories.js @@ -64,6 +64,15 @@ const appendToBookmarkCategoryStatusesById = (state, bookmarkCategoryId, statuse })); }; +const prependToBookmarkCategoryStatusesById = (state, bookmarkCategoryId, statuses) => { + return state.update(bookmarkCategoryId, listMap => listMap.withMutations(map => { + map.set('isLoading', false); + if (map.get('items')) { + map.update('items', list => ImmutableOrderedSet([statuses]).union(list)); + } + })); +}; + const removeStatusFromBookmarkCategoryById = (state, bookmarkCategoryId, status) => { if (state.getIn([bookmarkCategoryId, 'items'])) { return state.updateIn([bookmarkCategoryId, 'items'], items => items.delete(status)); @@ -107,7 +116,7 @@ export default function bookmarkCategories(state = initialState, action) { case BOOKMARK_CATEGORY_STATUSES_EXPAND_SUCCESS: return appendToBookmarkCategoryStatuses(state, action.id, action.statuses, action.next); case BOOKMARK_CATEGORY_EDITOR_ADD_SUCCESS: - return appendToBookmarkCategoryStatusesById(state, action.bookmarkCategoryId, action.statusId, undefined); + return prependToBookmarkCategoryStatusesById(state, action.bookmarkCategoryId, action.statusId); case BOOKMARK_CATEGORY_EDITOR_REMOVE_SUCCESS: return removeStatusFromBookmarkCategoryById(state, action.bookmarkCategoryId, action.statusId); case UNBOOKMARK_SUCCESS: