Repository: reduxjs/react-redux
Pull request #1134 (2018-12-17 09:55:53)

Ensure that component prop 'context' really contains a React context …
…before using it

after switching to react-redux 6.0.0, we've had a lot of errors stating

`Warning: React.createElement: type is invalid -- expected a string (for built-in components) or a class/function (for composite components) but got: undefined. You likely forgot to export your component from the file it's defined in, or you might have mixed up default and named imports.`

all over in our app. After digging deeper, we've discovered that we use a lot of (connected) components already using a property named `context` which conflicts with your new connectAdvanced code. So maybe you can improve the check on `this.props.context` a little bit to ensure it is used only if it really contains a valid React context.

netlify[bot]: Deploy preview for *react-redux-docs* ready!

Built with commit 2c8fa0c59b47c09097df7876b31eae88a3457e6a

https://deploy-preview-1134--react-redux-docs.netlify.com
timdorr: Can you add a test?
casdevs: ok, I'm going to add tests within the next few days

Patch:
diff --git a/.github/ISSUE_TEMPLATE/---bug-report.md b/.github/ISSUE_TEMPLATE/---bug-report.md
index 4d67a47..cdd73c3 100644
--- a/.github/ISSUE_TEMPLATE/---bug-report.md
+++ b/.github/ISSUE_TEMPLATE/---bug-report.md
@@ -21,4 +21,4 @@ about: Something isn't working correctly.
 
 
 
-**Which versions of React, ReactDOM/React Native, Redux, and React-Redux are you using?  Which browser and OS are affected by this issue? Did this work in previous versions of React-Redux?**
+**Which versions of React, ReactDOM/React Native, Redux, and React Redux are you using?  Which browser and OS are affected by this issue? Did this work in previous versions of React Redux?**
diff --git a/.prettierrc b/.prettierrc
index b2095be..b18aca9 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -1,4 +1,5 @@
 {
   "semi": false,
-  "singleQuote": true
+  "singleQuote": true,
+  "tabWidth": 2
 }
