Merge branch 'fix-context-fatal-error'

Author: mpeyper

.all-contributorsrc

@@ -70,7 +70,17 @@
         "code",
         "test"
       ]
+    },
+    {
+      "login": "macklay",
+      "name": "Nick Smirnov",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/6972011?v=4",
+      "profile": "https://github.com/macklay",
+      "contributions": [
+        "code"
+      ]
     }
   ],
-  "repoType": "github"
+  "repoType": "github",
+  "commitConvention": "none"
 }

README.md

@@ -66,9 +66,21 @@ _Whats with the name?_
 Thanks goes to these wonderful people ([emojis](https://github.com/kentcdodds/all-contributors#emoji-key)):
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
-<!-- prettier-ignore -->
-| [<img src="https://avatars0.githubusercontent.com/u/23029903?v=4" width="100px;"/><br /><sub><b>Michael Peyper</b></sub>](https://github.com/mpeyper)<br />[💬](#question-mpeyper "Answering Questions") [🐛](https://github.com/ioof-holdings/@redux-dynostore/core/issues?q=author%3Ampeyper "Bug reports") [💻](https://github.com/ioof-holdings/@redux-dynostore/core/commits?author=mpeyper "Code") [📖](https://github.com/ioof-holdings/@redux-dynostore/core/commits?author=mpeyper "Documentation") [💡](#example-mpeyper "Examples") [🤔](#ideas-mpeyper "Ideas, Planning, & Feedback") [🚇](#infra-mpeyper "Infrastructure (Hosting, Build-Tools, etc)") [👀](#review-mpeyper "Reviewed Pull Requests") [📦](#platform-mpeyper "Packaging/porting to new platform") [📢](#talk-mpeyper "Talks") [⚠️](https://github.com/ioof-holdings/@redux-dynostore/core/commits?author=mpeyper "Tests") [🔧](#tool-mpeyper "Tools") | [<img src="https://avatars2.githubusercontent.com/u/6560018?v=4" width="100px;"/><br /><sub><b>Jonathan Peyper</b></sub>](https://github.com/jpeyper)<br />[💬](#question-jpeyper "Answering Questions") [🐛](https://github.com/ioof-holdings/@redux-dynostore/core/issues?q=author%3Ajpeyper "Bug reports") [💻](https://github.com/ioof-holdings/@redux-dynostore/core/commits?author=jpeyper "Code") [🤔](#ideas-jpeyper "Ideas, Planning, & Feedback") [👀](#review-jpeyper "Reviewed Pull Requests") [⚠️](https://github.com/ioof-holdings/@redux-dynostore/core/commits?author=jpeyper "Tests") | [<img src="https://avatars3.githubusercontent.com/u/11048958?v=4" width="100px;"/><br /><sub><b>Greg Miller</b></sub>](https://github.com/Gregor1971)<br />[💡](#example-Gregor1971 "Examples") | [<img src="https://avatars2.githubusercontent.com/u/1493968?v=4" width="100px;"/><br /><sub><b>Ethorsen</b></sub>](https://github.com/Ethorsen)<br />[💻](https://github.com/ioof-holdings/@redux-dynostore/core/commits?author=Ethorsen "Code") [📖](https://github.com/ioof-holdings/@redux-dynostore/core/commits?author=Ethorsen "Documentation") [⚠️](https://github.com/ioof-holdings/@redux-dynostore/core/commits?author=Ethorsen "Tests") | [<img src="https://avatars0.githubusercontent.com/u/6849798?v=4" width="100px;"/><br /><sub><b>Jake88</b></sub>](https://github.com/Jake88)<br />[💻](https://github.com/ioof-holdings/@redux-dynostore/core/commits?author=Jake88 "Code") [⚠️](https://github.com/ioof-holdings/@redux-dynostore/core/commits?author=Jake88 "Tests") |
-| :---: | :---: | :---: | :---: | :---: |
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+  <tr>
+    <td align="center"><a href="https://github.com/mpeyper"><img src="https://avatars0.githubusercontent.com/u/23029903?v=4" width="100px;" alt=""/><br /><sub><b>Michael Peyper</b></sub></a><br /><a href="#question-mpeyper" title="Answering Questions">💬</a> <a href="https://github.com/ioof-holdings/@redux-dynostore/core/issues?q=author%3Ampeyper" title="Bug reports">🐛</a> <a href="https://github.com/ioof-holdings/@redux-dynostore/core/commits?author=mpeyper" title="Code">💻</a> <a href="https://github.com/ioof-holdings/@redux-dynostore/core/commits?author=mpeyper" title="Documentation">📖</a> <a href="#example-mpeyper" title="Examples">💡</a> <a href="#ideas-mpeyper" title="Ideas, Planning, & Feedback">🤔</a> <a href="#infra-mpeyper" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="https://github.com/ioof-holdings/@redux-dynostore/core/pulls?q=is%3Apr+reviewed-by%3Ampeyper" title="Reviewed Pull Requests">👀</a> <a href="#platform-mpeyper" title="Packaging/porting to new platform">📦</a> <a href="#talk-mpeyper" title="Talks">📢</a> <a href="https://github.com/ioof-holdings/@redux-dynostore/core/commits?author=mpeyper" title="Tests">⚠️</a> <a href="#tool-mpeyper" title="Tools">🔧</a></td>
+    <td align="center"><a href="https://github.com/jpeyper"><img src="https://avatars2.githubusercontent.com/u/6560018?v=4" width="100px;" alt=""/><br /><sub><b>Jonathan Peyper</b></sub></a><br /><a href="#question-jpeyper" title="Answering Questions">💬</a> <a href="https://github.com/ioof-holdings/@redux-dynostore/core/issues?q=author%3Ajpeyper" title="Bug reports">🐛</a> <a href="https://github.com/ioof-holdings/@redux-dynostore/core/commits?author=jpeyper" title="Code">💻</a> <a href="#ideas-jpeyper" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/ioof-holdings/@redux-dynostore/core/pulls?q=is%3Apr+reviewed-by%3Ajpeyper" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/ioof-holdings/@redux-dynostore/core/commits?author=jpeyper" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://github.com/Gregor1971"><img src="https://avatars3.githubusercontent.com/u/11048958?v=4" width="100px;" alt=""/><br /><sub><b>Greg Miller</b></sub></a><br /><a href="#example-Gregor1971" title="Examples">💡</a></td>
+    <td align="center"><a href="https://github.com/Ethorsen"><img src="https://avatars2.githubusercontent.com/u/1493968?v=4" width="100px;" alt=""/><br /><sub><b>Ethorsen</b></sub></a><br /><a href="https://github.com/ioof-holdings/@redux-dynostore/core/commits?author=Ethorsen" title="Code">💻</a> <a href="https://github.com/ioof-holdings/@redux-dynostore/core/commits?author=Ethorsen" title="Documentation">📖</a> <a href="https://github.com/ioof-holdings/@redux-dynostore/core/commits?author=Ethorsen" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://github.com/Jake88"><img src="https://avatars0.githubusercontent.com/u/6849798?v=4" width="100px;" alt=""/><br /><sub><b>Jake88</b></sub></a><br /><a href="https://github.com/ioof-holdings/@redux-dynostore/core/commits?author=Jake88" title="Code">💻</a> <a href="https://github.com/ioof-holdings/@redux-dynostore/core/commits?author=Jake88" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://github.com/macklay"><img src="https://avatars3.githubusercontent.com/u/6972011?v=4" width="100px;" alt=""/><br /><sub><b>Nick Smirnov</b></sub></a><br /><a href="https://github.com/ioof-holdings/@redux-dynostore/core/commits?author=macklay" title="Code">💻</a></td>
+  </tr>
+</table>
+
+<!-- markdownlint-enable -->
+<!-- prettier-ignore-end -->
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification.

packages/redux-dynostore-react-redux-subspace/README.md

@@ -49,7 +49,7 @@ When mounted, `MyComponent` will be wrapped in a [`SubspaceProvider`](https://io
 
 If you are attaching a reducer dynamically, you should use the [redux-subspace variant](/packages/redux-dynostore-redux-subspace) to ensure it will receive the namespaced actions.
 
-##### `stateHandler`
+### `stateHandler`
 
 ```javascript
 const store = createStore(reducer, dynostore(dynamicReducers(), { stateHandler: customStateHandler }))
@@ -72,3 +72,15 @@ State handlers are provided as an object with the following functions:
 _Note, this is a subset of [the `stateHandler` option of `dynamicReducers`](/packages/redux-dynostore-core#stateHandler)._
 
 By default, `subspaced` will use the `defaultStateHandler` exported from the core package.
+
+### Additional Subspace Options
+
+Any additional options provided to `subspaced` will be passed through as the [options argument to the underlying `react-redux-subspace` library](https://ioof-holdings.github.io/redux-subspace/packages/react-redux-subspace/docs/api/subspaced.html#arguments).  This is most commonly used to provide a custom context to locate the Redux store to use:
+
+```javascript
+const CustomContext = React.createContext
+
+// ...
+
+export default dynamic('identifier', subspaced({ context: CustomContext }))(MyComponent)
+```

packages/redux-dynostore-react-redux-subspace/src/subspaced.js

@@ -9,7 +9,11 @@
 import { subspaced } from 'react-redux-subspace'
 import { defaultStateHandler } from '@redux-dynostore/core'
 
-const subspacedEnhancer = ({ stateHandler, mapExtraState = () => null } = {}) => identifier => store => {
+const subspacedEnhancer = ({
+  stateHandler,
+  mapExtraState = () => null,
+  ...subspaceOptions
+} = {}) => identifier => store => {
   const defaultOptions = store.dynostoreOptions || {}
   const { getValue, canMerge, merge } = stateHandler || defaultOptions.stateHandler || defaultStateHandler
 
@@ -29,7 +33,7 @@ const subspacedEnhancer = ({ stateHandler, mapExtraState = () => null } = {}) =>
 
     return merge(extraState, componentState)
   }
-  const subspaceEnhancer = subspaced(mapState, identifier)
+  const subspaceEnhancer = subspaced(mapState, identifier, subspaceOptions)
   return Component => subspaceEnhancer(Component)
 }
 

packages/redux-dynostore-react-redux-subspace/test/subspaced.test.js

@@ -276,3 +276,54 @@ describe('mapExtraState tests', () => {
     ).toThrow(TypeError)
   })
 })
+
+describe('subspaceOptions tests', () => {
+  const mockStore = configureStore([])
+  let store
+
+  const CustomContext = React.createContext()
+
+  class TestComponent extends React.Component {
+    render() {
+      return <p>{this.props.testKey}</p>
+    }
+  }
+
+  const mapStateToProps = state => ({
+    testKey: state.testKey
+  })
+
+  const ConnectedTestComponent = connect(
+    mapStateToProps,
+    null,
+    null,
+    { context: CustomContext }
+  )(TestComponent)
+
+  beforeEach(() => {
+    store = mockStore({
+      testId: {
+        testKey: 'root value'
+      },
+      parentId: {
+        testId: {
+          testKey: 'nested value'
+        }
+      }
+    })
+  })
+
+  test('should create subspaced enhanced component using custom context', () => {
+    const SubspacedComponent = subspaced({ context: CustomContext })('testId')(store)(ConnectedTestComponent)
+
+    const { getByText } = render(
+      <Provider store={store} context={CustomContext}>
+        <SubspaceProvider mapState={state => state.parentId} namespace="parentId" context={CustomContext}>
+          <SubspacedComponent />
+        </SubspaceProvider>
+      </Provider>
+    )
+
+    expect(getByText('nested value')).toBeDefined()
+  })
+})