-
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.
Optimization. Asynchronous redusers. Bandle size
- Loading branch information
Showing
19 changed files
with
296 additions
and
84 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
import { | ||
AnyAction, | ||
combineReducers, | ||
Reducer, | ||
ReducersMapObject, | ||
} from "@reduxjs/toolkit"; | ||
import { ReducerManager, StateSchema, StateSchemaKey } from "./StateSchema"; | ||
|
||
export function createReducerManager( | ||
initialReducers: ReducersMapObject<StateSchema> | ||
): ReducerManager { | ||
const reducers = { ...initialReducers }; | ||
|
||
let combinedReducer = combineReducers(reducers); | ||
|
||
let keysToRemove: Array<StateSchemaKey> = []; | ||
|
||
return { | ||
getReducerMap: () => reducers, | ||
reduce: (state: StateSchema, action: AnyAction) => { | ||
if (keysToRemove.length > 0) { | ||
state = { ...state }; | ||
keysToRemove.forEach((key) => { | ||
delete state[key]; | ||
}); | ||
keysToRemove = []; | ||
} | ||
return combinedReducer(state, action); | ||
}, | ||
add: (key: StateSchemaKey, reducer: Reducer) => { | ||
if (!key || reducers[key]) { | ||
return; | ||
} | ||
reducers[key] = reducer; | ||
|
||
combinedReducer = combineReducers(reducers); | ||
}, | ||
remove: (key: StateSchemaKey) => { | ||
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 |
---|---|---|
@@ -1,9 +1,31 @@ | ||
import { CounterSchema } from "entities/Counter"; | ||
import { UserSchema } from "entities/User"; | ||
import { LoginSchema } from "features/AuthByUsername"; | ||
import { | ||
AnyAction, | ||
EnhancedStore, | ||
Reducer, | ||
ReducersMapObject, | ||
} from "@reduxjs/toolkit"; | ||
import { CombinedState } from "redux"; | ||
|
||
export interface StateSchema { | ||
counter: CounterSchema; | ||
user: UserSchema; | ||
loginForm: LoginSchema; | ||
|
||
// Асинхронные редюсеры | ||
loginForm?: LoginSchema; | ||
} | ||
|
||
export type StateSchemaKey = keyof StateSchema; | ||
|
||
export interface ReducerManager { | ||
getReducerMap: () => ReducersMapObject<StateSchema>; | ||
reduce: (state: StateSchema, action: AnyAction) => CombinedState<StateSchema>; | ||
add: (key: StateSchemaKey, reducer: Reducer) => void; | ||
remove: (key: StateSchemaKey) => void; | ||
} | ||
|
||
export interface ReduxStoreWithManager extends EnhancedStore<StateSchema> { | ||
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 |
---|---|---|
@@ -1,19 +1,32 @@ | ||
import { configureStore, ReducersMapObject } from "@reduxjs/toolkit"; | ||
import { | ||
configureStore, | ||
ReducersMapObject, | ||
} from "@reduxjs/toolkit"; | ||
import { counterReducer } from "entities/Counter"; | ||
import { StateSchema } from "./stateSchema"; | ||
import { userReducer } from "entities/User"; | ||
import { loginReducer } from "features/AuthByUsername"; | ||
import { StateSchema } from "./StateSchema"; | ||
import { createReducerManager } from "./reducerManager"; | ||
|
||
export function createReduxStore(initialState: StateSchema) { | ||
export function createReduxStore( | ||
initialState?: StateSchema, | ||
asyncReducers?: ReducersMapObject<StateSchema> | ||
) { | ||
const rootReducers: ReducersMapObject<StateSchema> = { | ||
...asyncReducers, | ||
counter: counterReducer, | ||
user: userReducer, | ||
loginForm: loginReducer, | ||
}; | ||
|
||
return configureStore<StateSchema>({ | ||
reducer: rootReducers, | ||
const reducerManager = createReducerManager(rootReducers); | ||
|
||
const store = configureStore<StateSchema>({ | ||
reducer: reducerManager.reduce, | ||
devTools: __IS_DEV__, | ||
preloadedState: initialState, | ||
}); | ||
|
||
// @ts-ignore | ||
store.reducerManager = reducerManager; | ||
|
||
return store; | ||
} |
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,19 +1,22 @@ | ||
import { FC, ReactNode } from "react"; | ||
import { ReactNode } from "react"; | ||
import { Provider } from "react-redux"; | ||
import { createReduxStore } from "../index"; | ||
import { StateSchema } from "../config/stateSchema"; | ||
import { DeepPartial } from "redux"; | ||
import { createReduxStore } from "app/providers/StoreProvider/config/store"; | ||
import { StateSchema } from "app/providers/StoreProvider/config/StateSchema"; | ||
import { DeepPartial, ReducersMapObject } from "@reduxjs/toolkit"; | ||
|
||
interface StoreProviderProps { | ||
children?: ReactNode; | ||
initialState?: DeepPartial<StateSchema>; | ||
asyncReducers?: DeepPartial<ReducersMapObject<StateSchema>>; | ||
} | ||
|
||
export const StoreProvider: FC<StoreProviderProps> = ({ | ||
children, | ||
initialState, | ||
}) => { | ||
const store = createReduxStore(initialState as StateSchema); | ||
export const StoreProvider = (props: StoreProviderProps) => { | ||
const { children, initialState, asyncReducers } = props; | ||
|
||
const store = createReduxStore( | ||
initialState as StateSchema, | ||
asyncReducers as ReducersMapObject<StateSchema> | ||
); | ||
|
||
return <Provider store={store}>{children}</Provider>; | ||
}; |
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 |
---|---|---|
|
@@ -20,6 +20,6 @@ | |
|
||
// Цвета | ||
--overlay-color: rgba(0 0 0 / 60%); | ||
--red-light: red; | ||
--red-light: #f00; | ||
--red-dark: #c30b0b; | ||
} |
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 @@ | ||
export { LoginModal } from "./ui/LoginModal/LoginModal"; | ||
export { LoginSchema } from "./model/types/LoginSchema"; | ||
export { loginReducer } from "./model/slice/LoginSlice"; | ||
export { loginReducer } from "./model/slice/loginSlice"; |
3 changes: 3 additions & 0 deletions
3
src/features/AuthByUsername/model/selectors/getLoginError/getLoginError.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 |
---|---|---|
@@ -0,0 +1,3 @@ | ||
import { StateSchema } from "app/providers/StoreProvider"; | ||
|
||
export const getLoginError = (state: StateSchema) => state?.loginForm?.error; |
3 changes: 3 additions & 0 deletions
3
src/features/AuthByUsername/model/selectors/getLoginIsLoading/getLoginIsLoading.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 |
---|---|---|
@@ -0,0 +1,3 @@ | ||
import { StateSchema } from 'app/providers/StoreProvider'; | ||
|
||
export const getLoginIsLoading = (state: StateSchema) => state?.loginForm?.isLoading || false; |
3 changes: 3 additions & 0 deletions
3
src/features/AuthByUsername/model/selectors/getLoginPassword/getLoginPassword.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 |
---|---|---|
@@ -0,0 +1,3 @@ | ||
import { StateSchema } from 'app/providers/StoreProvider'; | ||
|
||
export const getLoginPassword = (state: StateSchema) => state?.loginForm?.password || ''; |
3 changes: 3 additions & 0 deletions
3
src/features/AuthByUsername/model/selectors/getLoginUsername/getLoginUsername.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 |
---|---|---|
@@ -0,0 +1,3 @@ | ||
import { StateSchema } from 'app/providers/StoreProvider'; | ||
|
||
export const getLoginUsername = (state: StateSchema) => state?.loginForm?.username || ''; |
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
2 changes: 1 addition & 1 deletion
2
.../AuthByUsername/model/slice/LoginSlice.ts → .../AuthByUsername/model/slice/loginSlice.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
11 changes: 11 additions & 0 deletions
11
src/features/AuthByUsername/ui/LoginForm/LoginForm.async.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 |
---|---|---|
@@ -0,0 +1,11 @@ | ||
import { FC, lazy } from "react"; | ||
import { LoginFormProps } from "./LoginForm"; | ||
|
||
export const LoginFormAsync = lazy<FC<LoginFormProps>>( | ||
() => | ||
new Promise((resolve) => { | ||
// @ts-ignore | ||
// ТАК В РЕАЛЬНЫХ ПРОЕКТАХ НЕ ДЕЛАТЬ!!!!! ДЕЛАЕМ ДЛЯ КУРСА! | ||
setTimeout(() => resolve(import("./LoginForm")), 1500); | ||
}) | ||
); |
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
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,17 +1,24 @@ | ||
import { FC } from "react"; | ||
import { Modal } from "shared/ui/Modal/Modal"; | ||
import { LoginForm } from "../LoginForm/LoginForm"; | ||
import { classNames } from "shared/lib/classNames/classNames"; | ||
import { Suspense } from "react"; | ||
import { Loader } from "shared/ui/Loader/Loader"; | ||
import { LoginFormAsync } from "../LoginForm/LoginForm.async"; | ||
|
||
interface LoginModalProps { | ||
className?: string; | ||
isOpen: boolean; | ||
onClose: () => void; | ||
} | ||
|
||
export const LoginModal: FC<LoginModalProps> = ({ onClose, isOpen }) => { | ||
return ( | ||
<Modal isOpen={isOpen} onClose={onClose}> | ||
<LoginForm /> | ||
</Modal> | ||
); | ||
}; | ||
export const LoginModal = ({ className, isOpen, onClose }: LoginModalProps) => ( | ||
<Modal | ||
className={classNames("", {}, [className])} | ||
isOpen={isOpen} | ||
onClose={onClose} | ||
lazy | ||
> | ||
<Suspense fallback={<Loader />}> | ||
<LoginFormAsync /> | ||
</Suspense> | ||
</Modal> | ||
); |
Oops, something went wrong.