Fix load order re-applying and transition between sidebar pages
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
import { createSlice, PayloadAction } from "@reduxjs/toolkit"
|
||||
import { StateChangeTypes } from "downshift";
|
||||
|
||||
import type { AppState, AppThunk } from "../lib/store"
|
||||
|
||||
@@ -98,7 +97,7 @@ export const applyLoadOrder = (): AppThunk => (dispatch, getState) => {
|
||||
dispatch(setPlugins([...originalPlugins.sort((a, b) => b.lastModified - a.lastModified), ...newPlugins]));
|
||||
}
|
||||
|
||||
export const addPluginInOrder = (plugin: PluginFile): AppThunk => (dispatch, getState) => {
|
||||
export const addPluginInOrder = (plugin: PluginFile): AppThunk => (dispatch) => {
|
||||
dispatch(addPlugin(plugin));
|
||||
dispatch(applyLoadOrder());
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { createSlice, PayloadAction } from "@reduxjs/toolkit"
|
||||
|
||||
import type { AppState } from "../lib/store"
|
||||
import type { AppState, AppThunk } from "../lib/store"
|
||||
import { applyLoadOrder } from "./plugins";
|
||||
|
||||
export type PluginsTxtState = string;
|
||||
|
||||
@@ -11,7 +12,7 @@ export const pluginsTxtSlice = createSlice({
|
||||
initialState,
|
||||
reducers: {
|
||||
setPluginsTxt: (state, action: PayloadAction<string>) => action.payload,
|
||||
clearPluginsTxt: (state) => "",
|
||||
clearPluginsTxt: () => "",
|
||||
},
|
||||
})
|
||||
|
||||
@@ -19,4 +20,9 @@ export const { setPluginsTxt, clearPluginsTxt } = pluginsTxtSlice.actions
|
||||
|
||||
export const selectPluginsTxt = (state: AppState) => state.pluginsTxt
|
||||
|
||||
export const setPluginsTxtAndApplyLoadOrder = (pluginsTxt: string): AppThunk => (dispatch) => {
|
||||
dispatch(setPluginsTxt(pluginsTxt));
|
||||
dispatch(applyLoadOrder());
|
||||
}
|
||||
|
||||
export default pluginsTxtSlice.reducer
|
||||
Reference in New Issue
Block a user