Skip to content
This repository was archived by the owner on Jun 26, 2020. It is now read-only.

Update constants and support React.lazy #1103

Merged
gaearon merged 3 commits into from
Aug 20, 2018
Merged

Update constants and support React.lazy #1103

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dcef11d
Update constants to match https://github.com/facebook/react/pull/13444
gaearon Aug 20, 2018
da79b0c
Update constants and support Lazy
gaearon Aug 20, 2018
c4242f6
Fix lint
gaearon Aug 20, 2018
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
48 changes: 30 additions & 18 deletions backend/attachRendererFiber.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ function getInternalReactConstants(version) {
// **********************************************************
if (semver.gte(version, '16.4.3')) {
ReactTypeOfWork = {
IndeterminateComponent: 0,
FunctionalComponent: 1,
FunctionalComponentLazy: 2,
ClassComponent: 3,
ClassComponentLazy: 4,
FunctionalComponent: 0,
FunctionalComponentLazy: 1,
ClassComponent: 2,
ClassComponentLazy: 3,
IndeterminateComponent: 4,
HostRoot: 5,
HostPortal: 6,
HostComponent: 7,
Expand All @@ -50,7 +50,9 @@ function getInternalReactConstants(version) {
ReactTypeOfWork = {
IndeterminateComponent: 0,
FunctionalComponent: 1,
FunctionalComponentLazy: -1, // Doesn't exist yet
ClassComponent: 2,
ClassComponentLazy: -1, // Doesn't exist yet
HostRoot: 3,
HostPortal: 4,
HostComponent: 5,
Expand All @@ -63,6 +65,7 @@ function getInternalReactConstants(version) {
ContextConsumer: 12,
ContextProvider: 13,
ForwardRef: 14,
ForwardRefLazy: -1, // Doesn't exist yet
Profiler: 15,
Placeholder: 16,
};
Expand Down Expand Up @@ -101,13 +104,17 @@ function attachRendererFiber(hook: Hook, rid: string, renderer: ReactRenderer):
var {PerformedWork} = ReactTypeOfSideEffect;
var {
FunctionalComponent,
FunctionalComponentLazy,
ClassComponent,
ClassComponentLazy,
ContextConsumer,
HostRoot,
HostPortal,
HostComponent,
HostText,
Fragment,
ForwardRef,
ForwardRefLazy,
} = ReactTypeOfWork;
var {
ASYNC_MODE_NUMBER,
Expand All @@ -116,8 +123,6 @@ function attachRendererFiber(hook: Hook, rid: string, renderer: ReactRenderer):
CONTEXT_CONSUMER_SYMBOL_STRING,
CONTEXT_PROVIDER_NUMBER,
CONTEXT_PROVIDER_SYMBOL_STRING,
FORWARD_REF_NUMBER,
FORWARD_REF_SYMBOL_STRING,
PROFILER_NUMBER,
PROFILER_SYMBOL_STRING,
STRICT_MODE_NUMBER,
Expand Down Expand Up @@ -148,11 +153,20 @@ function attachRendererFiber(hook: Hook, rid: string, renderer: ReactRenderer):
var actualStartTime = null;
var treeBaseDuration = null;

var resolvedType = type;
if (typeof type === 'object' && type !== null) {
if (typeof type.then === 'function') {
resolvedType = type._reactResult;
}
}

switch (fiber.tag) {
case FunctionalComponent:
case FunctionalComponentLazy:
case ClassComponent:
case ClassComponentLazy:
nodeType = 'Composite';
name = getDisplayName(fiber.type);
name = getDisplayName(resolvedType);
Copy link
Contributor Author

@gaearon gaearon Aug 20, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These shouldn't appear in the tree before type is resolved. So I'm assuming it is here.

publicInstance = fiber.stateNode;
props = fiber.memoizedProps;
state = fiber.memoizedState;
Expand All @@ -174,6 +188,13 @@ function attachRendererFiber(hook: Hook, rid: string, renderer: ReactRenderer):
}
children = [];
break;
case ForwardRef:
case ForwardRefLazy:
Copy link
Contributor Author

@gaearon gaearon Aug 20, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was more convenient to use tag than $$typeof here.

const functionName = getDisplayName(resolvedType.render, '');
nodeType = 'Special';
name = functionName !== '' ? `ForwardRef(${functionName})` : 'ForwardRef';
children = [];
break;
case HostRoot:
nodeType = 'Wrapper';
children = [];
Expand Down Expand Up @@ -221,7 +242,7 @@ function attachRendererFiber(hook: Hook, rid: string, renderer: ReactRenderer):
nodeType = 'Wrapper';
children = [];
break;
default: // Coroutines and yields
default:
const symbolOrNumber = typeof type === 'object' && type !== null
? type.$$typeof
: type;
Expand Down Expand Up @@ -259,13 +280,6 @@ function attachRendererFiber(hook: Hook, rid: string, renderer: ReactRenderer):
name = 'StrictMode';
children = [];
break;
case FORWARD_REF_NUMBER:
case FORWARD_REF_SYMBOL_STRING:
const functionName = getDisplayName(fiber.type.render, '');
nodeType = 'Special';
name = functionName !== '' ? `ForwardRef(${functionName})` : 'ForwardRef';
children = [];
break;
case PLACEHOLDER_NUMBER:
case PLACEHOLDER_SYMBOL_STRING:
nodeType = 'Special';
Expand Down Expand Up @@ -357,8 +371,6 @@ function attachRendererFiber(hook: Hook, rid: string, renderer: ReactRenderer):
}
}



// This is a slightly annoying indirection.
// It is currently necessary because DevTools wants
// to use unique objects as keys for instances.
Expand Down