diff --git a/README.md b/README.md
index 77e4961..f6943f9 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ If you are on an older version of React Native, you’ll need to keep using [Rea
 
 ## Documentation
 
-The React-Redux docs are now published at **https://react-redux.js.org** .
+The React Redux docs are now published at **https://react-redux.js.org** .
 
 We're currently expanding and rewriting our docs content - check back soon for more updates!
 
diff --git a/docs/README.md b/docs/README.md
index 242fd11..8b7ed55 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,12 +1,12 @@
 # Table of Contents
 
 - Introduction
-  - [Quick Start: adding React-Redux to a React todo app](./introduction/quick-start.md)
+  - [Quick Start: adding React Redux to a React todo app](./introduction/quick-start.md)
   - [Basic Tutorial](./introduction/basic-tutorial.md)
-- Using React-Redux
+- Using React Redux
   - [Connect: Extracting Data with `mapStateToProps`](./using-react-redux/connect-extracting-data-with-mapStateToProps.md)
-- [API](api.md#api)
-  - [`<Provider store>`](api.md#provider-store)
-  - [`connect([mapStateToProps], [mapDispatchToProps], [mergeProps], [options])`](api.md#connectmapstatetoprops-mapdispatchtoprops-mergeprops-options)
-  - [`connectAdvanced(selectorFactory, [connectOptions])`](api.md#connectadvancedselectorfactory-connectoptions)
+- API
+  - [`<Provider store>`](./api/Provider.md)
+  - [`connect([mapStateToProps], [mapDispatchToProps], [mergeProps], [options])`](./api/connect.md)
+  - [`connectAdvanced(selectorFactory, [connectOptions])`](./api/connect-advanced.md)
 - [Troubleshooting](troubleshooting.md#troubleshooting)
diff --git a/docs/api.md b/docs/api.md
deleted file mode 100644
index 346e9a4..0000000
--- a/docs/api.md
+++ /dev/null
@@ -1,491 +0,0 @@
----
-id: api
-title: Api
-sidebar_label: API
-hide_title: true
----
-
-# API
-
-<a id="provider"></a>
-## Provider
-
-Makes the Redux store available to the `connect()` calls in the component hierarchy below. Normally, you can’t use `connect()` without wrapping a parent or ancestor component in `<Provider>`.
-
-If you *really* need to, you can manually pass `store` as a prop to every `connect()`ed component, but we only recommend to do this for stubbing `store` in unit tests, or in non-fully-React codebases. Normally, you should just use `<Provider>`.
-
-### Props
-
-* `store` (*[Redux Store](https://redux.js.org/api/store)*): The single Redux store in your application.
-* `children` (*ReactElement*) The root of your component hierarchy.
-
-### Example
-
-#### Vanilla React
-
-```jsx
-ReactDOM.render(
-  <Provider store={store}>
-    <MyRootComponent />
-  </Provider>,
-  rootEl
-)
-```
-
-#### React Router
-
-```jsx
-ReactDOM.render(
-  <Provider store={store}>
-    <Router history={history}>
-      <Route path="/" component={App}>
-        <Route path="foo" component={Foo}/>
-        <Route path="bar" component={Bar}/>
-      </Route>
-    </Router>
-  </Provider>,
-  document.getElementById('root')
-)
-```
-
-
-## connect
-
-```
-connect([mapStateToProps], [mapDispatchToProps], [mergeProps], [options])
-```
-
-Connects a React component to a Redux store. `connect` is a facade around `connectAdvanced`, providing a convenient API for the most common use cases.
-
-It does not modify the component class passed to it; instead, it *returns* a new, connected component class for you to use.
-
-### Arguments
-
-* [`mapStateToProps(state, [ownProps]): stateProps`] \(*Function*): If this argument is specified, the new component will subscribe to Redux store updates. This means that any time the store is updated, `mapStateToProps` will be called. The results of `mapStateToProps` must be a plain object, which will be merged into the component’s props. If you don't want to subscribe to store updates, pass `null` or `undefined` in place of `mapStateToProps`.
-
-  If your `mapStateToProps` function is declared as taking two parameters, it will be called with the store state as the first parameter and the props passed to the connected component as the second parameter, and will also be re-invoked whenever the connected component receives new props as determined by shallow equality comparisons.  (The second parameter is normally referred to as `ownProps` by convention.)
-
-  >Note: in advanced scenarios where you need more control over the rendering performance, `mapStateToProps()` can also return a function. In this case, *that* function will be used as `mapStateToProps()` for a particular component instance. This allows you to do per-instance memoization. You can refer to [#279](https://github.com/reduxjs/react-redux/pull/279) and the tests it adds for more details. Most apps never need this.
-
-  >The `mapStateToProps` function's first argument is the entire Redux store’s state and it returns an object to be passed as props. It is often called a **selector**. Use [reselect](https://github.com/reduxjs/reselect) to efficiently compose selectors and [compute derived data](https://redux.js.org/recipes/computing-derived-data).
-
-* [`mapDispatchToProps(dispatch, [ownProps]): dispatchProps`] \(*Object* or *Function*): If an object is passed, each function inside it is assumed to be a Redux action creator. An object with the same function names, but with every action creator wrapped into a `dispatch` call so they may be invoked directly, will be merged into the component’s props.  
-
-  If a function is passed, it will be given `dispatch` as the first parameter.  It’s up to you to return an object that somehow uses `dispatch` to bind action creators in your own way. (Tip: you may use the [`bindActionCreators()`](https://redux.js.org/api/bindactioncreators) helper from Redux.)  
-
-  If your `mapDispatchToProps` function is declared as taking two parameters, it will be called with `dispatch` as the first parameter and the props passed to the connected component as the second parameter, and will be re-invoked whenever the connected component receives new props.  (The second parameter is normally referred to as `ownProps` by convention.)
-
-  If you do not supply your own `mapDispatchToProps` function or object full of action creators, the default `mapDispatchToProps` implementation just injects `dispatch` into your component’s props.
-
-  >Note: in advanced scenarios where you need more control over the rendering performance, `mapDispatchToProps()` can also return a function. In this case, *that* function will be used as `mapDispatchToProps()` for a particular component instance. This allows you to do per-instance memoization. You can refer to [#279](https://github.com/reduxjs/react-redux/pull/279) and the tests it adds for more details. Most apps never need this.
-
-* [`mergeProps(stateProps, dispatchProps, ownProps): props`] \(*Function*): If specified, it is passed the result of `mapStateToProps()`, `mapDispatchToProps()`, and the parent `props`. The plain object you return from it will be passed as props to the wrapped component. You may specify this function to select a slice of the state based on props, or to bind action creators to a particular variable from props. If you omit it, `Object.assign({}, ownProps, stateProps, dispatchProps)` is used by default.
-
-* [`options`] *(Object)* If specified, further customizes the behavior of the connector. In addition to the options passable to `connectAdvanced()` (see those below), `connect()` accepts these additional options:
-  * [`pure`] *(Boolean)*: If true, `connect()` will avoid re-renders and calls to `mapStateToProps`, `mapDispatchToProps`, and `mergeProps` if the relevant state/props objects remain equal based on their respective equality checks. Assumes that the wrapped component is a “pure” component and does not rely on any input or state other than its props and the selected Redux store’s state. Default value: `true`
-  * [`areStatesEqual`] *(Function)*: When pure, compares incoming store state to its previous value. Default value: `strictEqual (===)`
-  * [`areOwnPropsEqual`] *(Function)*: When pure, compares incoming props to its previous value. Default value: `shallowEqual`
-  * [`areStatePropsEqual`] *(Function)*: When pure, compares the result of `mapStateToProps` to its previous value. Default value: `shallowEqual`
-  * [`areMergedPropsEqual`] *(Function)*: When pure, compares the result of `mergeProps` to its previous value. Default value: `shallowEqual`
-  * [`storeKey`] *(String)*: The key of the context from where to read the store. You probably only need this if you are in the inadvisable position of having multiple stores. Default value: `'store'`
-
-#### The arity of mapStateToProps and mapDispatchToProps determines whether they receive ownProps
-
-> Note: `ownProps` **is not passed** to `mapStateToProps` and `mapDispatchToProps` if the formal definition of the function contains one mandatory parameter (function has length 1). For example, functions defined like below won't receive `ownProps` as the second argument.
-
-```js
-function mapStateToProps(state) {
-  console.log(state); // state
-  console.log(arguments[1]); // undefined
-}
-```
-```js
-const mapStateToProps = (state, ownProps = {}) => {
-  console.log(state); // state
-  console.log(ownProps); // {}
-}
-```
-
-Functions with no mandatory parameters or two parameters **will receive** `ownProps`.
-```js
-const mapStateToProps = (state, ownProps) => {
-  console.log(state); // state
-  console.log(ownProps); // ownProps
-}
-```
-```js
-function mapStateToProps() {
-  console.log(arguments[0]); // state
-  console.log(arguments[1]); // ownProps
-}
-```
-```js
-const mapStateToProps = (...args) => {
-  console.log(args[0]); // state
-  console.log(args[1]); // ownProps
-}
-```
-
-#### Optimizing connect when options.pure is true
-
-When `options.pure` is true, `connect` performs several equality checks that are used to avoid unnecessary calls to `mapStateToProps`, `mapDispatchToProps`, `mergeProps`, and ultimately to `render`. These include `areStatesEqual`, `areOwnPropsEqual`, `areStatePropsEqual`, and `areMergedPropsEqual`. While the defaults are probably appropriate 99% of the time, you may wish to override them with custom implementations for performance or other reasons. Here are several examples:
-
-* You may wish to override `areStatesEqual` if your `mapStateToProps` function is computationally expensive and is also only concerned with a small slice of your state. For example: `areStatesEqual: (next, prev) => prev.entities.todos === next.entities.todos`; this would effectively ignore state changes for everything but that slice of state.
-
-* You may wish to override `areStatesEqual` to always return false (`areStatesEqual: () => false`) if you have impure reducers that mutate your store state. (This would likely impact the other equality checks as well, depending on your `mapStateToProps` function.)
-
-* You may wish to override `areOwnPropsEqual` as a way to whitelist incoming props. You'd also have to implement `mapStateToProps`, `mapDispatchToProps` and `mergeProps` to also whitelist props. (It may be simpler to achieve this other ways, for example by using [recompose's mapProps](https://github.com/acdlite/recompose/blob/master/docs/API.md#mapprops).)
-
-* You may wish to override `areStatePropsEqual` to use `strictEqual` if your `mapStateToProps` uses a memoized selector that will only return a new object if a relevant prop has changed. This would be a very slight performance improvement, since would avoid extra equality checks on individual props each time `mapStateToProps` is called.
-
-* You may wish to override `areMergedPropsEqual` to implement a `deepEqual` if your selectors produce complex props. ex: nested objects, new arrays, etc. (The deep equal check should be faster than just re-rendering.)
-
-### Returns
-
-A higher-order React component class that passes state and action creators into your component derived from the supplied arguments. This is created by `connectAdvanced`, and details of this higher-order component are covered there.
-
-<a id="connect-examples"></a>
-#### Examples
-
-#### Inject just `dispatch` and don't listen to store
-
-```js
-export default connect()(TodoApp)
-```
-
-#### Inject all action creators  (`addTodo`, `completeTodo`, ...) without subscribing to the store
-
-```js
-import * as actionCreators from './actionCreators'
-
-export default connect(null, actionCreators)(TodoApp)
-```
-
-#### Inject `dispatch` and every field in the global state
-
->Don’t do this! It kills any performance optimizations because `TodoApp` will rerender after every state change.  
->It’s better to have more granular `connect()` on several components in your view hierarchy that each only  
->listen to a relevant slice of the state.
-
-```js
-export default connect(state => state)(TodoApp)
-```
-
-#### Inject `dispatch` and `todos`
-
-```js
-function mapStateToProps(state) {
-  return { todos: state.todos }
-}
-
-export default connect(mapStateToProps)(TodoApp)
-```
-
-#### Inject `todos` and all action creators
-
-```js
-import * as actionCreators from './actionCreators'
-
-function mapStateToProps(state) {
-  return { todos: state.todos }
-}
-
-export default connect(mapStateToProps, actionCreators)(TodoApp)
-```
-
-#### Inject `todos` and all action creators (`addTodo`, `completeTodo`, ...) as `actions`
-
-```js
-import * as actionCreators from './actionCreators'
-import { bindActionCreators } from 'redux'
-
-function mapStateToProps(state) {
-  return { todos: state.todos }
-}
-
-function mapDispatchToProps(dispatch) {
-  return { actions: bindActionCreators(actionCreators, dispatch) }
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(TodoApp)
-```
-
-####  Inject `todos` and a specific action creator (`addTodo`)
-
-```js
-import { addTodo } from './actionCreators'
-import { bindActionCreators } from 'redux'
-
-function mapStateToProps(state) {
-  return { todos: state.todos }
-}
-
-function mapDispatchToProps(dispatch) {
-  return bindActionCreators({ addTodo }, dispatch)
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(TodoApp)
-```
-
-####  Inject `todos` and specific action creators (`addTodo` and `deleteTodo`) with shorthand syntax
-
-```js
-import { addTodo, deleteTodo } from './actionCreators'
-
-function mapStateToProps(state) {
-  return { todos: state.todos }
-}
-
-const mapDispatchToProps = {
-  addTodo,
-  deleteTodo
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(TodoApp)
-```
-
-#### Inject `todos`, todoActionCreators as `todoActions`, and counterActionCreators as `counterActions`
-
-```js
-import * as todoActionCreators from './todoActionCreators'
-import * as counterActionCreators from './counterActionCreators'
-import { bindActionCreators } from 'redux'
-
-function mapStateToProps(state) {
-  return { todos: state.todos }
-}
-
-function mapDispatchToProps(dispatch) {
-  return {
-    todoActions: bindActionCreators(todoActionCreators, dispatch),
-    counterActions: bindActionCreators(counterActionCreators, dispatch)
-  }
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(TodoApp)
-```
-
-#### Inject `todos`, and todoActionCreators and counterActionCreators together as `actions`
-
-```js
-import * as todoActionCreators from './todoActionCreators'
-import * as counterActionCreators from './counterActionCreators'
-import { bindActionCreators } from 'redux'
-
-function mapStateToProps(state) {
-  return { todos: state.todos }
-}
-
-function mapDispatchToProps(dispatch) {
-  return {
-    actions: bindActionCreators(Object.assign({}, todoActionCreators, counterActionCreators), dispatch)
-  }
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(TodoApp)
-```
-
-#### Inject `todos`, and all todoActionCreators and counterActionCreators directly as props
-
-```js
-import * as todoActionCreators from './todoActionCreators'
-import * as counterActionCreators from './counterActionCreators'
-import { bindActionCreators } from 'redux'
-
-function mapStateToProps(state) {
-  return { todos: state.todos }
-}
-
-function mapDispatchToProps(dispatch) {
-  return bindActionCreators(Object.assign({}, todoActionCreators, counterActionCreators), dispatch)
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(TodoApp)
-```
-
-#### Inject `todos` of a specific user depending on props
-
-```js
-import * as actionCreators from './actionCreators'
-
-function mapStateToProps(state, ownProps) {
-  return { todos: state.todos[ownProps.userId] }
-}
-
-export default connect(mapStateToProps)(TodoApp)
-```
-
-#### Inject `todos` of a specific user depending on props, and inject `props.userId` into the action
-
-```js
-import * as actionCreators from './actionCreators'
-
-function mapStateToProps(state) {
-  return { todos: state.todos }
-}
-
-function mergeProps(stateProps, dispatchProps, ownProps) {
-  return Object.assign({}, ownProps, {
-    todos: stateProps.todos[ownProps.userId],
-    addTodo: (text) => dispatchProps.addTodo(ownProps.userId, text)
-  })
-}
-
-export default connect(mapStateToProps, actionCreators, mergeProps)(TodoApp)
-```
-
-#### Factory functions
-
-Factory functions can be used for performance optimizations
-
-```js
-import { addTodo } from './actionCreators'
-
-function mapStateToPropsFactory(initialState, initialProps) {
-  const getSomeProperty= createSelector(...);
-  const anotherProperty = 200 + initialState[initialProps.another];
-  return function(state){
-    return {
-      anotherProperty,
-      someProperty: getSomeProperty(state),
-      todos: state.todos
-    }
-  }
-}
-
-function mapDispatchToPropsFactory(initialState, initialProps) {
-  function goToSomeLink(){
-    initialProps.history.push('some/link');
-  }
-  return function(dispatch){
-    return {
-      addTodo
-    }
-  }
-}
-
-
-export default connect(mapStateToPropsFactory, mapDispatchToPropsFactory)(TodoApp)
-```
-
-## connectAdvanced
-
-```js
-connectAdvanced(selectorFactory, [connectOptions])
-```
-
-Connects a React component to a Redux store. It is the base for `connect()` but is less opinionated about how to combine `state`, `props`, and `dispatch` into your final props. It makes no assumptions about defaults or memoization of results, leaving those responsibilities to the caller.
-
-It does not modify the component class passed to it; instead, it *returns* a new, connected component class for you to use.
-
-### Arguments
-
-* `selectorFactory(dispatch, factoryOptions): selector(state, ownProps): props` \(*Function*): Initializes a selector function (during each instance's constructor). That selector function is called any time the connector component needs to compute new props, as a result of a store state change or receiving new props. The result of `selector` is expected to be a plain object, which is passed as the props to the wrapped component. If a consecutive call to `selector` returns the same object (`===`) as its previous call, the component will not be re-rendered. It's the responsibility of `selector` to return that previous object when appropriate.
-
-* [`connectOptions`] *(Object)* If specified, further customizes the behavior of the connector.
-
-  * [`getDisplayName`] *(Function)*: computes the connector component's displayName property relative to that of the wrapped component. Usually overridden by wrapper functions. Default value: `name => 'ConnectAdvanced('+name+')'`
-
-  * [`methodName`] *(String)*: shown in error messages. Usually overridden by wrapper functions. Default value: `'connectAdvanced'`
-
-  * [`renderCountProp`] *(String)*: if defined, a property named this value will be added to the props passed to the wrapped component. Its value will be the number of times the component has been rendered, which can be useful for tracking down unnecessary re-renders. Default value: `undefined`
-
-  * [`shouldHandleStateChanges`] *(Boolean)*: controls whether the connector component subscribes to redux store state changes. If set to false, it will only re-render when parent component re-renders. Default value:  `true`
-
-  * [`storeKey`] *(String)*: the key of props/context to get the store. You probably only need this if you are in the inadvisable position of having multiple stores. Default value: `'store'`
-
-  * [`withRef`] *(Boolean)*: If true, stores a ref to the wrapped component instance and makes it available via `getWrappedInstance()` method. Default value: `false`
-
-  * Additionally, any extra options passed via `connectOptions` will be passed through to your `selectorFactory` in the `factoryOptions` argument.
-
-<a id="connectAdvanced-returns"></a>
-
-### Returns
-
-A higher-order React component class that builds props from the store state and passes them to the wrapped component. A higher-order component is a function which accepts a component argument and returns a new component.
-
-#### Static Properties
-
-* `WrappedComponent` *(Component)*: The original component class passed to `connectAdvanced(...)(Component)`.
-
-#### Static Methods
-
-All the original static methods of the component are hoisted.
-
-#### Instance Methods
-
-##### `getWrappedInstance(): ReactComponent`
-
-Returns the wrapped component instance. Only available if you pass `{ withRef: true }` as part of the `options` argument.
-
-### Remarks
-
-* Since `connectAdvanced` returns a higher-order component, it needs to be invoked two times. The first time with its arguments as described above, and a second time, with the component: `connectAdvanced(selectorFactory)(MyComponent)`.
-
-* `connectAdvanced` does not modify the passed React component. It returns a new, connected component, that you should use instead.
-
-<a id="connectAdvanced-examples"></a>
-#### Examples
-
-#### Inject `todos` of a specific user depending on props, and inject `props.userId` into the action
-
-```js
-import * as actionCreators from './actionCreators'
-import { bindActionCreators } from 'redux'
-
-function selectorFactory(dispatch) {
-  let ownProps = {}
-  let result = {}
-  const actions = bindActionCreators(actionCreators, dispatch)
-  const addTodo = (text) => actions.addTodo(ownProps.userId, text)
-  return (nextState, nextOwnProps) => {
-    const todos = nextState.todos[nextOwnProps.userId]
-    const nextResult = { ...nextOwnProps, todos, addTodo }
-    ownProps = nextOwnProps
-    if (!shallowEqual(result, nextResult)) result = nextResult
-    return result
-  }
-}
-export default connectAdvanced(selectorFactory)(TodoApp)
-```
-
-## createProvider
-
-```js
-createProvider([storeKey])
-```
-
-Creates a new `<Provider>` which will set the Redux Store on the passed key of the context. You probably only need this if you are in the inadvisable position of having multiple stores. You will also need to pass the same `storeKey` to the `options` argument of [`connect`](#connectmapstatetoprops-mapdispatchtoprops-mergeprops-options)
-
-### Arguments
-
-* [`storeKey`] (*String*): The key of the context on which to set the store. Default value: `'store'`
-
-### Examples
-Before creating multiple stores, please go through this FAQ: [Can or should I create multiple stores?](http://redux.js.org/docs/faq/StoreSetup.html#can-or-should-i-create-multiple-stores-can-i-import-my-store-directly-and-use-it-in-components-myself)
-
-```js
-import {connect, createProvider} from 'react-redux'
-
-const STORE_KEY = 'componentStore'
-
-export const Provider = createProvider(STORE_KEY)
-
-function connectExtended(
-  mapStateToProps,
-  mapDispatchToProps,
-  mergeProps,
-  options = {}
-) {
-  options.storeKey = STORE_KEY
-  return connect(
-    mapStateToProps,
-    mapDispatchToProps,
-    mergeProps,
-    options
-  )
-}
-
-export {connectExtended as connect}
-```
-Now you can import the above `Provider` and `connect` and use them.
diff --git a/docs/api/Provider.md b/docs/api/Provider.md
index 918a57f..68e02c7 100644
--- a/docs/api/Provider.md
+++ b/docs/api/Provider.md
@@ -2,6 +2,7 @@
 id: provider
 title: Provider
 sidebar_label: Provider
+hide_title: true
 ---
 
 # `<Provider />`
@@ -10,20 +11,40 @@ sidebar_label: Provider
 
 The `<Provider />` makes the Redux `store` available to any nested components that have been wrapped in the `connect()` function.
 
-Since any React component in a React-Redux app can be connected, most applications will render a `<Provider>` at the top level, with the entire app’s component tree inside of it.
+Since any React component in a React Redux app can be connected, most applications will render a `<Provider>` at the top level, with the entire app’s component tree inside of it.
 
-Normally, you can’t use a connected component unless it is nested inside of a `<Provider>` .
-
-Note: If you really need to, you can manually pass `store` as a prop to a connected component, but we only recommend to do this for stubbing `store` in unit tests, or in non-fully-React codebases. Normally, you should just use `<Provider>`.
+Normally, you can’t use a connected component unless it is nested inside of a `<Provider>`.
 
 ### Props
 
-`store` (Redux Store)
+`store` ([Redux Store](https://redux.js.org/api/store))
 The single Redux `store` in your application.
 
 `children` (ReactElement)
 The root of your component hierarchy.
 
+`context`
+You may provide a context instance. If you do so, you will need to provide the same context instance to all of your connected components as well. Failure to provide the correct context results in runtime error:
+
+> Invariant Violation
+>
+> Could not find "store" in the context of "Connect(MyComponent)". Either wrap the root component in a <Provider>, or pass a custom React context provider to <Provider> and the corresponding React context consumer to Connect(Todo) in connect options.
+
+**Note:** You do not need to provide custom context in order to access the store.
+React Redux exports the context instance it uses by default so that you can access the store by:
+
+```js
+import { ReactReduxContext } from 'react-redux'
+
+// in your connected component
+render() {
+  return (
+    <ReactReduxContext.Consumer>
+      {({ store }) => <div>{store}</div>}
+    </ReactReduxContext.Consumer>
+  )
+}
+```
 
 ### Example Usage
 
@@ -32,48 +53,47 @@ In the example below, the `<App />` component is our root-level component. This
 **Vanilla React Example**
 
 ```jsx
-    import React from 'react';
-    import ReactDOM from 'react-dom';
-    import { Provider } from 'react-redux';
-
-    import { App } from './App';
-    import createStore from './createReduxStore';
+import React from 'react'
+import ReactDOM from 'react-dom'
+import { Provider } from 'react-redux'
 
-    const store = createStore();
+import { App } from './App'
+import createStore from './createReduxStore'
 
-    ReactDOM.render(
-      <Provider store={store}>
-        <App />
-      </Provider>,
-      document.getElementById('root')
-    )
-```    
+const store = createStore()
 
+ReactDOM.render(
+  <Provider store={store}>
+    <App />
+  </Provider>,
+  document.getElementById('root')
+)
+```
 
 **Usage with React Router**
 
 ```jsx
-    import React from 'react';
-    import ReactDOM from 'react-dom';
-    import { Provider } from 'react-redux';
-    import { Router, Route } from 'react-router-dom';
-
-    import { App } from './App';
-    import { Foo } from './Foo';
-    import { Bar } from './Bar';
-    import createStore from './createReduxStore';
-
-    const store = createStore();
-
-    ReactDOM.render(
-      <Provider store={store}>
-        <Router history={history}>
-          <Route path="/" component={App}>
-            <Route path="foo" component={Foo}/>
-            <Route path="bar" component={Bar}/>
-          </Route>
-        </Router>
-      </Provider>,
-      document.getElementById('root')
-    )
-```    
+import React from 'react'
+import ReactDOM from 'react-dom'
+import { Provider } from 'react-redux'
+import { Router, Route } from 'react-router-dom'
+
+import { App } from './App'
+import { Foo } from './Foo'
+import { Bar } from './Bar'
+import createStore from './createReduxStore'
+
+const store = createStore()
+
+ReactDOM.render(
+  <Provider store={store}>
+    <Router history={history}>
+      <Route path="/" component={App}>
+        <Route path="foo" component={Foo} />
+        <Route path="bar" component={Bar} />
+      </Route>
+    </Router>
+  </Provider>,
+  document.getElementById('root')
+)
+```
diff --git a/docs/api/connect-advanced.md b/docs/api/connect-advanced.md
new file mode 100644
index 0000000..ff65f1d
--- /dev/null
+++ b/docs/api/connect-advanced.md
@@ -0,0 +1,86 @@
+---
+id: connect-advanced
+title: connectAdvanced
+sidebar_label: connectAdvanced()
+hide_title: true
+---
+
+# `connectAdvanced()`
+
+```js
+connectAdvanced(selectorFactory, connectOptions?)
+```
+
+Connects a React component to a Redux store. It is the base for `connect()` but is less opinionated about how to combine `state`, `props`, and `dispatch` into your final props. It makes no assumptions about defaults or memoization of results, leaving those responsibilities to the caller.
+
+It does not modify the component class passed to it; instead, it _returns_ a new, connected component class for you to use.
+
+Most applications will not need to use this, as the default behavior in `connect` is intended to work for most use cases.
+
+> Note: `connectAdvanced` was added in version 5.0, and `connect` was reimplemented as a specific set of parameters to `connectAdvanced`.
+
+## Arguments
+
+- `selectorFactory(dispatch, factoryOptions): selector(state, ownProps): props` \(_Function_): Initializes a selector function (during each instance's constructor). That selector function is called any time the connector component needs to compute new props, as a result of a store state change or receiving new props. The result of `selector` is expected to be a plain object, which is passed as the props to the wrapped component. If a consecutive call to `selector` returns the same object (`===`) as its previous call, the component will not be re-rendered. It's the responsibility of `selector` to return that previous object when appropriate.
+
+- [`connectOptions`] _(Object)_ If specified, further customizes the behavior of the connector.
+
+  - [`getDisplayName`] _(Function)_: computes the connector component's displayName property relative to that of the wrapped component. Usually overridden by wrapper functions. Default value: `name => 'ConnectAdvanced('+name+')'`
+
+  - [`methodName`] _(String)_: shown in error messages. Usually overridden by wrapper functions. Default value: `'connectAdvanced'`
+
+  - [`renderCountProp`] _(String)_: if defined, a property named this value will be added to the props passed to the wrapped component. Its value will be the number of times the component has been rendered, which can be useful for tracking down unnecessary re-renders. Default value: `undefined`
+
+  - [`shouldHandleStateChanges`] _(Boolean)_: controls whether the connector component subscribes to redux store state changes. If set to false, it will only re-render when parent component re-renders. Default value: `true`
+
+  - [`forwardRef`] _(Boolean)_: If true, adding a ref to the connected wrapper component will actually return the instance of the wrapped component.
+
+  - Additionally, any extra options passed via `connectOptions` will be passed through to your `selectorFactory` in the `factoryOptions` argument.
+
+<a id="connectAdvanced-returns"></a>
+
+## Returns
+
+A higher-order React component class that builds props from the store state and passes them to the wrapped component. A higher-order component is a function which accepts a component argument and returns a new component.
+
+### Static Properties
+
+- `WrappedComponent` _(Component)_: The original component class passed to `connectAdvanced(...)(Component)`.
+
+### Static Methods
+
+All the original static methods of the component are hoisted.
+
+## Remarks
+
+- Since `connectAdvanced` returns a higher-order component, it needs to be invoked two times. The first time with its arguments as described above, and a second time, with the component: `connectAdvanced(selectorFactory)(MyComponent)`.
+
+- `connectAdvanced` does not modify the passed React component. It returns a new, connected component, that you should use instead.
+
+<a id="connectAdvanced-examples"></a>
+
+### Examples
+
+### Inject `todos` of a specific user depending on props, and inject `props.userId` into the action
+
+```js
+import * as actionCreators from './actionCreators'
+import { bindActionCreators } from 'redux'
+
+function selectorFactory(dispatch) {
+  let ownProps = {}
+  let result = {}
+
+  const actions = bindActionCreators(actionCreators, dispatch)
+  const addTodo = text => actions.addTodo(ownProps.userId, text)
+
+  return (nextState, nextOwnProps) => {
+    const todos = nextState.todos[nextOwnProps.userId]
+    const nextResult = { ...nextOwnProps, todos, addTodo }
+    ownProps = nextOwnProps
+    if (!shallowEqual(result, nextResult)) result = nextResult
+    return result
+  }
+}
+export default connectAdvanced(selectorFactory)(TodoApp)
+```
diff --git a/docs/api/connect.md b/docs/api/connect.md
new file mode 100644
index 0000000..d901081
--- /dev/null
+++ b/docs/api/connect.md
@@ -0,0 +1,628 @@
+---
+id: connect
+title: Connect
+sidebar_label: connect()
+hide_title: true
+---
+
+# `connect()`
+
+## Overview
+
+The `connect()` function connects a React component to a Redux store.
+
+It provides its connected component with the pieces of the data it needs from the store, and the functions it can use to dispatch actions to the store.
+
+It does not modify the component class passed to it; instead, it returns a new, connected component class that wraps the component you passed in.
+
+```js
+function connect(mapStateToProps?, mapDispatchToProps?, mergeProps?, options?)
+```
+
+The `mapStateToProps` and `mapDispatchToProps` deals with your Redux store’s `state` and `dispatch`, respectively. `state` and `dispatch` will be supplied to your `mapStateToProps` or `mapDispatchToProps` functions as the first argument.
+
+The returns of `mapStateToProps` and `mapDispatchToProps` are referred to internally as `stateProps` and `dispatchProps`, respectively. They will be supplied to `mergeProps`, if defined, as the first and the second argument, where the third argument will be `ownProps`. The combined result, commonly referred to as `mergedProps`, will then be supplied to your connected component.
+
+## `connect()` Parameters
+
+`connect` accepts four different parameters, all optional. By convention, they are called:
+
+1. `mapStateToProps?: Function`
+2. `mapDispatchToProps?: Function | Object`
+3. `mergeProps?: Function`
+4. `options?: Object`
+
+### `mapStateToProps?: (state, ownProps?) => Object`
+
+If a `mapStateToProps` function is specified, the new wrapper component will subscribe to Redux store updates. This means that any time the store is updated, `mapStateToProps` will be called. The results of `mapStateToProps` must be a plain object, which will be merged into the wrapped component’s props. If you don't want to subscribe to store updates, pass `null` or `undefined` in place of `mapStateToProps`.
+
+#### Parameters
+
+1. `state: Object`
+2. `ownProps?: Object`
+
+A `mapStateToProps` function takes a maximum of two parameters. The number of declared function parameters (a.k.a. arity) affects when it will be called. This also determines whether the function will receive ownProps. See notes [here](#the-arity-of-maptoprops-functions).
+
+##### `state`
+
+If your `mapStateToProps` function is declared as taking one parameter, it will be called whenever the store state changes, and given the store state as the only parameter.
+
+```js
+const mapStateToProps = state => ({ todos: state.todos })
+```
+
+##### `ownProps`
+
+If your `mapStateToProps` function is declared as taking two parameters, it will be called whenever the store state changes _or_ when the wrapper component receives new props (based on shallow equality comparisons). It will be given the store state as the first parameter, and the wrapper component's props as the second parameter.
+
+The second parameter is normally referred to as `ownProps` by convention.
+
+```js
+const mapStateToProps = (state, ownProps) => ({
+  todo: state.todos[ownProps.id]
+})
+```
+
+#### Returns
+
+Your `mapStateToProps` functions are expected to return an object. This object, normally referred to as `stateProps`, will be merged as props to your connected component. If you define `mergeProps`, it will be supplied as the first parameter to `mergeProps`.
+
+The return of the `mapStateToProps` determine whether the connected component will re-render (details [here](../using-react-redux/connect-mapstate#return-values-determine-if-your-component-re-renders)).
+
+For more details on recommended usage of `mapStateToProps`, please refer to [our guide on using `mapStateToProps`](../using-react-redux/connect-mapstate).
+
+> You may define `mapStateToProps` and `mapDispatchToProps` as a factory function, i.e., you return a function instead of an object. In this case your returned function will be treated as the real `mapStateToProps` or `mapDispatchToProps`, and be called in subsequent calls. You may see notes on [Factory Functions](#factory-functions) or our guide on performance optimizations.
+
+### `mapDispatchToProps?: Object | (dispatch, ownProps?) => Object`
+
+Conventionally called `mapDispatchToProps`, this second parameter to `connect()` may either be an object, a function, or not supplied.
+
+Your component will receive `dispatch` by default, i.e., when you do not supply a second parameter to `connect()`:
+
+```js
+// do not pass `mapDispatchToProps`
+connect()(MyComponent)
+connect(mapState)(MyComponent)
+connect(
+  mapState,
+  null,
+  mergeProps,
+  options
+)(MyComponent)
+```
+
+If you define a `mapDispatchToProps` as a function, it will be called with a maximum of two parameters.
+
+#### Parameters
+
+1. `dispatch: Function`
+2. `ownProps?: Object`
+
+##### `dispatch`
+
+If your `mapDispatchToProps` is declared as a function taking one parameter, it will be given the `dispatch` of your `store`.
+
+```js
+const mapDispatchToProps = dispatch => {
+  return {
+    // dispatching plain actions
+    increment: () => dispatch({ type: 'INCREMENT' }),
+    decrement: () => dispatch({ type: 'DECREMENT' }),
+    reset: () => dispatch({ type: 'RESET' })
+  }
+}
+```
+
+##### `ownProps`
+
+If your `mapDispatchToProps` function is declared as taking two parameters, it will be called with `dispatch` as the first parameter and the props passed to the wrapper component as the second parameter, and will be re-invoked whenever the connected component receives new props.
+
+The second parameter is normally referred to as `ownProps` by convention.
+
+```js
+// binds on component re-rendering
+<button onClick={() => this.props.toggleTodo(this.props.todoId)} />
+
+// binds on `props` change
+const mapDispatchToProps = (dispatch, ownProps) => {
+  toggleTodo: () => dispatch(toggleTodo(ownProps.todoId))
+}
+```
+
+The number of declared function parameters of `mapDispatchToProps` determines whether they receive ownProps. See notes [here](#the-arity-of-maptoprops-functions).
+
+#### Returns
+
+Your `mapDispatchToProps` functions are expected to return an object. Each fields of the object should be a function, calling which is expected to dispatch an action to the store.
+
+The return of your `mapDispatchToProps` functions are regarded as `dispatchProps`. It will be merged as props to your connected component. If you define `mergeProps`, it will be supplied as the second parameter to `mergeProps`.
+
+```js
+const createMyAction = () => ({ type: 'MY_ACTION' })
+const mapDispatchToProps = (dispatch, ownProps) => {
+  const boundActions = bindActionCreators({ createMyAction }, dispatch)
+  return {
+    dispatchPlainObject: () => dispatch({ type: 'MY_ACTION' }),
+    dispatchActionCreatedByActionCreator: () => dispatch(createMyAction()),
+    ...boundActions,
+    // you may return dispatch here
+    dispatch
+  }
+}
+```
+
+For more details on recommended usage, please refer to [our guide on using `mapDispatchToProps`](../using-react-redux/connect-mapdispatch).
+
+> You may define `mapStateToProps` and `mapDispatchToProps` as a factory function, i.e., you return a function instead of an object. In this case your returned function will be treated as the real `mapStateToProps` or `mapDispatchToProps`, and be called in subsequent calls. You may see notes on [Factory Functions](#factory-functions) or our guide on performance optimizations.
+
+#### Object Shorthand Form
+
+`mapDispatchToProps` may be an object where each field is an [action creator](https://redux.js.org/glossary#action-creator).
+
+```js
+import { addTodo, deleteTodo, toggleTodo } from './actionCreators'
+
+const mapDispatchToProps = {
+  addTodo,
+  deleteTodo,
+  toggleTodo
+}
+
+export default connect(
+  null,
+  mapDispatchToProps
+)(TodoApp)
+```
+
+In this case, React-Redux binds the `dispatch` of your store to each of the action creators using `bindActionCreators`. The result will be regarded as `dispatchProps`, which will be either directly merged to your connected components, or supplied to `mergeProps` as the second argument.
+
+```js
+// internally, React-Redux calls bindActionCreators
+// to bind the action creators to the dispatch of your store
+bindActionCreators(mapDispatchToProps, dispatch)
+```
+
+We also have a section in our `mapDispatchToProps` guide on the usage of object shorthand form [here](../using-react-redux/connect-mapdispatch#defining-mapdispatchtoprops-as-an-object).
+
+### `mergeProps?: (stateProps, dispatchProps, ownProps) => Object`
+
+If specified, defines how the final props for your own wrapped component are determined. If you do not provide `mergeProps`, your wrapped component receives `{ ...ownProps, ...stateProps, ...dispatchProps }` by default.
+
+#### Parameters
+
+`mergeProps` should be specified with maximum of three parameters. They are the result of `mapStateToProps()`, `mapDispatchToProps()`, and the wrapper component's `props`, respectively:
+
+1. `stateProps`
+2. `dispatchProps`
+3. `ownProps`
+
+The fields in the plain object you return from it will be used as the props for the wrapped component. You may specify this function to select a slice of the state based on props, or to bind action creators to a particular variable from props.
+
+#### Returns
+
+The return value of `mergeProps` is referred to as `mergedProps` and the fields will be used as the props for the wrapped component.
+
+### `options?: Object`
+
+```js
+{
+  context?: Object,
+  pure?: boolean,
+  areStatesEqual?: Function,
+  areOwnPropsEqual?: Function,
+  areOwnPropsEqual?: Function,
+  areStatePropsEqual?: Function,
+  areMergedPropsEqual?: Function,
+  forwardRef?: boolean,
+}
+```
+
+#### `context: Object`
+
+> Note: This parameter is supported in >= v6.0 only
+
+React-Redux v6 allows you to supply a custom context instance to be used by React-Redux.
+You need to pass the instance of your context to both `<Provider />` and your connected component.
+You may pass the context to your connected component either by passing it here as a field of option, or as a prop to your connected component in rendering.
+
+```js
+// const MyContext = React.createContext();
+connect(
+  mapStateToProps,
+  mapDispatchToProps,
+  null,
+  { context: MyContext }
+)(MyComponent)
+```
+
+#### `pure: boolean`
+
+- default value: `true`
+
+Assumes that the wrapped component is a “pure” component and does not rely on any input or state other than its props and the selected Redux store’s state.
+
+When `options.pure` is true, `connect` performs several equality checks that are used to avoid unnecessary calls to `mapStateToProps`, `mapDispatchToProps`, `mergeProps`, and ultimately to `render`. These include `areStatesEqual`, `areOwnPropsEqual`, `areStatePropsEqual`, and `areMergedPropsEqual`. While the defaults are probably appropriate 99% of the time, you may wish to override them with custom implementations for performance or other reasons.
+
+We provide a few examples in the following sections.
+
+#### `areStatesEqual: (next: Object, prev: Object) => boolean`
+
+- default value: `strictEqual: (next, prev) => prev === next`
+
+When pure, compares incoming store state to its previous value.
+
+_Example 1_
+
+```js
+const areStatesEqual = (next, prev) =>
+  prev.entities.todos === next.entities.todos
+```
+
+You may wish to override `areStatesEqual` if your `mapStateToProps` function is computationally expensive and is also only concerned with a small slice of your state. The example above will effectively ignore state changes for everything but that slice of state.
+
+_Example 2_
+
+If you have impure reducers that mutate your store state, you may wish to override `areStatesEqual` to always return false:
+
+```js
+const areStatesEqual = () => false
+```
+
+This would likely impact the other equality checks as well, depending on your `mapStateToProps` function.
+
+`areOwnPropsEqual: (next: Object, prev: Object) => boolean`
+
+- default value: `shallowEqual: (objA, objB) => boolean`
+  ( returns `true` when each field of the objects is equal )
+
+When pure, compares incoming props to its previous value.
+
+You may wish to override `areOwnPropsEqual` as a way to whitelist incoming props. You'd also have to implement `mapStateToProps`, `mapDispatchToProps` and `mergeProps` to also whitelist props. (It may be simpler to achieve this other ways, for example by using [recompose's mapProps](https://github.com/acdlite/recompose/blob/master/docs/API.md#mapprops).)
+
+#### `areStatePropsEqual: (next: Object, prev: Object) => boolean`
+
+- type: `function`
+- default value: `shallowEqual`
+
+When pure, compares the result of `mapStateToProps` to its previous value.
+
+#### `areMergedPropsEqual: (next: Object, prev: Object) => boolean`
+
+- default value: `shallowEqual`
+
+When pure, compares the result of `mergeProps` to its previous value.
+
+You may wish to override `areStatePropsEqual` to use `strictEqual` if your `mapStateToProps` uses a memoized selector that will only return a new object if a relevant prop has changed. This would be a very slight performance improvement, since would avoid extra equality checks on individual props each time `mapStateToProps` is called.
+
+You may wish to override `areMergedPropsEqual` to implement a `deepEqual` if your selectors produce complex props. ex: nested objects, new arrays, etc. (The deep equal check may be faster than just re-rendering.)
+
+#### `forwardRef: boolean`
+
+> Note: This parameter is supported in >= v6.0 only
+
+If `{forwardRef : true}` has been passed to `connect`, adding a ref to the connected wrapper component will actually return the instance of the wrapped component.
+
+## `connect()` Returns
+
+The return of `connect()` is a wrapper function that takes your component and returns a wrapper component with the additional props it injects.
+
+```js
+import { login, logout } from './actionCreators'
+
+const mapState = state => state.user
+const mapDispatch = { login, logout }
+
+// first call: returns a hoc that you can use to wrap any component
+const connectUser = connect(
+  mapState,
+  mapDispatch
+)
+
+// second call: returns the wrapper component with mergedProps
+// you may use the hoc to enable different components to get the same behavior
+const ConnectedUserLogin = connectUser(Login)
+const ConnectedUserProfile = connectUser(Profile)
+```
+
+In most cases, the wrapper function will be called right away, without being saved in a temporary variable:
+
+```js
+import { login, logout } from './actionCreators'
+
+const mapState = state => state.user
+const mapDispatch = { login, logout }
+
+// call connect to generate the wrapper function, and immediately call
+// the wrapper function to generate the final wrapper component.
+
+export default connect(
+  mapState,
+  mapDispatch
+)(Login)
+```
+
+## Example Usage
+
+Because `connect` is so flexible, it may help to see some additional examples of how it can be called:
+
+- Inject just `dispatch` and don't listen to store
+
+```js
+export default connect()(TodoApp)
+```
+
+- Inject all action creators (`addTodo`, `completeTodo`, ...) without subscribing to the store
+
+```js
+import * as actionCreators from './actionCreators'
+
+export default connect(
+  null,
+  actionCreators
+)(TodoApp)
+```
+
+- Inject `dispatch` and every field in the global state
+
+> Don’t do this! It kills any performance optimizations because `TodoApp` will rerender after every state change.
+> It’s better to have more granular `connect()` on several components in your view hierarchy that each only listen to a relevant slice of the state.
+
+```js
+// don't do this!
+export default connect(state => state)(TodoApp)
+```
+
+- Inject `dispatch` and `todos`
+
+```js
+function mapStateToProps(state) {
+  return { todos: state.todos }
+}
+
+export default connect(mapStateToProps)(TodoApp)
+```
+
+- Inject `todos` and all action creators
+
+```js
+import * as actionCreators from './actionCreators'
+
+function mapStateToProps(state) {
+  return { todos: state.todos }
+}
+
+export default connect(
+  mapStateToProps,
+  actionCreators
+)(TodoApp)
+```
+
+- Inject `todos` and all action creators (`addTodo`, `completeTodo`, ...) as `actions`
+
+```js
+import * as actionCreators from './actionCreators'
+import { bindActionCreators } from 'redux'
+
+function mapStateToProps(state) {
+  return { todos: state.todos }
+}
+
+function mapDispatchToProps(dispatch) {
+  return { actions: bindActionCreators(actionCreators, dispatch) }
+}
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(TodoApp)
+```
+
+- Inject `todos` and a specific action creator (`addTodo`)
+
+```js
+import { addTodo } from './actionCreators'
+import { bindActionCreators } from 'redux'
+
+function mapStateToProps(state) {
+  return { todos: state.todos }
+}
+
+function mapDispatchToProps(dispatch) {
+  return bindActionCreators({ addTodo }, dispatch)
+}
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(TodoApp)
+```
+
+- Inject `todos` and specific action creators (`addTodo` and `deleteTodo`) with shorthand syntax
+
+```js
+import { addTodo, deleteTodo } from './actionCreators'
+
+function mapStateToProps(state) {
+  return { todos: state.todos }
+}
+
+const mapDispatchToProps = {
+  addTodo,
+  deleteTodo
+}
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(TodoApp)
+```
+
+- Inject `todos`, `todoActionCreators` as `todoActions`, and `counterActionCreators` as `counterActions`
+
+```js
+import * as todoActionCreators from './todoActionCreators'
+import * as counterActionCreators from './counterActionCreators'
+import { bindActionCreators } from 'redux'
+
+function mapStateToProps(state) {
+  return { todos: state.todos }
+}
+
+function mapDispatchToProps(dispatch) {
+  return {
+    todoActions: bindActionCreators(todoActionCreators, dispatch),
+    counterActions: bindActionCreators(counterActionCreators, dispatch)
+  }
+}
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(TodoApp)
+```
+
+- Inject `todos`, and todoActionCreators and counterActionCreators together as `actions`
+
+```js
+import * as todoActionCreators from './todoActionCreators'
+import * as counterActionCreators from './counterActionCreators'
+import { bindActionCreators } from 'redux'
+
+function mapStateToProps(state) {
+  return { todos: state.todos }
+}
+
+function mapDispatchToProps(dispatch) {
+  return {
+    actions: bindActionCreators(
+      { ...todoActionCreators, ...counterActionCreators },
+      dispatch
+    )
+  }
+}
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(TodoApp)
+```
+
+- Inject `todos`, and all `todoActionCreators` and `counterActionCreators` directly as props
+
+```js
+import * as todoActionCreators from './todoActionCreators'
+import * as counterActionCreators from './counterActionCreators'
+import { bindActionCreators } from 'redux'
+
+function mapStateToProps(state) {
+  return { todos: state.todos }
+}
+
+function mapDispatchToProps(dispatch) {
+  return bindActionCreators(
+    { ...todoActionCreators, ...counterActionCreators },
+    dispatch
+  )
+}
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(TodoApp)
+```
+
+- Inject `todos` of a specific user depending on props
+
+```js
+import * as actionCreators from './actionCreators'
+
+function mapStateToProps(state, ownProps) {
+  return { todos: state.todos[ownProps.userId] }
+}
+
+export default connect(mapStateToProps)(TodoApp)
+```
+
+- Inject `todos` of a specific user depending on props, and inject `props.userId` into the action
+
+```js
+import * as actionCreators from './actionCreators'
+
+function mapStateToProps(state) {
+  return { todos: state.todos }
+}
+
+function mergeProps(stateProps, dispatchProps, ownProps) {
+  return Object.assign({}, ownProps, {
+    todos: stateProps.todos[ownProps.userId],
+    addTodo: text => dispatchProps.addTodo(ownProps.userId, text)
+  })
+}
+
+export default connect(
+  mapStateToProps,
+  actionCreators,
+  mergeProps
+)(TodoApp)
+```
+
+## Notes
+
+### The Arity of `mapToProps` Functions
+
+The number of declared function parameters of `mapStateToProps` and `mapDispatchToProps` determines whether they receive `ownProps`
+
+> Note: `ownProps` is not passed to `mapStateToProps` and `mapDispatchToProps` if the formal definition of the function contains one mandatory parameter (function has length 1). For example, functions defined like below won't receive `ownProps` as the second argument
+
+```js
+function mapStateToProps(state) {
+  console.log(state) // state
+  console.log(arguments[1]) // undefined
+}
+
+const mapStateToProps = (state, ownProps = {}) => {
+  console.log(state) // state
+  console.log(ownProps) // {}
+}
+```
+
+Functions with no mandatory parameters or two parameters\*will receive `ownProps`.
+
+```js
+const mapStateToProps = (state, ownProps) => {
+  console.log(state) // state
+  console.log(ownProps) // ownProps
+}
+
+function mapStateToProps() {
+  console.log(arguments[0]) // state
+  console.log(arguments[1]) // ownProps
+}
+
+const mapStateToProps = (...args) => {
+  console.log(args[0]) // state
+  console.log(args[1]) // ownProps
+}
+```
+
+### Factory Functions
+
+If your `mapStateToProps` or `mapDispatchToProps` functions return a function, they will be called once when the component instantiates, and their returns will be used as the actual `mapStateToProps`, `mapDispatchToProps`, functions respectively, in their subsequent calls.
+
+The factory functions are commonly used with memoized selectors. This gives you the ability to create component-instance-specific selectors inside the closure:
+
+```js
+const makeUniqueSelectorInstance = () =>
+  createSelector(
+    [selectItems, selectItemId],
+    (items, itemId) => items[itemId]
+  )
+const makeMapState = state => {
+  const selectItemForThisComponent = makeUniqueSelectorInstance()
+  return function realMapState(state, ownProps) {
+    const item = selectItemForThisComponent(state, ownProps.itemId)
+    return { item }
+  }
+}
+export default connect(makeMapState)(SomeComponent)
+```
diff --git a/docs/introduction/basic-tutorial.md b/docs/introduction/basic-tutorial.md
index 11e89c2..91d35f8 100644
--- a/docs/introduction/basic-tutorial.md
+++ b/docs/introduction/basic-tutorial.md
@@ -7,7 +7,7 @@ sidebar_label: Basic Tutorial
 
 # Basic Tutorial
 
-To see how to use React-Redux in practice, we’ll show a step-by-step example by creating a todo list app.
+To see how to use React Redux in practice, we’ll show a step-by-step example by creating a todo list app.
 
 ## A Todo List Example
 
@@ -24,7 +24,7 @@ We have implemented our React UI components as follows:
 - `TodoApp` is the entry component for our app. It renders the header, the `AddTodo`, `TodoList`, and `VisibilityFilters` components.
 - `AddTodo` is the component that allows a user to input a todo item and add to the list upon clicking its “Add Todo” button:
   - It uses a controlled input that sets state upon `onChange`.
-  - When the user clicks on the “Add Todo” button, it dispatches the action (that we will provide using React-Redux) to add the todo to the store.
+  - When the user clicks on the “Add Todo” button, it dispatches the action (that we will provide using React Redux) to add the todo to the store.
 - `TodoList` is the component that renders the list of todos:
   - It renders the filtered list of todos when one of the `VisibilityFilters` is selected.
 - `Todo` is the component that renders a single todo item:
@@ -66,28 +66,28 @@ You may check out [this CodeSandbox](https://codesandbox.io/s/6vwyqrpqk3) for th
 
 <br />
 
-We will now show how to connect this store to our app using React-Redux.
+We will now show how to connect this store to our app using React Redux.
 
 ### Providing the Store
 
-First we need to make the `store` available to our app. To do this, we wrap our app with the `<Provider />` API provided by React-Redux.
+First we need to make the `store` available to our app. To do this, we wrap our app with the `<Provider />` API provided by React Redux.
 
 ```jsx
 // index.js
-import React from "react";
-import ReactDOM from "react-dom";
-import TodoApp from "./TodoApp";
+import React from 'react'
+import ReactDOM from 'react-dom'
+import TodoApp from './TodoApp'
 
-import { Provider } from "react-redux";
-import store from "./redux/store";
+import { Provider } from 'react-redux'
+import store from './redux/store'
 
-const rootElement = document.getElementById("root");
+const rootElement = document.getElementById('root')
 ReactDOM.render(
   <Provider store={store}>
     <TodoApp />
   </Provider>,
   rootElement
-);
+)
 ```
 
 Notice how our `<TodoApp />` is now wrapped with the `<Provider />` with `store` passed in as a prop.
@@ -96,7 +96,7 @@ Notice how our `<TodoApp />` is now wrapped with the `<Provider />` with `store`
 
 ### Connecting the Components
 
-React-Redux provides a `connect` function for you to read values from the Redux store (and re-read the values when the store updates). 
+React Redux provides a `connect` function for you to read values from the Redux store (and re-read the values when the store updates).
 
 The `connect` function takes two arguments, both optional:
 
@@ -111,25 +111,25 @@ Normally, you’ll call `connect` in this way:
 ```js
 const mapStateToProps = (state, ownProps) => ({
   // ... computed data from state and optionally ownProps
-});
+})
 
 const mapDispatchToProps = {
   // ... normally is an object full of action creators
-};
+}
 
 // `connect` returns a new function that accepts the component to wrap:
 const connectToStore = connect(
   mapStateToProps,
   mapDispatchToProps
-);
+)
 // and that function returns the connected, wrapper component:
-const ConnectedComponent = connectToStore(Component);
+const ConnectedComponent = connectToStore(Component)
 
 // We normally do both in one step, like this:
 connect(
   mapStateToProps,
   mapDispatchToProps
-)(Component);
+)(Component)
 ```
 
 Let’s work on `<AddTodo />` first. It needs to trigger changes to the `store` to add new todos. Therefore, it needs to be able to `dispatch` actions to the store. Here’s how we do it.
@@ -138,16 +138,16 @@ Our `addTodo` action creator looks like this:
 
 ```js
 // redux/actions.js
-import { ADD_TODO } from "./actionTypes";
+import { ADD_TODO } from './actionTypes'
 
-let nextTodoId = 0;
+let nextTodoId = 0
 export const addTodo = content => ({
   type: ADD_TODO,
   payload: {
     id: ++nextTodoId,
     content
   }
-});
+})
 
 // ... other actions
 ```
@@ -158,8 +158,8 @@ By passing it to `connect`, our component receives it as a prop, and it will aut
 // components/AddTodo.js
 
 // ... other imports
-import { connect } from "react-redux";
-import { addTodo } from "../redux/actions";
+import { connect } from 'react-redux'
+import { addTodo } from '../redux/actions'
 
 class AddTodo extends React.Component {
   // ... component implementation
@@ -168,7 +168,7 @@ class AddTodo extends React.Component {
 export default connect(
   null,
   { addTodo }
-)(AddTodo);
+)(AddTodo)
 ```
 
 Notice now that `<AddTodo />` is wrapped with a parent component called `<Connect(AddTodo) />`. Meanwhile, `<AddTodo />` now gains one prop: the `addTodo` action.
@@ -180,20 +180,20 @@ We also need to implement the `handleAddTodo` function to let it dispatch the `a
 ```jsx
 // components/AddTodo.js
 
-import React from "react";
-import { connect } from "react-redux";
-import { addTodo } from "../redux/actions";
+import React from 'react'
+import { connect } from 'react-redux'
+import { addTodo } from '../redux/actions'
 
 class AddTodo extends React.Component {
   // ...
 
   handleAddTodo = () => {
     // dispatches actions to add todo
-    this.props.addTodo(this.state.input);
+    this.props.addTodo(this.state.input)
 
     // sets state back to empty string
-    this.setState({ input: "" });
-  };
+    this.setState({ input: '' })
+  }
 
   render() {
     return (
@@ -206,14 +206,14 @@ class AddTodo extends React.Component {
           Add Todo
         </button>
       </div>
-    );
+    )
   }
 }
 
 export default connect(
   null,
   { addTodo }
-)(AddTodo);
+)(AddTodo)
 ```
 
 Now our `<AddTodo />` is connected to the store. When we add a todo it would dispatch an action to change the store. We are not seeing it in the app because the other components are not connected yet. If you have the Redux DevTools Extension hooked up, you should see the action being dispatched:
@@ -253,16 +253,16 @@ Luckily we have a selector that does exactly this. We may simply import the sele
 ```js
 // redux/selectors.js
 
-export const getTodosState = store => store.todos;
+export const getTodosState = store => store.todos
 
 export const getTodoList = store =>
-  getTodosState(store) ? getTodosState(store).allIds : [];
+  getTodosState(store) ? getTodosState(store).allIds : []
 
 export const getTodoById = (store, id) =>
-  getTodosState(store) ? { ...getTodosState(store).byIds[id], id } : {};
+  getTodosState(store) ? { ...getTodosState(store).byIds[id], id } : {}
 
 export const getTodos = store =>
-  getTodoList(store).map(id => getTodoById(store, id));
+  getTodoList(store).map(id => getTodoById(store, id))
 ```
 
 ```js
@@ -303,7 +303,7 @@ If you call `connect` without providing any arguments, your component will:
 
 ```js
 // ... Component
-export default connect()(Component); // Component will receive `dispatch` (just like our <TodoList />!)
+export default connect()(Component) // Component will receive `dispatch` (just like our <TodoList />!)
 ```
 
 #### Subscribe to the store and do not inject action creators
@@ -315,8 +315,8 @@ If you call `connect` with only `mapStateToProps`, your component will:
 
 ```js
 // ... Component
-const mapStateToProps = state => state.partOfState;
-export default connect(mapStateToProps)(Component);
+const mapStateToProps = state => state.partOfState
+export default connect(mapStateToProps)(Component)
 ```
 
 #### Do not subscribe to the store and inject action creators
@@ -327,12 +327,12 @@ If you call `connect` with only `mapDispatchToProps`, your component will:
 - receive each of the action creators you inject with `mapDispatchToProps` as props and automatically dispatch the actions upon being called
 
 ```js
-import { addTodo } from "./actionCreators";
+import { addTodo } from './actionCreators'
 // ... Component
 export default connect(
   null,
   { addTodo }
-)(Component);
+)(Component)
 ```
 
 #### Subscribe to the store and inject action creators
@@ -343,16 +343,16 @@ If you call `connect` with both `mapStateToProps` and `mapDispatchToProps`, your
 - receive all of the action creators you inject with `mapDispatchToProps` as props and automatically dispatch the actions upon being called.
 
 ```js
-import * as actionCreators from "./actionCreators";
+import * as actionCreators from './actionCreators'
 // ... Component
-const mapStateToProps = state => state.partOfState;
+const mapStateToProps = state => state.partOfState
 export default connect(
   mapStateToProps,
   actionCreators
-)(Component);
+)(Component)
 ```
 
-These four cases cover the most basic usages of `connect`. To read more about `connect`, continue reading our [API section](./api.md) that explains it in more detail.
+These four cases cover the most basic usages of `connect`. To read more about `connect`, continue reading our [API section](../api/connect.md) that explains it in more detail.
 
 <!-- TODO: Put up link to the page that further explains connect -->
 
@@ -410,17 +410,17 @@ Meanwhile, we also need to update our `<TodoList />` component to filter todos a
 
 // ... other selectors
 export const getTodosByVisibilityFilter = (store, visibilityFilter) => {
-  const allTodos = getTodos(store);
+  const allTodos = getTodos(store)
   switch (visibilityFilter) {
     case VISIBILITY_FILTERS.COMPLETED:
-      return allTodos.filter(todo => todo.completed);
+      return allTodos.filter(todo => todo.completed)
     case VISIBILITY_FILTERS.INCOMPLETE:
-      return allTodos.filter(todo => !todo.completed);
+      return allTodos.filter(todo => !todo.completed)
     case VISIBILITY_FILTERS.ALL:
     default:
-      return allTodos;
+      return allTodos
   }
-};
+}
 ```
 
 And connecting to the store with the help of the selector:
@@ -431,22 +431,22 @@ And connecting to the store with the help of the selector:
 // ...
 
 const mapStateToProps = state => {
-  const { visibilityFilter } = state;
-  const todos = getTodosByVisibilityFilter(state, visibilityFilter);
-  return { todos };
-};
+  const { visibilityFilter } = state
+  const todos = getTodosByVisibilityFilter(state, visibilityFilter)
+  return { todos }
+}
 
-export default connect(mapStateToProps)(TodoList);
+export default connect(mapStateToProps)(TodoList)
 ```
 
-Now we've finished a very simple example of a todo app with React-Redux. All our components are connected! Isn't that nice? 🎉🎊
+Now we've finished a very simple example of a todo app with React Redux. All our components are connected! Isn't that nice? 🎉🎊
 
 ![](https://i.imgur.com/ONqer2R.png)
 
 ## Links
 
 - [Usage with React](https://redux.js.org/basics/usagewithreact)
-- [Using the React-Redux Bindings](https://blog.isquaredsoftware.com/presentations/workshops/redux-fundamentals/react-redux.html)
+- [Using the React Redux Bindings](https://blog.isquaredsoftware.com/presentations/workshops/redux-fundamentals/react-redux.html)
 - [Higher Order Components in Depth](https://medium.com/@franleplant/react-higher-order-components-in-depth-cf9032ee6c3e)
 - [Computing Derived Data](https://redux.js.org/recipes/computingderiveddata#sharing-selectors-across-multiple-components)
 - [Idiomatic Redux: Using Reselect Selectors for Encapsulation and Performance](https://blog.isquaredsoftware.com/2017/12/idiomatic-redux-using-reselect-selectors/)
diff --git a/docs/introduction/quick-start.md b/docs/introduction/quick-start.md
index 71b5e04..2ddaf94 100644
--- a/docs/introduction/quick-start.md
+++ b/docs/introduction/quick-start.md
@@ -7,13 +7,13 @@ sidebar_label: Quick Start
 
 # Quick Start
 
-[React-Redux](https://github.com/reduxjs/react-redux) is the official [React](https://reactjs.org/) binding for [Redux](https://redux.js.org/). It lets your React components read data from a Redux store, and dispatch actions to the store to update data.
+[React Redux](https://github.com/reduxjs/react-redux) is the official [React](https://reactjs.org/) binding for [Redux](https://redux.js.org/). It lets your React components read data from a Redux store, and dispatch actions to the store to update data.
 
 ## Installation
 
-React-Redux version 6 requires **React 16.4 or later.**
+React Redux 6.x requires **React 16.4 or later.**
 
-To use React-Redux with your React app:
+To use React Redux with your React app:
 
 ```bash
 npm install --save react-redux
@@ -27,52 +27,55 @@ yarn add react-redux
 
 You'll also need to [install Redux](https://redux-docs.netlify.com/introduction/installation) and [set up a Redux store](https://redux-docs.netlify.com/recipes/configuring-your-store) in your app.
 
-## `Provider` and `connect`
+## `<Provider />`
 
-React-Redux provides `<Provider />`, which makes the Redux store available to the rest of your app:
+React Redux provides `<Provider />`, which makes the Redux store available to the rest of your app:
 
 ```js
-import React from "react";
-import ReactDOM from "react-dom";
+import React from 'react'
+import ReactDOM from 'react-dom'
 
-import { Provider } from "react-redux";
-import store from "./store";
+import { Provider } from 'react-redux'
+import store from './store'
 
-import App from "./App";
+import App from './App'
 
-const rootElement = document.getElementById("root");
+const rootElement = document.getElementById('root')
 ReactDOM.render(
   <Provider store={store}>
     <App />
   </Provider>,
   rootElement
-);
+)
 ```
 
-React-Redux provides a `connect` function for you to connect your component to the store.
+## `connect()`
+
+React Redux provides a `connect` function for you to connect your component to the store.
 
 Normally, you’ll call `connect` in this way:
 
 ```js
-import { connect } from "react-redux";
-import { increment, decrement, reset } from "./actionCreators";
+import { connect } from 'react-redux'
+import { increment, decrement, reset } from './actionCreators'
 
 // const Counter = ...
 
 const mapStateToProps = (state /*, ownProps*/) => {
   return {
     counter: state.counter
-  };
-};
+  }
+}
 
-const mapDispatchToProps = { increment, decrement, reset };
+const mapDispatchToProps = { increment, decrement, reset }
 
 export default connect(
   mapStateToProps,
   mapDispatchToProps
-)(Counter);
+)(Counter)
 ```
 
+
 ## Help and Discussion
 
 The **[#redux channel](https://discord.gg/0ZcbPKXt5bZ6au5t)** of the **[Reactiflux Discord community](http://www.reactiflux.com)** is our official resource for all questions related to learning and using Redux. Reactiflux is a great place to hang out, ask questions, and learn - come join us!
diff --git a/docs/introduction/why-use-react-redux.md b/docs/introduction/why-use-react-redux.md
index ad3c8ec..f18fc71 100644
--- a/docs/introduction/why-use-react-redux.md
+++ b/docs/introduction/why-use-react-redux.md
@@ -1,19 +1,19 @@
 ---
 id: why-use-react-redux
-title: Why Use React-Redux?
+title: Why Use React Redux?
 hide_title: true
-sidebar_label: Why Use React-Redux?
+sidebar_label: Why Use React Redux?
 ---
 
-# Why Use React-Redux?
+# Why Use React Redux?
 
-Redux itself is a standalone library that can be used with any UI layer or framework, including React, Angular, Vue, Ember, and vanilla JS.  Although Redux and React are commonly used together, they are independent of each other.
+Redux itself is a standalone library that can be used with any UI layer or framework, including React, Angular, Vue, Ember, and vanilla JS. Although Redux and React are commonly used together, they are independent of each other.
 
 If you are using Redux with any kind of UI framework, you will normally use a "UI binding" library to tie Redux together with your UI framework, rather than directly interacting with the store from your UI code.
 
-**React-Redux is the official Redux UI binding library for React**.  If you are using Redux and React together, you should also use React-Redux to bind these two libraries.
+**React Redux is the official Redux UI binding library for React**. If you are using Redux and React together, you should also use React Redux to bind these two libraries.
 
-To understand why you should use React-Redux, it may help to understand what a "UI binding library" does.
+To understand why you should use React Redux, it may help to understand what a "UI binding library" does.
 
 > **Note**: If you have questions about whether you should use Redux in general, please see these articles for discussion of when and why you might want to use Redux, and how it's intended to be used:
 >
@@ -22,7 +22,6 @@ To understand why you should use React-Redux, it may help to understand what a "
 > - [You Might Not Need Redux](https://medium.com/@dan_abramov/you-might-not-need-redux-be46360cf367)
 > - [Idiomatic Redux: The Tao of Redux, Part 1 - Implementation and Intent](https://blog.isquaredsoftware.com/2017/05/idiomatic-redux-tao-of-redux-part-1/)
 
-
 ## Integrating Redux with a UI
 
 Using Redux with _any_ UI layer requires [the same consistent set of steps](https://blog.isquaredsoftware.com/presentations/workshops/redux-fundamentals/ui-layer.html#/4):
@@ -30,70 +29,62 @@ Using Redux with _any_ UI layer requires [the same consistent set of steps](http
 1. Create a Redux store
 2. Subscribe to updates
 3. Inside the subscription callback:
-    1. Get the current store state
-    2. Extract the data needed by this piece of UI
-    3. Update the UI with the data
+   1. Get the current store state
+   2. Extract the data needed by this piece of UI
+   3. Update the UI with the data
 4. If necessary, render the UI with initial state
 5. Respond to UI inputs by dispatching Redux actions
 
-While it is possible to write this logic by hand, doing so would become very repetitive.  In addition, optimizing UI performance would require complicated logic.
-
-The process of subscribing to the store, checking for updated data, and triggering a re-render can be made more generic and reusable.  **A UI binding library like React-Redux handles the store interaction logic, so you don't have to write that code yourself.**
+While it is possible to write this logic by hand, doing so would become very repetitive. In addition, optimizing UI performance would require complicated logic.
 
-> **Note**: For a deeper look at how React-Redux works internally and how it handles the store interaction for you, see **[Idiomatic Redux: The History and Implementation of React-Redux](https://blog.isquaredsoftware.com/2018/11/react-redux-history-implementation/)**.
+The process of subscribing to the store, checking for updated data, and triggering a re-render can be made more generic and reusable. **A UI binding library like React Redux handles the store interaction logic, so you don't have to write that code yourself.**
 
+> **Note**: For a deeper look at how React Redux works internally and how it handles the store interaction for you, see **[Idiomatic Redux: The History and Implementation of React Redux](https://blog.isquaredsoftware.com/2018/11/react-redux-history-implementation/)**.
 
-## Reasons to Use React-Redux
+## Reasons to Use React Redux
 
 ### It is the Official Redux UI Bindings for React
 
-While Redux can be used with any UI layer, it was originally designed and intended for use with React.  There are [UI binding layers for many other frameworks](https://redux.js.org/introduction/ecosystem#library-integration-and-bindings), but React-Redux is maintained directly by the Redux team.
-
-As the offical Redux binding for React, React-Redux is kept up-to-date with any API changes from either library, to ensure that your React components behave as expected.  Its intended usage adopts the design principles of React - writing declarative components.
+While Redux can be used with any UI layer, it was originally designed and intended for use with React. There are [UI binding layers for many other frameworks](https://redux.js.org/introduction/ecosystem#library-integration-and-bindings), but React Redux is maintained directly by the Redux team.
 
+As the offical Redux binding for React, React Redux is kept up-to-date with any API changes from either library, to ensure that your React components behave as expected. Its intended usage adopts the design principles of React - writing declarative components.
 
 ### It Encourages Good React Architecture
 
-React components are a lot like functions.  While it's possible to write all your code in a single function, it's usually better to split that logic into smaller functions that each handle a specific task, making them easier to understand.
+React components are a lot like functions. While it's possible to write all your code in a single function, it's usually better to split that logic into smaller functions that each handle a specific task, making them easier to understand.
 
-Similarly, while you can write large React components that handle many different tasks, it's usually better to split up components based on responsibilities.  In particular, it is common to have "container" components that are responsible for collecting and managing some kind of data, and "presentational" components that simply display UI based on whatever data they've received as props.
+Similarly, while you can write large React components that handle many different tasks, it's usually better to split up components based on responsibilities. In particular, it is common to have "container" components that are responsible for collecting and managing some kind of data, and "presentational" components that simply display UI based on whatever data they've received as props.
 
-**The React-Redux `connect` function generates "container" wrapper components that handle the process of interacting with the store for you**.  That way, your own components can focus on other tasks, whether it be collecting other data, or just displaying a piece of the UI.  In addition, **`connect` abstracts away the question of _which_ store is being used, making your own components more reusable**.  
-
-As a general architectural principle, **we want to keep our own components "unaware" of Redux**.  They should simply receive data and functions as props, just like any other React component.  This ultimately makes it easier to test and reuse your own components.
+**The React Redux `connect` function generates "container" wrapper components that handle the process of interacting with the store for you**. That way, your own components can focus on other tasks, whether it be collecting other data, or just displaying a piece of the UI. In addition, **`connect` abstracts away the question of _which_ store is being used, making your own components more reusable**.
 
+As a general architectural principle, **we want to keep our own components "unaware" of Redux**. They should simply receive data and functions as props, just like any other React component. This ultimately makes it easier to test and reuse your own components.
 
 ### It Implements Performance Optimizations For You
 
-React is generally fast, but by default any updates to a component will cause React to re-render all of the components inside that part of the component tree.  This does require work, and if the data for a given component hasn't changed, then re-rendering is likely some wasted effort because the requested UI output would be the same.  
-
-If performance is a concern, the best way to improve performance is to skip unnecessary re-renders, so that components only re-render when their data has actually changed.  **React-Redux implements many performance optimizations internally, so that your own component only re-renders when it actually needs to.**
+React is generally fast, but by default any updates to a component will cause React to re-render all of the components inside that part of the component tree. This does require work, and if the data for a given component hasn't changed, then re-rendering is likely some wasted effort because the requested UI output would be the same.
 
-In addition, by connecting multiple components in your React component tree, you can ensure that each connected component only extracts the specific pieces of data from the store state that are needed by that component.  This means that your own component will need to re-render less often, because most of the time those specific pieces of data haven't changed.
+If performance is a concern, the best way to improve performance is to skip unnecessary re-renders, so that components only re-render when their data has actually changed. **React Redux implements many performance optimizations internally, so that your own component only re-renders when it actually needs to.**
 
+In addition, by connecting multiple components in your React component tree, you can ensure that each connected component only extracts the specific pieces of data from the store state that are needed by that component. This means that your own component will need to re-render less often, because most of the time those specific pieces of data haven't changed.
 
 ### Community Support
 
-As the official binding library for React and Redux, React-Redux has a large community of users.  This makes it easier to ask for help, learn about best practices, use libraries that build on top of React-Redux, and reuse your knowledge across different applications.
-
-
+As the official binding library for React and Redux, React Redux has a large community of users. This makes it easier to ask for help, learn about best practices, use libraries that build on top of React Redux, and reuse your knowledge across different applications.
 
 ## Links and References
 
+### Understanding React Redux
 
-### Understanding React-Redux
-
-- [Idiomatic Redux: The History and Implementation of React-Redux](https://blog.isquaredsoftware.com/2018/11/react-redux-history-implementation/)
+- [Idiomatic Redux: The History and Implementation of React Redux](https://blog.isquaredsoftware.com/2018/11/react-redux-history-implementation/)
 - [`connect.js` Explained](https://gist.github.com/gaearon/1d19088790e70ac32ea636c025ba424e)
 - [Redux Fundamentals workshop slides](https://blog.isquaredsoftware.com/2018/06/redux-fundamentals-workshop-slides/)
-    - [UI Layer Integration](https://blog.isquaredsoftware.com/presentations/workshops/redux-fundamentals/ui-layer.html)
-    - [Using React-Redux](https://blog.isquaredsoftware.com/presentations/workshops/redux-fundamentals/react-redux.html)
-
+  - [UI Layer Integration](https://blog.isquaredsoftware.com/presentations/workshops/redux-fundamentals/ui-layer.html)
+  - [Using React Redux](https://blog.isquaredsoftware.com/presentations/workshops/redux-fundamentals/react-redux.html)
 
 ### Community Resources
 
-- Discord channel: [#redux on Reactiflux](https://gist.github.com/gaearon/1d19088790e70ac32ea636c025ba424e)  ([Reactiflux invite link](https://reactiflux.com))
-- Stack Overflow topics: [Redux](https://stackoverflow.com/questions/tagged/redux), [React-Redux](https://stackoverflow.com/questions/tagged/redux)
+- Discord channel: [#redux on Reactiflux](https://gist.github.com/gaearon/1d19088790e70ac32ea636c025ba424e) ([Reactiflux invite link](https://reactiflux.com))
+- Stack Overflow topics: [Redux](https://stackoverflow.com/questions/tagged/redux), [React Redux](https://stackoverflow.com/questions/tagged/redux)
 - Reddit: [/r/reactjs](https://www.reddit.com/r/reactjs/), [/r/reduxjs](https://www.reddit.com/r/reduxjs/)
 - Github issues (bug reports and feature requests): https://github.com/reduxjs/react-redux/issues
 - Tutorials, articles, and further resources: [React/Redux Links](https://www.reddit.com/r/reduxjs/)
diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md
index 83270fa..d52a299 100644
--- a/docs/troubleshooting.md
+++ b/docs/troubleshooting.md
@@ -10,7 +10,8 @@ hide_title: true
 Make sure to check out [Troubleshooting Redux](http://redux.js.org/docs/Troubleshooting.html) first.
 
 ### I'm getting the following alert: Accessing PropTypes via the main React package is deprecated. Use the prop-types package from npm instead.
-This warning is shown when using react 15.5.*. Basically, now it's just a warning, but in react16 the application might break. the PropTypes should now be imported from 'prop-types' package, and not from the react package.
+
+This warning is shown when using react 15.5.\*. Basically, now it's just a warning, but in react16 the application might break. the PropTypes should now be imported from 'prop-types' package, and not from the react package.
 
 Update to the latest version of react-redux.
 
@@ -19,8 +20,8 @@ Update to the latest version of react-redux.
 See the link above.
 In short,
 
-* Reducers should never mutate state, they must return new objects, or React Redux won’t see the updates.
-* Make sure you either bind action creators with the `mapDispatchToProps` argument to `connect()` or with the `bindActionCreators()` method, or that you manually call `dispatch()`. Just calling your `MyActionCreators.addTodo()` function won’t work because it just *returns* an action, but does not *dispatch* it.
+- Reducers should never mutate state, they must return new objects, or React Redux won’t see the updates.
+- Make sure you either bind action creators with the `mapDispatchToProps` argument to `connect()` or with the `bindActionCreators()` method, or that you manually call `dispatch()`. Just calling your `MyActionCreators.addTodo()` function won’t work because it just _returns_ an action, but does not _dispatch_ it.
 
 ### My views aren’t updating on route change with React Router 0.13
 
@@ -29,7 +30,8 @@ If you’re using React Router 0.13, you might [bump into this problem](https://
 Root view:
 
 ```jsx
-Router.run(routes, Router.HistoryLocation, (Handler, routerState) => { // note "routerState" here
+Router.run(routes, Router.HistoryLocation, (Handler, routerState) => {
+  // note "routerState" here
   ReactDOM.render(
     <Provider store={store}>
       {/* note "routerState" here */}
@@ -56,7 +58,7 @@ You can also upgrade to React Router 1.0 which shouldn’t have this problem. (L
 
 If your views depend on global state or [React “context”](http://facebook.github.io/react/docs/context.html), you might find that views decorated with `connect()` will fail to update.
 
->This is because `connect()` implements [shouldComponentUpdate](https://facebook.github.io/react/docs/component-specs.html#updating-shouldcomponentupdate) by default, assuming that your component will produce the same results given the same props and state. This is a similar concept to React’s [PureRenderMixin](https://facebook.github.io/react/docs/pure-render-mixin.html).
+> This is because `connect()` implements [shouldComponentUpdate](https://facebook.github.io/react/docs/component-specs.html#updating-shouldcomponentupdate) by default, assuming that your component will produce the same results given the same props and state. This is a similar concept to React’s [PureRenderMixin](https://facebook.github.io/react/docs/pure-render-mixin.html).
 
 The _best_ solution to this is to make sure that your components are pure and pass any external state to them via props. This will ensure that your views do not re-render unless they actually need to re-render and will greatly speed up your application.
 
@@ -67,9 +69,14 @@ function mapStateToProps(state) {
   return { todos: state.todos }
 }
 
-export default connect(mapStateToProps, null, null, {
-  pure: false
-})(TodoApp)
+export default connect(
+  mapStateToProps,
+  null,
+  null,
+  {
+    pure: false
+  }
+)(TodoApp)
 ```
 
 This will remove the assumption that `TodoApp` is pure and cause it to update whenever its parent component renders. Note that this will make your application less performant, so only do this if you have no other option.
diff --git a/docs/using-react-redux/accessing-store.md b/docs/using-react-redux/accessing-store.md
new file mode 100644
index 0000000..9ebf55f
--- /dev/null
+++ b/docs/using-react-redux/accessing-store.md
@@ -0,0 +1,144 @@
+---
+id: accessing-store
+title: Accessing the Store
+hide_title: true
+sidebar_label: Accessing the Store
+---
+
+# Accessing the Store
+
+React Redux provides APIs that allow your components to dispatch actions and subscribe to data updates from the store.
+
+As part of that, React Redux abstracts away the details of which store you are using, and the exact details of how that
+store interaction is handled. In typical usage, your own components should never need to care about those details, and
+won't ever reference the store directly. React Redux also internally handles the details of how the store and state are
+propagated to connected components, so that this works as expected by default.
+
+However, there may be certain use cases where you may need to customize how the store and state are propagated to
+connected components, or access the store directly. Here are some examples of how to do this.
+
+## Understanding Context Usage
+
+Internally, React Redux uses [React's "context" feature](https://reactjs.org/docs/context.html) to make the
+Redux store accessible to deeply nested connected components. As of React Redux version 6, this is normally handled
+by a single default context object instance generated by `React.createContext()`, called `ReactReduxContext`.
+
+React Redux's `<Provider>` component uses `<ReactReduxContext.Provider>` to put the Redux store and the current store
+state into context, and `connect` uses `<ReactReduxContext.Consumer>` to read those values and handle updates.
+
+## Providing Custom Context
+
+Instead of using the default context instance from React Redux, you may supply your own custom context instance.
+
+```js
+<Provider context={MyContext} store={store}>
+  <App />
+</Provider>
+```
+
+If you supply a custom context, React Redux will use that context instance instead of the one it creates and exports by default.
+
+After you’ve supplied the custom context to `<Provider />`, you will need to supply this context instance to all of your connected components that are expected to connect to the same store:
+
+```js
+// You can pass the context as an option to connect
+export default connect(
+  mapState,
+  mapDispatch,
+  null,
+  { context: MyContext }
+)(MyComponent)
+
+// or, call connect as normal to start
+const ConnectedComponent = connect(
+  mapState,
+  mapDispatch
+)(MyComponent)
+
+// Later, pass the custom context as a prop to the connected component
+<ConnectedComponent context={MyContext} />
+```
+
+The following runtime error occurs when React Redux does not find a store in the context it is looking. For example:
+
+- You provided a custom context instance to `<Provider />`, but did not provide the same instance (or did not provide any) to your connected components.
+- You provided a custom context to your connected component, but did not provide the same instance (or did not provide any) to `<Provider />`.
+
+> Invariant Violation
+>
+> Could not find "store" in the context of "Connect(MyComponent)". Either wrap the root component in a `<Provider>`, or pass a custom React context provider to `<Provider>` and the corresponding React context consumer to Connect(Todo) in connect options.
+
+## Multiple Stores
+
+[Redux was designed to use a single store](https://redux.js.org/api/store#a-note-for-flux-users).
+However, if you are in an unavoidable position of needing to use multiple stores, with v6 you may do so by providing (multiple) custom contexts.
+This also provides a natural isolation of the stores as they live in separate context instances.
+
+```js
+// a naive example
+const ContextA = React.createContext();
+const ContextB = React.createContext();
+
+// assuming reducerA and reducerB are proper reducer functions
+const storeA = createStore(reducerA);
+const storeB = createStore(reducerB);
+
+// supply the context instances to Provider
+function App() {
+	return (
+	  <Provider store={storeA} context={ContextA} />
+		<Provider store={storeB} context={ContextB}>
+		  <App />
+		</Provider>
+	  </Provider>
+	);
+}
+
+// fetch the corresponding store with connected components
+// you need to use the correct context
+connect(mapStateA, null, null, { context: ContextA })(MyComponentA)
+
+// You may also pass the alternate context instance directly to the connected component instead
+<ConnectedMyComponentA context={ContextA} />
+
+// it is possible to chain connect()
+// in this case MyComponent will receive merged props from both stores
+compose(
+  connect(mapStateA, null, null, { context: ContextA }),
+  connect(mapStateB, null, null, { context: ContextB })
+)(MyComponent);
+```
+
+## Using `ReactReduxContext` Directly
+
+In rare cases, you may need to access the Redux store directly in your own components. This can be done by rendering
+the appropriate context consumer yourself, and accessing the `store` field out of the context value.
+
+> **Note**: This is **_not_ considered part of the React Redux public API, and may break without notice**. We do recognize
+> that the community has use cases where this is necessary, and will try to make it possible for users to build additional
+> functionality on top of React Redux, but our specific use of context is considered an implementation detail.
+> If you have additional use cases that are not sufficiently covered by the current APIs, please file an issue to discuss
+> possible API improvements.
+
+```js
+import { ReactReduxContext } from 'react-redux'
+
+// in your connected component
+function MyConnectedComponent() {
+  return (
+    <ReactReduxContext.Consumer>
+      {({ store }) => {
+        // do something useful with the store, like passing it to a child
+        // component where it can be used in lifecycle methods
+      }}
+    </ReactReduxContext.Consumer>
+  )
+}
+```
+
+## Further Resources
+
+- CodeSandbox example: [A reading list app with theme using a separate store](https://codesandbox.io/s/92pm9n2kl4), implemented by providing (multiple) custom context(s).
+- Related issues:
+  - [#1132: Update docs for using a different store key](https://github.com/reduxjs/react-redux/issues/1132)
+  - [#1126: `<Provider>` misses state changes that occur between when its constructor runs and when it mounts](https://github.com/reduxjs/react-redux/issues/1126)
diff --git a/docs/using-react-redux/connect-dispatching-actions-with-mapDispatchToProps.md b/docs/using-react-redux/connect-dispatching-actions-with-mapDispatchToProps.md
index a501188..9734f46 100644
--- a/docs/using-react-redux/connect-dispatching-actions-with-mapDispatchToProps.md
+++ b/docs/using-react-redux/connect-dispatching-actions-with-mapDispatchToProps.md
@@ -12,8 +12,8 @@ As the second argument passed in to `connect`, `mapDispatchToProps` is used for
 `dispatch` is a function of the Redux store. You call `store.dispatch` to dispatch an action.
 This is the only way to trigger a state change.
 
-With React-Redux, your components never access the store directly - `connect` does it for you.
-React-Redux gives you two ways to let components dispatch actions:
+With React Redux, your components never access the store directly - `connect` does it for you.
+React Redux gives you two ways to let components dispatch actions:
 
 - By default, a connected component receives `props.dispatch` and can dispatch actions itself.
 - `connect` can accept an argument called `mapDispatchToProps`, which lets you create functions that dispatch when called, and pass those functions as props to your component.
@@ -27,15 +27,15 @@ The `mapDispatchToProps` functions are normally referred to as `mapDispatch` for
 If you don't specify the second argument to `connect()`, your component will receive `dispatch` by default. For example:
 
 ```js
-connect()(MyComponent);
+connect()(MyComponent)
 // which is equivalent with
 connect(
   null,
   null
-)(MyComponent);
+)(MyComponent)
 
 // or
-connect(mapStateToProps /** no second argument */)(MyComponent);
+connect(mapStateToProps /** no second argument */)(MyComponent)
 ```
 
 Once you have connected your component in this way, your component receives `props.dispatch`. You may use it to dispatch actions to the store.
@@ -44,12 +44,12 @@ Once you have connected your component in this way, your component receives `pro
 function Counter({ count, dispatch }) {
   return (
     <div>
-      <button onClick={() => dispatch({ type: "DECREMENT" })}>-</button>
+      <button onClick={() => dispatch({ type: 'DECREMENT' })}>-</button>
       <span>{count}</span>
-      <button onClick={() => dispatch({ type: "INCREMENT" })}>+</button>
-      <button onClick={() => dispatch({ type: "RESET" })}>reset</button>
+      <button onClick={() => dispatch({ type: 'INCREMENT' })}>+</button>
+      <button onClick={() => dispatch({ type: 'RESET' })}>reset</button>
     </div>
-  );
+  )
 }
 ```
 
@@ -89,10 +89,10 @@ const TodoList = ({ todos, toggleTodo }) => (
       <Todo todo={todo} onClick={toggleTodo} />
     ))}
   </div>
-);
+)
 ```
 
-This is what React-Redux’s `connect` does — it encapsulates the logic of talking to the Redux store and lets you not worry about it. And this is what you should totally make full use of in your implementation.
+This is what React Redux’s `connect` does — it encapsulates the logic of talking to the Redux store and lets you not worry about it. And this is what you should totally make full use of in your implementation.
 
 ## Two Forms of `mapDispatchToProps`
 
@@ -123,11 +123,11 @@ You will normally make use of this by returning new functions that call `dispatc
 const mapDispatchToProps = dispatch => {
   return {
     // dispatching plain actions
-    increment: () => dispatch({ type: "INCREMENT" }),
-    decrement: () => dispatch({ type: "DECREMENT" }),
-    reset: () => dispatch({ type: "RESET" })
-  };
-};
+    increment: () => dispatch({ type: 'INCREMENT' }),
+    decrement: () => dispatch({ type: 'DECREMENT' }),
+    reset: () => dispatch({ type: 'RESET' })
+  }
+}
 ```
 
 You will also likely want to forward arguments to your action creators:
@@ -141,8 +141,8 @@ const mapDispatchToProps = dispatch => {
     // implicitly forwarding arguments
     onReceiveImpressions: (...impressions) =>
       dispatch(trackImpressions(impressions))
-  };
-};
+  }
+}
 ```
 
 **`ownProps` ( optional )**
@@ -153,12 +153,12 @@ This means, instead of re-binding new `props` to action dispatchers upon compone
 
 ```js
 // binds on component re-rendering
-<button onClick={() => this.props.toggleTodo(this.props.todoId)} />;
+;<button onClick={() => this.props.toggleTodo(this.props.todoId)} />
 
 // binds on `props` change
 const mapDispatchToProps = (dispatch, ownProps) => {
-  toggleTodo: () => dispatch(toggleTodo(ownProps.todoId));
-};
+  toggleTodo: () => dispatch(toggleTodo(ownProps.todoId))
+}
 ```
 
 ### Return
@@ -169,9 +169,9 @@ Your `mapDispatchToProps` function should return a plain object:
 - If you use action creators ( as oppose to plain object actions ) inside `dispatch`, it is a convention to simply name the field key the same name as the action creator:
 
 ```js
-const increment = () => ({ type: "INCREMENT" });
-const decrement = () => ({ type: "DECREMENT" });
-const reset = () => ({ type: "RESET" });
+const increment = () => ({ type: 'INCREMENT' })
+const decrement = () => ({ type: 'DECREMENT' })
+const reset = () => ({ type: 'RESET' })
 
 const mapDispatchToProps = dispatch => {
   return {
@@ -179,8 +179,8 @@ const mapDispatchToProps = dispatch => {
     increment: () => dispatch(increment()),
     decrement: () => dispatch(decrement()),
     reset: () => dispatch(reset())
-  };
-};
+  }
+}
 ```
 
 The return of the `mapDispatchToProps` function will be merged to your connected component as props. You may call them directly to dispatch its action.
@@ -194,7 +194,7 @@ function Counter({ count, increment, decrement, reset }) {
       <button onClick={increment}>+</button>
       <button onClick={reset}>reset</button>
     </div>
-  );
+  )
 }
 ```
 
@@ -214,18 +214,21 @@ Wrapping these functions by hand is tedious, so Redux provides a function to sim
 The wrapper functions generated by `bindActionCreators` will automatically forward all of their arguments, so you don't need to do that by hand.
 
 ```js
-import { bindActionCreators } from "redux";
+import { bindActionCreators } from 'redux'
 
-const increment = () => ({ type: "INCREMENT" });
-const decrement = () => ({ type: "DECREMENT" });
-const reset = () => ({ type: "RESET" });
+const increment = () => ({ type: 'INCREMENT' })
+const decrement = () => ({ type: 'DECREMENT' })
+const reset = () => ({ type: 'RESET' })
 
 // binding an action creator
 // returns (...args) => dispatch(increment(...args))
-const boundIncrement = bindActionCreators(increment, dispatch);
+const boundIncrement = bindActionCreators(increment, dispatch)
 
 // binding an object full of action creators
-const boundActionCreators = bindActionCreators({ increment, decrement, reset }, dispatch);
+const boundActionCreators = bindActionCreators(
+  { increment, decrement, reset },
+  dispatch
+)
 // returns
 // {
 //   increment: (...args) => dispatch(increment(...args)),
@@ -237,18 +240,18 @@ const boundActionCreators = bindActionCreators({ increment, decrement, reset },
 To use `bindActionCreators` in our `mapDispatchToProps` function:
 
 ```js
-import { bindActionCreators } from "redux";
+import { bindActionCreators } from 'redux'
 // ...
 
 function mapDispatchToProps(dispatch) {
-  return bindActionCreators({ increment, decrement, reset }, dispatch);
+  return bindActionCreators({ increment, decrement, reset }, dispatch)
 }
 
 // component receives props.increment, props.decrement, props.reset
 connect(
   null,
   mapDispatchToProps
-)(Counter);
+)(Counter)
 ```
 
 ### Manually Injecting `dispatch`
@@ -256,14 +259,14 @@ connect(
 If the `mapDispatchToProps` argument is supplied, the component will no longer receive the default `dispatch`. You may bring it back by adding it manually to the return of your `mapDispatchToProps`, although most of the time you shouldn’t need to do this:
 
 ```js
-import { bindActionCreators } from "redux";
+import { bindActionCreators } from 'redux'
 // ...
 
 function mapDispatchToProps(dispatch) {
   return {
     dispatch,
     ...bindActionCreators({ increment, decrement, reset }, dispatch)
-  };
+  }
 }
 ```
 
@@ -281,8 +284,8 @@ Note that:
 - Your component will no longer receive `dispatch` as a prop
 
 ```js
-// React-Redux does this for you automatically:
-dispatch => bindActionCreators(mapDispatchToProps, dispatch);
+// React Redux does this for you automatically:
+dispatch => bindActionCreators(mapDispatchToProps, dispatch)
 ```
 
 Therefore, our `mapDispatchToProps` can simply be:
@@ -292,7 +295,7 @@ const mapDispatchToProps = {
   increment,
   decrement,
   reset
-};
+}
 ```
 
 Since the actual name of the variable is up to you, you might want to give it a name like `actionCreators`, or even define the object inline in the call to `connect`:
@@ -337,7 +340,7 @@ In another words, if you do:
 
 ```js
 // component receives `dispatch`
-connect(mapStateToProps /** no second argument*/)(Component);
+connect(mapStateToProps /** no second argument*/)(Component)
 ```
 
 **2. Your customized `mapDispatchToProps` function return specifically contains `dispatch`**
@@ -351,20 +354,20 @@ const mapDispatchToProps = dispatch => {
     decrement: () => dispatch(decrement()),
     reset: () => dispatch(reset()),
     dispatch
-  };
-};
+  }
+}
 ```
 
 Or alternatively, with `bindActionCreators`:
 
 ```js
-import { bindActionCreators } from "redux";
+import { bindActionCreators } from 'redux'
 
 function mapDispatchToProps(dispatch) {
   return {
     dispatch,
     ...bindActionCreators({ increment, decrement, reset }, dispatch)
-  };
+  }
 }
 ```
 
@@ -374,18 +377,18 @@ There are discussions regarding whether to provide `dispatch` to your components
 
 ### Can I `mapDispatchToProps` without `mapStateToProps` in Redux?
 
-Yes. You can skip the first parameter by passing `undefined` or `null`. Your component will not subscribe to the store, and will still receive the dispatch props defined by `mapStateToProps`.
+Yes. You can skip the first parameter by passing `undefined` or `null`. Your component will not subscribe to the store, and will still receive the dispatch props defined by `mapDispatchToProps`.
 
 ```js
 connect(
   null,
   mapDispatchToProps
-)(MyComponent);
+)(MyComponent)
 ```
 
 ### Can I call `store.dispatch`?
 
-It's an anti-pattern to interact with the store directly in a React component, whether it's an explicit import of the store or accessing it via context (see the [Redux FAQ entry on store setup](https://redux.js.org/faq/storesetup#can-or-should-i-create-multiple-stores-can-i-import-my-store-directly-and-use-it-in-components-myself) for more details). Let React-Redux’s `connect` handle the access to the store, and use the `dispatch` it passes to the props to dispatch actions.
+It's an anti-pattern to interact with the store directly in a React component, whether it's an explicit import of the store or accessing it via context (see the [Redux FAQ entry on store setup](https://redux.js.org/faq/storesetup#can-or-should-i-create-multiple-stores-can-i-import-my-store-directly-and-use-it-in-components-myself) for more details). Let React Redux’s `connect` handle the access to the store, and use the `dispatch` it passes to the props to dispatch actions.
 
 ## Links and References
 
diff --git a/docs/using-react-redux/connect-extracting-data-with-mapStateToProps.md b/docs/using-react-redux/connect-extracting-data-with-mapStateToProps.md
index d6934c7..d304d96 100644
--- a/docs/using-react-redux/connect-extracting-data-with-mapStateToProps.md
+++ b/docs/using-react-redux/connect-extracting-data-with-mapStateToProps.md
@@ -6,12 +6,12 @@ sidebar_label: Connect: Extracting Data with mapStateToProps
 ---
 
 # Connect: Extracting Data with `mapStateToProps`
+
 As the first argument passed in to `connect`, `mapStateToProps` is used for selecting the part of the data from the store that the connected component needs. It’s frequently referred to as just `mapState` for short.
 
 - It is called every time the store state changes.
 - It receives the entire store state, and should return an object of data this component needs.
 
-
 ## Defining `mapStateToProps`
 
 `mapStateToProps` should be defined as a function:
@@ -33,47 +33,47 @@ This function should be passed as the first argument to `connect`, and will be c
 
 #### `state`
 
-The first argument to a `mapStateToProps` function is the entire Redux store state (the same value returned by a call to `store.getState()`).  Because of this, the first argument is traditionally just called `state`.  (While you can give the argument any name you want, calling it `store` would be incorrect - it's the "state value", not the "store instance".)
+The first argument to a `mapStateToProps` function is the entire Redux store state (the same value returned by a call to `store.getState()`). Because of this, the first argument is traditionally just called `state`. (While you can give the argument any name you want, calling it `store` would be incorrect - it's the "state value", not the "store instance".)
 
-The `mapStateToProps` function should always be written with at least `state` passed in. 
+The `mapStateToProps` function should always be written with at least `state` passed in.
 
 ```js
-// TodoList.js 
+// TodoList.js
 
 function mapStateToProps(state) {
-  const { todos } = state;
-  return { todoList: todos.allIds };
-};
-    
-export default connect(mapStateToProps)(TodoList);
+  const { todos } = state
+  return { todoList: todos.allIds }
+}
+
+export default connect(mapStateToProps)(TodoList)
 ```
 
 #### `ownProps` (optional)
 
-You may define the function with a second argument, `ownProps`, if your component needs the data from its own props to retrieve data from the store.  This argument will contain all of the props given to the wrapper component that was generated by `connect`.
+You may define the function with a second argument, `ownProps`, if your component needs the data from its own props to retrieve data from the store. This argument will contain all of the props given to the wrapper component that was generated by `connect`.
 
 ```js
 // Todo.js
 
 function mapStateToProps(state, ownProps) {
-  const { visibilityFilter } = state;
-  const { id } = ownProps;
-  const todo = getTodoById(state, id);
+  const { visibilityFilter } = state
+  const { id } = ownProps
+  const todo = getTodoById(state, id)
 
   // component receives additionally:
-  return { todo, visibilityFilter };
-};
+  return { todo, visibilityFilter }
+}
 
 // Later, in your application, a parent component renders:
-<ConnectedTodo id={123} />
+;<ConnectedTodo id={123} />
 // and your component receives props.id, props.todo, and props.visibilityFilter
 ```
 
-You do not need to include values from `ownProps` in the object returned from `mapStateToProps`.  `connect` will automatically merge those different prop sources into a final set of props.
+You do not need to include values from `ownProps` in the object returned from `mapStateToProps`. `connect` will automatically merge those different prop sources into a final set of props.
 
 ### Return
 
-Your  `mapStateToProps` function should return a plain object that contains the data the component needs:
+Your `mapStateToProps` function should return a plain object that contains the data the component needs:
 
 - Each field in the object will become a prop for your actual component
 - The values in the fields will be used to determine if your component needs to re-render
@@ -83,52 +83,42 @@ For example:
 ```js
 function mapStateToProps(state) {
   return {
-    a : 42,
-    todos : state.todos,
-    filter : state.visibilityFilter
+    a: 42,
+    todos: state.todos,
+    filter: state.visibilityFilter
   }
 }
 
 // component will receive: props.a, props.todos, and props.filter
 ```
 
-
-> Note: In advanced scenarios where you need more control over the rendering performance, `mapStateToProps` can also return a function. In this case, that function will be used as the final `mapStateToProps` for a particular component instance. This allows you to do per-instance memoization. See the [Advanced Usage]() section of the docs for more details, as well as  [PR #279](https://github.com/reduxjs/react-redux/pull/279) and the tests it adds. Most apps never need this.
-
+> Note: In advanced scenarios where you need more control over the rendering performance, `mapStateToProps` can also return a function. In this case, that function will be used as the final `mapStateToProps` for a particular component instance. This allows you to do per-instance memoization. See the [Advanced Usage]() section of the docs for more details, as well as [PR #279](https://github.com/reduxjs/react-redux/pull/279) and the tests it adds. Most apps never need this.
 
 ## Usage Guidelines
 
-
 ### Let `mapStateToProps` Reshape the Data from the Store
 
-`mapStateToProps` functions can, and should, do a lot more than just `return state.someSlice`.  **They have the responsibility of "re-shaping" store data as needed for that component.**  This may include returning a value as a specific prop name, combining pieces of data from different parts of the state tree, and transforming the store data in different ways.
-
+`mapStateToProps` functions can, and should, do a lot more than just `return state.someSlice`. **They have the responsibility of "re-shaping" store data as needed for that component.** This may include returning a value as a specific prop name, combining pieces of data from different parts of the state tree, and transforming the store data in different ways.
 
 ### Use Selector Functions to Extract and Transform Data
 
-We highly encourage the use of "selector" functions to help encapsulate the process of extracting values from specific locations in the state tree.  Memoized selector functions also play a key role in improving application performance (see the following sections in this page and the [Advanced Usage: Performance]() page for more details on why and how to use selectors.)
-
+We highly encourage the use of "selector" functions to help encapsulate the process of extracting values from specific locations in the state tree. Memoized selector functions also play a key role in improving application performance (see the following sections in this page and the [Advanced Usage: Performance]() page for more details on why and how to use selectors.)
 
 ### `mapStateToProps` Functions Should Be Fast
 
-Whenever the store changes, all of the `mapStateToProps` functions of all of the connected components will run. Because of this, your `mapStateToProps` functions should run as fast as possible.  This also means that a slow `mapStateToProps` function can be a potential bottleneck for your application.
-
-As part of the "re-shaping data" idea, `mapStateToProps` functions frequently need to transform data in various ways (such as filtering an array, mapping an array of IDs to their corresponding objects, or extracting plain JS values from Immutable.js objects).  These transformations can often be expensive, both in terms of cost to execute the transformation, and whether the component re-renders as a result.  If performance is a concern, ensure that these transformations are only run if the input values have changed.
+Whenever the store changes, all of the `mapStateToProps` functions of all of the connected components will run. Because of this, your `mapStateToProps` functions should run as fast as possible. This also means that a slow `mapStateToProps` function can be a potential bottleneck for your application.
 
+As part of the "re-shaping data" idea, `mapStateToProps` functions frequently need to transform data in various ways (such as filtering an array, mapping an array of IDs to their corresponding objects, or extracting plain JS values from Immutable.js objects). These transformations can often be expensive, both in terms of cost to execute the transformation, and whether the component re-renders as a result. If performance is a concern, ensure that these transformations are only run if the input values have changed.
 
 ### `mapStateToProps` Functions Should Be Pure and Synchronous
 
-Much like a Redux reducer, a `mapStateToProps` function should always be 100% pure and synchronous.  It should simply take `state` (and `ownProps`) as arguments, and return the data the component needs as props.  It should _not_ be used to trigger asynchronous behavior like AJAX calls for data fetching, and the functions should not be declared as `async`.
-
-
+Much like a Redux reducer, a `mapStateToProps` function should always be 100% pure and synchronous. It should simply take `state` (and `ownProps`) as arguments, and return the data the component needs as props. It should _not_ be used to trigger asynchronous behavior like AJAX calls for data fetching, and the functions should not be declared as `async`.
 
 ## `mapStateToProps` and Performance
 
-
 ### Return Values Determine If Your Component Re-Renders
 
-React-Redux internally implements the `shouldComponentUpdate` method such that the wrapper component re-renders precisely when the data your component needs has changed. By default, React-Redux decides whether the contents of the object returned from `mapStateToProps` are different using `===` comparison (a "shallow equality" check) on each fields of the returned object. If any of the fields have changed, then your component will be re-rendered so it can receive the updated values as props.  Note that returning a mutated object of the same reference is a common mistake that can result in your component not re-rendering when expected.
-
+React Redux internally implements the `shouldComponentUpdate` method such that the wrapper component re-renders precisely when the data your component needs has changed. By default, React Redux decides whether the contents of the object returned from `mapStateToProps` are different using `===` comparison (a "shallow equality" check) on each fields of the returned object. If any of the fields have changed, then your component will be re-rendered so it can receive the updated values as props. Note that returning a mutated object of the same reference is a common mistake that can result in your component not re-rendering when expected.
 
 To summarize the behavior of the component wrapped by `connect` with `mapStateToProps` to extract data from the store:
 
@@ -137,10 +127,9 @@ To summarize the behavior of the component wrapped by `connect` with `mapStateTo
 | `mapStateToProps` runs when: | store `state` changes                  | store `state` changes <br /> or <br />any field of `ownProps` is different                   |
 | component re-renders when:   | any field of `stateProps` is different | any field of `stateProps` is different <br /> or <br /> any field of `ownProps` is different |
 
-
 ### Only Return New Object References If Needed
 
-React-Redux does shallow comparisons to see if the `mapStateToProps` results have changed.  It’s easy to accidentally return new object or array references every time, which would cause your component to re-render even if the data is actually the same.
+React Redux does shallow comparisons to see if the `mapStateToProps` results have changed. It’s easy to accidentally return new object or array references every time, which would cause your component to re-render even if the data is actually the same.
 
 Many common operations result in new object or array references being created:
 
@@ -150,13 +139,11 @@ Many common operations result in new object or array references being created:
 - Copying values with `Object.assign`
 - Copying values with the spread operator `{ ...oldState, ...newData }`
 
-Put these operations in [memoized selector functions]() to ensure that they only run if the input values have changed.  This will also ensure that if the input values _haven't_ changed, `mapStateToProps` will still return the same result values as before, and `connect` can skip re-rendering.
-
-
+Put these operations in [memoized selector functions]() to ensure that they only run if the input values have changed. This will also ensure that if the input values _haven't_ changed, `mapStateToProps` will still return the same result values as before, and `connect` can skip re-rendering.
 
 ### Only Perform Expensive Operations When Data Changes
 
-Transforming data can often be expensive (_and_ usually results in new object references being created).  In order for your `mapStateToProps` function to be as fast as possible, you should only re-run these complex transformations when the relevant data has changed.
+Transforming data can often be expensive (_and_ usually results in new object references being created). In order for your `mapStateToProps` function to be as fast as possible, you should only re-run these complex transformations when the relevant data has changed.
 
 There are a few ways to approach this:
 
@@ -164,7 +151,6 @@ There are a few ways to approach this:
 - Transformations can also be done in a component's `render()` method
 - If the transformation does need to be done in a `mapStateToProps` function, then we recommend using [memoized selector functions]() to ensure the transformation is only run when the input values have changed.
 
-
 #### Immutable.js Performance Concerns
 
 Immutable.js author Lee Byron on Twitter [explicitly advises avoiding `toJS` when performance is a concern](https://twitter.com/leeb/status/746733697093668864?lang=en):
@@ -173,18 +159,13 @@ Immutable.js author Lee Byron on Twitter [explicitly advises avoiding `toJS` whe
 
 There's several other performance concerns to take into consideration with Immutable.js - see the list of links at the end of this page for more information.
 
-
-
 ## Behavior and Gotchas
 
-
 ### `mapStateToProps` Will Not Run if the Store State is the Same
 
-The wrapper component generated by `connect` subscribes to the Redux store.  Every time an action is dispatched, it calls `store.getState()` and checks to see if `lastState === currentState`.  If the two state values are identical by reference, then it will _not_ re-run your `mapStateToProps` function, because it assumes that the rest of the store state hasn't changed either.
-
-The Redux `combineReducers` utility function tries to optimize for this.  If none of the slice reducers returned a new value, then `combineReducers` returns the old state object instead of a new one.  This means that mutation in a reducer can lead to the root state object not being updated, and thus the UI won't re-render.
-
+The wrapper component generated by `connect` subscribes to the Redux store. Every time an action is dispatched, it calls `store.getState()` and checks to see if `lastState === currentState`. If the two state values are identical by reference, then it will _not_ re-run your `mapStateToProps` function, because it assumes that the rest of the store state hasn't changed either.
 
+The Redux `combineReducers` utility function tries to optimize for this. If none of the slice reducers returned a new value, then `combineReducers` returns the old state object instead of a new one. This means that mutation in a reducer can lead to the root state object not being updated, and thus the UI won't re-render.
 
 ### The Number of Declared Arguments Affects Behavior
 
@@ -192,19 +173,18 @@ With just `(state)`, the function runs whenever the root store state object is d
 
 This means that **you should not add the `ownProps` argument unless you actually need to use it**, or your `mapStateToProps` function will run more often than it needs to.
 
-
-There are some edge cases around this behavior.  **The number of mandatory arguments determines whether `mapStateToProps` will receive `ownProps`**.
+There are some edge cases around this behavior. **The number of mandatory arguments determines whether `mapStateToProps` will receive `ownProps`**.
 
 If the formal definition of the function contains one mandatory parameter, `mapStateToProps` will _not_ receive `ownProps`:
 
 ```js
 function mapStateToProps(state) {
-  console.log(state);        // state
-  console.log(arguments[1]); // undefined
+  console.log(state) // state
+  console.log(arguments[1]) // undefined
 }
 const mapStateToProps = (state, ownProps = {}) => {
-  console.log(state);    // state
-  console.log(ownProps); // undefined
+  console.log(state) // state
+  console.log(ownProps) // undefined
 }
 ```
 
@@ -212,18 +192,18 @@ It _will_ receive `ownProps` when the formal definition of the function contains
 
 ```js
 function mapStateToProps(state, ownProps) {
-  console.log(state);    // state
-  console.log(ownProps); // ownProps
+  console.log(state) // state
+  console.log(ownProps) // ownProps
 }
 
 function mapStateToProps() {
-  console.log(arguments[0]); // state
-  console.log(arguments[1]); // ownProps
+  console.log(arguments[0]) // state
+  console.log(arguments[1]) // ownProps
 }
 
 function mapStateToProps(...args) {
-  console.log(args[0]); // state
-  console.log(args[1]); // ownProps
+  console.log(args[0]) // state
+  console.log(args[1]) // ownProps
 }
 ```
 
diff --git a/package-lock.json b/package-lock.json
index ac54136..7a882e0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3898,12 +3898,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -3918,17 +3920,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4045,7 +4050,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4057,6 +4063,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -4071,6 +4078,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -4078,12 +4086,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -4102,6 +4112,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -4182,7 +4193,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -4194,6 +4206,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -4315,6 +4328,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
diff --git a/package.json b/package.json
index cd1ddb2..af09f71 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "build:umd:min": "cross-env NODE_ENV=production rollup -c -o dist/react-redux.min.js",
     "build": "npm run build:commonjs && npm run build:es && npm run build:umd && npm run build:umd:min",
     "clean": "rimraf lib dist es coverage",
-    "format": "prettier --write '{src,test}/**/*.js'",
+    "format": "prettier --write \"{src,test}/**/*.{js,ts}\" index.d.ts \"docs/**/*.md\"",
     "lint": "eslint src test/utils test/components",
     "prepare": "npm run clean && npm run build",
     "pretest": "npm run lint",
diff --git a/rollup.config.js b/rollup.config.js
index ae0c726..9a72d4e 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -2,7 +2,7 @@ import nodeResolve from 'rollup-plugin-node-resolve'
 import babel from 'rollup-plugin-babel'
 import replace from 'rollup-plugin-replace'
 import commonjs from 'rollup-plugin-commonjs'
-import {uglify} from 'rollup-plugin-uglify'
+import { uglify } from 'rollup-plugin-uglify'
 import pkg from './package.json'
 
 const env = process.env.NODE_ENV
@@ -22,14 +22,17 @@ const config = {
     nodeResolve(),
     babel({
       exclude: '**/node_modules/**',
-      runtimeHelpers: true,
+      runtimeHelpers: true
     }),
     replace({
       'process.env.NODE_ENV': JSON.stringify(env)
     }),
     commonjs({
       namedExports: {
-        'node_modules/react-is/index.js': ['isValidElementType'],
+        'node_modules/react-is/index.js': [
+          'isValidElementType',
+          'isContextConsumer'
+        ]
       }
     })
   ]
diff --git a/src/components/connectAdvanced.js b/src/components/connectAdvanced.js
index 4dbb9ff..2aeb9b4 100644
--- a/src/components/connectAdvanced.js
+++ b/src/components/connectAdvanced.js
@@ -1,7 +1,7 @@
 import hoistStatics from 'hoist-non-react-statics'
 import invariant from 'invariant'
 import React, { Component, PureComponent } from 'react'
-import { isValidElementType } from 'react-is'
+import { isValidElementType, isContextConsumer } from 'react-is'
 
 import { ReactReduxContext } from './Context'
 
@@ -77,7 +77,7 @@ export default function connectAdvanced(
 
   const customStoreWarningMessage =
     'To use a custom Redux store for specific components,  create a custom React context with ' +
-    "React.createContext(), and pass the context object to React-Redux's Provider and specific components" +
+    "React.createContext(), and pass the context object to React Redux's Provider and specific components" +
     ' like:  <Provider context={MyContext}><ConnectedComponent context={MyContext} /></Provider>. ' +
     'You may also pass a {context : MyContext} option to connect'
 
@@ -213,7 +213,12 @@ export default function connectAdvanced(
       }
 
       render() {
-        const ContextToUse = this.props.context || Context
+        const ContextToUse =
+          this.props.context &&
+          this.props.context.Consumer &&
+          isContextConsumer(<this.props.context.Consumer />)
+            ? this.props.context
+            : Context
 
         return (
           <ContextToUse.Consumer>
diff --git a/website/core/Footer.js b/website/core/Footer.js
index 7308570..ccb55c7 100644
--- a/website/core/Footer.js
+++ b/website/core/Footer.js
@@ -40,9 +40,9 @@ class Footer extends React.Component {
                 "using-react-redux/connect-mapstate"
               )}
             >
-              Using React-Redux
+              Using React Redux
             </a>
-            <a href={this.docUrl("api")}>API Reference</a>
+            <a href={this.docUrl("api/connect")}>API Reference</a>
             <a href={this.docUrl("troubleshooting")}>Guides</a>
           </div>
           <div>
diff --git a/website/pages/en/index.js b/website/pages/en/index.js
index 2b33896..fe9c90d 100755
--- a/website/pages/en/index.js
+++ b/website/pages/en/index.js
@@ -103,7 +103,7 @@ const FeaturesTop = props => (
   <Block layout="fourColumn" className="featureBlock">
     {[
       {
-        content: "React-Redux is maintained by the Redux team, and **kept up-to-date with the latest APIs from Redux and React**.",
+        content: "React Redux is maintained by the Redux team, and **kept up-to-date with the latest APIs from Redux and React**.",
         image : imgUrl("noun_Certificate_1945625.svg"),
         imageAlign: 'top',
         title: "Official"
diff --git a/website/sidebars.json b/website/sidebars.json
index e28ae4a..1751a9d 100644
--- a/website/sidebars.json
+++ b/website/sidebars.json
@@ -5,13 +5,15 @@
       "introduction/basic-tutorial",
       "introduction/why-use-react-redux"
     ],
-    "Using React-Redux": [
+    "Using React Redux": [
       "using-react-redux/connect-mapstate",
-      "using-react-redux/connect-mapdispatch"
+      "using-react-redux/connect-mapdispatch",
+      "using-react-redux/accessing-store"
     ],
     "API Reference": [
-      "api",
-      "api/provider"
+      "api/connect",
+      "api/provider",
+      "api/connect-advanced"
     ],
     "Guides": [
       "troubleshooting"
diff --git a/website/siteConfig.js b/website/siteConfig.js
index 90cafb8..ce8253d 100644
--- a/website/siteConfig.js
+++ b/website/siteConfig.js
@@ -30,8 +30,8 @@ const siteConfig = {
   // For no header links in the top nav bar -> headerLinks: [],
   headerLinks: [
     { doc: "introduction/quick-start", label: "Quick Start" },
-    { doc: "using-react-redux/connect-mapstate", label: "Using React-Redux"},
-    { doc: "api", label: "API" },
+    { doc: "using-react-redux/connect-mapstate", label: "Using React Redux"},
+    { doc: "api/connect", label: "API" },
     { href : "https://www.github.com/reduxjs/react-redux", label : "Github"},
     { href: "/introduction/quick-start#help-and-discussion", label: "Need help?" },
   ],
@@ -44,7 +44,13 @@ const siteConfig = {
   /* Colors for website */
   colors: {
     primaryColor: "#764ABC",
-    secondaryColor: "#764ABC",
+    secondaryColor: "#40216F",
+    accentColor1: "#717171",
+    accentColor2: "#F3EAFF",
+    accentColor3: "#D2B9F3",
+    accentColor4: "#ECF4F9",
+    accentColor5: "#CBDDEA",
+    accentColor6: "#2F5773"
   },
 
   /* Custom fonts for website */
diff --git a/website/static/css/custom.css b/website/static/css/custom.css
index a35e7a3..86025f4 100644
--- a/website/static/css/custom.css
+++ b/website/static/css/custom.css
@@ -8,57 +8,163 @@ header.postHeader:empty + article h1 {
   margin-top: 0;
 }
 
-a {
-  /* blue links - kickin' it old-school! */
-  color: blue;
+.post article a {
+  /* add underlines to links in blocks of text for a11y */
+  color: $primaryColor;
+  text-decoration: underline;
+  overflow: hidden;
+  position: relative;
+  transition: outline-offset 0.2s ease-in-out;
 }
-a:hover {
-  /* add underlines for a11y */
+
+.post article a:hover,
+.post article a:focus,
+.post article a:active {
+  /* change color and bg to display state change in more than one way for a11y */
+  background-color: $secondaryColor;
+  color: white;
+  box-shadow: 0 0 0 2px $secondaryColor;
+  outline: none;
   text-decoration: underline;
+  overflow: hidden;
+  position: relative;
+  transition: outline-offset 0.2s ease-in-out;
 }
-a:visited {
-  color: $primaryColor;
+
+.post article blockquote {
+  color: black;
+  background-color: $accentColor4;
+  border-left: 8px solid $accentColor5;
+}
+
+.post article blockquote a {
+  /* add underlines to links in blocks of text for a11y */
+  color: black;
+  text-decoration: underline;
+  overflow: hidden;
+  position: relative;
+  transition: outline-offset 0.2s ease-in-out;
+}
+
+.post article blockquote a:hover,
+.post article blockquote a:focus,
+.post article blockquote a:active {
+  /* change color and bg to display state change in more than one way for a11y */
+  background-color: $accentColor6;
+  color: white;
+  box-shadow: 0 0 0 2px $accentColor6;
+  outline: none;
+  text-decoration: underline;
+}
+
+.post article blockquote {
+  color: black;
+  background-color: $accentColor4;
+  border-left: 8px solid $accentColor5;
+}
+
+.post article blockquote a {
+  /* add underlines to links in blocks of text for a11y */
+  color: black;
+  text-decoration: underline;
+  overflow: hidden;
+  position: relative;
+  transition: outline-offset 0.2s ease-in-out;
+}
+
+.post article blockquote a:hover,
+.post article blockquote a:focus,
+.post article blockquote a:active {
+  /* change color and bg to display state change in more than one way for a11y */
+  background-color: $accentColor6;
+  color: white;
+  box-shadow: 0 0 0 2px $accentColor6;
+  outline: none;
+  text-decoration: underline;
+}
+
+.post article .hash-link {
+  /* add underlines to links in blocks of text for a11y */
+  color: $accentColor1;
+  transition: outline-offset 0.2s ease-in-out;
+  opacity: 1;
+}
+
+.post article .hash-link:hover,
+.post article .hash-link:focus,
+.post article .hash-link:active {
+  /* change color and bg to display state change in more than one way for a11y */
+  color: $secondaryColor;
+  background-color: white;
+  box-shadow: 0 0 0 0 $accentColor6;
+  transition: outline-offset 0.2s ease-in-out;
 }
+
+.hash-link .hash-link-icon {
+  fill: currentColor;
+}
+
 .fixedHeaderContainer header .headerTitleWithLogo {
-  color : white;
+  color: white;
   display: block !important;
 }
-.navigationSlider .slidingNav ul a {
-  color : white !important;
-  font-weight: 400 !important;
+
+.navigationSlider .slidingNav ul.nav-site a {
+  color: white;
+  font-weight: 400;
 }
-.navigationSlider .slidingNav ul a[href*="github"] {
+
+.navigationSlider .slidingNav ul.nav-site a:hover,
+.navigationSlider .slidingNav ul.nav-site a:focus,
+.navigationSlider .slidingNav ul.nav-site a:active {
+  color: white;
+  font-weight: 400;
+  text-decoration: underline;
+}
+
+.navigationSlider .slidingNav ul a[href*='github'] {
   font-size: 0;
 }
-.navigationSlider .slidingNav ul a[href*="github"]::before {
-  content : "";
-  width : 32px;
-  height : 32px;
-  background: url("/img/github-brands.svg");
+
+.navigationSlider .slidingNav ul a[href*='github']::before {
+  content: '';
+  width: 32px;
+  height: 32px;
+  background: url('/img/github-brands.svg');
 }
+
 .nav-footer .copyright,
 .nav-footer .sitemap a {
   /* increase link contrast */
   color: white;
 }
+
 .button.hero {
   background: $primaryColor;
   color: #fff;
   font-size: 30px;
-  padding: .5em 1.25em;
+  padding: 0.5em 1.25em;
   font-weight: bold;
 }
+
 .button.hero:visited {
   background: $primaryColor;
   color: #fff;
 }
+
 .button.hero:hover {
   background: #fff;
   color: $primaryColor;
 }
+
+.homeContainer .homeWrapper {
+  padding-bottom: 0;
+}
+
 .productShowcaseSection .featureBlock {
   padding: 40px 0;
 }
+
 .productShowcaseSection .featureBlock img {
   width: 60px;
   height: 60px;
@@ -66,7 +172,6 @@ a:visited {
   max-height: 60px;
 }
 
-
 .featureBlock .blockContent > div p {
   text-align: left;
 }
@@ -74,13 +179,15 @@ a:visited {
 .libBlock > div p {
   text-align: center;
 }
+
 .libBlock h2 a,
 .libBlock h2 a:visited {
-  color : black;
+  color: black;
   display: flex;
   justify-content: center;
   align-items: center;
 }
+
 .libBlock img {
   margin-left: 5px;
   max-width: 16px !important;
@@ -92,11 +199,10 @@ a:visited {
   margin-bottom: 5px;
 }
 
-
 @media only screen and (max-device-width: 480px) {
   .productShowcaseSection .featureBlock {
-    padding-top: 0;
-    padding-bottom: 0;
+    padding-top: 30px;
+    padding-bottom: 5px;
   }
 
   .featureBlock .imageAlignTop .blockImage {
@@ -111,10 +217,10 @@ a:visited {
   .featureBlock .blockContent {
     margin-bottom: 25px;
   }
-  
+
   .homeSplashFade img {
-    width : 60px;
-    height : 60px;
+    width: 60px;
+    height: 60px;
   }
 
   .homeSplashFade h1 {


Test patch:
diff --git a/test/components/connect.spec.js b/test/components/connect.spec.js
index 7a8629e..4ca9a2f 100644
--- a/test/components/connect.spec.js
+++ b/test/components/connect.spec.js
@@ -1564,6 +1564,36 @@ describe('React', () => {
       expect(actualState).toEqual(expectedState)
     })
 
+    it('should ignore non-react-context values that are passed as a prop to the component', () => {
+      class Container extends Component {
+        render() {
+          return <Passthrough />
+        }
+      }
+
+      const nonContext = { someProperty: {} }
+
+      let actualState
+
+      const expectedState = { foos: {} }
+
+      const decorator = connect(state => {
+        actualState = state
+        return {}
+      })
+      const Decorated = decorator(Container)
+
+      const store = createStore(() => expectedState)
+
+      rtl.render(
+        <ProviderMock store={store}>
+          <Decorated context={nonContext} />
+        </ProviderMock>
+      )
+
+      expect(actualState).toEqual(expectedState)
+    })
+
     it('should throw an error if the store is not in the props or context', () => {
       const spy = jest.spyOn(console, 'error').mockImplementation(() => {})