use custom store to avoid conflicts

cellog · May 1, 2017 · f7a2f6e · f7a2f6e
1 parent 6b9785f
commit f7a2f6e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/docs/package.json b/docs/package.json
@@ -13,6 +13,7 @@
     "react-burger-menu": "^2.0.1",
     "react-dom": "^15.5.4",
     "react-redux": "^5.0.4",
+    "react-redux-custom-store": "^1.0.0",
     "redux": "^3.6.0"
   },
   "devDependencies": {

diff --git a/docs/src/App.jsx b/docs/src/App.jsx
@@ -19,7 +19,7 @@ class App extends Component {
           <Link to="/" className="menu-item">Home</Link>
           <Link route="examples" className="menu-item">Examples</Link>
           <ul>
-            {Object.keys(examples).map(example => <li>
+            {Object.keys(examples).map(example => <li key={example}>
               <Link route="examples" example={example} className="menu-item">{example}</Link>
             </li>)}
           </ul>

diff --git a/docs/src/components/Example.jsx b/docs/src/components/Example.jsx
@@ -2,15 +2,18 @@ import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import createHistory from 'history/createMemoryHistory'
 import { createStore, applyMiddleware, combineReducers, compose } from 'redux'
-import { Provider, connect } from 'react-redux'
+import { createProvider, connect } from 'react-redux-custom-store'
 import makeRouter, { makeRouterMiddleware } from 'ion-router'
 import routing from 'ion-router/reducer'
 
 import Browser from './Browser'
 import ShowSource from './ShowSource'
 import examples from '../examples'
 
-const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose // eslint-disable-line
+const Provider = createProvider('examples')
+const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ ? // eslint-disable-line
+  window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__({ name: 'examples' }) // eslint-disable-line
+  : compose
 
 class Example extends Component {
   static propTypes = {

diff --git a/docs/yarn.lock b/docs/yarn.lock
@@ -4285,6 +4285,10 @@ react-dom@^15.5.4:
     object-assign "^4.1.0"
     prop-types "~15.5.7"
 
+react-redux-custom-store@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/react-redux-custom-store/-/react-redux-custom-store-1.0.0.tgz#dcbf177c73aca546533aff94c65c98d98ce9ba15"
+
 react-redux@^5.0.4:
   version "5.0.4"
   resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.0.4.tgz#1563babadcfb2672f57f9ceaa439fb16bf85d55b"
@@ -4584,11 +4588,11 @@ resolve-pathname@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.1.0.tgz#e8358801b86b83b17560d4e3c382d7aef2100944"
 
-[email protected]:
+[email protected], resolve@^1.1.6:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
-resolve@^1.1.6, resolve@^1.2.0:
+resolve@^1.2.0:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.3.tgz#655907c3469a8680dc2de3a275a8fdd69691f0e5"
   dependencies: