Skip to content

Commit 19f6fe1

Browse files
elicwhiteelicwhite
authored
Revert "Revert "Dispatch commands to both UIManagers from both renderers (#17211)" (#17232)" (#17799)
* Revert "Revert "Dispatch commands to both UIManagers from both renderers (#17211)" (#17232)" This reverts commit d0fc0ba. * Clean up another __DEV__ warning check
1 parent 6250462 commit 19f6fe1

File tree

3 files changed

+116
-27
lines changed

3 files changed

+116
-27
lines changed

‎packages/react-native-renderer/src/ReactFabric.js

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ import {createPortal} from 'shared/ReactPortal';
2929
import {setBatchingImplementation} from 'legacy-events/ReactGenericBatching';
3030
import ReactVersion from 'shared/ReactVersion';
3131

32+
// Module provided by RN:
33+
import {UIManager} from 'react-native/Libraries/ReactPrivate/ReactNativePrivateInterface';
34+
3235
import NativeMethodsMixin from './NativeMethodsMixin';
3336
import ReactNativeComponent from './ReactNativeComponent';
3437
import {getClosestInstanceFromNode} from './ReactFabricComponentTree';
@@ -38,8 +41,6 @@ import {LegacyRoot} from 'shared/ReactRootTags';
3841
import ReactSharedInternals from 'shared/ReactSharedInternals';
3942
import getComponentName from 'shared/getComponentName';
4043

41-
const {dispatchCommand: fabricDispatchCommand} = nativeFabricUIManager;
42-
4344
const ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;
4445

4546
function findHostInstance_DEPRECATED(
@@ -162,26 +163,26 @@ const ReactFabric: ReactFabricType = {
162163
findNodeHandle,
163164

164165
dispatchCommand(handle: any, command: string, args: Array<any>) {
165-
const invalid =
166-
handle._nativeTag == null || handle._internalInstanceHandle == null;
167-
168-
if (invalid) {
166+
if (handle._nativeTag == null) {
169167
if (__DEV__) {
170-
if (invalid) {
171-
console.error(
172-
"dispatchCommand was called with a ref that isn't a " +
173-
'native component. Use React.forwardRef to get access to the underlying native component',
174-
);
175-
}
168+
console.error(
169+
"dispatchCommand was called with a ref that isn't a " +
170+
'native component. Use React.forwardRef to get access to the underlying native component',
171+
);
176172
}
173+
177174
return;
178175
}
179176

180-
fabricDispatchCommand(
181-
handle._internalInstanceHandle.stateNode.node,
182-
command,
183-
args,
184-
);
177+
if (handle._internalInstanceHandle) {
178+
nativeFabricUIManager.dispatchCommand(
179+
handle._internalInstanceHandle.stateNode.node,
180+
command,
181+
args,
182+
);
183+
} else {
184+
UIManager.dispatchViewManagerCommand(handle._nativeTag, command, args);
185+
}
185186
},
186187

187188
render(element: React$Element<any>, containerTag: any, callback: ?Function) {

‎packages/react-native-renderer/src/ReactNativeRenderer.js

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -174,17 +174,23 @@ const ReactNativeRenderer: ReactNativeType = {
174174
dispatchCommand(handle: any, command: string, args: Array<any>) {
175175
if (handle._nativeTag == null) {
176176
if (__DEV__) {
177-
if (handle._nativeTag == null) {
178-
console.error(
179-
"dispatchCommand was called with a ref that isn't a " +
180-
'native component. Use React.forwardRef to get access to the underlying native component',
181-
);
182-
}
177+
console.error(
178+
"dispatchCommand was called with a ref that isn't a " +
179+
'native component. Use React.forwardRef to get access to the underlying native component',
180+
);
183181
}
184182
return;
185183
}
186184

187-
UIManager.dispatchViewManagerCommand(handle._nativeTag, command, args);
185+
if (handle._internalInstanceHandle) {
186+
nativeFabricUIManager.dispatchCommand(
187+
handle._internalInstanceHandle.stateNode.node,
188+
command,
189+
args,
190+
);
191+
} else {
192+
UIManager.dispatchViewManagerCommand(handle._nativeTag, command, args);
193+
}
188194
},
189195

190196
render(element: React$Element<any>, containerTag: any, callback: ?Function) {

‎packages/react-native-renderer/src/__tests__/ReactFabricAndNative-test.internal.js

Lines changed: 85 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ let ReactNative;
1616
let UIManager;
1717
let createReactNativeComponentClass;
1818

19-
describe('ReactFabric', () => {
19+
describe('created with ReactFabric called with ReactNative', () => {
2020
beforeEach(() => {
2121
jest.resetModules();
2222
require('react-native/Libraries/ReactPrivate/InitializeNativeFabricUIManager');
@@ -75,7 +75,7 @@ describe('ReactFabric', () => {
7575
});
7676

7777
it('dispatches commands on Fabric nodes with the RN renderer', () => {
78-
UIManager.dispatchViewManagerCommand.mockReset();
78+
nativeFabricUIManager.dispatchCommand.mockClear();
7979
const View = createReactNativeComponentClass('RCTView', () => ({
8080
validAttributes: {title: true},
8181
uiViewClassName: 'RCTView',
@@ -84,13 +84,95 @@ describe('ReactFabric', () => {
8484
let ref = React.createRef();
8585

8686
ReactFabric.render(<View title="bar" ref={ref} />, 11);
87-
expect(UIManager.dispatchViewManagerCommand).not.toBeCalled();
87+
expect(nativeFabricUIManager.dispatchCommand).not.toBeCalled();
8888
ReactNative.dispatchCommand(ref.current, 'myCommand', [10, 20]);
89+
expect(nativeFabricUIManager.dispatchCommand).toHaveBeenCalledTimes(1);
90+
expect(nativeFabricUIManager.dispatchCommand).toHaveBeenCalledWith(
91+
expect.any(Object),
92+
'myCommand',
93+
[10, 20],
94+
);
95+
expect(UIManager.dispatchViewManagerCommand).not.toBeCalled();
96+
});
97+
});
98+
99+
describe('created with ReactNative called with ReactFabric', () => {
100+
beforeEach(() => {
101+
jest.resetModules();
102+
require('react-native/Libraries/ReactPrivate/InitializeNativeFabricUIManager');
103+
ReactFabric = require('react-native-renderer/fabric');
104+
jest.resetModules();
105+
UIManager = require('react-native/Libraries/ReactPrivate/ReactNativePrivateInterface')
106+
.UIManager;
107+
jest.mock('shared/ReactFeatureFlags', () =>
108+
require('shared/forks/ReactFeatureFlags.native-oss'),
109+
);
110+
ReactNative = require('react-native-renderer');
111+
112+
React = require('react');
113+
createReactNativeComponentClass = require('react-native/Libraries/ReactPrivate/ReactNativePrivateInterface')
114+
.ReactNativeViewConfigRegistry.register;
115+
});
116+
117+
it('find Paper instances with the Fabric renderer', () => {
118+
const View = createReactNativeComponentClass('RCTView', () => ({
119+
validAttributes: {title: true},
120+
uiViewClassName: 'RCTView',
121+
}));
122+
123+
let ref = React.createRef();
124+
125+
class Component extends React.Component {
126+
render() {
127+
return <View title="foo" />;
128+
}
129+
}
130+
131+
ReactNative.render(<Component ref={ref} />, 11);
132+
133+
let instance = ReactFabric.findHostInstance_DEPRECATED(ref.current);
134+
expect(instance._nativeTag).toBe(3);
135+
});
136+
137+
it('find Paper nodes with the Fabric renderer', () => {
138+
const View = createReactNativeComponentClass('RCTView', () => ({
139+
validAttributes: {title: true},
140+
uiViewClassName: 'RCTView',
141+
}));
142+
143+
let ref = React.createRef();
144+
145+
class Component extends React.Component {
146+
render() {
147+
return <View title="foo" />;
148+
}
149+
}
150+
151+
ReactNative.render(<Component ref={ref} />, 11);
152+
153+
let handle = ReactFabric.findNodeHandle(ref.current);
154+
expect(handle).toBe(3);
155+
});
156+
157+
it('dispatches commands on Paper nodes with the Fabric renderer', () => {
158+
UIManager.dispatchViewManagerCommand.mockReset();
159+
const View = createReactNativeComponentClass('RCTView', () => ({
160+
validAttributes: {title: true},
161+
uiViewClassName: 'RCTView',
162+
}));
163+
164+
let ref = React.createRef();
165+
166+
ReactNative.render(<View title="bar" ref={ref} />, 11);
167+
expect(UIManager.dispatchViewManagerCommand).not.toBeCalled();
168+
ReactFabric.dispatchCommand(ref.current, 'myCommand', [10, 20]);
89169
expect(UIManager.dispatchViewManagerCommand).toHaveBeenCalledTimes(1);
90170
expect(UIManager.dispatchViewManagerCommand).toHaveBeenCalledWith(
91171
expect.any(Number),
92172
'myCommand',
93173
[10, 20],
94174
);
175+
176+
expect(nativeFabricUIManager.dispatchCommand).not.toBeCalled();
95177
});
96178
});

0 commit comments

Comments
 (0)