{"body":"* [Native] Delete NativeComponent and NativeMethodsMixin\r\n\r\n* Remove more files","patch":"diff --git a\/packages\/react-native-renderer\/src\/NativeMethodsMixin.js b\/packages\/react-native-renderer\/src\/NativeMethodsMixin.js\ndeleted file mode 100644\nindex 4c15f49258..0000000000\n--- a\/packages\/react-native-renderer\/src\/NativeMethodsMixin.js\n+++ \/dev\/null\n@@ -1,330 +0,0 @@\n-\/**\n- * Copyright (c) Facebook, Inc. and its affiliates.\n- *\n- * This source code is licensed under the MIT license found in the\n- * LICENSE file in the root directory of this source tree.\n- *\n- * @flow\n- *\/\n-\n-import type {\n- MeasureInWindowOnSuccessCallback,\n- MeasureLayoutOnSuccessCallback,\n- MeasureOnSuccessCallback,\n- NativeMethodsMixinType,\n- ReactNativeBaseComponentViewConfig,\n-} from '.\/ReactNativeTypes';\n-\n-import invariant from 'shared\/invariant';\n-\/\/ Modules provided by RN:\n-import {\n- TextInputState,\n- UIManager,\n-} from 'react-native\/Libraries\/ReactPrivate\/ReactNativePrivateInterface';\n-\n-import {create} from '.\/ReactNativeAttributePayload';\n-import {\n- mountSafeCallback_NOT_REALLY_SAFE,\n- throwOnStylesProp,\n- warnForStyleProps,\n-} from '.\/NativeMethodsMixinUtils';\n-\n-export default function(\n- findNodeHandle: any => ?number,\n- findHostInstance: any => any,\n-) {\n- \/**\n- * `NativeMethodsMixin` provides methods to access the underlying native\n- * component directly. This can be useful in cases when you want to focus\n- * a view or measure its on-screen dimensions, for example.\n- *\n- * The methods described here are available on most of the default components\n- * provided by React Native. Note, however, that they are *not* available on\n- * composite components that aren't directly backed by a native view. This will\n- * generally include most components that you define in your own app. For more\n- * information, see [Direct\n- * Manipulation](docs\/direct-manipulation.html).\n- *\n- * Note the Flow $Exact<> syntax is required to support mixins.\n- * React createClass mixins can only be used with exact types.\n- *\/\n- const NativeMethodsMixin: $Exact = {\n- \/**\n- * Determines the location on screen, width, and height of the given view and\n- * returns the values via an async callback. If successful, the callback will\n- * be called with the following arguments:\n- *\n- * - x\n- * - y\n- * - width\n- * - height\n- * - pageX\n- * - pageY\n- *\n- * Note that these measurements are not available until after the rendering\n- * has been completed in native. If you need the measurements as soon as\n- * possible, consider using the [`onLayout`\n- * prop](docs\/view.html#onlayout) instead.\n- *\/\n- measure: function(callback: MeasureOnSuccessCallback) {\n- let maybeInstance;\n-\n- \/\/ Fiber errors if findNodeHandle is called for an umounted component.\n- \/\/ Tests using ReactTestRenderer will trigger this case indirectly.\n- \/\/ Mimicking stack behavior, we should silently ignore this case.\n- \/\/ TODO Fix ReactTestRenderer so we can remove this try\/catch.\n- try {\n- maybeInstance = findHostInstance(this);\n- } catch (error) {}\n-\n- \/\/ If there is no host component beneath this we should fail silently.\n- \/\/ This is not an error; it could mean a class component rendered null.\n- if (maybeInstance == null) {\n- return;\n- }\n-\n- if (maybeInstance.canonical) {\n- \/\/ We can't call FabricUIManager here because it won't be loaded in paper\n- \/\/ at initialization time. See https:\/\/github.com\/facebook\/react\/pull\/15490\n- \/\/ for more info.\n- nativeFabricUIManager.measure(\n- maybeInstance.node,\n- mountSafeCallback_NOT_REALLY_SAFE(this, callback),\n- );\n- } else {\n- UIManager.measure(\n- findNodeHandle(this),\n- mountSafeCallback_NOT_REALLY_SAFE(this, callback),\n- );\n- }\n- },\n-\n- \/**\n- * Determines the location of the given view in the window and returns the\n- * values via an async callback. If the React root view is embedded in\n- * another native view, this will give you the absolute coordinates. If\n- * successful, the callback will be called with the following\n- * arguments:\n- *\n- * - x\n- * - y\n- * - width\n- * - height\n- *\n- * Note that these measurements are not available until after the rendering\n- * has been completed in native.\n- *\/\n- measureInWindow: function(callback: MeasureInWindowOnSuccessCallback) {\n- let maybeInstance;\n-\n- \/\/ Fiber errors if findNodeHandle is called for an umounted component.\n- \/\/ Tests using ReactTestRenderer will trigger this case indirectly.\n- \/\/ Mimicking stack behavior, we should silently ignore this case.\n- \/\/ TODO Fix ReactTestRenderer so we can remove this try\/catch.\n- try {\n- maybeInstance = findHostInstance(this);\n- } catch (error) {}\n-\n- \/\/ If there is no host component beneath this we should fail silently.\n- \/\/ This is not an error; it could mean a class component rendered null.\n- if (maybeInstance == null) {\n- return;\n- }\n-\n- if (maybeInstance.canonical) {\n- \/\/ We can't call FabricUIManager here because it won't be loaded in paper\n- \/\/ at initialization time. See https:\/\/github.com\/facebook\/react\/pull\/15490\n- \/\/ for more info.\n- nativeFabricUIManager.measureInWindow(\n- maybeInstance.node,\n- mountSafeCallback_NOT_REALLY_SAFE(this, callback),\n- );\n- } else {\n- UIManager.measureInWindow(\n- findNodeHandle(this),\n- mountSafeCallback_NOT_REALLY_SAFE(this, callback),\n- );\n- }\n- },\n-\n- \/**\n- * Like [`measure()`](#measure), but measures the view relative an ancestor,\n- * specified as `relativeToNativeNode`. This means that the returned x, y\n- * are relative to the origin x, y of the ancestor view.\n- *\n- * As always, to obtain a native node handle for a component, you can use\n- * `findNodeHandle(component)`.\n- *\/\n- measureLayout: function(\n- relativeToNativeNode: number | Object,\n- onSuccess: MeasureLayoutOnSuccessCallback,\n- onFail?: () => void \/* currently unused *\/,\n- ) {\n- let maybeInstance;\n-\n- \/\/ Fiber errors if findNodeHandle is called for an umounted component.\n- \/\/ Tests using ReactTestRenderer will trigger this case indirectly.\n- \/\/ Mimicking stack behavior, we should silently ignore this case.\n- \/\/ TODO Fix ReactTestRenderer so we can remove this try\/catch.\n- try {\n- maybeInstance = findHostInstance(this);\n- } catch (error) {}\n-\n- \/\/ If there is no host component beneath this we should fail silently.\n- \/\/ This is not an error; it could mean a class component rendered null.\n- if (maybeInstance == null) {\n- return;\n- }\n-\n- if (maybeInstance.canonical) {\n- if (__DEV__) {\n- console.error(\n- 'Warning: measureLayout on components using NativeMethodsMixin ' +\n- 'or ReactNative.NativeComponent is not currently supported in Fabric. ' +\n- 'measureLayout must be called on a native ref. Consider using forwardRef.',\n- );\n- }\n- return;\n- } else {\n- let relativeNode;\n-\n- if (typeof relativeToNativeNode === 'number') {\n- \/\/ Already a node handle\n- relativeNode = relativeToNativeNode;\n- } else if (relativeToNativeNode._nativeTag) {\n- relativeNode = relativeToNativeNode._nativeTag;\n- }\n-\n- if (relativeNode == null) {\n- if (__DEV__) {\n- console.error(\n- 'Warning: ref.measureLayout must be called with a node handle or a ref to a native component.',\n- );\n- }\n-\n- return;\n- }\n-\n- UIManager.measureLayout(\n- findNodeHandle(this),\n- relativeNode,\n- mountSafeCallback_NOT_REALLY_SAFE(this, onFail),\n- mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess),\n- );\n- }\n- },\n-\n- \/**\n- * This function sends props straight to native. They will not participate in\n- * future diff process - this means that if you do not include them in the\n- * next render, they will remain active (see [Direct\n- * Manipulation](docs\/direct-manipulation.html)).\n- *\/\n- setNativeProps: function(nativeProps: Object) {\n- \/\/ Class components don't have viewConfig -> validateAttributes.\n- \/\/ Nor does it make sense to set native props on a non-native component.\n- \/\/ Instead, find the nearest host component and set props on it.\n- \/\/ Use findNodeHandle() rather than findNodeHandle() because\n- \/\/ We want the instance\/wrapper (not the native tag).\n- let maybeInstance;\n-\n- \/\/ Fiber errors if findNodeHandle is called for an umounted component.\n- \/\/ Tests using ReactTestRenderer will trigger this case indirectly.\n- \/\/ Mimicking stack behavior, we should silently ignore this case.\n- \/\/ TODO Fix ReactTestRenderer so we can remove this try\/catch.\n- try {\n- maybeInstance = findHostInstance(this);\n- } catch (error) {}\n-\n- \/\/ If there is no host component beneath this we should fail silently.\n- \/\/ This is not an error; it could mean a class component rendered null.\n- if (maybeInstance == null) {\n- return;\n- }\n-\n- if (maybeInstance.canonical) {\n- if (__DEV__) {\n- console.error(\n- 'Warning: setNativeProps is not currently supported in Fabric',\n- );\n- }\n- return;\n- }\n-\n- const nativeTag =\n- maybeInstance._nativeTag || maybeInstance.canonical._nativeTag;\n- const viewConfig: ReactNativeBaseComponentViewConfig<> =\n- maybeInstance.viewConfig || maybeInstance.canonical.viewConfig;\n-\n- if (__DEV__) {\n- warnForStyleProps(nativeProps, viewConfig.validAttributes);\n- }\n-\n- const updatePayload = create(nativeProps, viewConfig.validAttributes);\n-\n- \/\/ Avoid the overhead of bridge calls if there's no update.\n- \/\/ This is an expensive no-op for Android, and causes an unnecessary\n- \/\/ view invalidation for certain components (eg RCTTextInput) on iOS.\n- if (updatePayload != null) {\n- UIManager.updateView(\n- nativeTag,\n- viewConfig.uiViewClassName,\n- updatePayload,\n- );\n- }\n- },\n-\n- \/**\n- * Requests focus for the given input or view. The exact behavior triggered\n- * will depend on the platform and type of view.\n- *\/\n- focus: function() {\n- TextInputState.focusTextInput(findNodeHandle(this));\n- },\n-\n- \/**\n- * Removes focus from an input or view. This is the opposite of `focus()`.\n- *\/\n- blur: function() {\n- TextInputState.blurTextInput(findNodeHandle(this));\n- },\n- };\n-\n- if (__DEV__) {\n- \/\/ hide this from Flow since we can't define these properties outside of\n- \/\/ __DEV__ without actually implementing them (setting them to undefined\n- \/\/ isn't allowed by ReactClass)\n- const NativeMethodsMixin_DEV = (NativeMethodsMixin: any);\n- invariant(\n- !NativeMethodsMixin_DEV.componentWillMount &&\n- !NativeMethodsMixin_DEV.componentWillReceiveProps &&\n- !NativeMethodsMixin_DEV.UNSAFE_componentWillMount &&\n- !NativeMethodsMixin_DEV.UNSAFE_componentWillReceiveProps,\n- 'Do not override existing functions.',\n- );\n- \/\/ TODO (bvaughn) Remove cWM and cWRP in a future version of React Native,\n- \/\/ Once these lifecycles have been remove from the reconciler.\n- NativeMethodsMixin_DEV.componentWillMount = function() {\n- throwOnStylesProp(this, this.props);\n- };\n- NativeMethodsMixin_DEV.componentWillReceiveProps = function(newProps) {\n- throwOnStylesProp(this, newProps);\n- };\n- NativeMethodsMixin_DEV.UNSAFE_componentWillMount = function() {\n- throwOnStylesProp(this, this.props);\n- };\n- NativeMethodsMixin_DEV.UNSAFE_componentWillReceiveProps = function(\n- newProps,\n- ) {\n- throwOnStylesProp(this, newProps);\n- };\n-\n- \/\/ React may warn about cWM\/cWRP\/cWU methods being deprecated.\n- \/\/ Add a flag to suppress these warnings for this special case.\n- \/\/ TODO (bvaughn) Remove this flag once the above methods have been removed.\n- NativeMethodsMixin_DEV.componentWillMount.__suppressDeprecationWarning = true;\n- NativeMethodsMixin_DEV.componentWillReceiveProps.__suppressDeprecationWarning = true;\n- }\n-\n- return NativeMethodsMixin;\n-}\ndiff --git a\/packages\/react-native-renderer\/src\/ReactFabric.js b\/packages\/react-native-renderer\/src\/ReactFabric.js\nindex d9b532e497..13ae10b1f6 100644\n--- a\/packages\/react-native-renderer\/src\/ReactFabric.js\n+++ b\/packages\/react-native-renderer\/src\/ReactFabric.js\n@@ -32,8 +32,6 @@ import ReactVersion from 'shared\/ReactVersion';\n \/\/ Module provided by RN:\n import {UIManager} from 'react-native\/Libraries\/ReactPrivate\/ReactNativePrivateInterface';\n \n-import NativeMethodsMixin from '.\/NativeMethodsMixin';\n-import ReactNativeComponent from '.\/ReactNativeComponent';\n import {getClosestInstanceFromNode} from '.\/ReactFabricComponentTree';\n import {getInspectorDataForViewTag} from '.\/ReactNativeFiberInspector';\n \n@@ -155,8 +153,6 @@ setBatchingImplementation(\n const roots = new Map();\n \n const ReactFabric: ReactFabricType = {\n- NativeComponent: ReactNativeComponent(findNodeHandle, findHostInstance),\n-\n \/\/ This is needed for implementation details of TouchableNativeFeedback\n \/\/ Remove this once TouchableNativeFeedback doesn't use cloneElement\n findHostInstance_DEPRECATED,\n@@ -223,10 +219,7 @@ const ReactFabric: ReactFabricType = {\n return createPortal(children, containerTag, null, key);\n },\n \n- __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {\n- \/\/ Used as a mixin in many createClass-based components\n- NativeMethodsMixin: NativeMethodsMixin(findNodeHandle, findHostInstance),\n- },\n+ __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {},\n };\n \n injectIntoDevTools({\ndiff --git a\/packages\/react-native-renderer\/src\/ReactNativeComponent.js b\/packages\/react-native-renderer\/src\/ReactNativeComponent.js\ndeleted file mode 100644\nindex fe0425e04e..0000000000\n--- a\/packages\/react-native-renderer\/src\/ReactNativeComponent.js\n+++ \/dev\/null\n@@ -1,285 +0,0 @@\n-\/**\n- * Copyright (c) Facebook, Inc. and its affiliates.\n- *\n- * This source code is licensed under the MIT license found in the\n- * LICENSE file in the root directory of this source tree.\n- *\n- * @flow\n- * @format\n- *\/\n-\n-import type {\n- MeasureInWindowOnSuccessCallback,\n- MeasureLayoutOnSuccessCallback,\n- MeasureOnSuccessCallback,\n- NativeMethods,\n- ReactNativeBaseComponentViewConfig,\n-} from '.\/ReactNativeTypes';\n-\n-import React from 'react';\n-\/\/ Modules provided by RN:\n-import {\n- TextInputState,\n- UIManager,\n-} from 'react-native\/Libraries\/ReactPrivate\/ReactNativePrivateInterface';\n-\n-import {create} from '.\/ReactNativeAttributePayload';\n-import {mountSafeCallback_NOT_REALLY_SAFE} from '.\/NativeMethodsMixinUtils';\n-\n-export default function(\n- findNodeHandle: any => ?number,\n- findHostInstance: any => any,\n-) {\n- \/**\n- * Superclass that provides methods to access the underlying native component.\n- * This can be useful when you want to focus a view or measure its dimensions.\n- *\n- * Methods implemented by this class are available on most default components\n- * provided by React Native. However, they are *not* available on composite\n- * components that are not directly backed by a native view. For more\n- * information, see [Direct Manipulation](docs\/direct-manipulation.html).\n- *\n- * @abstract\n- *\/\n- class ReactNativeComponent extends React.Component {\n- \/**\n- * Due to bugs in Flow's handling of React.createClass, some fields already\n- * declared in the base class need to be redeclared below.\n- *\/\n- props: Props;\n-\n- \/**\n- * Removes focus. This is the opposite of `focus()`.\n- *\/\n- blur(): void {\n- TextInputState.blurTextInput(findNodeHandle(this));\n- }\n-\n- \/**\n- * Requests focus. The exact behavior depends on the platform and view.\n- *\/\n- focus(): void {\n- TextInputState.focusTextInput(findNodeHandle(this));\n- }\n-\n- \/**\n- * Measures the on-screen location and dimensions. If successful, the callback\n- * will be called asynchronously with the following arguments:\n- *\n- * - x\n- * - y\n- * - width\n- * - height\n- * - pageX\n- * - pageY\n- *\n- * These values are not available until after natives rendering completes. If\n- * you need the measurements as soon as possible, consider using the\n- * [`onLayout` prop](docs\/view.html#onlayout) instead.\n- *\/\n- measure(callback: MeasureOnSuccessCallback): void {\n- let maybeInstance;\n-\n- \/\/ Fiber errors if findNodeHandle is called for an umounted component.\n- \/\/ Tests using ReactTestRenderer will trigger this case indirectly.\n- \/\/ Mimicking stack behavior, we should silently ignore this case.\n- \/\/ TODO Fix ReactTestRenderer so we can remove this try\/catch.\n- try {\n- maybeInstance = findHostInstance(this);\n- } catch (error) {}\n-\n- \/\/ If there is no host component beneath this we should fail silently.\n- \/\/ This is not an error; it could mean a class component rendered null.\n- if (maybeInstance == null) {\n- return;\n- }\n-\n- if (maybeInstance.canonical) {\n- \/\/ We can't call FabricUIManager here because it won't be loaded in paper\n- \/\/ at initialization time. See https:\/\/github.com\/facebook\/react\/pull\/15490\n- \/\/ for more info.\n- nativeFabricUIManager.measure(\n- maybeInstance.node,\n- mountSafeCallback_NOT_REALLY_SAFE(this, callback),\n- );\n- } else {\n- UIManager.measure(\n- findNodeHandle(this),\n- mountSafeCallback_NOT_REALLY_SAFE(this, callback),\n- );\n- }\n- }\n-\n- \/**\n- * Measures the on-screen location and dimensions. Even if the React Native\n- * root view is embedded within another native view, this method will give you\n- * the absolute coordinates measured from the window. If successful, the\n- * callback will be called asynchronously with the following arguments:\n- *\n- * - x\n- * - y\n- * - width\n- * - height\n- *\n- * These values are not available until after natives rendering completes.\n- *\/\n- measureInWindow(callback: MeasureInWindowOnSuccessCallback): void {\n- let maybeInstance;\n-\n- \/\/ Fiber errors if findNodeHandle is called for an umounted component.\n- \/\/ Tests using ReactTestRenderer will trigger this case indirectly.\n- \/\/ Mimicking stack behavior, we should silently ignore this case.\n- \/\/ TODO Fix ReactTestRenderer so we can remove this try\/catch.\n- try {\n- maybeInstance = findHostInstance(this);\n- } catch (error) {}\n-\n- \/\/ If there is no host component beneath this we should fail silently.\n- \/\/ This is not an error; it could mean a class component rendered null.\n- if (maybeInstance == null) {\n- return;\n- }\n-\n- if (maybeInstance.canonical) {\n- \/\/ We can't call FabricUIManager here because it won't be loaded in paper\n- \/\/ at initialization time. See https:\/\/github.com\/facebook\/react\/pull\/15490\n- \/\/ for more info.\n- nativeFabricUIManager.measureInWindow(\n- maybeInstance.node,\n- mountSafeCallback_NOT_REALLY_SAFE(this, callback),\n- );\n- } else {\n- UIManager.measureInWindow(\n- findNodeHandle(this),\n- mountSafeCallback_NOT_REALLY_SAFE(this, callback),\n- );\n- }\n- }\n-\n- \/**\n- * Similar to [`measure()`](#measure), but the resulting location will be\n- * relative to the supplied ancestor's location.\n- *\n- * Obtain a native node handle with `ReactNative.findNodeHandle(component)`.\n- *\/\n- measureLayout(\n- relativeToNativeNode: number | Object,\n- onSuccess: MeasureLayoutOnSuccessCallback,\n- onFail?: () => void \/* currently unused *\/,\n- ): void {\n- let maybeInstance;\n-\n- \/\/ Fiber errors if findNodeHandle is called for an umounted component.\n- \/\/ Tests using ReactTestRenderer will trigger this case indirectly.\n- \/\/ Mimicking stack behavior, we should silently ignore this case.\n- \/\/ TODO Fix ReactTestRenderer so we can remove this try\/catch.\n- try {\n- maybeInstance = findHostInstance(this);\n- } catch (error) {}\n-\n- \/\/ If there is no host component beneath this we should fail silently.\n- \/\/ This is not an error; it could mean a class component rendered null.\n- if (maybeInstance == null) {\n- return;\n- }\n-\n- if (maybeInstance.canonical) {\n- if (__DEV__) {\n- console.error(\n- 'Warning: measureLayout on components using NativeMethodsMixin ' +\n- 'or ReactNative.NativeComponent is not currently supported in Fabric. ' +\n- 'measureLayout must be called on a native ref. Consider using forwardRef.',\n- );\n- }\n- return;\n- } else {\n- let relativeNode;\n-\n- if (typeof relativeToNativeNode === 'number') {\n- \/\/ Already a node handle\n- relativeNode = relativeToNativeNode;\n- } else if (relativeToNativeNode._nativeTag) {\n- relativeNode = relativeToNativeNode._nativeTag;\n- }\n-\n- if (relativeNode == null) {\n- if (__DEV__) {\n- console.error(\n- 'Warning: ref.measureLayout must be called with a node handle or a ref to a native component.',\n- );\n- }\n-\n- return;\n- }\n-\n- UIManager.measureLayout(\n- findNodeHandle(this),\n- relativeNode,\n- mountSafeCallback_NOT_REALLY_SAFE(this, onFail),\n- mountSafeCallback_NOT_REALLY_SAFE(this, onSuccess),\n- );\n- }\n- }\n-\n- \/**\n- * This function sends props straight to native. They will not participate in\n- * future diff process - this means that if you do not include them in the\n- * next render, they will remain active (see [Direct\n- * Manipulation](docs\/direct-manipulation.html)).\n- *\/\n- setNativeProps(nativeProps: Object): void {\n- \/\/ Class components don't have viewConfig -> validateAttributes.\n- \/\/ Nor does it make sense to set native props on a non-native component.\n- \/\/ Instead, find the nearest host component and set props on it.\n- \/\/ Use findNodeHandle() rather than ReactNative.findNodeHandle() because\n- \/\/ We want the instance\/wrapper (not the native tag).\n- let maybeInstance;\n-\n- \/\/ Fiber errors if findNodeHandle is called for an umounted component.\n- \/\/ Tests using ReactTestRenderer will trigger this case indirectly.\n- \/\/ Mimicking stack behavior, we should silently ignore this case.\n- \/\/ TODO Fix ReactTestRenderer so we can remove this try\/catch.\n- try {\n- maybeInstance = findHostInstance(this);\n- } catch (error) {}\n-\n- \/\/ If there is no host component beneath this we should fail silently.\n- \/\/ This is not an error; it could mean a class component rendered null.\n- if (maybeInstance == null) {\n- return;\n- }\n-\n- if (maybeInstance.canonical) {\n- if (__DEV__) {\n- console.error(\n- 'Warning: setNativeProps is not currently supported in Fabric',\n- );\n- }\n- return;\n- }\n-\n- const nativeTag =\n- maybeInstance._nativeTag || maybeInstance.canonical._nativeTag;\n- const viewConfig: ReactNativeBaseComponentViewConfig<> =\n- maybeInstance.viewConfig || maybeInstance.canonical.viewConfig;\n-\n- const updatePayload = create(nativeProps, viewConfig.validAttributes);\n-\n- \/\/ Avoid the overhead of bridge calls if there's no update.\n- \/\/ This is an expensive no-op for Android, and causes an unnecessary\n- \/\/ view invalidation for certain components (eg RCTTextInput) on iOS.\n- if (updatePayload != null) {\n- UIManager.updateView(\n- nativeTag,\n- viewConfig.uiViewClassName,\n- updatePayload,\n- );\n- }\n- }\n- }\n-\n- \/\/ eslint-disable-next-line no-unused-expressions\n- (ReactNativeComponent.prototype: NativeMethods);\n-\n- return ReactNativeComponent;\n-}\ndiff --git a\/packages\/react-native-renderer\/src\/ReactNativeFiberHostComponent.js b\/packages\/react-native-renderer\/src\/ReactNativeFiberHostComponent.js\nindex cad31637b4..ba316e010c 100644\n--- a\/packages\/react-native-renderer\/src\/ReactNativeFiberHostComponent.js\n+++ b\/packages\/react-native-renderer\/src\/ReactNativeFiberHostComponent.js\n@@ -28,13 +28,6 @@ import {\n warnForStyleProps,\n } from '.\/NativeMethodsMixinUtils';\n \n-\/**\n- * This component defines the same methods as NativeMethodsMixin but without the\n- * findNodeHandle wrapper. This wrapper is unnecessary for HostComponent views\n- * and would also result in a circular require.js dependency (since\n- * ReactNativeFiber depends on this component and NativeMethodsMixin depends on\n- * ReactNativeFiber).\n- *\/\n class ReactNativeFiberHostComponent {\n _children: Array;\n _nativeTag: number;\ndiff --git a\/packages\/react-native-renderer\/src\/ReactNativeRenderer.js b\/packages\/react-native-renderer\/src\/ReactNativeRenderer.js\nindex 5c5b10fcf1..c8ddd3457a 100644\n--- a\/packages\/react-native-renderer\/src\/ReactNativeRenderer.js\n+++ b\/packages\/react-native-renderer\/src\/ReactNativeRenderer.js\n@@ -35,8 +35,6 @@ import ReactVersion from 'shared\/ReactVersion';\n \/\/ Module provided by RN:\n import {UIManager} from 'react-native\/Libraries\/ReactPrivate\/ReactNativePrivateInterface';\n \n-import NativeMethodsMixin from '.\/NativeMethodsMixin';\n-import ReactNativeComponent from '.\/ReactNativeComponent';\n import {getClosestInstanceFromNode} from '.\/ReactNativeComponentTree';\n import {getInspectorDataForViewTag} from '.\/ReactNativeFiberInspector';\n \n@@ -164,8 +162,6 @@ function computeComponentStackForErrorReporting(reactTag: number): string {\n const roots = new Map();\n \n const ReactNativeRenderer: ReactNativeType = {\n- NativeComponent: ReactNativeComponent(findNodeHandle, findHostInstance),\n-\n \/\/ This is needed for implementation details of TouchableNativeFeedback\n \/\/ Remove this once TouchableNativeFeedback doesn't use cloneElement\n findHostInstance_DEPRECATED,\n@@ -235,8 +231,6 @@ const ReactNativeRenderer: ReactNativeType = {\n unstable_batchedUpdates: batchedUpdates,\n \n __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {\n- \/\/ Used as a mixin in many createClass-based components\n- NativeMethodsMixin: NativeMethodsMixin(findNodeHandle, findHostInstance),\n computeComponentStackForErrorReporting,\n },\n };\ndiff --git a\/packages\/react-native-renderer\/src\/ReactNativeTypes.js b\/packages\/react-native-renderer\/src\/ReactNativeTypes.js\nindex 013058a996..7619625b13 100644\n--- a\/packages\/react-native-renderer\/src\/ReactNativeTypes.js\n+++ b\/packages\/react-native-renderer\/src\/ReactNativeTypes.js\n@@ -8,7 +8,7 @@\n * @flow\n *\/\n \n-import React, {type ElementRef, type AbstractComponent} from 'react';\n+import type {ElementRef, AbstractComponent} from 'react';\n \n export type MeasureOnSuccessCallback = (\n x: number,\n@@ -77,31 +77,6 @@ export type ReactNativeBaseComponentViewConfig<\n \n export type ViewConfigGetter = () => ReactNativeBaseComponentViewConfig<>;\n \n-\/**\n- * Class only exists for its Flow type.\n- *\/\n-class ReactNativeComponent extends React.Component {\n- blur(): void {}\n- focus(): void {}\n- measure(callback: MeasureOnSuccessCallback): void {}\n- measureInWindow(callback: MeasureInWindowOnSuccessCallback): void {}\n- measureLayout(\n- relativeToNativeNode: number | ElementRef>,\n- onSuccess: MeasureLayoutOnSuccessCallback,\n- onFail?: () => void,\n- ): void {}\n- setNativeProps(nativeProps: Object): void {}\n-}\n-\n-\/\/ This type is only used for FlowTests. It shouldn't be imported directly\n-export type _InternalReactNativeComponentClass = Class<\n- ReactNativeComponent,\n->;\n-\n-\/**\n- * This type keeps ReactNativeFiberHostComponent and NativeMethodsMixin in sync.\n- * It can also provide types for ReactNative applications that use NMM or refs.\n- *\/\n export type NativeMethods = {\n blur(): void,\n focus(): void,\n@@ -116,28 +91,22 @@ export type NativeMethods = {\n ...\n };\n \n-export type NativeMethodsMixinType = NativeMethods;\n export type HostComponent = AbstractComponent>;\n \n type SecretInternalsType = {\n- NativeMethodsMixin: NativeMethodsMixinType,\n computeComponentStackForErrorReporting(tag: number): string,\n \/\/ TODO (bvaughn) Decide which additional types to expose here?\n \/\/ And how much information to fill in for the above types.\n ...\n };\n \n-type SecretInternalsFabricType = {\n- NativeMethodsMixin: NativeMethodsMixinType,\n- ...\n-};\n+type SecretInternalsFabricType = {...};\n \n \/**\n * Flat ReactNative renderer bundles are too big for Flow to parse efficiently.\n * Provide minimal Flow typing for the high-level RN API and call it a day.\n *\/\n export type ReactNativeType = {\n- NativeComponent: typeof ReactNativeComponent,\n findHostInstance_DEPRECATED(\n componentOrHandle: any,\n ): ?ElementRef>,\n@@ -157,7 +126,6 @@ export type ReactNativeType = {\n };\n \n export type ReactFabricType = {\n- NativeComponent: typeof ReactNativeComponent,\n findHostInstance_DEPRECATED(componentOrHandle: any): ?HostComponent,\n findNodeHandle(componentOrHandle: any): ?number,\n dispatchCommand(handle: any, command: string, args: Array): void,\ndiff --git a\/packages\/react-native-renderer\/src\/__tests__\/ReactFabric-test.internal.js b\/packages\/react-native-renderer\/src\/__tests__\/ReactFabric-test.internal.js\nindex 51dd4ca835..0929b80e36 100644\n--- a\/packages\/react-native-renderer\/src\/__tests__\/ReactFabric-test.internal.js\n+++ b\/packages\/react-native-renderer\/src\/__tests__\/ReactFabric-test.internal.js\n@@ -13,11 +13,9 @@\n let React;\n let ReactFabric;\n let ReactFeatureFlags;\n-let createReactClass;\n let createReactNativeComponentClass;\n let UIManager;\n let StrictMode;\n-let NativeMethodsMixin;\n \n const SET_NATIVE_PROPS_NOT_SUPPORTED_MESSAGE =\n 'Warning: setNativeProps is not currently supported in Fabric';\n@@ -42,16 +40,8 @@ describe('ReactFabric', () => {\n ReactFeatureFlags = require('shared\/ReactFeatureFlags');\n UIManager = require('react-native\/Libraries\/ReactPrivate\/ReactNativePrivateInterface')\n .UIManager;\n- createReactClass = require('create-react-class\/factory')(\n- React.Component,\n- React.isValidElement,\n- new React.Component().updater,\n- );\n createReactNativeComponentClass = require('react-native\/Libraries\/ReactPrivate\/ReactNativePrivateInterface')\n .ReactNativeViewConfigRegistry.register;\n- NativeMethodsMixin =\n- ReactFabric.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED\n- .NativeMethodsMixin;\n });\n \n it('should be able to create and render a native component', () => {\n@@ -213,49 +203,34 @@ describe('ReactFabric', () => {\n uiViewClassName: 'RCTView',\n }));\n \n- class Subclass extends ReactFabric.NativeComponent {\n- render() {\n- return ;\n- }\n- }\n+ UIManager.updateView.mockReset();\n \n- const CreateClass = createReactClass({\n- mixins: [NativeMethodsMixin],\n- render: () => {\n- return ;\n- },\n+ let viewRef;\n+ ReactFabric.render(\n+ {\n+ viewRef = ref;\n+ }}\n+ \/>,\n+ 11,\n+ );\n+ expect(UIManager.updateView).not.toBeCalled();\n+\n+ expect(() => {\n+ viewRef.setNativeProps({});\n+ }).toErrorDev([SET_NATIVE_PROPS_NOT_SUPPORTED_MESSAGE], {\n+ withoutStack: true,\n });\n \n- [View, Subclass, CreateClass].forEach(Component => {\n- UIManager.updateView.mockReset();\n+ expect(UIManager.updateView).not.toBeCalled();\n \n- let viewRef;\n- ReactFabric.render(\n- {\n- viewRef = ref;\n- }}\n- \/>,\n- 11,\n- );\n- expect(UIManager.updateView).not.toBeCalled();\n-\n- expect(() => {\n- viewRef.setNativeProps({});\n- }).toErrorDev([SET_NATIVE_PROPS_NOT_SUPPORTED_MESSAGE], {\n- withoutStack: true,\n- });\n-\n- expect(UIManager.updateView).not.toBeCalled();\n-\n- expect(() => {\n- viewRef.setNativeProps({foo: 'baz'});\n- }).toErrorDev([SET_NATIVE_PROPS_NOT_SUPPORTED_MESSAGE], {\n- withoutStack: true,\n- });\n- expect(UIManager.updateView).not.toBeCalled();\n+ expect(() => {\n+ viewRef.setNativeProps({foo: 'baz'});\n+ }).toErrorDev([SET_NATIVE_PROPS_NOT_SUPPORTED_MESSAGE], {\n+ withoutStack: true,\n });\n+ expect(UIManager.updateView).not.toBeCalled();\n });\n \n it('should call dispatchCommand for native refs', () => {\n@@ -264,75 +239,53 @@ describe('ReactFabric', () => {\n uiViewClassName: 'RCTView',\n }));\n \n- [View].forEach(Component => {\n- nativeFabricUIManager.dispatchCommand.mockClear();\n+ nativeFabricUIManager.dispatchCommand.mockClear();\n \n- let viewRef;\n- ReactFabric.render(\n- {\n- viewRef = ref;\n- }}\n- \/>,\n- 11,\n- );\n+ let viewRef;\n+ ReactFabric.render(\n+ {\n+ viewRef = ref;\n+ }}\n+ \/>,\n+ 11,\n+ );\n \n- expect(nativeFabricUIManager.dispatchCommand).not.toBeCalled();\n- ReactFabric.dispatchCommand(viewRef, 'updateCommand', [10, 20]);\n- expect(nativeFabricUIManager.dispatchCommand).toHaveBeenCalledTimes(1);\n- expect(\n- nativeFabricUIManager.dispatchCommand,\n- ).toHaveBeenCalledWith(expect.any(Object), 'updateCommand', [10, 20]);\n- });\n+ expect(nativeFabricUIManager.dispatchCommand).not.toBeCalled();\n+ ReactFabric.dispatchCommand(viewRef, 'updateCommand', [10, 20]);\n+ expect(nativeFabricUIManager.dispatchCommand).toHaveBeenCalledTimes(1);\n+ expect(\n+ nativeFabricUIManager.dispatchCommand,\n+ ).toHaveBeenCalledWith(expect.any(Object), 'updateCommand', [10, 20]);\n });\n \n it('should warn and no-op if calling dispatchCommand on non native refs', () => {\n- const View = createReactNativeComponentClass('RCTView', () => ({\n- validAttributes: {foo: true},\n- uiViewClassName: 'RCTView',\n- }));\n-\n class BasicClass extends React.Component {\n render() {\n return ;\n }\n }\n \n- class Subclass extends ReactFabric.NativeComponent {\n- render() {\n- return ;\n- }\n- }\n+ nativeFabricUIManager.dispatchCommand.mockReset();\n \n- const CreateClass = createReactClass({\n- mixins: [NativeMethodsMixin],\n- render: () => {\n- return ;\n- },\n- });\n-\n- [BasicClass, Subclass, CreateClass].forEach(Component => {\n- nativeFabricUIManager.dispatchCommand.mockReset();\n-\n- let viewRef;\n- ReactFabric.render(\n- {\n- viewRef = ref;\n- }}\n- \/>,\n- 11,\n- );\n-\n- expect(nativeFabricUIManager.dispatchCommand).not.toBeCalled();\n- expect(() => {\n- ReactFabric.dispatchCommand(viewRef, 'updateCommand', [10, 20]);\n- }).toErrorDev([DISPATCH_COMMAND_REQUIRES_HOST_COMPONENT], {\n- withoutStack: true,\n- });\n+ let viewRef;\n+ ReactFabric.render(\n+ {\n+ viewRef = ref;\n+ }}\n+ \/>,\n+ 11,\n+ );\n \n- expect(nativeFabricUIManager.dispatchCommand).not.toBeCalled();\n+ expect(nativeFabricUIManager.dispatchCommand).not.toBeCalled();\n+ expect(() => {\n+ ReactFabric.dispatchCommand(viewRef, 'updateCommand', [10, 20]);\n+ }).toErrorDev([DISPATCH_COMMAND_REQUIRES_HOST_COMPONENT], {\n+ withoutStack: true,\n });\n+\n+ expect(nativeFabricUIManager.dispatchCommand).not.toBeCalled();\n });\n \n it('should call FabricUIManager.measure on ref.measure', () => {\n@@ -341,39 +294,24 @@ describe('ReactFabric', () => {\n uiViewClassName: 'RCTView',\n }));\n \n- class Subclass extends ReactFabric.NativeComponent {\n- render() {\n- return {this.props.children}<\/View>;\n- }\n- }\n-\n- const CreateClass = createReactClass({\n- mixins: [NativeMethodsMixin],\n- render() {\n- return {this.props.children}<\/View>;\n- },\n- });\n-\n- [View, Subclass, CreateClass].forEach(Component => {\n- nativeFabricUIManager.measure.mockClear();\n+ nativeFabricUIManager.measure.mockClear();\n \n- let viewRef;\n- ReactFabric.render(\n- {\n- viewRef = ref;\n- }}\n- \/>,\n- 11,\n- );\n+ let viewRef;\n+ ReactFabric.render(\n+ {\n+ viewRef = ref;\n+ }}\n+ \/>,\n+ 11,\n+ );\n \n- expect(nativeFabricUIManager.measure).not.toBeCalled();\n- const successCallback = jest.fn();\n- viewRef.measure(successCallback);\n- expect(nativeFabricUIManager.measure).toHaveBeenCalledTimes(1);\n- expect(successCallback).toHaveBeenCalledTimes(1);\n- expect(successCallback).toHaveBeenCalledWith(10, 10, 100, 100, 0, 0);\n- });\n+ expect(nativeFabricUIManager.measure).not.toBeCalled();\n+ const successCallback = jest.fn();\n+ viewRef.measure(successCallback);\n+ expect(nativeFabricUIManager.measure).toHaveBeenCalledTimes(1);\n+ expect(successCallback).toHaveBeenCalledTimes(1);\n+ expect(successCallback).toHaveBeenCalledWith(10, 10, 100, 100, 0, 0);\n });\n \n it('should call FabricUIManager.measureInWindow on ref.measureInWindow', () => {\n@@ -382,39 +320,24 @@ describe('ReactFabric', () => {\n uiViewClassName: 'RCTView',\n }));\n \n- class Subclass extends ReactFabric.NativeComponent {\n- render() {\n- return {this.props.children}<\/View>;\n- }\n- }\n+ nativeFabricUIManager.measureInWindow.mockClear();\n \n- const CreateClass = createReactClass({\n- mixins: [NativeMethodsMixin],\n- render() {\n- return {this.props.children}<\/View>;\n- },\n- });\n-\n- [View, Subclass, CreateClass].forEach(Component => {\n- nativeFabricUIManager.measureInWindow.mockClear();\n-\n- let viewRef;\n- ReactFabric.render(\n- {\n- viewRef = ref;\n- }}\n- \/>,\n- 11,\n- );\n+ let viewRef;\n+ ReactFabric.render(\n+ {\n+ viewRef = ref;\n+ }}\n+ \/>,\n+ 11,\n+ );\n \n- expect(nativeFabricUIManager.measureInWindow).not.toBeCalled();\n- const successCallback = jest.fn();\n- viewRef.measureInWindow(successCallback);\n- expect(nativeFabricUIManager.measureInWindow).toHaveBeenCalledTimes(1);\n- expect(successCallback).toHaveBeenCalledTimes(1);\n- expect(successCallback).toHaveBeenCalledWith(10, 10, 100, 100);\n- });\n+ expect(nativeFabricUIManager.measureInWindow).not.toBeCalled();\n+ const successCallback = jest.fn();\n+ viewRef.measureInWindow(successCallback);\n+ expect(nativeFabricUIManager.measureInWindow).toHaveBeenCalledTimes(1);\n+ expect(successCallback).toHaveBeenCalledTimes(1);\n+ expect(successCallback).toHaveBeenCalledWith(10, 10, 100, 100);\n });\n \n it('should support ref in ref.measureLayout', () => {\n@@ -423,98 +346,34 @@ describe('ReactFabric', () => {\n uiViewClassName: 'RCTView',\n }));\n \n- [View].forEach(Component => {\n- nativeFabricUIManager.measureLayout.mockClear();\n-\n- let viewRef;\n- let otherRef;\n- ReactFabric.render(\n- \n- {\n- viewRef = ref;\n- }}\n- \/>\n- {\n- otherRef = ref;\n- }}\n- \/>\n- <\/Component>,\n- 11,\n- );\n-\n- expect(nativeFabricUIManager.measureLayout).not.toBeCalled();\n- const successCallback = jest.fn();\n- const failureCallback = jest.fn();\n- viewRef.measureLayout(otherRef, successCallback, failureCallback);\n- expect(nativeFabricUIManager.measureLayout).toHaveBeenCalledTimes(1);\n- expect(successCallback).toHaveBeenCalledTimes(1);\n- expect(successCallback).toHaveBeenCalledWith(1, 1, 100, 100);\n- });\n- });\n+ nativeFabricUIManager.measureLayout.mockClear();\n \n- it('should warn when calling measureLayout on Subclass and NativeMethodsMixin', () => {\n- const View = createReactNativeComponentClass('RCTView', () => ({\n- validAttributes: {foo: true},\n- uiViewClassName: 'RCTView',\n- }));\n-\n- class Subclass extends ReactFabric.NativeComponent {\n- render() {\n- return {this.props.children}<\/View>;\n- }\n- }\n-\n- const CreateClass = createReactClass({\n- mixins: [NativeMethodsMixin],\n- render() {\n- return {this.props.children}<\/View>;\n- },\n- });\n-\n- [Subclass, CreateClass].forEach(Component => {\n- nativeFabricUIManager.measureLayout.mockReset();\n-\n- let viewRef;\n- let otherRef;\n- ReactFabric.render(\n- \n- {\n- viewRef = ref;\n- }}\n- \/>\n- {\n- otherRef = ref;\n- }}\n- \/>\n- <\/Component>,\n- 11,\n- );\n-\n- const successCallback = jest.fn();\n- const failureCallback = jest.fn();\n-\n- expect(() => {\n- viewRef.measureLayout(otherRef, successCallback, failureCallback);\n- }).toErrorDev(\n- [\n- 'Warning: measureLayout on components using NativeMethodsMixin ' +\n- 'or ReactNative.NativeComponent is not currently supported in Fabric. ' +\n- 'measureLayout must be called on a native ref. Consider using forwardRef.',\n- ],\n- {\n- withoutStack: true,\n- },\n- );\n+ let viewRef;\n+ let otherRef;\n+ ReactFabric.render(\n+ \n+ {\n+ viewRef = ref;\n+ }}\n+ \/>\n+ {\n+ otherRef = ref;\n+ }}\n+ \/>\n+ <\/View>,\n+ 11,\n+ );\n \n- expect(nativeFabricUIManager.measureLayout).not.toBeCalled();\n- expect(UIManager.measureLayout).not.toBeCalled();\n- });\n+ expect(nativeFabricUIManager.measureLayout).not.toBeCalled();\n+ const successCallback = jest.fn();\n+ const failureCallback = jest.fn();\n+ viewRef.measureLayout(otherRef, successCallback, failureCallback);\n+ expect(nativeFabricUIManager.measureLayout).toHaveBeenCalledTimes(1);\n+ expect(successCallback).toHaveBeenCalledTimes(1);\n+ expect(successCallback).toHaveBeenCalledWith(1, 1, 100, 100);\n });\n \n it('returns the correct instance and calls it in the callback', () => {\ndiff --git a\/packages\/react-native-renderer\/src\/__tests__\/ReactNativeMount-test.internal.js b\/packages\/react-native-renderer\/src\/__tests__\/ReactNativeMount-test.internal.js\nindex ac38fcfe2f..395cac0c20 100644\n--- a\/packages\/react-native-renderer\/src\/__tests__\/ReactNativeMount-test.internal.js\n+++ b\/packages\/react-native-renderer\/src\/__tests__\/ReactNativeMount-test.internal.js\n@@ -13,10 +13,8 @@\n let React;\n let StrictMode;\n let ReactNative;\n-let createReactClass;\n let createReactNativeComponentClass;\n let UIManager;\n-let NativeMethodsMixin;\n \n const DISPATCH_COMMAND_REQUIRES_HOST_COMPONENT =\n \"Warning: dispatchCommand was called with a ref that isn't a \" +\n@@ -31,16 +29,8 @@ describe('ReactNative', () => {\n ReactNative = require('react-native-renderer');\n UIManager = require('react-native\/Libraries\/ReactPrivate\/ReactNativePrivateInterface')\n .UIManager;\n- createReactClass = require('create-react-class\/factory')(\n- React.Component,\n- React.isValidElement,\n- new React.Component().updater,\n- );\n createReactNativeComponentClass = require('react-native\/Libraries\/ReactPrivate\/ReactNativePrivateInterface')\n .ReactNativeViewConfigRegistry.register;\n- NativeMethodsMixin =\n- ReactNative.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED\n- .NativeMethodsMixin;\n });\n \n it('should be able to create and render a native component', () => {\n@@ -109,75 +99,53 @@ describe('ReactNative', () => {\n uiViewClassName: 'RCTView',\n }));\n \n- [View].forEach(Component => {\n- UIManager.dispatchViewManagerCommand.mockClear();\n+ UIManager.dispatchViewManagerCommand.mockClear();\n \n- let viewRef;\n- ReactNative.render(\n- {\n- viewRef = ref;\n- }}\n- \/>,\n- 11,\n- );\n+ let viewRef;\n+ ReactNative.render(\n+ {\n+ viewRef = ref;\n+ }}\n+ \/>,\n+ 11,\n+ );\n \n- expect(UIManager.dispatchViewManagerCommand).not.toBeCalled();\n- ReactNative.dispatchCommand(viewRef, 'updateCommand', [10, 20]);\n- expect(UIManager.dispatchViewManagerCommand).toHaveBeenCalledTimes(1);\n- expect(\n- UIManager.dispatchViewManagerCommand,\n- ).toHaveBeenCalledWith(expect.any(Number), 'updateCommand', [10, 20]);\n- });\n+ expect(UIManager.dispatchViewManagerCommand).not.toBeCalled();\n+ ReactNative.dispatchCommand(viewRef, 'updateCommand', [10, 20]);\n+ expect(UIManager.dispatchViewManagerCommand).toHaveBeenCalledTimes(1);\n+ expect(\n+ UIManager.dispatchViewManagerCommand,\n+ ).toHaveBeenCalledWith(expect.any(Number), 'updateCommand', [10, 20]);\n });\n \n it('should warn and no-op if calling dispatchCommand on non native refs', () => {\n- const View = createReactNativeComponentClass('RCTView', () => ({\n- validAttributes: {foo: true},\n- uiViewClassName: 'RCTView',\n- }));\n-\n class BasicClass extends React.Component {\n render() {\n return ;\n }\n }\n \n- class Subclass extends ReactNative.NativeComponent {\n- render() {\n- return ;\n- }\n- }\n-\n- const CreateClass = createReactClass({\n- mixins: [NativeMethodsMixin],\n- render: () => {\n- return ;\n- },\n- });\n-\n- [BasicClass, Subclass, CreateClass].forEach(Component => {\n- UIManager.dispatchViewManagerCommand.mockReset();\n+ UIManager.dispatchViewManagerCommand.mockReset();\n \n- let viewRef;\n- ReactNative.render(\n- {\n- viewRef = ref;\n- }}\n- \/>,\n- 11,\n- );\n-\n- expect(UIManager.dispatchViewManagerCommand).not.toBeCalled();\n- expect(() => {\n- ReactNative.dispatchCommand(viewRef, 'updateCommand', [10, 20]);\n- }).toErrorDev([DISPATCH_COMMAND_REQUIRES_HOST_COMPONENT], {\n- withoutStack: true,\n- });\n+ let viewRef;\n+ ReactNative.render(\n+ {\n+ viewRef = ref;\n+ }}\n+ \/>,\n+ 11,\n+ );\n \n- expect(UIManager.dispatchViewManagerCommand).not.toBeCalled();\n+ expect(UIManager.dispatchViewManagerCommand).not.toBeCalled();\n+ expect(() => {\n+ ReactNative.dispatchCommand(viewRef, 'updateCommand', [10, 20]);\n+ }).toErrorDev([DISPATCH_COMMAND_REQUIRES_HOST_COMPONENT], {\n+ withoutStack: true,\n });\n+\n+ expect(UIManager.dispatchViewManagerCommand).not.toBeCalled();\n });\n \n it('should not call UIManager.updateView from ref.setNativeProps for properties that have not changed', () => {\n@@ -186,46 +154,31 @@ describe('ReactNative', () => {\n uiViewClassName: 'RCTView',\n }));\n \n- class Subclass extends ReactNative.NativeComponent {\n- render() {\n- return ;\n- }\n- }\n+ UIManager.updateView.mockReset();\n \n- const CreateClass = createReactClass({\n- mixins: [NativeMethodsMixin],\n- render: () => {\n- return ;\n- },\n- });\n-\n- [View, Subclass, CreateClass].forEach(Component => {\n- UIManager.updateView.mockReset();\n-\n- let viewRef;\n- ReactNative.render(\n- {\n- viewRef = ref;\n- }}\n- \/>,\n- 11,\n- );\n+ let viewRef;\n+ ReactNative.render(\n+ {\n+ viewRef = ref;\n+ }}\n+ \/>,\n+ 11,\n+ );\n \n- expect(UIManager.updateView).not.toBeCalled();\n+ expect(UIManager.updateView).not.toBeCalled();\n \n- viewRef.setNativeProps({});\n- expect(UIManager.updateView).not.toBeCalled();\n+ viewRef.setNativeProps({});\n+ expect(UIManager.updateView).not.toBeCalled();\n \n- viewRef.setNativeProps({foo: 'baz'});\n- expect(UIManager.updateView).toHaveBeenCalledTimes(1);\n- expect(UIManager.updateView).toHaveBeenCalledWith(\n- expect.any(Number),\n- 'RCTView',\n- {foo: 'baz'},\n- );\n- });\n+ viewRef.setNativeProps({foo: 'baz'});\n+ expect(UIManager.updateView).toHaveBeenCalledTimes(1);\n+ expect(UIManager.updateView).toHaveBeenCalledWith(\n+ expect.any(Number),\n+ 'RCTView',\n+ {foo: 'baz'},\n+ );\n });\n \n it('should call UIManager.measure on ref.measure', () => {\n@@ -234,39 +187,24 @@ describe('ReactNative', () => {\n uiViewClassName: 'RCTView',\n }));\n \n- class Subclass extends ReactNative.NativeComponent {\n- render() {\n- return {this.props.children}<\/View>;\n- }\n- }\n+ UIManager.measure.mockClear();\n \n- const CreateClass = createReactClass({\n- mixins: [NativeMethodsMixin],\n- render() {\n- return {this.props.children}<\/View>;\n- },\n- });\n-\n- [View, Subclass, CreateClass].forEach(Component => {\n- UIManager.measure.mockClear();\n+ let viewRef;\n+ ReactNative.render(\n+ {\n+ viewRef = ref;\n+ }}\n+ \/>,\n+ 11,\n+ );\n \n- let viewRef;\n- ReactNative.render(\n- {\n- viewRef = ref;\n- }}\n- \/>,\n- 11,\n- );\n-\n- expect(UIManager.measure).not.toBeCalled();\n- const successCallback = jest.fn();\n- viewRef.measure(successCallback);\n- expect(UIManager.measure).toHaveBeenCalledTimes(1);\n- expect(successCallback).toHaveBeenCalledTimes(1);\n- expect(successCallback).toHaveBeenCalledWith(10, 10, 100, 100, 0, 0);\n- });\n+ expect(UIManager.measure).not.toBeCalled();\n+ const successCallback = jest.fn();\n+ viewRef.measure(successCallback);\n+ expect(UIManager.measure).toHaveBeenCalledTimes(1);\n+ expect(successCallback).toHaveBeenCalledTimes(1);\n+ expect(successCallback).toHaveBeenCalledWith(10, 10, 100, 100, 0, 0);\n });\n \n it('should call UIManager.measureInWindow on ref.measureInWindow', () => {\n@@ -275,39 +213,24 @@ describe('ReactNative', () => {\n uiViewClassName: 'RCTView',\n }));\n \n- class Subclass extends ReactNative.NativeComponent {\n- render() {\n- return {this.props.children}<\/View>;\n- }\n- }\n-\n- const CreateClass = createReactClass({\n- mixins: [NativeMethodsMixin],\n- render() {\n- return {this.props.children}<\/View>;\n- },\n- });\n+ UIManager.measureInWindow.mockClear();\n \n- [View, Subclass, CreateClass].forEach(Component => {\n- UIManager.measureInWindow.mockClear();\n+ let viewRef;\n+ ReactNative.render(\n+ {\n+ viewRef = ref;\n+ }}\n+ \/>,\n+ 11,\n+ );\n \n- let viewRef;\n- ReactNative.render(\n- {\n- viewRef = ref;\n- }}\n- \/>,\n- 11,\n- );\n-\n- expect(UIManager.measureInWindow).not.toBeCalled();\n- const successCallback = jest.fn();\n- viewRef.measureInWindow(successCallback);\n- expect(UIManager.measureInWindow).toHaveBeenCalledTimes(1);\n- expect(successCallback).toHaveBeenCalledTimes(1);\n- expect(successCallback).toHaveBeenCalledWith(10, 10, 100, 100);\n- });\n+ expect(UIManager.measureInWindow).not.toBeCalled();\n+ const successCallback = jest.fn();\n+ viewRef.measureInWindow(successCallback);\n+ expect(UIManager.measureInWindow).toHaveBeenCalledTimes(1);\n+ expect(successCallback).toHaveBeenCalledTimes(1);\n+ expect(successCallback).toHaveBeenCalledWith(10, 10, 100, 100);\n });\n \n it('should support reactTag in ref.measureLayout', () => {\n@@ -316,53 +239,38 @@ describe('ReactNative', () => {\n uiViewClassName: 'RCTView',\n }));\n \n- class Subclass extends ReactNative.NativeComponent {\n- render() {\n- return {this.props.children}<\/View>;\n- }\n- }\n-\n- const CreateClass = createReactClass({\n- mixins: [NativeMethodsMixin],\n- render() {\n- return {this.props.children}<\/View>;\n- },\n- });\n+ UIManager.measureLayout.mockClear();\n \n- [View, Subclass, CreateClass].forEach(Component => {\n- UIManager.measureLayout.mockClear();\n+ let viewRef;\n+ let otherRef;\n+ ReactNative.render(\n+ \n+ {\n+ viewRef = ref;\n+ }}\n+ \/>\n+ {\n+ otherRef = ref;\n+ }}\n+ \/>\n+ <\/View>,\n+ 11,\n+ );\n \n- let viewRef;\n- let otherRef;\n- ReactNative.render(\n- \n- {\n- viewRef = ref;\n- }}\n- \/>\n- {\n- otherRef = ref;\n- }}\n- \/>\n- <\/Component>,\n- 11,\n- );\n-\n- expect(UIManager.measureLayout).not.toBeCalled();\n- const successCallback = jest.fn();\n- const failureCallback = jest.fn();\n- viewRef.measureLayout(\n- ReactNative.findNodeHandle(otherRef),\n- successCallback,\n- failureCallback,\n- );\n- expect(UIManager.measureLayout).toHaveBeenCalledTimes(1);\n- expect(successCallback).toHaveBeenCalledTimes(1);\n- expect(successCallback).toHaveBeenCalledWith(1, 1, 100, 100);\n- });\n+ expect(UIManager.measureLayout).not.toBeCalled();\n+ const successCallback = jest.fn();\n+ const failureCallback = jest.fn();\n+ viewRef.measureLayout(\n+ ReactNative.findNodeHandle(otherRef),\n+ successCallback,\n+ failureCallback,\n+ );\n+ expect(UIManager.measureLayout).toHaveBeenCalledTimes(1);\n+ expect(successCallback).toHaveBeenCalledTimes(1);\n+ expect(successCallback).toHaveBeenCalledWith(1, 1, 100, 100);\n });\n \n it('should support ref in ref.measureLayout of host components', () => {\n@@ -371,36 +279,34 @@ describe('ReactNative', () => {\n uiViewClassName: 'RCTView',\n }));\n \n- [View].forEach(Component => {\n- UIManager.measureLayout.mockClear();\n+ UIManager.measureLayout.mockClear();\n \n- let viewRef;\n- let otherRef;\n- ReactNative.render(\n- \n- {\n- viewRef = ref;\n- }}\n- \/>\n- {\n- otherRef = ref;\n- }}\n- \/>\n- <\/Component>,\n- 11,\n- );\n-\n- expect(UIManager.measureLayout).not.toBeCalled();\n- const successCallback = jest.fn();\n- const failureCallback = jest.fn();\n- viewRef.measureLayout(otherRef, successCallback, failureCallback);\n- expect(UIManager.measureLayout).toHaveBeenCalledTimes(1);\n- expect(successCallback).toHaveBeenCalledTimes(1);\n- expect(successCallback).toHaveBeenCalledWith(1, 1, 100, 100);\n- });\n+ let viewRef;\n+ let otherRef;\n+ ReactNative.render(\n+ \n+ {\n+ viewRef = ref;\n+ }}\n+ \/>\n+ {\n+ otherRef = ref;\n+ }}\n+ \/>\n+ <\/View>,\n+ 11,\n+ );\n+\n+ expect(UIManager.measureLayout).not.toBeCalled();\n+ const successCallback = jest.fn();\n+ const failureCallback = jest.fn();\n+ viewRef.measureLayout(otherRef, successCallback, failureCallback);\n+ expect(UIManager.measureLayout).toHaveBeenCalledTimes(1);\n+ expect(successCallback).toHaveBeenCalledTimes(1);\n+ expect(successCallback).toHaveBeenCalledWith(1, 1, 100, 100);\n });\n \n it('returns the correct instance and calls it in the callback', () => {\ndiff --git a\/packages\/react\/src\/__tests__\/createReactClassIntegration-test.internal.js b\/packages\/react\/src\/__tests__\/createReactClassIntegration-test.internal.js\ndeleted file mode 100644\nindex 3ea37ce80a..0000000000\n--- a\/packages\/react\/src\/__tests__\/createReactClassIntegration-test.internal.js\n+++ \/dev\/null\n@@ -1,74 +0,0 @@\n-\/**\n- * Copyright (c) Facebook, Inc. and its affiliates.\n- *\n- * This source code is licensed under the MIT license found in the\n- * LICENSE file in the root directory of this source tree.\n- *\n- * @emails react-core\n- *\/\n-\n-'use strict';\n-\n-describe('create-react-class-integration', () => {\n- describe('ReactNative NativeMethodsMixin', () => {\n- let React;\n- let ReactNative;\n- let NativeMethodsMixin;\n- let createReactClass;\n-\n- beforeEach(() => {\n- jest.resetModules();\n-\n- React = require('react');\n-\n- createReactClass = require('create-react-class\/factory')(\n- React.Component,\n- React.isValidElement,\n- new React.Component().updater,\n- );\n-\n- ReactNative = require('react-native-renderer');\n- NativeMethodsMixin =\n- ReactNative.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED\n- .NativeMethodsMixin;\n- });\n-\n- it('should not warn about default DEV-only legacy lifecycle methods', () => {\n- const View = createReactClass({\n- mixins: [NativeMethodsMixin],\n- render: () => null,\n- });\n-\n- ReactNative.render(, 1);\n- });\n-\n- it('should warn if users specify their own legacy componentWillMount', () => {\n- const View = createReactClass({\n- displayName: 'MyNativeComponent',\n- mixins: [NativeMethodsMixin],\n- componentWillMount: () => {},\n- render: () => null,\n- });\n-\n- expect(() =>\n- ReactNative.render(, 1),\n- ).toWarnDev('componentWillMount has been renamed', {withoutStack: true});\n- });\n-\n- it('should warn if users specify their own legacy componentWillReceiveProps', () => {\n- const View = createReactClass({\n- displayName: 'MyNativeComponent',\n- mixins: [NativeMethodsMixin],\n- componentWillReceiveProps: () => {},\n- render: () => null,\n- });\n-\n- expect(() => ReactNative.render(, 1)).toWarnDev(\n- 'componentWillReceiveProps has been renamed',\n- {\n- withoutStack: true,\n- },\n- );\n- });\n- });\n-});\ndiff --git a\/scripts\/rollup\/shims\/react-native\/NativeMethodsMixin.js b\/scripts\/rollup\/shims\/react-native\/NativeMethodsMixin.js\ndeleted file mode 100644\nindex c50f379fde..0000000000\n--- a\/scripts\/rollup\/shims\/react-native\/NativeMethodsMixin.js\n+++ \/dev\/null\n@@ -1,21 +0,0 @@\n-\/**\n- * Copyright (c) Facebook, Inc. and its affiliates.\n- *\n- * This source code is licensed under the MIT license found in the\n- * LICENSE file in the root directory of this source tree.\n- *\n- * @format\n- * @flow\n- *\/\n-\n-'use strict';\n-\n-const {\n- __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,\n-} = require('.\/ReactNative');\n-\n-import type {NativeMethodsMixinType} from '.\/ReactNativeTypes';\n-\n-const {NativeMethodsMixin} = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;\n-\n-module.exports = ((NativeMethodsMixin: any): $Exact);\n","files":[{"status":"D","path":"packages\/react-native-renderer\/src\/NativeMethodsMixin.js"},{"status":"M","path":"packages\/react-native-renderer\/src\/ReactFabric.js"},{"status":"D","path":"packages\/react-native-renderer\/src\/ReactNativeComponent.js"},{"status":"M","path":"packages\/react-native-renderer\/src\/ReactNativeFiberHostComponent.js"},{"status":"M","path":"packages\/react-native-renderer\/src\/ReactNativeRenderer.js"},{"status":"M","path":"packages\/react-native-renderer\/src\/ReactNativeTypes.js"},{"status":"M","path":"packages\/react-native-renderer\/src\/__tests__\/ReactFabric-test.internal.js"},{"status":"M","path":"packages\/react-native-renderer\/src\/__tests__\/ReactNativeMount-test.internal.js"},{"status":"D","path":"packages\/react\/src\/__tests__\/createReactClassIntegration-test.internal.js"},{"status":"D","path":"scripts\/rollup\/shims\/react-native\/NativeMethodsMixin.js"}],"parents":["d4f2b0379c8ecf8266497f863ee5a2aa612ff4ba"],"commit":{"authorName":"Eli White","subject":"[Native] Delete NativeComponent and NativeMethodsMixin (#18036)","shortRevision":"2d6be757df","authorEmail":"github@eli-white.com","authoredAt":"2020-02-13T15:09:25-08:00","revision":"2d6be757df86177ca8590bf7c361d6c910640895"}}

dillon1000/react

Files changed