gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Fix status is added bookmark category statuses list on bottom when bookmark

Browse source
This commit is contained in:
KMY 2023-09-24 12:27:28 +09:00
parent b35fd9faba
commit b3076e6ffc
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/javascript/mastodon/reducers/bookmark_categories.js
View file

@ -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) => { const removeStatusFromBookmarkCategoryById = (state, bookmarkCategoryId, status) => {
if (state.getIn([bookmarkCategoryId, 'items'])) { if (state.getIn([bookmarkCategoryId, 'items'])) {
return state.updateIn([bookmarkCategoryId, 'items'], items => items.delete(status)); 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: case BOOKMARK_CATEGORY_STATUSES_EXPAND_SUCCESS:
return appendToBookmarkCategoryStatuses(state, action.id, action.statuses, action.next); return appendToBookmarkCategoryStatuses(state, action.id, action.statuses, action.next);
case BOOKMARK_CATEGORY_EDITOR_ADD_SUCCESS: 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: case BOOKMARK_CATEGORY_EDITOR_REMOVE_SUCCESS:
return removeStatusFromBookmarkCategoryById(state, action.bookmarkCategoryId, action.statusId); return removeStatusFromBookmarkCategoryById(state, action.bookmarkCategoryId, action.statusId);
case UNBOOKMARK_SUCCESS: case UNBOOKMARK_SUCCESS: