Skip to content

Commit 4ac4082

Browse files
committed
Start updating to _next_ release of react-reconciler for devtools hook
1 parent 01b7a23 commit 4ac4082

File tree

4 files changed

+388
-37
lines changed

4 files changed

+388
-37
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"dependencies": {
4444
"invariant": "^2.2.0",
4545
"lodash": "^3.x.x",
46-
"react-devtools": "^2.0.12",
46+
"react-devtools": "^2.5.2",
4747
"react-motion": "^0.5.2",
4848
"react-reconciler": "^0.2.0",
4949
"ws": "^1.1.0",

src/fiber/devtools.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,15 @@ defineProperty(global, 'WebSocket', {
77
defineProperty(global, 'window', {
88
value: global
99
});
10-
1110
const {connectToDevTools} = require('react-devtools-core');
1211

1312
connectToDevTools({
1413
isAppActive() {
1514
// Don't steal the DevTools from currently active app.
15+
console.log('isAppActive', true);
1616
return true;
1717
},
1818
host: 'localhost',
19-
// default port? port: ,
19+
port: 8097,
2020
resolveRNStyle: null, // TODO maybe: require('flattenStyle')
2121
});
22-

src/fiber/fiber.js

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ const ReactFiberReconciler : (
99
hostConfig: HostConfig<*, *, *, *, *, *, *, *>
1010
) => Reconciler<*, *, *> = require('react-reconciler');
1111

12+
const injectIntoDevToolsConfig = require('./devtools');
1213
const eventListener = require('./events');
1314
const update = require('../shared/update').default;
1415
const solveClass = require('../shared/solveClass').default;
@@ -211,6 +212,9 @@ const BlessedReconciler = ReactFiberReconciler({
211212
useSyncScheduling: true,
212213
});
213214

215+
console.log('BlessedReconciler', injectIntoDevToolsConfig);
216+
BlessedReconciler.injectIntoDevTools(injectIntoDevToolsConfig);
217+
214218
module.exports = {
215219
render(element, screen, callback) {
216220
let root = roots.get(screen);
@@ -229,13 +233,3 @@ module.exports = {
229233
};
230234

231235
const roots = new Map();
232-
233-
/*
234-
if (typeof injectInternals === 'function') {
235-
injectInternals({
236-
findFiberByHostInstance: () => null,// BlessedReconciler.getClosestInstanceFromNode,
237-
findHostInstanceByFiber: BlessedReconciler.findHostInstance,
238-
});
239-
}
240-
241-
*/

0 commit comments

Comments
 (0)