-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
007883b
commit 48cb614
Showing
28 changed files
with
564 additions
and
331 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
import { UserState } from '@/entities/User'; | ||
import { LoginState } from '@/features/Auth'; | ||
import { SearchState } from '@/features/Search'; | ||
import { SettingsState } from '@/features/Settings'; | ||
import { SortState } from '@/features/Sorts'; | ||
import type { | ||
EnhancedStore, | ||
Reducer, | ||
ReducersMapObject, | ||
UnknownAction, | ||
} from '@reduxjs/toolkit'; | ||
|
||
export interface RootState { | ||
settings: SettingsState; | ||
user: UserState; | ||
|
||
// Async reducers | ||
sort?: SortState; | ||
loginForm?: LoginState; | ||
search?: SearchState; | ||
} | ||
|
||
export type RootStateKey = keyof RootState; | ||
|
||
export interface ReducerManager { | ||
getReducerMap: () => ReducersMapObject<RootState>; | ||
reduce: (state: RootState, action: UnknownAction) => Partial<RootState>; | ||
add: (key: RootStateKey, reducer: Reducer) => void; | ||
remove: (key: RootStateKey) => void; | ||
} | ||
|
||
export interface ReduxStoreWithManager extends EnhancedStore<RootState> { | ||
reducerManager: ReducerManager; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
import type { | ||
Reducer, | ||
ReducersMapObject, | ||
UnknownAction, | ||
} from '@reduxjs/toolkit'; | ||
import { combineReducers } from '@reduxjs/toolkit'; | ||
import { ReducerManager, RootState, RootStateKey } from './RootState'; | ||
|
||
export function createReducerManager( | ||
initialReducers: ReducersMapObject<RootState>, | ||
): ReducerManager { | ||
const reducers = { ...initialReducers }; | ||
let combinedReducer = combineReducers(reducers); | ||
let keysToRemove: RootStateKey[] = []; | ||
|
||
return { | ||
getReducerMap: () => reducers, | ||
reduce: (state: RootState, action: UnknownAction) => { | ||
if (keysToRemove.length > 0) { | ||
state = { ...state }; | ||
for (let key of keysToRemove) { | ||
delete state[key]; | ||
} | ||
keysToRemove = []; | ||
} | ||
|
||
// @ts-ignore fix | ||
return combinedReducer(state, action); | ||
}, | ||
add: (key: RootStateKey, reducer: Reducer) => { | ||
if (!key || reducers[key]) { | ||
return; | ||
} | ||
reducers[key] = reducer; | ||
combinedReducer = combineReducers(reducers); | ||
}, | ||
remove: (key: RootStateKey) => { | ||
if (!key || !reducers[key]) { | ||
return; | ||
} | ||
|
||
delete reducers[key]; | ||
keysToRemove.push(key); | ||
combinedReducer = combineReducers(reducers); | ||
}, | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
import { userReducer } from '@/entities/User'; | ||
import { settingsReducer } from '@/features/Settings'; | ||
import type { | ||
ReducerFromReducersMapObject, | ||
ReducersMapObject, | ||
} from '@reduxjs/toolkit'; | ||
import { configureStore } from '@reduxjs/toolkit'; | ||
import { RootState } from './RootState'; | ||
import { createReducerManager } from './reducerManager'; | ||
|
||
export function createReduxStore( | ||
initialState?: RootState, | ||
asyncReducers?: ReducersMapObject<RootState>, | ||
) { | ||
const rootReducers: ReducersMapObject<RootState> = { | ||
...asyncReducers, | ||
settings: settingsReducer, | ||
user: userReducer, | ||
}; | ||
|
||
const reducerManager = createReducerManager(rootReducers); | ||
|
||
const store = configureStore<RootState>({ | ||
reducer: reducerManager.reduce as ReducerFromReducersMapObject<RootState>, | ||
devTools: process.env.NODE_ENV === 'development', // FIX: ReferenceError: IS_DEV is not defined | ||
preloadedState: initialState, | ||
}); | ||
|
||
// @ts-ignore | ||
store.reducerManager = reducerManager; | ||
|
||
return store; | ||
} | ||
|
||
export type AppDispatch = ReturnType<typeof createReduxStore>['dispatch']; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
import { | ||
ReduxStoreWithManager, | ||
RootState, | ||
RootStateKey, | ||
} from './config/RootState'; | ||
import { AppDispatch, createReduxStore } from './config/store'; | ||
import { StoreProvider } from './ui/StoreProvider'; | ||
|
||
export { StoreProvider, createReduxStore }; | ||
|
||
export type { AppDispatch, ReduxStoreWithManager, RootState, RootStateKey }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
import { RootState } from '@/app/providers/StoreProvider/config/RootState'; | ||
import { createReduxStore } from '@/app/providers/StoreProvider/config/store'; | ||
import { setLocalstorage } from '@/shared/lib/features'; | ||
import { LocalstorageKeys } from '@/shared/types/localstorage'; | ||
import type { ReducersMapObject } from '@reduxjs/toolkit'; | ||
import { FC, ReactNode, useEffect } from 'react'; | ||
import { Provider } from 'react-redux'; | ||
|
||
interface StoreProviderProps { | ||
children?: ReactNode; | ||
initialState?: Partial<RootState>; | ||
asyncReducers?: Partial<ReducersMapObject<RootState>>; | ||
} | ||
|
||
export const StoreProvider: FC<StoreProviderProps> = ({ | ||
children, | ||
initialState, | ||
asyncReducers, | ||
}) => { | ||
const store = createReduxStore( | ||
initialState as RootState, | ||
asyncReducers as ReducersMapObject<RootState>, | ||
); | ||
|
||
useEffect(() => { | ||
const unsubscribe = store.subscribe(() => { | ||
setLocalstorage(LocalstorageKeys.SETTINGS, store.getState().settings); | ||
}); | ||
|
||
return () => { | ||
unsubscribe(); | ||
}; | ||
}, [store]); | ||
|
||
return <Provider store={store}>{children}</Provider>; | ||
}; |
This file was deleted.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
src/entities/User/model/selectors/getUserAuthData/getUserAuthData.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
import { RootState } from '@/app/store/store'; | ||
import { RootState } from '@/app/providers/StoreProvider'; | ||
|
||
export const getUserAuthData = (state: RootState) => state.user.authData; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
import { loginByUsername } from './model/service/loginByUsername'; | ||
import { loginActions, loginReducer } from './model/slice/loginSlice'; | ||
import { LoginState } from './model/types/loginState'; | ||
import { ModalLogin } from './ui/ModalLogin/ModalLogin'; | ||
import ModalLogin from './ui/ModalLogin/ModalLogin'; | ||
|
||
export { ModalLogin, loginActions, loginByUsername, loginReducer }; | ||
export type { LoginState }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
import { RootState } from '@/app/store/store'; | ||
import { RootState } from '@/app/providers/StoreProvider'; | ||
import { loginInitialState } from '../slice/loginSlice'; | ||
|
||
export const getLoginState = (state: RootState) => state?.loginForm; | ||
export const getLoginState = (state: RootState) => | ||
state?.loginForm ?? loginInitialState; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.