diff --git a/packages/react-native-renderer/src/ReactFabric.js b/packages/react-native-renderer/src/ReactFabric.js index 12770d5122d2b..72f6df865dbbc 100644 --- a/packages/react-native-renderer/src/ReactFabric.js +++ b/packages/react-native-renderer/src/ReactFabric.js @@ -44,7 +44,7 @@ import warningWithoutStack from 'shared/warningWithoutStack'; const ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner; -function findHostInstance_deprecated( +function findHostInstance_DEPRECATED( componentOrHandle: any, ): ?HostComponent { if (__DEV__) { @@ -76,7 +76,7 @@ function findHostInstance_deprecated( if (__DEV__) { hostInstance = findHostInstanceWithWarning( componentOrHandle, - 'findHostInstance_deprecated', + 'findHostInstance_DEPRECATED', ); } else { hostInstance = findHostInstance(componentOrHandle); @@ -158,7 +158,7 @@ const ReactFabric: ReactFabricType = { // This is needed for implementation details of TouchableNativeFeedback // Remove this once TouchableNativeFeedback doesn't use cloneElement - findHostInstance_deprecated, + findHostInstance_DEPRECATED, findNodeHandle, dispatchCommand(handle: any, command: string, args: Array) { diff --git a/packages/react-native-renderer/src/ReactNativeRenderer.js b/packages/react-native-renderer/src/ReactNativeRenderer.js index d0aad7b2a2253..8cb1ae810f5de 100644 --- a/packages/react-native-renderer/src/ReactNativeRenderer.js +++ b/packages/react-native-renderer/src/ReactNativeRenderer.js @@ -47,7 +47,7 @@ import warningWithoutStack from 'shared/warningWithoutStack'; const ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner; -function findHostInstance_deprecated( +function findHostInstance_DEPRECATED( componentOrHandle: any, ): ?HostComponent { if (__DEV__) { @@ -79,7 +79,7 @@ function findHostInstance_deprecated( if (__DEV__) { hostInstance = findHostInstanceWithWarning( componentOrHandle, - 'findHostInstance_deprecated', + 'findHostInstance_DEPRECATED', ); } else { hostInstance = findHostInstance(componentOrHandle); @@ -167,7 +167,7 @@ const ReactNativeRenderer: ReactNativeType = { // This is needed for implementation details of TouchableNativeFeedback // Remove this once TouchableNativeFeedback doesn't use cloneElement - findHostInstance_deprecated, + findHostInstance_DEPRECATED, findNodeHandle, dispatchCommand(handle: any, command: string, args: Array) { diff --git a/packages/react-native-renderer/src/ReactNativeTypes.js b/packages/react-native-renderer/src/ReactNativeTypes.js index 0ef08d294d8e5..db590dd41c456 100644 --- a/packages/react-native-renderer/src/ReactNativeTypes.js +++ b/packages/react-native-renderer/src/ReactNativeTypes.js @@ -141,6 +141,7 @@ type SecretInternalsFabricType = { */ export type ReactNativeType = { NativeComponent: typeof ReactNativeComponent, + findHostInstance_DEPRECATED(componentOrHandle: any): ?HostComponent, findNodeHandle(componentOrHandle: any): ?number, dispatchCommand(handle: any, command: string, args: Array): void, render( @@ -157,6 +158,7 @@ export type ReactNativeType = { export type ReactFabricType = { NativeComponent: typeof ReactNativeComponent, + findHostInstance_DEPRECATED(componentOrHandle: any): ?HostComponent, findNodeHandle(componentOrHandle: any): ?number, dispatchCommand(handle: any, command: string, args: Array): void, render( diff --git a/packages/react-native-renderer/src/__tests__/ReactFabric-test.internal.js b/packages/react-native-renderer/src/__tests__/ReactFabric-test.internal.js index df67d953f749c..5a502edd67ab7 100644 --- a/packages/react-native-renderer/src/__tests__/ReactFabric-test.internal.js +++ b/packages/react-native-renderer/src/__tests__/ReactFabric-test.internal.js @@ -779,7 +779,7 @@ describe('ReactFabric', () => { expect(touchStart2).toBeCalled(); }); - it('findHostInstance_deprecated should warn if used to find a host component inside StrictMode', () => { + it('findHostInstance_DEPRECATED should warn if used to find a host component inside StrictMode', () => { const View = createReactNativeComponentClass('RCTView', () => ({ validAttributes: {foo: true}, uiViewClassName: 'RCTView', @@ -802,10 +802,10 @@ describe('ReactFabric', () => { let match; expect( - () => (match = ReactFabric.findHostInstance_deprecated(parent)), + () => (match = ReactFabric.findHostInstance_DEPRECATED(parent)), ).toWarnDev([ - 'Warning: findHostInstance_deprecated is deprecated in StrictMode. ' + - 'findHostInstance_deprecated was passed an instance of ContainsStrictModeChild which renders StrictMode children. ' + + 'Warning: findHostInstance_DEPRECATED is deprecated in StrictMode. ' + + 'findHostInstance_DEPRECATED was passed an instance of ContainsStrictModeChild which renders StrictMode children. ' + 'Instead, add a ref directly to the element you want to reference. ' + 'Learn more about using refs safely here: ' + 'https://fb.me/react-strict-mode-find-node' + @@ -816,7 +816,7 @@ describe('ReactFabric', () => { expect(match).toBe(child); }); - it('findHostInstance_deprecated should warn if passed a component that is inside StrictMode', () => { + it('findHostInstance_DEPRECATED should warn if passed a component that is inside StrictMode', () => { const View = createReactNativeComponentClass('RCTView', () => ({ validAttributes: {foo: true}, uiViewClassName: 'RCTView', @@ -840,10 +840,10 @@ describe('ReactFabric', () => { let match; expect( - () => (match = ReactFabric.findHostInstance_deprecated(parent)), + () => (match = ReactFabric.findHostInstance_DEPRECATED(parent)), ).toWarnDev([ - 'Warning: findHostInstance_deprecated is deprecated in StrictMode. ' + - 'findHostInstance_deprecated was passed an instance of IsInStrictMode which is inside StrictMode. ' + + 'Warning: findHostInstance_DEPRECATED is deprecated in StrictMode. ' + + 'findHostInstance_DEPRECATED was passed an instance of IsInStrictMode which is inside StrictMode. ' + 'Instead, add a ref directly to the element you want to reference. ' + 'Learn more about using refs safely here: ' + 'https://fb.me/react-strict-mode-find-node' + diff --git a/packages/react-native-renderer/src/__tests__/ReactFabricAndNative-test.internal.js b/packages/react-native-renderer/src/__tests__/ReactFabricAndNative-test.internal.js index 71a6080b377a4..5efeebfd9211d 100644 --- a/packages/react-native-renderer/src/__tests__/ReactFabricAndNative-test.internal.js +++ b/packages/react-native-renderer/src/__tests__/ReactFabricAndNative-test.internal.js @@ -50,7 +50,7 @@ describe('created with ReactFabric called with ReactNative', () => { ReactFabric.render(, 11); - let instance = ReactNative.findHostInstance_deprecated(ref.current); + let instance = ReactNative.findHostInstance_DEPRECATED(ref.current); expect(instance._nativeTag).toBe(2); }); @@ -130,7 +130,7 @@ describe('created with ReactNative called with ReactFabric', () => { ReactNative.render(, 11); - let instance = ReactFabric.findHostInstance_deprecated(ref.current); + let instance = ReactFabric.findHostInstance_DEPRECATED(ref.current); expect(instance._nativeTag).toBe(3); }); diff --git a/packages/react-native-renderer/src/__tests__/ReactNativeMount-test.internal.js b/packages/react-native-renderer/src/__tests__/ReactNativeMount-test.internal.js index ea41cf23af8b9..3a629b4e2eb14 100644 --- a/packages/react-native-renderer/src/__tests__/ReactNativeMount-test.internal.js +++ b/packages/react-native-renderer/src/__tests__/ReactNativeMount-test.internal.js @@ -541,7 +541,7 @@ describe('ReactNative', () => { ); }); - it('findHostInstance_deprecated should warn if used to find a host component inside StrictMode', () => { + it('findHostInstance_DEPRECATED should warn if used to find a host component inside StrictMode', () => { const View = createReactNativeComponentClass('RCTView', () => ({ validAttributes: {foo: true}, uiViewClassName: 'RCTView', @@ -564,10 +564,10 @@ describe('ReactNative', () => { let match; expect( - () => (match = ReactNative.findHostInstance_deprecated(parent)), + () => (match = ReactNative.findHostInstance_DEPRECATED(parent)), ).toWarnDev([ - 'Warning: findHostInstance_deprecated is deprecated in StrictMode. ' + - 'findHostInstance_deprecated was passed an instance of ContainsStrictModeChild which renders StrictMode children. ' + + 'Warning: findHostInstance_DEPRECATED is deprecated in StrictMode. ' + + 'findHostInstance_DEPRECATED was passed an instance of ContainsStrictModeChild which renders StrictMode children. ' + 'Instead, add a ref directly to the element you want to reference. ' + 'Learn more about using refs safely here: ' + 'https://fb.me/react-strict-mode-find-node' + @@ -578,7 +578,7 @@ describe('ReactNative', () => { expect(match).toBe(child); }); - it('findHostInstance_deprecated should warn if passed a component that is inside StrictMode', () => { + it('findHostInstance_DEPRECATED should warn if passed a component that is inside StrictMode', () => { const View = createReactNativeComponentClass('RCTView', () => ({ validAttributes: {foo: true}, uiViewClassName: 'RCTView', @@ -602,10 +602,10 @@ describe('ReactNative', () => { let match; expect( - () => (match = ReactNative.findHostInstance_deprecated(parent)), + () => (match = ReactNative.findHostInstance_DEPRECATED(parent)), ).toWarnDev([ - 'Warning: findHostInstance_deprecated is deprecated in StrictMode. ' + - 'findHostInstance_deprecated was passed an instance of IsInStrictMode which is inside StrictMode. ' + + 'Warning: findHostInstance_DEPRECATED is deprecated in StrictMode. ' + + 'findHostInstance_DEPRECATED was passed an instance of IsInStrictMode which is inside StrictMode. ' + 'Instead, add a ref directly to the element you want to reference. ' + 'Learn more about using refs safely here: ' + 'https://fb.me/react-strict-mode-find-node' +