Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit473600d

Browse files
committed
better definition for mapDispatchToProps
1 parentecb89b2 commit473600d

File tree

6 files changed

+49
-43
lines changed

6 files changed

+49
-43
lines changed

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name":"redux-ts",
33
"version":"4.1.2",
44
"description":"Utils to define redux reducer/action in typescript",
5-
"main":"dist/redux-ts.min.js",
5+
"main":"dist/redux-ts.production.min.js",
66
"typings":"dist/src/index.d.ts",
77
"files": [
88
"*.md",
@@ -72,6 +72,6 @@
7272
"react":">=15",
7373
"react-dom":">=15",
7474
"react-redux":">=5",
75-
"redux":">=3"
75+
"redux":">=4"
7676
}
7777
}

‎src/helpers/redux.helpers.ts‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import{ActionCreatorDefinition,StateToProps,DispatchToProps}from'..'
1+
import{ActionCreatorDefinition,DispatchToProps,Indexer}from'..'
22

33
exportconstcreateAction=<TPayload>(
44
type:string,
@@ -12,11 +12,17 @@ export const createAction = <TPayload>(
1212
returncreator
1313
}
1414

15-
exportconstmapDispatchToProps:DispatchToProps=map=>dispatch=>
16-
Object.keys(map).reduce(
17-
(prev,key)=>({
18-
...prev,
19-
[key]:(...params:any[])=>dispatch(map[key](...params)),
20-
}),
21-
{},
22-
)astypeofmap
15+
exportconstmapDispatchToProps:DispatchToProps=map=>(dispatch,own)=>{
16+
constmapper=<TextendsIndexer>(m:T)=>
17+
Object.keys(m).reduce(
18+
(prev,key)=>({
19+
...prev,
20+
[key]:(...params:any[])=>dispatch(m[key](...params)),
21+
}),
22+
{},
23+
)astypeofm
24+
25+
returntypeofmap==='function' ?mapper(map(dispatch,own)) :mapper(map)
26+
27+
// : map => mapper(d, o)
28+
}

‎src/models/redux.model.ts‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
import{Dispatch,AnyAction}from'redux'
2-
import{ActionCreatorDefinition}from'..'
1+
import{AnyAction}from'redux'
2+
import{MapDispatchToPropsFunction,MapStateToProps}from'react-redux'
3+
4+
exporttypeIndexer<T=any>={[key:string]:T}
35

46
exportinterfaceStateToProps<TState=any>{
5-
<Textends{[key:string]:any}={},Town={}>(
6-
map:(store:TState,own:Town)=>T,
7-
):(store:TState,own:Town)=>T
7+
<TextendsIndexer,TOwn>(
8+
map:MapStateToProps<T,TOwn,TState>,
9+
):MapStateToProps<T,TOwn,TState>
810
}
911

10-
exportinterfaceDispatchToProps<
11-
TDispatchActionextendsAnyAction=AnyAction
12-
>{
13-
<Textends{[key:string]:(...params:any[])=>AnyAction},Town>(
14-
map:T,
15-
own:Town,
16-
):(dispatch:Dispatch<TDispatchAction>,own:Town)=>T
12+
exportinterfaceDispatchToProps{
13+
<TextendsIndexer<(...params:any[])=>AnyAction>,TOwn>(
14+
map:T|MapDispatchToPropsFunction<T,TOwn>,
15+
):MapDispatchToPropsFunction<T,TOwn>
1716
}

‎webpack.common.js‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,38 @@
1-
constwebpack=require("webpack")
2-
constnodeExternals=require("webpack-node-externals")
1+
constwebpack=require('webpack')
2+
constnodeExternals=require('webpack-node-externals')
33

44
module.exports={
55
externals:[nodeExternals()],
6-
entry:"./src/index.ts",
6+
entry:['./src/index.ts'],
77
resolve:{
8-
extensions:[".ts",".tsx",".js",".jsx"]
8+
extensions:['.ts','.tsx','.js','.jsx'],
99
},
1010
module:{
1111
rules:[
1212
{
1313
test:/\.tsx?$/,
1414
use:[
1515
{
16-
loader:"ts-loader",
16+
loader:'ts-loader',
1717
options:{
1818
compilerOptions:{
1919
declaration:true,
20-
sourceMap:true
21-
}
22-
}
23-
}
24-
]
25-
}
26-
]
20+
sourceMap:true,
21+
},
22+
},
23+
},
24+
],
25+
},
26+
],
2727
},
2828

2929
plugins:[
30+
// new CopyWebpackPlugin(['./index.js']),
3031
// new webpack.DefinePlugin({
3132
// "process.env.NODE_ENV": JSON.stringify(env)
3233
// }),
3334
// new webpack.SourceMapDevToolPlugin({
3435
// filename: "[file].map"
3536
// })
36-
]
37+
],
3738
}

‎webpack.dev.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
constmerge=require("webpack-merge")
2-
constcommon=require("./webpack.common.js")
1+
constmerge=require('webpack-merge')
2+
constcommon=require('./webpack.common.js')
33

44
module.exports=merge(common,{
5-
mode:"development",
6-
devtool:"source-map",
5+
mode:'development',
6+
devtool:'source-map',
77
output:{
8-
filename:"redux-ts.js"
9-
}
8+
filename:'redux-ts.development.js',
9+
},
1010
})

‎webpack.prod.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ module.exports = merge(common, {
99
libraryTarget:'umd',
1010
umdNamedDefine:true,
1111
globalObject:'this',
12-
filename:'redux-ts.min.js',
12+
filename:'redux-ts.production.min.js',
1313
},
1414
})

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp