Skip to content

Commit db89895

Browse files
committed
Make injecting findFiberByHostInstance optional so future versions can drop it
1 parent 6072e52 commit db89895

File tree

3 files changed

+9
-13
lines changed

3 files changed

+9
-13
lines changed

packages/react-devtools-shared/src/backend/console.js

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -135,17 +135,7 @@ export function registerRenderer(
135135
renderer: ReactRenderer,
136136
onErrorOrWarning?: OnErrorOrWarning,
137137
): void {
138-
const {
139-
currentDispatcherRef,
140-
getCurrentFiber,
141-
findFiberByHostInstance,
142-
version,
143-
} = renderer;
144-
145-
// Ignore React v15 and older because they don't expose a component stack anyway.
146-
if (typeof findFiberByHostInstance !== 'function') {
147-
return;
148-
}
138+
const {currentDispatcherRef, getCurrentFiber, version} = renderer;
149139

150140
// currentDispatcherRef gets injected for v16.8+ to support hooks inspection.
151141
// getCurrentFiber gets injected for v16.9+.

packages/react-devtools-shared/src/backend/index.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,12 @@ export function initBackend(
7373

7474
// Inject any not-yet-injected renderers (if we didn't reload-and-profile)
7575
if (rendererInterface == null) {
76-
if (typeof renderer.findFiberByHostInstance === 'function') {
76+
if (
77+
// v16-19
78+
typeof renderer.findFiberByHostInstance === 'function' ||
79+
// v16.8+
80+
renderer.currentDispatcherRef != null
81+
) {
7782
// react-reconciler v16+
7883
rendererInterface = attach(hook, id, renderer, global);
7984
} else if (renderer.ComponentTree) {

packages/react-devtools-shared/src/backend/types.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,11 @@ export type Lane = number;
105105
export type Lanes = number;
106106

107107
export type ReactRenderer = {
108-
findFiberByHostInstance: (hostInstance: HostInstance) => Fiber | null,
109108
version: string,
110109
rendererPackageName: string,
111110
bundleType: BundleType,
111+
// 16.0+ - To be removed in future versions.
112+
findFiberByHostInstance?: (hostInstance: HostInstance) => Fiber | null,
112113
// 16.9+
113114
overrideHookState?: ?(
114115
fiber: Object,

0 commit comments

Comments
 (0)