Update and pass contexts _currentValue.

Author: Daniel Lehr

src/__tests__/index.test.js

@@ -281,7 +281,9 @@ describe('reactTreeWalker', () => {
 
  describe('react', () => {
  it('supports new context API', () => {
- const { Provider, Consumer } = React.createContext()
+ const { Provider, Consumer } = React.createContext({
+ handler: io => io,
+ })
 
  class SomeInstance extends React.Component {
  render() {
@@ -292,9 +294,9 @@ describe('reactTreeWalker', () => {
  const tree = (
  <Provider value={{ message: 'This is a provider message' }}>
  <Consumer>
- {({ message }) => (
+ {({ message, handler }) => (
  <strong>
- <i>{message}</i>
+ <i>{`${message}: ${handler}`}</i>
  </strong>
  )}
  </Consumer>
@@ -311,7 +313,7 @@ describe('reactTreeWalker', () => {
  elements.pop() // Pop the div element
  elements.pop() // Pop the class instance
  expect(elements.pop()).toBe('Next')
- expect(elements.pop()).toBe('This is a provider message')
+ expect(elements.pop()).toBe('This is a provider message: io => io')
  })
  })
 

src/index.js

@@ -116,11 +116,14 @@ export default function reactTreeWalker(
  if (currentElement.type) {
  if (currentElement.type._context) {
  // eslint-disable-next-line no-param-reassign
- currentElement.type._context.currentValue = currentElement.props.value
+ currentElement.type._context._currentValue = {
+ ...currentElement.type._context._currentValue,
+ ...currentElement.props.value,
+ }
  }
  if (currentElement.type.Provider && currentElement.type.Consumer) {
  const el = currentElement.props.children(
- currentElement.type.Provider._context.currentValue,
+ currentElement.type.Provider._context._currentValue,
  )
  return recursive(el)
  }