Skip to content
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

### Fixed
- Fixed context not passed through from primary renderer (`react-dom`) into `react-pixi-fiber`


## [0.6.0] - 2018-11-10

Expand Down
4 changes: 2 additions & 2 deletions src/Stage.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class Stage extends React.Component {
const stageProps = getDisplayObjectProps(this.props);
applyProps(this._app.stage, {}, stageProps);

render(<AppProvider app={this._app}>{children}</AppProvider>, this._app.stage);
render(<AppProvider app={this._app}>{children}</AppProvider>, this._app.stage, undefined, this);
}

componentDidUpdate(prevProps, prevState) {
Expand All @@ -90,7 +90,7 @@ class Stage extends React.Component {
this._app.renderer.resize(currentWidth, currentHeight);
}

render(<AppProvider app={this._app}>{children}</AppProvider>, this._app.stage);
render(<AppProvider app={this._app}>{children}</AppProvider>, this._app.stage, undefined, this);
}

componentWillUnmount() {
Expand Down
4 changes: 2 additions & 2 deletions src/render.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ export const roots = new Map();
* element should be any instance of PIXI DisplayObject
* containerTag should be an instance of PIXI root Container (i.e. the Stage)
*/
export function render(element, containerTag, callback) {
export function render(element, containerTag, callback, parentComponent) {
let root = roots.get(containerTag);
if (!root) {
root = ReactPixiFiber.createContainer(containerTag);
roots.set(containerTag, root);
}

ReactPixiFiber.updateContainer(element, root, undefined, callback);
ReactPixiFiber.updateContainer(element, root, parentComponent, callback);

ReactPixiFiber.injectIntoDevTools({
findFiberByHostInstance: ReactPixiFiber.findFiberByHostInstance,
Expand Down
14 changes: 12 additions & 2 deletions test/Stage.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,12 @@ describe("Stage", () => {
const stage = instance._app.stage;

expect(render).toHaveBeenCalledTimes(1);
expect(render).toHaveBeenCalledWith(<AppProvider app={instance._app}>{children}</AppProvider>, stage);
expect(render).toHaveBeenCalledWith(
<AppProvider app={instance._app}>{children}</AppProvider>,
stage,
undefined,
instance
);
});

it("calls render on componentDidUpdate", () => {
Expand All @@ -190,7 +195,12 @@ describe("Stage", () => {
element.update(<Stage>{children2}</Stage>);

expect(render).toHaveBeenCalledTimes(1);
expect(render).toHaveBeenCalledWith(<AppProvider app={instance._app}>{children2}</AppProvider>, stage);
expect(render).toHaveBeenCalledWith(
<AppProvider app={instance._app}>{children2}</AppProvider>,
stage,
undefined,
instance
);
});

it("calls unmount on componentWillUnmount", () => {
Expand Down