fix: react-redux 6.0.0 new way of passing context (#113)

* Fix react-redux 6.0.0 new way of passing context * Remove unused Store * Remove unused dispatch in type props NavLink * Rebase from master
faceyspacey · Dec 29, 2018 · d7e104f · d7e104f
1 parent 5a3f2bb
commit d7e104f
Show file tree

Hide file tree

Showing 3 changed files with 1,868 additions and 2,655 deletions.
diff --git a/src/Link.js b/src/Link.js
@@ -1,9 +1,7 @@
 // @flow
 
 import React from 'react'
-import PropTypes from 'prop-types'
 import { connect } from 'react-redux'
-import type { Store } from 'redux'
 import type { Connector } from 'react-redux'
 import { selectLocationState } from 'redux-first-router'
 
@@ -29,34 +27,28 @@ type OwnProps = {
 }
 
 type Props = {
-  dispatch: Function // eslint-disable-line flowtype/no-weak-types
+  dispatch: Function, // eslint-disable-line flowtype/no-weak-types
+  routesMap: object
 } & OwnProps
 
-type Context = {
-  store: Store<*, *>
-}
-
-export const Link = (
-  {
-    to,
-    href,
-    location,
-    redirect,
-    replace,
-    tagName = 'a',
-    children,
-    onPress,
-    onClick,
-    down = false,
-    shouldDispatch = true,
-    target,
-    dispatch,
-    ...props
-  }: Props
-) => {
+export const Link = ({
+  to,
+  href,
+  redirect,
+  replace,
+  tagName = 'a',
+  children,
+  onPress,
+  onClick,
+  down = false,
+  shouldDispatch = true,
+  target,
+  dispatch,
+  routesMap,
+  ...props
+}: Props) => {
   to = href || to // href is deprecated and will be removed in next major version
 
-  const { routesMap } = location
   const url = toUrl(to, routesMap)
   const handler = handlePress.bind(
     null,
@@ -97,9 +89,10 @@ export const Link = (
   )
 }
 
-const mapState = state => ({ location: selectLocationState(state) })
-const mapProps = dispatch => ({ dispatch })
-const connector: Connector<OwnProps, Props> = connect(mapState, mapProps)
+const mapState = state => ({
+  routesMap: selectLocationState(state).routesMap
+})
+const connector: Connector<OwnProps, Props> = connect(mapState)
 
 // $FlowIgnore
 export default connector(Link)
diff --git a/src/NavLink.js b/src/NavLink.js
@@ -1,9 +1,7 @@
 // @flow
 
 import React from 'react'
-import PropTypes from 'prop-types'
 import { connect } from 'react-redux'
-import type { Store } from 'redux'
 import type { Connector } from 'react-redux'
 import matchPath from 'rudy-match-path'
 import { selectLocationState, getOptions } from 'redux-first-router'
@@ -36,25 +34,23 @@ type OwnProps = {
 }
 
 type Props = {
-  dispatch: Function
+  location: any
 } & OwnProps
 
-const NavLink = (
-  {
-    to,
-    href,
-    location,
-    className,
-    style,
-    activeClassName = 'active',
-    activeStyle,
-    ariaCurrent = 'true',
-    exact,
-    strict,
-    isActive,
-    ...props
-  }: Props
-) => {
+const NavLink = ({
+  to,
+  href,
+  location,
+  className,
+  style,
+  activeClassName = 'active',
+  activeStyle,
+  ariaCurrent = 'true',
+  exact,
+  strict,
+  isActive,
+  ...props
+}: Props) => {
   to = href || to
 
   const options = getOptions()
@@ -82,7 +78,7 @@ const NavLink = (
       className={combinedClassName}
       style={combinedStyle}
       aria-current={active && ariaCurrent}
-      location={location}
+      routesMap={location.routesMap}
       {...props}
     />
   )