Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions store/configureStore.development.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import { applyMiddleware, createStore } from "redux"
import { composeWithDevTools } from "redux-devtools-extension"
import createSagaMiddleware from "redux-saga"
import { combinedReducers } from "./reducers"
import { combinedReducers, RootState } from "./reducers"
import { rootSaga } from "./sagas"
import { IInitialState } from "./states"

const sagaMiddleware = createSagaMiddleware()

export function configureStore(initialState?: IInitialState) {
export function configureStore(initialState?: RootState) {
const store = createStore(
combinedReducers,
initialState,
Expand Down
5 changes: 2 additions & 3 deletions store/configureStore.production.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { applyMiddleware, createStore } from "redux"
import createSagaMiddleware from "redux-saga"
import { combinedReducers } from "./reducers"
import { combinedReducers, RootState } from "./reducers"
import { rootSaga } from "./sagas"
import { IInitialState } from "./states"

const sagaMiddleware = createSagaMiddleware()

export function configureStore(initialState?: IInitialState) {
export function configureStore(initialState?: RootState) {
const store = createStore(
combinedReducers,
initialState,
Expand Down
4 changes: 2 additions & 2 deletions store/configureStore.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Env } from "../constants"
import { IInitialState } from "../store/states"
import { RootState } from "./reducers"

const configureStoreComponent = (() => {
if (Env.NODE_ENV === "production") {
Expand All @@ -8,5 +8,5 @@ const configureStoreComponent = (() => {
return require("./configureStore.development")
})()

export const configureStore = (initialState?: IInitialState) =>
export const configureStore = (initialState?: RootState) =>
configureStoreComponent.configureStore(initialState)
4 changes: 2 additions & 2 deletions store/counter/selectors.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import { IInitialState } from "../states"
import { RootState } from "../reducers"

export const countSelector = (state: IInitialState) => state.counter.count
export const countSelector = (state: RootState) => state.counter.count
4 changes: 2 additions & 2 deletions store/page/selectors.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IInitialState } from "../states"
import { RootState } from "../reducers"

export const selectedPageSelector = (state: IInitialState) =>
export const selectedPageSelector = (state: RootState) =>
state.page.selectedPage
5 changes: 3 additions & 2 deletions store/reducers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ import {
reduxSagaDebounceReducer,
reduxSagaThrottleReducer,
} from "./redux-saga/reducers"
import { IInitialState } from "./states"

export const combinedReducers = combineReducers<IInitialState>({
export const combinedReducers = combineReducers({
counter: countReducer,
page: pageReducer,
reduxSagaDebounce: reduxSagaDebounceReducer,
reduxSagaThrottle: reduxSagaThrottleReducer,
})

export type RootState = ReturnType<typeof combinedReducers>
12 changes: 5 additions & 7 deletions store/redux-saga/selectors.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import { IInitialState } from "../states"
import { RootState } from "../reducers"
import { IReduxSagaState } from "./states"

export const reduxSagaDebounceSelector = (
state: IInitialState
): IReduxSagaState => state.reduxSagaDebounce
export const reduxSagaDebounceSelector = (state: RootState): IReduxSagaState =>
state.reduxSagaDebounce

export const reduxSagaThrottleSelector = (
state: IInitialState
): IReduxSagaState => state.reduxSagaThrottle
export const reduxSagaThrottleSelector = (state: RootState): IReduxSagaState =>
state.reduxSagaThrottle
13 changes: 0 additions & 13 deletions store/states.ts

This file was deleted.