Skip to content

Commit 9de43b2

Browse files
committed
Remove extra createShallowEqualSelector file since it's not adding much value
1 parent cd75a22 commit 9de43b2

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

src/components/connect.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { bindActionCreators } from 'redux'
33
import { createSelector, createSelectorCreator, defaultMemoize } from 'reselect'
44

55
import connectAdvanced from './connectAdvanced'
6-
import createShallowEqualSelector from '../utils/createShallowEqualSelector'
6+
import shallowEqual from '../utils/shallowEqual'
77
import warning from '../utils/warning'
88

99
const defaultMergeProps = (stateProps, dispatchProps, ownProps) => ({
@@ -92,9 +92,12 @@ export default function connect(
9292
}
9393

9494
function selectorFactory({ displayName }) {
95-
const ownPropsSelector = createShallowEqualSelector((_, props) => props, props => props)
95+
const ownPropsSelector = createSelectorCreator(defaultMemoize, shallowEqual)(
96+
(_, props) => props,
97+
props => props
98+
)
9699

97-
return createShallowEqualSelector(
100+
return createSelectorCreator(defaultMemoize, shallowEqual)(
98101
verify(displayName, 'mapStateToProps', getStatePropsSelector(ownPropsSelector)),
99102
verify(displayName, 'mapDispatchToProps', getDispatchPropsSelector(ownPropsSelector)),
100103
ownPropsSelector,

src/components/connectAdvanced.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
import hoistStatics from 'hoist-non-react-statics'
22
import invariant from 'invariant'
33
import { Component, createElement } from 'react'
4+
import { createSelectorCreator, defaultMemoize } from 'reselect'
45

5-
import createShallowEqualSelector from '../utils/createShallowEqualSelector'
6+
import shallowEqual from '../utils/shallowEqual'
67
import storeShape from '../utils/storeShape'
78

89
function buildSelector({ displayName, store, selectorFactory, shouldUseState }) {
910
// wrap the source selector in a shallow equals because props objects with
1011
// same properties are symantically equal to React... no need to re-render.
11-
const selector = createShallowEqualSelector(
12+
const selector = createSelectorCreator(defaultMemoize, shallowEqual)(
1213
selectorFactory({ displayName, dispatch: store.dispatch }),
1314
result => result
1415
)

src/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import Provider from './components/Provider'
22
import connect from './components/connect'
33
import connectAdvanced from './components/connectAdvanced'
4-
import createShallowEqualSelector from './utils/createShallowEqualSelector'
4+
import shallowEqual from './utils/shallowEqual'
55

66
export {
77
Provider,
88
connect,
99
connectAdvanced,
10-
createShallowEqualSelector
10+
shallowEqual
1111
}

src/utils/createShallowEqualSelector.js

-4
This file was deleted.

0 commit comments

Comments
 (0)