Skip to content
Open
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
38 changes: 28 additions & 10 deletions src/Resolver.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,31 @@
/* eslint-disable no-underscore-dangle */

import React from "react";
import ReactDOM from "react-dom";
import {renderToStaticMarkup} from "react-dom/server";

// react-dom seems to be clashing with react-native, no idea why
// so I'll just comment them out to make it work in react-native.
//import ReactDOM from "react-dom";
//import {renderToStaticMarkup} from "react-dom/server";

let ReactDOM;
let renderToStaticMarkup

const ID = "ReactResolver.ID";
const CHILDREN = "ReactResolver.CHILDREN";
const HAS_RESOLVED = "ReactResolver.HAS_RESOLVED";
const IS_CLIENT = "ReactResolver.IS_CLIENT";
const PAYLOAD = "__REACT_RESOLVER_PAYLOAD__";

/**
* Check if we're running under a ReactNative enviroment;
* @return {boolean}
*
* https://stackoverflow.com/questions/39468022/how-do-i-know-if-my-code-is-running-as-react-native
*/
function isReactNative() {
return (typeof navigator != 'undefined' && navigator.product == 'ReactNative');
}

export default class Resolver extends React.Component {
static childContextTypes = {
resolver: React.PropTypes.instanceOf(Resolver),
Expand Down Expand Up @@ -47,14 +63,16 @@ export default class Resolver extends React.Component {
static resolve = function(render, initialData = {}) {
const queue = [];

renderToStaticMarkup(
<Resolver data={initialData} onResolve={((promise) => {
queue.push(promise);
return Promise.resolve(true);
})}>
{render}
</Resolver>
);
if (!isReactNative()) {
renderToStaticMarkup(
<Resolver data={initialData} onResolve={((promise) => {
queue.push(promise);
return Promise.resolve(true);
})}>
{render}
</Resolver>
);
}

return Promise.all(queue).then((results) => {
const data = { ...initialData };
Expand Down