Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: portal with new context #1866

Merged
merged 1 commit into from
May 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 32 additions & 1 deletion packages/rax-create-portal/src/__tests__/createPortal.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* @jsx createElement */

import PropTypes from 'rax-proptypes';
import { Component, createElement, render, shared } from 'rax';
import { Component, createElement, render, shared, createContext, useContext, useState } from 'rax';
import ServerDriver from 'driver-server';
import unmountComponentAtNode from 'rax-unmount-component-at-node';
import createPortal from '../';
Expand Down Expand Up @@ -206,4 +206,35 @@ describe('createPortal', () => {
expect(portalContainer.childNodes[0].childNodes[0].data).toBe('initial');
expect(updatedCount).toBe(4);
});

it('should render correct when new context change', () => {
const container = createNodeElement('div');
const portalTarget = createNodeElement('div');
const Context = createContext(0);

let changeValue = null;
function Portal() {
const value = useContext(Context);
return <div>{value}</div>;
}

function App() {
const [value, setValue] = useState(1);
changeValue = setValue;
return (
<Context.Provider value={value}>
<div>0</div>
{createPortal(<Portal />, portalTarget)}
</Context.Provider>
);
}
render(<App />, container);
jest.runAllTimers();
expect(container.childNodes[0].childNodes[0].data).toBe('0');
expect(portalTarget.childNodes[0].childNodes[0].data).toBe('1');

changeValue(2);
jest.runAllTimers();
expect(portalTarget.childNodes[0].childNodes[0].data).toBe('2');
});
});
2 changes: 1 addition & 1 deletion packages/rax/src/vdom/instance.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export default {
// Init root component with empty children
let renderedComponent = instantiateComponent(createElement(Root));
let defaultContext = parentContext || {};
let rootInstance = renderedComponent.__mountComponent(container, null, defaultContext);
let rootInstance = renderedComponent.__mountComponent(container, parent, defaultContext);
this.set(container, rootInstance);
// Mount new element through update queue avoid when there is in rendering phase
rootInstance.__update(element);
Expand Down