From 3093010ea54351c21912abebeb648b19bf1d98b2 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Fri, 31 Jul 2020 13:28:05 -0700 Subject: [PATCH] move fabric to ReactCommon/react/renderer Summary: This diff moves fabric C++ code from ReactCommon/fabric to ReactCommon/react/renderer As part of this diff I also refactored components, codegen and callsites on CatalystApp, FB4A and venice Script: P137350694 changelog: [internal] internal refactor Reviewed By: fkgozali Differential Revision: D22852139 fbshipit-source-id: f85310ba858b6afd81abfd9cbe6d70b28eca7415 --- .../RCTActivityIndicatorViewComponentView.mm | 6 +- .../Image/RCTImageComponentView.mm | 14 +- .../RCTInputAccessoryComponentView.mm | 4 +- ...CTLegacyViewManagerInteropComponentView.mm | 4 +- ...gacyViewManagerInteropCoordinatorAdapter.h | 2 +- .../Modal/RCTModalHostViewComponentView.mm | 8 +- .../Root/RCTRootComponentView.mm | 4 +- .../RCTSafeAreaViewComponentView.mm | 4 +- .../RCTPullToRefreshViewComponentView.mm | 8 +- .../ScrollView/RCTScrollViewComponentView.mm | 12 +- .../Slider/RCTSliderComponentView.mm | 6 +- .../Switch/RCTSwitchComponentView.mm | 8 +- ...TParagraphComponentAccessibilityProvider.h | 6 +- ...ParagraphComponentAccessibilityProvider.mm | 8 +- .../Text/RCTParagraphComponentView.mm | 18 +- .../TextInput/RCTTextInputComponentView.mm | 8 +- .../TextInput/RCTTextInputUtils.h | 2 +- .../RCTUnimplementedNativeComponentView.mm | 6 +- .../RCTUnimplementedViewComponentView.mm | 10 +- .../View/RCTViewComponentView.h | 10 +- .../View/RCTViewComponentView.mm | 6 +- .../Fabric/Mounting/RCTComponentViewFactory.h | 2 +- .../Mounting/RCTComponentViewFactory.mm | 4 +- .../Mounting/RCTComponentViewProtocol.h | 10 +- .../Mounting/RCTComponentViewRegistry.h | 2 +- React/Fabric/Mounting/RCTMountingManager.h | 8 +- React/Fabric/Mounting/RCTMountingManager.mm | 8 +- ...CTMountingTransactionObserverCoordinator.h | 2 +- .../RCTMountingTransactionObserving.h | 2 +- React/Fabric/RCTConversions.h | 12 +- React/Fabric/RCTImageResponseObserverProxy.h | 2 +- React/Fabric/RCTImageResponseObserverProxy.mm | 4 +- React/Fabric/RCTScheduler.h | 12 +- React/Fabric/RCTScheduler.mm | 10 +- React/Fabric/RCTSurfacePresenter.mm | 14 +- .../RCTTouchableComponentViewProtocol.h | 2 +- React/Fabric/Surface/RCTFabricSurface.h | 2 +- React/Fabric/Utils/MainRunLoopEventBeat.h | 2 +- React/Fabric/Utils/RuntimeEventBeat.h | 2 +- .../react/fabric/jni/AsyncEventBeat.h | 4 +- .../java/com/facebook/react/fabric/jni/BUCK | 10 +- .../com/facebook/react/fabric/jni/Binding.cpp | 22 +- .../com/facebook/react/fabric/jni/Binding.h | 8 +- .../fabric/jni/ComponentFactoryDelegate.cpp | 2 +- .../fabric/jni/ComponentFactoryDelegate.h | 4 +- .../react/fabric/jni/EventBeatManager.h | 2 +- .../react/fabric/jni/EventEmitterWrapper.cpp | 2 +- .../react/fabric/jni/EventEmitterWrapper.h | 2 +- .../react/fabric/jni/JBackgroundExecutor.h | 2 +- .../react/fabric/jni/NodeStateWrapper.h | 2 +- .../react/fabric/jni/StateWrapperImpl.h | 2 +- .../{fabric => react/renderer}/.clang-tidy | 0 .../renderer}/animations/BUCK | 24 +- .../animations/LayoutAnimationDriver.cpp | 24 +- .../animations/LayoutAnimationDriver.h | 12 +- .../LayoutAnimationKeyFrameManager.cpp | 26 +-- .../LayoutAnimationKeyFrameManager.h | 18 +- .../attributedstring/AttributedString.cpp | 2 +- .../attributedstring/AttributedString.h | 10 +- .../attributedstring/AttributedStringBox.cpp | 0 .../attributedstring/AttributedStringBox.h | 2 +- .../renderer}/attributedstring/BUCK | 10 +- .../attributedstring/ParagraphAttributes.cpp | 6 +- .../attributedstring/ParagraphAttributes.h | 6 +- .../attributedstring/TextAttributes.cpp | 8 +- .../attributedstring/TextAttributes.h | 12 +- .../renderer}/attributedstring/conversions.h | 22 +- .../renderer}/attributedstring/primitives.h | 0 .../tests/AttributedStringTest.cpp | 8 +- .../tests/ParagraphAttributesTest.cpp | 6 +- .../tests/TextAttributesTest.cpp | 8 +- .../renderer}/componentregistry/BUCK | 6 +- .../ComponentDescriptorFactory.h | 4 +- .../ComponentDescriptorProvider.h | 4 +- .../ComponentDescriptorProviderRegistry.cpp | 0 .../ComponentDescriptorProviderRegistry.h | 6 +- .../ComponentDescriptorRegistry.cpp | 4 +- .../ComponentDescriptorRegistry.h | 4 +- .../components/activityindicator/BUCK | 10 +- .../activityindicator/conversions.h | 2 +- .../renderer}/components/image/BUCK | 12 +- .../image/ImageComponentDescriptor.h | 6 +- .../components/image/ImageEventEmitter.cpp | 0 .../components/image/ImageEventEmitter.h | 2 +- .../renderer}/components/image/ImageProps.cpp | 6 +- .../renderer}/components/image/ImageProps.h | 6 +- .../components/image/ImageShadowNode.cpp | 4 +- .../components/image/ImageShadowNode.h | 12 +- .../renderer}/components/image/ImageState.cpp | 0 .../renderer}/components/image/ImageState.h | 4 +- .../renderer}/components/image/conversions.h | 4 +- .../components/image/tests/ImageTest.cpp | 0 .../renderer}/components/inputaccessory/BUCK | 4 +- .../InputAccessoryComponentDescriptor.h | 4 +- .../InputAccessoryShadowNode.cpp | 0 .../inputaccessory/InputAccessoryShadowNode.h | 8 +- .../inputaccessory/InputAccessoryState.h | 6 +- .../components/legacyviewmanagerinterop/BUCK | 6 +- ...acyViewManagerInteropComponentDescriptor.h | 4 +- ...cyViewManagerInteropComponentDescriptor.mm | 0 .../LegacyViewManagerInteropShadowNode.cpp | 0 .../LegacyViewManagerInteropShadowNode.h | 8 +- .../LegacyViewManagerInteropState.h | 0 .../LegacyViewManagerInteropState.mm | 0 ...gacyViewManagerInteropViewEventEmitter.cpp | 0 ...LegacyViewManagerInteropViewEventEmitter.h | 4 +- .../LegacyViewManagerInteropViewProps.cpp | 0 .../LegacyViewManagerInteropViewProps.h | 2 +- .../RCTLegacyViewManagerInteropCoordinator.h | 0 .../RCTLegacyViewManagerInteropCoordinator.mm | 0 .../renderer}/components/modal/BUCK | 22 +- .../modal/ModalHostViewComponentDescriptor.h | 4 +- .../modal/ModalHostViewShadowNode.cpp | 4 +- .../modal/ModalHostViewShadowNode.h | 8 +- .../components/modal/ModalHostViewState.cpp | 0 .../components/modal/ModalHostViewState.h | 6 +- .../renderer}/components/picker/BUCK | 14 +- .../AndroidDialogPickerComponentDescriptor.h | 2 +- .../AndroidDialogPickerEventEmitter.cpp | 0 .../AndroidDialogPickerEventEmitter.h | 2 +- .../AndroidDialogPickerProps.cpp | 4 +- .../androidpicker/AndroidDialogPickerProps.h | 8 +- .../AndroidDialogPickerShadowNode.cpp | 0 .../AndroidDialogPickerShadowNode.h | 2 +- ...AndroidDropdownPickerComponentDescriptor.h | 2 +- .../AndroidDropdownPickerEventEmitter.cpp | 0 .../AndroidDropdownPickerEventEmitter.h | 2 +- .../AndroidDropdownPickerProps.cpp | 4 +- .../AndroidDropdownPickerProps.h | 8 +- .../AndroidDropdownPickerShadowNode.cpp | 0 .../AndroidDropdownPickerShadowNode.h | 2 +- .../renderer}/components/root/BUCK | 10 +- .../components/root/RootComponentDescriptor.h | 4 +- .../renderer}/components/root/RootProps.cpp | 4 +- .../renderer}/components/root/RootProps.h | 6 +- .../components/root/RootShadowNode.cpp | 4 +- .../components/root/RootShadowNode.h | 6 +- .../root/tests/RootShadowNodeTest.cpp | 0 .../renderer}/components/safeareaview/BUCK | 4 +- .../SafeAreaViewComponentDescriptor.h | 4 +- .../safeareaview/SafeAreaViewShadowNode.cpp | 0 .../safeareaview/SafeAreaViewShadowNode.h | 8 +- .../safeareaview/SafeAreaViewState.cpp | 0 .../safeareaview/SafeAreaViewState.h | 2 +- .../renderer}/components/scrollview/BUCK | 10 +- .../scrollview/RCTComponentViewHelpers.h | 0 .../ScrollViewComponentDescriptor.h | 4 +- .../scrollview/ScrollViewEventEmitter.cpp | 0 .../scrollview/ScrollViewEventEmitter.h | 6 +- .../components/scrollview/ScrollViewProps.cpp | 8 +- .../components/scrollview/ScrollViewProps.h | 4 +- .../scrollview/ScrollViewShadowNode.cpp | 2 +- .../scrollview/ScrollViewShadowNode.h | 10 +- .../components/scrollview/ScrollViewState.cpp | 0 .../components/scrollview/ScrollViewState.h | 2 +- .../components/scrollview/conversions.h | 2 +- .../components/scrollview/primitives.h | 0 .../scrollview/tests/ScrollViewTest.cpp | 0 .../renderer}/components/slider/BUCK | 22 +- .../slider/SliderComponentDescriptor.h | 6 +- .../components/slider/SliderShadowNode.cpp | 2 +- .../components/slider/SliderShadowNode.h | 14 +- .../components/slider/SliderState.cpp | 0 .../renderer}/components/slider/SliderState.h | 4 +- .../android/SliderMeasurementsManager.cpp | 2 +- .../android/SliderMeasurementsManager.h | 4 +- .../ios/SliderMeasurementsManager.cpp | 0 .../platform/ios/SliderMeasurementsManager.h | 4 +- .../components/slider/tests/SliderTest.cpp | 0 .../renderer}/components/switch/BUCK | 14 +- .../AndroidSwitchComponentDescriptor.h | 2 +- .../AndroidSwitchMeasurementsManager.cpp | 2 +- .../AndroidSwitchMeasurementsManager.h | 4 +- .../androidswitch/AndroidSwitchShadowNode.cpp | 0 .../androidswitch/AndroidSwitchShadowNode.h | 6 +- .../renderer}/components/text/BUCK | 18 +- .../text/basetext/BaseTextProps.cpp | 8 +- .../components/text/basetext/BaseTextProps.h | 8 +- .../text/basetext/BaseTextShadowNode.cpp | 10 +- .../text/basetext/BaseTextShadowNode.h | 4 +- .../paragraph/ParagraphComponentDescriptor.h | 6 +- .../text/paragraph/ParagraphProps.cpp | 8 +- .../text/paragraph/ParagraphProps.h | 8 +- .../text/paragraph/ParagraphShadowNode.cpp | 8 +- .../text/paragraph/ParagraphShadowNode.h | 16 +- .../text/paragraph/ParagraphState.cpp | 4 +- .../text/paragraph/ParagraphState.h | 6 +- .../components/text/paragraph/conversions.h | 4 +- .../text/rawtext/RawTextComponentDescriptor.h | 4 +- .../components/text/rawtext/RawTextProps.cpp | 4 +- .../components/text/rawtext/RawTextProps.h | 4 +- .../text/rawtext/RawTextShadowNode.cpp | 0 .../text/rawtext/RawTextShadowNode.h | 4 +- .../text/tests/ParagraphLocalDataTest.cpp | 10 +- .../components/text/tests/TextTest.cpp | 0 .../text/text/TextComponentDescriptor.h | 4 +- .../components/text/text/TextProps.cpp | 0 .../components/text/text/TextProps.h | 10 +- .../components/text/text/TextShadowNode.cpp | 0 .../components/text/text/TextShadowNode.h | 8 +- .../renderer}/components/textinput/BUCK | 24 +- .../AndroidTextInputComponentDescriptor.h | 2 +- .../AndroidTextInputEventEmitter.cpp | 0 .../AndroidTextInputEventEmitter.h | 2 +- .../AndroidTextInputProps.cpp | 6 +- .../androidtextinput/AndroidTextInputProps.h | 22 +- .../AndroidTextInputShadowNode.cpp | 12 +- .../AndroidTextInputShadowNode.h | 4 +- .../AndroidTextInputState.cpp | 4 +- .../androidtextinput/AndroidTextInputState.h | 6 +- .../components/textinput/iostextinput/BUCK | 24 +- .../TextInputComponentDescriptor.h | 4 +- .../iostextinput/TextInputEventEmitter.cpp | 0 .../iostextinput/TextInputEventEmitter.h | 4 +- .../textinput/iostextinput/TextInputProps.cpp | 8 +- .../textinput/iostextinput/TextInputProps.h | 20 +- .../iostextinput/TextInputShadowNode.cpp | 10 +- .../iostextinput/TextInputShadowNode.h | 14 +- .../textinput/iostextinput/TextInputState.cpp | 0 .../textinput/iostextinput/TextInputState.h | 6 +- .../textinput/iostextinput/conversions.h | 4 +- .../textinput/iostextinput/primitives.h | 0 .../textinput/iostextinput/propsConversions.h | 4 +- .../components/unimplementedview/BUCK | 8 +- .../UnimplementedViewComponentDescriptor.cpp | 0 .../UnimplementedViewComponentDescriptor.h | 4 +- .../UnimplementedViewProps.cpp | 2 +- .../UnimplementedViewProps.h | 2 +- .../UnimplementedViewShadowNode.cpp | 0 .../UnimplementedViewShadowNode.h | 4 +- .../renderer}/components/view/BUCK | 14 +- .../components/view/ConcreteViewShadowNode.h | 16 +- .../renderer}/components/view/Touch.cpp | 0 .../renderer}/components/view/Touch.h | 6 +- .../renderer}/components/view/TouchEvent.cpp | 0 .../renderer}/components/view/TouchEvent.h | 4 +- .../components/view/TouchEventEmitter.cpp | 0 .../components/view/TouchEventEmitter.h | 10 +- .../components/view/ViewComponentDescriptor.h | 4 +- .../components/view/ViewEventEmitter.cpp | 0 .../components/view/ViewEventEmitter.h | 4 +- .../renderer}/components/view/ViewProps.cpp | 10 +- .../renderer}/components/view/ViewProps.h | 16 +- .../components/view/ViewPropsInterpolation.h | 0 .../components/view/ViewShadowNode.cpp | 2 +- .../components/view/ViewShadowNode.h | 4 +- .../accessibility/AccessibilityPrimitives.h | 0 .../view/accessibility/AccessibilityProps.cpp | 8 +- .../view/accessibility/AccessibilityProps.h | 8 +- .../accessibilityPropsConversions.h | 4 +- .../renderer}/components/view/conversions.h | 8 +- .../renderer}/components/view/primitives.h | 4 +- .../components/view/propsConversions.h | 4 +- .../components/view/tests/LayoutTest.cpp | 12 +- .../components/view/tests/ViewTest.cpp | 14 +- .../view/yoga/YogaLayoutableShadowNode.cpp | 12 +- .../view/yoga/YogaLayoutableShadowNode.h | 12 +- .../view/yoga/YogaStylableProps.cpp | 8 +- .../components/view/yoga/YogaStylableProps.h | 4 +- .../{fabric => react/renderer}/core/BUCK | 18 +- .../ComponentDescriptor.cpp | 0 .../componentdescriptor/ComponentDescriptor.h | 12 +- .../ConcreteComponentDescriptor.h | 12 +- .../renderer}/core/conversions.h | 2 +- .../core/events/BatchedEventQueue.cpp | 0 .../renderer}/core/events/BatchedEventQueue.h | 2 +- .../renderer}/core/events/EventBeat.cpp | 0 .../renderer}/core/events/EventBeat.h | 0 .../renderer}/core/events/EventDispatcher.cpp | 2 +- .../renderer}/core/events/EventDispatcher.h | 14 +- .../renderer}/core/events/EventEmitter.cpp | 2 +- .../renderer}/core/events/EventEmitter.h | 8 +- .../renderer}/core/events/EventHandler.h | 0 .../renderer}/core/events/EventPipe.h | 4 +- .../renderer}/core/events/EventPriority.h | 0 .../renderer}/core/events/EventQueue.cpp | 0 .../renderer}/core/events/EventQueue.h | 10 +- .../renderer}/core/events/EventTarget.cpp | 0 .../renderer}/core/events/EventTarget.h | 0 .../renderer}/core/events/RawEvent.cpp | 0 .../renderer}/core/events/RawEvent.h | 4 +- .../core/events/UnbatchedEventQueue.cpp | 0 .../core/events/UnbatchedEventQueue.h | 2 +- .../renderer}/core/events/ValueFactory.h | 0 .../core/layout/LayoutConstraints.cpp | 0 .../renderer}/core/layout/LayoutConstraints.h | 4 +- .../renderer}/core/layout/LayoutContext.h | 4 +- .../renderer}/core/layout/LayoutMetrics.h | 4 +- .../renderer}/core/layout/LayoutPrimitives.h | 0 .../core/layout/LayoutableShadowNode.cpp | 12 +- .../core/layout/LayoutableShadowNode.h | 12 +- .../renderer}/core/primitives/RawProps.cpp | 2 +- .../renderer}/core/primitives/RawProps.h | 6 +- .../renderer}/core/primitives/RawPropsKey.cpp | 2 +- .../renderer}/core/primitives/RawPropsKey.h | 2 +- .../core/primitives/RawPropsKeyMap.cpp | 0 .../core/primitives/RawPropsKeyMap.h | 4 +- .../core/primitives/RawPropsParser.cpp | 2 +- .../core/primitives/RawPropsParser.h | 12 +- .../core/primitives/RawPropsPrimitives.h | 0 .../renderer}/core/primitives/RawValue.cpp | 0 .../renderer}/core/primitives/RawValue.h | 0 .../core/primitives/ReactPrimitives.h | 4 +- .../renderer}/core/primitives/Sealable.cpp | 0 .../renderer}/core/primitives/Sealable.h | 0 .../renderer}/core/propsConversions.h | 8 +- .../core/shadownode/ConcreteShadowNode.h | 8 +- .../renderer}/core/shadownode/Props.cpp | 2 +- .../renderer}/core/shadownode/Props.h | 6 +- .../renderer}/core/shadownode/ShadowNode.cpp | 8 +- .../renderer}/core/shadownode/ShadowNode.h | 16 +- .../core/shadownode/ShadowNodeFamily.cpp | 4 +- .../core/shadownode/ShadowNodeFamily.h | 6 +- .../shadownode/ShadowNodeFamilyFragment.cpp | 2 +- .../shadownode/ShadowNodeFamilyFragment.h | 4 +- .../core/shadownode/ShadowNodeFragment.cpp | 0 .../core/shadownode/ShadowNodeFragment.h | 10 +- .../core/shadownode/ShadowNodeTraits.cpp | 0 .../core/shadownode/ShadowNodeTraits.h | 0 .../renderer}/core/state/ConcreteState.h | 2 +- .../renderer}/core/state/State.cpp | 8 +- .../renderer}/core/state/State.h | 2 +- .../renderer}/core/state/StateData.h | 0 .../renderer}/core/state/StatePipe.h | 2 +- .../renderer}/core/state/StateUpdate.cpp | 0 .../renderer}/core/state/StateUpdate.h | 2 +- .../core/tests/ComponentDescriptorTest.cpp | 0 .../core/tests/FindNodeAtPointTest.cpp | 0 .../core/tests/LayoutableShadowNodeTest.cpp | 0 .../renderer}/core/tests/PrimitivesTest.cpp | 2 +- .../renderer}/core/tests/RawPropsTest.cpp | 6 +- .../core/tests/ShadowNodeFamilyTest.cpp | 8 +- .../renderer}/core/tests/ShadowNodeTest.cpp | 4 +- .../renderer}/core/tests/TestComponent.h | 12 +- .../tests/benchmarks/RawPropsBenchmark.cpp | 6 +- .../renderer}/core/tests/traitCastTest.cpp | 14 +- .../{fabric => react/renderer}/debug/BUCK | 2 +- .../debug/DebugStringConvertible.cpp | 0 .../renderer}/debug/DebugStringConvertible.h | 0 .../debug/DebugStringConvertibleItem.cpp | 0 .../debug/DebugStringConvertibleItem.h | 2 +- .../renderer}/debug/SystraceSection.h | 0 .../debug/debugStringConvertibleUtils.h | 4 +- .../tests/DebugStringConvertibleTest.cpp | 2 +- .../{fabric => react/renderer}/element/BUCK | 26 +-- .../renderer}/element/ComponentBuilder.cpp | 0 .../renderer}/element/ComponentBuilder.h | 14 +- .../renderer}/element/Element.cpp | 0 .../renderer}/element/Element.h | 4 +- .../renderer}/element/ElementFragment.cpp | 0 .../renderer}/element/ElementFragment.h | 2 +- .../renderer}/element/testUtils.h | 16 +- .../renderer}/element/tests/ElementTest.cpp | 12 +- .../{fabric => react/renderer}/graphics/BUCK | 8 +- .../renderer}/graphics/ColorComponents.h | 0 .../renderer}/graphics/Geometry.h | 12 +- .../renderer}/graphics/Point.h | 2 +- .../renderer}/graphics/React-graphics.podspec | 0 .../renderer}/graphics/Rect.h | 6 +- .../renderer}/graphics/RectangleCorners.h | 2 +- .../renderer}/graphics/RectangleEdges.h | 4 +- .../renderer}/graphics/Size.h | 4 +- .../renderer}/graphics/Transform.cpp | 0 .../renderer}/graphics/Transform.h | 4 +- .../renderer}/graphics/conversions.h | 6 +- .../renderer}/graphics/platform/cxx/Color.cpp | 0 .../renderer}/graphics/platform/cxx/Color.h | 2 +- .../renderer}/graphics/platform/cxx/Float.h | 0 .../renderer}/graphics/platform/ios/Color.cpp | 0 .../renderer}/graphics/platform/ios/Color.h | 4 +- .../renderer}/graphics/platform/ios/Float.h | 0 .../renderer}/graphics/rounding.h | 2 +- .../renderer}/graphics/tests/GraphicsTest.cpp | 0 .../graphics/tests/TransformTest.cpp | 2 +- .../renderer}/imagemanager/BUCK | 12 +- .../imagemanager/ImageInstrumentation.h | 2 +- .../renderer}/imagemanager/ImageManager.h | 6 +- .../renderer}/imagemanager/ImageRequest.h | 10 +- .../renderer}/imagemanager/ImageResponse.cpp | 0 .../renderer}/imagemanager/ImageResponse.h | 0 .../imagemanager/ImageResponseObserver.h | 2 +- .../ImageResponseObserverCoordinator.cpp | 0 .../ImageResponseObserverCoordinator.h | 4 +- .../platform/cxx/ImageManager.cpp | 0 .../platform/cxx/ImageRequest.cpp | 0 .../imagemanager/platform/ios/ImageManager.mm | 0 .../platform/ios/ImageRequest.cpp | 0 .../ios/RCTImageInstrumentationProxy.h | 4 +- .../ios/RCTImageInstrumentationProxy.mm | 0 .../platform/ios/RCTImageManager.h | 0 .../platform/ios/RCTImageManager.mm | 6 +- .../platform/ios/RCTImageManagerProtocol.h | 4 +- .../ios/RCTImagePrimitivesConversions.h | 2 +- .../platform/ios/RCTSyncImageManager.h | 0 .../platform/ios/RCTSyncImageManager.mm | 4 +- .../renderer}/imagemanager/primitives.h | 2 +- .../imagemanager/tests/ImageManagerTest.cpp | 2 +- .../{fabric => react/renderer}/mapbuffer/BUCK | 0 .../renderer}/mapbuffer/MapBuffer.cpp | 0 .../renderer}/mapbuffer/MapBuffer.h | 0 .../mapbuffer/tests/MapBufferTest.cpp | 0 .../{fabric => react/renderer}/mounting/BUCK | 18 +- .../renderer}/mounting/Differentiator.cpp | 4 +- .../renderer}/mounting/Differentiator.h | 4 +- .../mounting/MountingCoordinator.cpp | 2 +- .../renderer}/mounting/MountingCoordinator.h | 12 +- .../mounting/MountingOverrideDelegate.h | 2 +- .../renderer}/mounting/MountingTelemetry.cpp | 0 .../renderer}/mounting/MountingTelemetry.h | 0 .../mounting/MountingTransaction.cpp | 0 .../renderer}/mounting/MountingTransaction.h | 6 +- .../mounting/MountingTransactionMetadata.cpp | 0 .../mounting/MountingTransactionMetadata.h | 4 +- .../renderer}/mounting/ShadowTree.cpp | 16 +- .../renderer}/mounting/ShadowTree.h | 16 +- .../renderer}/mounting/ShadowTreeDelegate.h | 2 +- .../renderer}/mounting/ShadowTreeRegistry.cpp | 0 .../renderer}/mounting/ShadowTreeRegistry.h | 4 +- .../renderer}/mounting/ShadowTreeRevision.cpp | 0 .../renderer}/mounting/ShadowTreeRevision.h | 8 +- .../renderer}/mounting/ShadowView.cpp | 2 +- .../renderer}/mounting/ShadowView.h | 10 +- .../renderer}/mounting/ShadowViewMutation.cpp | 0 .../renderer}/mounting/ShadowViewMutation.h | 2 +- .../renderer}/mounting/SurfaceTelemetry.cpp | 0 .../renderer}/mounting/SurfaceTelemetry.h | 2 +- .../mounting/TelemetryController.cpp | 2 +- .../renderer}/mounting/TelemetryController.h | 6 +- .../mounting/TreeStateReconciliation.cpp | 0 .../mounting/TreeStateReconciliation.h | 4 +- .../renderer}/mounting/stubs/StubView.cpp | 0 .../renderer}/mounting/stubs/StubView.h | 8 +- .../renderer}/mounting/stubs/StubViewTree.cpp | 0 .../renderer}/mounting/stubs/StubViewTree.h | 4 +- .../renderer}/mounting/stubs/stubs.cpp | 6 +- .../renderer}/mounting/stubs/stubs.h | 2 +- .../renderer}/mounting/tests/Entropy.h | 0 .../mounting/tests/MountingTelemetryTest.cpp | 2 +- .../renderer}/mounting/tests/MountingTest.cpp | 8 +- .../tests/ShadowTreeLifeCycleTest.cpp | 8 +- .../tests/StateReconciliationTest.cpp | 18 +- .../mounting/tests/shadowTreeGeneration.h | 8 +- .../scheduler/AsynchronousEventBeat.cpp | 0 .../scheduler/AsynchronousEventBeat.h | 2 +- .../{fabric => react/renderer}/scheduler/BUCK | 16 +- .../renderer}/scheduler/Scheduler.cpp | 18 +- .../renderer}/scheduler/Scheduler.h | 20 +- .../renderer}/scheduler/SchedulerDelegate.h | 6 +- .../renderer}/scheduler/SchedulerToolbox.cpp | 0 .../renderer}/scheduler/SchedulerToolbox.h | 6 +- .../scheduler/SynchronousEventBeat.cpp | 0 .../scheduler/SynchronousEventBeat.h | 2 +- .../renderer}/templateprocessor/BUCK | 20 +- .../templateprocessor/UITemplateProcessor.cpp | 16 +- .../templateprocessor/UITemplateProcessor.h | 6 +- .../tests/UITemplateProcessorTest.cpp | 16 +- .../renderer}/textlayoutmanager/BUCK | 20 +- .../textlayoutmanager/TextMeasureCache.cpp | 0 .../textlayoutmanager/TextMeasureCache.h | 6 +- .../platform/android/TextLayoutManager.cpp | 4 +- .../platform/android/TextLayoutManager.h | 8 +- .../platform/cxx/TextLayoutManager.cpp | 0 .../platform/cxx/TextLayoutManager.h | 10 +- .../platform/ios/NSTextStorage+FontScaling.h | 0 .../platform/ios/NSTextStorage+FontScaling.m | 0 .../platform/ios/RCTAttributedTextUtils.h | 6 +- .../platform/ios/RCTAttributedTextUtils.mm | 8 +- .../platform/ios/RCTFontProperties.h | 0 .../platform/ios/RCTFontUtils.h | 2 +- .../platform/ios/RCTFontUtils.mm | 0 .../platform/ios/RCTTextLayoutManager.h | 10 +- .../platform/ios/RCTTextLayoutManager.mm | 0 .../ios/RCTTextPrimitivesConversions.h | 4 +- .../platform/ios/TextLayoutManager.h | 8 +- .../platform/ios/TextLayoutManager.mm | 0 .../tests/TextLayoutManagerTest.cpp | 2 +- .../{fabric => react/renderer}/uimanager/BUCK | 22 +- .../uimanager/LayoutAnimationStatusDelegate.h | 0 .../renderer}/uimanager/UIManager.cpp | 6 +- .../renderer}/uimanager/UIManager.h | 20 +- .../uimanager/UIManagerAnimationDelegate.h | 6 +- .../renderer}/uimanager/UIManagerBinding.cpp | 2 +- .../renderer}/uimanager/UIManagerBinding.h | 6 +- .../renderer}/uimanager/UIManagerDelegate.h | 6 +- .../renderer}/uimanager/primitives.h | 4 +- .../uimanager/tests/FabricUIManagerTest.cpp | 2 +- packages/react-native-codegen/DEFS.bzl | 14 +- .../buck_tests/emptyFile.cpp | 2 +- .../buck_tests/emptyFile.mm | 4 +- .../src/generators/components/CppHelpers.js | 2 +- .../GenerateComponentDescriptorH.js | 4 +- .../components/GenerateEventEmitterCpp.js | 2 +- .../components/GenerateEventEmitterH.js | 2 +- .../generators/components/GeneratePropsCpp.js | 4 +- .../generators/components/GeneratePropsH.js | 14 +- .../components/GenerateShadowNodeCpp.js | 2 +- .../components/GenerateShadowNodeH.js | 6 +- .../generators/components/GenerateTests.js | 8 +- .../GenerateComponentDescriptorH-test.js.snap | 104 ++++----- .../GenerateEventEmitterCpp-test.js.snap | 52 ++--- .../GenerateEventEmitterH-test.js.snap | 52 ++--- .../GeneratePropsCpp-test.js.snap | 112 ++++----- .../__snapshots__/GeneratePropsH-test.js.snap | 88 +++---- .../GenerateShadowNodeCpp-test.js.snap | 52 ++--- .../GenerateShadowNodeH-test.js.snap | 108 ++++----- .../__snapshots__/GenerateTests-test.js.snap | 216 +++++++++--------- 506 files changed, 1661 insertions(+), 1659 deletions(-) rename ReactCommon/{fabric => react/renderer}/.clang-tidy (100%) rename ReactCommon/{fabric => react/renderer}/animations/BUCK (72%) rename ReactCommon/{fabric => react/renderer}/animations/LayoutAnimationDriver.cpp (90%) rename ReactCommon/{fabric => react/renderer}/animations/LayoutAnimationDriver.h (73%) rename ReactCommon/{fabric => react/renderer}/animations/LayoutAnimationKeyFrameManager.cpp (98%) rename ReactCommon/{fabric => react/renderer}/animations/LayoutAnimationKeyFrameManager.h (92%) rename ReactCommon/{fabric => react/renderer}/attributedstring/AttributedString.cpp (98%) rename ReactCommon/{fabric => react/renderer}/attributedstring/AttributedString.h (93%) rename ReactCommon/{fabric => react/renderer}/attributedstring/AttributedStringBox.cpp (100%) rename ReactCommon/{fabric => react/renderer}/attributedstring/AttributedStringBox.h (97%) rename ReactCommon/{fabric => react/renderer}/attributedstring/BUCK (86%) rename ReactCommon/{fabric => react/renderer}/attributedstring/ParagraphAttributes.cpp (91%) rename ReactCommon/{fabric => react/renderer}/attributedstring/ParagraphAttributes.h (93%) rename ReactCommon/{fabric => react/renderer}/attributedstring/TextAttributes.cpp (97%) rename ReactCommon/{fabric => react/renderer}/attributedstring/TextAttributes.h (93%) rename ReactCommon/{fabric => react/renderer}/attributedstring/conversions.h (97%) rename ReactCommon/{fabric => react/renderer}/attributedstring/primitives.h (100%) rename ReactCommon/{fabric => react/renderer}/attributedstring/tests/AttributedStringTest.cpp (85%) rename ReactCommon/{fabric => react/renderer}/attributedstring/tests/ParagraphAttributesTest.cpp (84%) rename ReactCommon/{fabric => react/renderer}/attributedstring/tests/TextAttributesTest.cpp (81%) rename ReactCommon/{fabric => react/renderer}/componentregistry/BUCK (89%) rename ReactCommon/{fabric => react/renderer}/componentregistry/ComponentDescriptorFactory.h (89%) rename ReactCommon/{fabric => react/renderer}/componentregistry/ComponentDescriptorProvider.h (95%) rename ReactCommon/{fabric => react/renderer}/componentregistry/ComponentDescriptorProviderRegistry.cpp (100%) rename ReactCommon/{fabric => react/renderer}/componentregistry/ComponentDescriptorProviderRegistry.h (91%) rename ReactCommon/{fabric => react/renderer}/componentregistry/ComponentDescriptorRegistry.cpp (98%) rename ReactCommon/{fabric => react/renderer}/componentregistry/ComponentDescriptorRegistry.h (95%) rename ReactCommon/{fabric => react/renderer}/components/activityindicator/BUCK (84%) rename ReactCommon/{fabric => react/renderer}/components/activityindicator/conversions.h (92%) rename ReactCommon/{fabric => react/renderer}/components/image/BUCK (82%) rename ReactCommon/{fabric => react/renderer}/components/image/ImageComponentDescriptor.h (87%) rename ReactCommon/{fabric => react/renderer}/components/image/ImageEventEmitter.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/image/ImageEventEmitter.h (90%) rename ReactCommon/{fabric => react/renderer}/components/image/ImageProps.cpp (86%) rename ReactCommon/{fabric => react/renderer}/components/image/ImageProps.h (82%) rename ReactCommon/{fabric => react/renderer}/components/image/ImageShadowNode.cpp (95%) rename ReactCommon/{fabric => react/renderer}/components/image/ImageShadowNode.h (81%) rename ReactCommon/{fabric => react/renderer}/components/image/ImageState.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/image/ImageState.h (92%) rename ReactCommon/{fabric => react/renderer}/components/image/conversions.h (97%) rename ReactCommon/{fabric => react/renderer}/components/image/tests/ImageTest.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/inputaccessory/BUCK (90%) rename ReactCommon/{fabric => react/renderer}/components/inputaccessory/InputAccessoryComponentDescriptor.h (90%) rename ReactCommon/{fabric => react/renderer}/components/inputaccessory/InputAccessoryShadowNode.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/inputaccessory/InputAccessoryShadowNode.h (79%) rename ReactCommon/{fabric => react/renderer}/components/inputaccessory/InputAccessoryState.h (78%) rename ReactCommon/{fabric => react/renderer}/components/legacyviewmanagerinterop/BUCK (86%) rename ReactCommon/{fabric => react/renderer}/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.h (85%) rename ReactCommon/{fabric => react/renderer}/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.mm (100%) rename ReactCommon/{fabric => react/renderer}/components/legacyviewmanagerinterop/LegacyViewManagerInteropShadowNode.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/legacyviewmanagerinterop/LegacyViewManagerInteropShadowNode.h (61%) rename ReactCommon/{fabric => react/renderer}/components/legacyviewmanagerinterop/LegacyViewManagerInteropState.h (100%) rename ReactCommon/{fabric => react/renderer}/components/legacyviewmanagerinterop/LegacyViewManagerInteropState.mm (100%) rename ReactCommon/{fabric => react/renderer}/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewEventEmitter.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewEventEmitter.h (87%) rename ReactCommon/{fabric => react/renderer}/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.h (92%) rename ReactCommon/{fabric => react/renderer}/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.h (100%) rename ReactCommon/{fabric => react/renderer}/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.mm (100%) rename ReactCommon/{fabric => react/renderer}/components/modal/BUCK (72%) rename ReactCommon/{fabric => react/renderer}/components/modal/ModalHostViewComponentDescriptor.h (91%) rename ReactCommon/{fabric => react/renderer}/components/modal/ModalHostViewShadowNode.cpp (76%) rename ReactCommon/{fabric => react/renderer}/components/modal/ModalHostViewShadowNode.h (79%) rename ReactCommon/{fabric => react/renderer}/components/modal/ModalHostViewState.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/modal/ModalHostViewState.h (87%) rename ReactCommon/{fabric => react/renderer}/components/picker/BUCK (84%) rename ReactCommon/{fabric => react/renderer}/components/picker/androidpicker/AndroidDialogPickerComponentDescriptor.h (87%) rename ReactCommon/{fabric => react/renderer}/components/picker/androidpicker/AndroidDialogPickerEventEmitter.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/picker/androidpicker/AndroidDialogPickerEventEmitter.h (89%) rename ReactCommon/{fabric => react/renderer}/components/picker/androidpicker/AndroidDialogPickerProps.cpp (89%) rename ReactCommon/{fabric => react/renderer}/components/picker/androidpicker/AndroidDialogPickerProps.h (90%) rename ReactCommon/{fabric => react/renderer}/components/picker/androidpicker/AndroidDialogPickerShadowNode.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/picker/androidpicker/AndroidDialogPickerShadowNode.h (90%) rename ReactCommon/{fabric => react/renderer}/components/picker/androidpicker/AndroidDropdownPickerComponentDescriptor.h (88%) rename ReactCommon/{fabric => react/renderer}/components/picker/androidpicker/AndroidDropdownPickerEventEmitter.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/picker/androidpicker/AndroidDropdownPickerEventEmitter.h (89%) rename ReactCommon/{fabric => react/renderer}/components/picker/androidpicker/AndroidDropdownPickerProps.cpp (89%) rename ReactCommon/{fabric => react/renderer}/components/picker/androidpicker/AndroidDropdownPickerProps.h (90%) rename ReactCommon/{fabric => react/renderer}/components/picker/androidpicker/AndroidDropdownPickerShadowNode.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/picker/androidpicker/AndroidDropdownPickerShadowNode.h (90%) rename ReactCommon/{fabric => react/renderer}/components/root/BUCK (85%) rename ReactCommon/{fabric => react/renderer}/components/root/RootComponentDescriptor.h (75%) rename ReactCommon/{fabric => react/renderer}/components/root/RootProps.cpp (84%) rename ReactCommon/{fabric => react/renderer}/components/root/RootProps.h (82%) rename ReactCommon/{fabric => react/renderer}/components/root/RootShadowNode.cpp (91%) rename ReactCommon/{fabric => react/renderer}/components/root/RootShadowNode.h (88%) rename ReactCommon/{fabric => react/renderer}/components/root/tests/RootShadowNodeTest.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/safeareaview/BUCK (90%) rename ReactCommon/{fabric => react/renderer}/components/safeareaview/SafeAreaViewComponentDescriptor.h (91%) rename ReactCommon/{fabric => react/renderer}/components/safeareaview/SafeAreaViewShadowNode.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/safeareaview/SafeAreaViewShadowNode.h (78%) rename ReactCommon/{fabric => react/renderer}/components/safeareaview/SafeAreaViewState.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/safeareaview/SafeAreaViewState.h (91%) rename ReactCommon/{fabric => react/renderer}/components/scrollview/BUCK (85%) rename ReactCommon/{fabric => react/renderer}/components/scrollview/RCTComponentViewHelpers.h (100%) rename ReactCommon/{fabric => react/renderer}/components/scrollview/ScrollViewComponentDescriptor.h (74%) rename ReactCommon/{fabric => react/renderer}/components/scrollview/ScrollViewEventEmitter.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/scrollview/ScrollViewEventEmitter.h (89%) rename ReactCommon/{fabric => react/renderer}/components/scrollview/ScrollViewProps.cpp (97%) rename ReactCommon/{fabric => react/renderer}/components/scrollview/ScrollViewProps.h (93%) rename ReactCommon/{fabric => react/renderer}/components/scrollview/ScrollViewShadowNode.cpp (96%) rename ReactCommon/{fabric => react/renderer}/components/scrollview/ScrollViewShadowNode.h (74%) rename ReactCommon/{fabric => react/renderer}/components/scrollview/ScrollViewState.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/scrollview/ScrollViewState.h (95%) rename ReactCommon/{fabric => react/renderer}/components/scrollview/conversions.h (97%) rename ReactCommon/{fabric => react/renderer}/components/scrollview/primitives.h (100%) rename ReactCommon/{fabric => react/renderer}/components/scrollview/tests/ScrollViewTest.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/slider/BUCK (79%) rename ReactCommon/{fabric => react/renderer}/components/slider/SliderComponentDescriptor.h (90%) rename ReactCommon/{fabric => react/renderer}/components/slider/SliderShadowNode.cpp (98%) rename ReactCommon/{fabric => react/renderer}/components/slider/SliderShadowNode.h (83%) rename ReactCommon/{fabric => react/renderer}/components/slider/SliderState.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/slider/SliderState.h (95%) rename ReactCommon/{fabric => react/renderer}/components/slider/platform/android/SliderMeasurementsManager.cpp (97%) rename ReactCommon/{fabric => react/renderer}/components/slider/platform/android/SliderMeasurementsManager.h (89%) rename ReactCommon/{fabric => react/renderer}/components/slider/platform/ios/SliderMeasurementsManager.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/slider/platform/ios/SliderMeasurementsManager.h (87%) rename ReactCommon/{fabric => react/renderer}/components/slider/tests/SliderTest.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/switch/BUCK (84%) rename ReactCommon/{fabric => react/renderer}/components/switch/androidswitch/AndroidSwitchComponentDescriptor.h (96%) rename ReactCommon/{fabric => react/renderer}/components/switch/androidswitch/AndroidSwitchMeasurementsManager.cpp (97%) rename ReactCommon/{fabric => react/renderer}/components/switch/androidswitch/AndroidSwitchMeasurementsManager.h (87%) rename ReactCommon/{fabric => react/renderer}/components/switch/androidswitch/AndroidSwitchShadowNode.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/switch/androidswitch/AndroidSwitchShadowNode.h (87%) rename ReactCommon/{fabric => react/renderer}/components/text/BUCK (79%) rename ReactCommon/{fabric => react/renderer}/components/text/basetext/BaseTextProps.cpp (95%) rename ReactCommon/{fabric => react/renderer}/components/text/basetext/BaseTextProps.h (80%) rename ReactCommon/{fabric => react/renderer}/components/text/basetext/BaseTextShadowNode.cpp (90%) rename ReactCommon/{fabric => react/renderer}/components/text/basetext/BaseTextShadowNode.h (93%) rename ReactCommon/{fabric => react/renderer}/components/text/paragraph/ParagraphComponentDescriptor.h (91%) rename ReactCommon/{fabric => react/renderer}/components/text/paragraph/ParagraphProps.cpp (85%) rename ReactCommon/{fabric => react/renderer}/components/text/paragraph/ParagraphProps.h (83%) rename ReactCommon/{fabric => react/renderer}/components/text/paragraph/ParagraphShadowNode.cpp (97%) rename ReactCommon/{fabric => react/renderer}/components/text/paragraph/ParagraphShadowNode.h (86%) rename ReactCommon/{fabric => react/renderer}/components/text/paragraph/ParagraphState.cpp (77%) rename ReactCommon/{fabric => react/renderer}/components/text/paragraph/ParagraphState.h (88%) rename ReactCommon/{fabric => react/renderer}/components/text/paragraph/conversions.h (85%) rename ReactCommon/{fabric => react/renderer}/components/text/rawtext/RawTextComponentDescriptor.h (75%) rename ReactCommon/{fabric => react/renderer}/components/text/rawtext/RawTextProps.cpp (86%) rename ReactCommon/{fabric => react/renderer}/components/text/rawtext/RawTextProps.h (88%) rename ReactCommon/{fabric => react/renderer}/components/text/rawtext/RawTextShadowNode.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/text/rawtext/RawTextShadowNode.h (86%) rename ReactCommon/{fabric => react/renderer}/components/text/tests/ParagraphLocalDataTest.cpp (83%) rename ReactCommon/{fabric => react/renderer}/components/text/tests/TextTest.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/text/text/TextComponentDescriptor.h (75%) rename ReactCommon/{fabric => react/renderer}/components/text/text/TextProps.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/text/text/TextProps.h (70%) rename ReactCommon/{fabric => react/renderer}/components/text/text/TextShadowNode.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/text/text/TextShadowNode.h (85%) rename ReactCommon/{fabric => react/renderer}/components/textinput/BUCK (74%) rename ReactCommon/{fabric => react/renderer}/components/textinput/androidtextinput/AndroidTextInputComponentDescriptor.h (99%) rename ReactCommon/{fabric => react/renderer}/components/textinput/androidtextinput/AndroidTextInputEventEmitter.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/textinput/androidtextinput/AndroidTextInputEventEmitter.h (98%) rename ReactCommon/{fabric => react/renderer}/components/textinput/androidtextinput/AndroidTextInputProps.cpp (98%) rename ReactCommon/{fabric => react/renderer}/components/textinput/androidtextinput/AndroidTextInputProps.h (89%) rename ReactCommon/{fabric => react/renderer}/components/textinput/androidtextinput/AndroidTextInputShadowNode.cpp (95%) rename ReactCommon/{fabric => react/renderer}/components/textinput/androidtextinput/AndroidTextInputShadowNode.h (95%) rename ReactCommon/{fabric => react/renderer}/components/textinput/androidtextinput/AndroidTextInputState.cpp (86%) rename ReactCommon/{fabric => react/renderer}/components/textinput/androidtextinput/AndroidTextInputState.h (97%) rename ReactCommon/{fabric => react/renderer}/components/textinput/iostextinput/BUCK (74%) rename ReactCommon/{fabric => react/renderer}/components/textinput/iostextinput/TextInputComponentDescriptor.h (90%) rename ReactCommon/{fabric => react/renderer}/components/textinput/iostextinput/TextInputEventEmitter.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/textinput/iostextinput/TextInputEventEmitter.h (92%) rename ReactCommon/{fabric => react/renderer}/components/textinput/iostextinput/TextInputProps.cpp (92%) rename ReactCommon/{fabric => react/renderer}/components/textinput/iostextinput/TextInputProps.h (71%) rename ReactCommon/{fabric => react/renderer}/components/textinput/iostextinput/TextInputShadowNode.cpp (93%) rename ReactCommon/{fabric => react/renderer}/components/textinput/iostextinput/TextInputShadowNode.h (82%) rename ReactCommon/{fabric => react/renderer}/components/textinput/iostextinput/TextInputState.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/textinput/iostextinput/TextInputState.h (87%) rename ReactCommon/{fabric => react/renderer}/components/textinput/iostextinput/conversions.h (97%) rename ReactCommon/{fabric => react/renderer}/components/textinput/iostextinput/primitives.h (100%) rename ReactCommon/{fabric => react/renderer}/components/textinput/iostextinput/propsConversions.h (96%) rename ReactCommon/{fabric => react/renderer}/components/unimplementedview/BUCK (87%) rename ReactCommon/{fabric => react/renderer}/components/unimplementedview/UnimplementedViewComponentDescriptor.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/unimplementedview/UnimplementedViewComponentDescriptor.h (87%) rename ReactCommon/{fabric => react/renderer}/components/unimplementedview/UnimplementedViewProps.cpp (85%) rename ReactCommon/{fabric => react/renderer}/components/unimplementedview/UnimplementedViewProps.h (93%) rename ReactCommon/{fabric => react/renderer}/components/unimplementedview/UnimplementedViewShadowNode.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/unimplementedview/UnimplementedViewShadowNode.h (76%) rename ReactCommon/{fabric => react/renderer}/components/view/BUCK (81%) rename ReactCommon/{fabric => react/renderer}/components/view/ConcreteViewShadowNode.h (88%) rename ReactCommon/{fabric => react/renderer}/components/view/Touch.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/view/Touch.h (93%) rename ReactCommon/{fabric => react/renderer}/components/view/TouchEvent.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/view/TouchEvent.h (91%) rename ReactCommon/{fabric => react/renderer}/components/view/TouchEventEmitter.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/view/TouchEventEmitter.h (76%) rename ReactCommon/{fabric => react/renderer}/components/view/ViewComponentDescriptor.h (88%) rename ReactCommon/{fabric => react/renderer}/components/view/ViewEventEmitter.cpp (100%) rename ReactCommon/{fabric => react/renderer}/components/view/ViewEventEmitter.h (90%) rename ReactCommon/{fabric => react/renderer}/components/view/ViewProps.cpp (96%) rename ReactCommon/{fabric => react/renderer}/components/view/ViewProps.h (80%) rename ReactCommon/{fabric => react/renderer}/components/view/ViewPropsInterpolation.h (100%) rename ReactCommon/{fabric => react/renderer}/components/view/ViewShadowNode.cpp (97%) rename ReactCommon/{fabric => react/renderer}/components/view/ViewShadowNode.h (89%) rename ReactCommon/{fabric => react/renderer}/components/view/accessibility/AccessibilityPrimitives.h (100%) rename ReactCommon/{fabric => react/renderer}/components/view/accessibility/AccessibilityProps.cpp (92%) rename ReactCommon/{fabric => react/renderer}/components/view/accessibility/AccessibilityProps.h (85%) rename ReactCommon/{fabric => react/renderer}/components/view/accessibility/accessibilityPropsConversions.h (97%) rename ReactCommon/{fabric => react/renderer}/components/view/conversions.h (99%) rename ReactCommon/{fabric => react/renderer}/components/view/primitives.h (98%) rename ReactCommon/{fabric => react/renderer}/components/view/propsConversions.h (98%) rename ReactCommon/{fabric => react/renderer}/components/view/tests/LayoutTest.cpp (96%) rename ReactCommon/{fabric => react/renderer}/components/view/tests/ViewTest.cpp (94%) rename ReactCommon/{fabric => react/renderer}/components/view/yoga/YogaLayoutableShadowNode.cpp (98%) rename ReactCommon/{fabric => react/renderer}/components/view/yoga/YogaLayoutableShadowNode.h (95%) rename ReactCommon/{fabric => react/renderer}/components/view/yoga/YogaStylableProps.cpp (93%) rename ReactCommon/{fabric => react/renderer}/components/view/yoga/YogaStylableProps.h (87%) rename ReactCommon/{fabric => react/renderer}/core/BUCK (82%) rename ReactCommon/{fabric => react/renderer}/core/componentdescriptor/ComponentDescriptor.cpp (100%) rename ReactCommon/{fabric => react/renderer}/core/componentdescriptor/ComponentDescriptor.h (94%) rename ReactCommon/{fabric => react/renderer}/core/componentdescriptor/ConcreteComponentDescriptor.h (95%) rename ReactCommon/{fabric => react/renderer}/core/conversions.h (96%) rename ReactCommon/{fabric => react/renderer}/core/events/BatchedEventQueue.cpp (100%) rename ReactCommon/{fabric => react/renderer}/core/events/BatchedEventQueue.h (94%) rename ReactCommon/{fabric => react/renderer}/core/events/EventBeat.cpp (100%) rename ReactCommon/{fabric => react/renderer}/core/events/EventBeat.h (100%) rename ReactCommon/{fabric => react/renderer}/core/events/EventDispatcher.cpp (98%) rename ReactCommon/{fabric => react/renderer}/core/events/EventDispatcher.h (84%) rename ReactCommon/{fabric => react/renderer}/core/events/EventEmitter.cpp (98%) rename ReactCommon/{fabric => react/renderer}/core/events/EventEmitter.h (93%) rename ReactCommon/{fabric => react/renderer}/core/events/EventHandler.h (100%) rename ReactCommon/{fabric => react/renderer}/core/events/EventPipe.h (85%) rename ReactCommon/{fabric => react/renderer}/core/events/EventPriority.h (100%) rename ReactCommon/{fabric => react/renderer}/core/events/EventQueue.cpp (100%) rename ReactCommon/{fabric => react/renderer}/core/events/EventQueue.h (88%) rename ReactCommon/{fabric => react/renderer}/core/events/EventTarget.cpp (100%) rename ReactCommon/{fabric => react/renderer}/core/events/EventTarget.h (100%) rename ReactCommon/{fabric => react/renderer}/core/events/RawEvent.cpp (100%) rename ReactCommon/{fabric => react/renderer}/core/events/RawEvent.h (86%) rename ReactCommon/{fabric => react/renderer}/core/events/UnbatchedEventQueue.cpp (100%) rename ReactCommon/{fabric => react/renderer}/core/events/UnbatchedEventQueue.h (92%) rename ReactCommon/{fabric => react/renderer}/core/events/ValueFactory.h (100%) rename ReactCommon/{fabric => react/renderer}/core/layout/LayoutConstraints.cpp (100%) rename ReactCommon/{fabric => react/renderer}/core/layout/LayoutConstraints.h (93%) rename ReactCommon/{fabric => react/renderer}/core/layout/LayoutContext.h (94%) rename ReactCommon/{fabric => react/renderer}/core/layout/LayoutMetrics.h (94%) rename ReactCommon/{fabric => react/renderer}/core/layout/LayoutPrimitives.h (100%) rename ReactCommon/{fabric => react/renderer}/core/layout/LayoutableShadowNode.cpp (96%) rename ReactCommon/{fabric => react/renderer}/core/layout/LayoutableShadowNode.h (95%) rename ReactCommon/{fabric => react/renderer}/core/primitives/RawProps.cpp (97%) rename ReactCommon/{fabric => react/renderer}/core/primitives/RawProps.h (96%) rename ReactCommon/{fabric => react/renderer}/core/primitives/RawPropsKey.cpp (96%) rename ReactCommon/{fabric => react/renderer}/core/primitives/RawPropsKey.h (94%) rename ReactCommon/{fabric => react/renderer}/core/primitives/RawPropsKeyMap.cpp (100%) rename ReactCommon/{fabric => react/renderer}/core/primitives/RawPropsKeyMap.h (94%) rename ReactCommon/{fabric => react/renderer}/core/primitives/RawPropsParser.cpp (99%) rename ReactCommon/{fabric => react/renderer}/core/primitives/RawPropsParser.h (86%) rename ReactCommon/{fabric => react/renderer}/core/primitives/RawPropsPrimitives.h (100%) rename ReactCommon/{fabric => react/renderer}/core/primitives/RawValue.cpp (100%) rename ReactCommon/{fabric => react/renderer}/core/primitives/RawValue.h (100%) rename ReactCommon/{fabric => react/renderer}/core/primitives/ReactPrimitives.h (92%) rename ReactCommon/{fabric => react/renderer}/core/primitives/Sealable.cpp (100%) rename ReactCommon/{fabric => react/renderer}/core/primitives/Sealable.h (100%) rename ReactCommon/{fabric => react/renderer}/core/propsConversions.h (94%) rename ReactCommon/{fabric => react/renderer}/core/shadownode/ConcreteShadowNode.h (95%) rename ReactCommon/{fabric => react/renderer}/core/shadownode/Props.cpp (92%) rename ReactCommon/{fabric => react/renderer}/core/shadownode/Props.h (88%) rename ReactCommon/{fabric => react/renderer}/core/shadownode/ShadowNode.cpp (97%) rename ReactCommon/{fabric => react/renderer}/core/shadownode/ShadowNode.h (95%) rename ReactCommon/{fabric => react/renderer}/core/shadownode/ShadowNodeFamily.cpp (97%) rename ReactCommon/{fabric => react/renderer}/core/shadownode/ShadowNodeFamily.h (96%) rename ReactCommon/{fabric => react/renderer}/core/shadownode/ShadowNodeFamilyFragment.cpp (94%) rename ReactCommon/{fabric => react/renderer}/core/shadownode/ShadowNodeFamilyFragment.h (93%) rename ReactCommon/{fabric => react/renderer}/core/shadownode/ShadowNodeFragment.cpp (100%) rename ReactCommon/{fabric => react/renderer}/core/shadownode/ShadowNodeFragment.h (89%) rename ReactCommon/{fabric => react/renderer}/core/shadownode/ShadowNodeTraits.cpp (100%) rename ReactCommon/{fabric => react/renderer}/core/shadownode/ShadowNodeTraits.h (100%) rename ReactCommon/{fabric => react/renderer}/core/state/ConcreteState.h (98%) rename ReactCommon/{fabric => react/renderer}/core/state/State.cpp (85%) rename ReactCommon/{fabric => react/renderer}/core/state/State.h (98%) rename ReactCommon/{fabric => react/renderer}/core/state/StateData.h (100%) rename ReactCommon/{fabric => react/renderer}/core/state/StatePipe.h (89%) rename ReactCommon/{fabric => react/renderer}/core/state/StateUpdate.cpp (100%) rename ReactCommon/{fabric => react/renderer}/core/state/StateUpdate.h (93%) rename ReactCommon/{fabric => react/renderer}/core/tests/ComponentDescriptorTest.cpp (100%) rename ReactCommon/{fabric => react/renderer}/core/tests/FindNodeAtPointTest.cpp (100%) rename ReactCommon/{fabric => react/renderer}/core/tests/LayoutableShadowNodeTest.cpp (100%) rename ReactCommon/{fabric => react/renderer}/core/tests/PrimitivesTest.cpp (96%) rename ReactCommon/{fabric => react/renderer}/core/tests/RawPropsTest.cpp (98%) rename ReactCommon/{fabric => react/renderer}/core/tests/ShadowNodeFamilyTest.cpp (89%) rename ReactCommon/{fabric => react/renderer}/core/tests/ShadowNodeTest.cpp (98%) rename ReactCommon/{fabric => react/renderer}/core/tests/TestComponent.h (82%) rename ReactCommon/{fabric => react/renderer}/core/tests/benchmarks/RawPropsBenchmark.cpp (93%) rename ReactCommon/{fabric => react/renderer}/core/tests/traitCastTest.cpp (89%) rename ReactCommon/{fabric => react/renderer}/debug/BUCK (98%) rename ReactCommon/{fabric => react/renderer}/debug/DebugStringConvertible.cpp (100%) rename ReactCommon/{fabric => react/renderer}/debug/DebugStringConvertible.h (100%) rename ReactCommon/{fabric => react/renderer}/debug/DebugStringConvertibleItem.cpp (100%) rename ReactCommon/{fabric => react/renderer}/debug/DebugStringConvertibleItem.h (95%) rename ReactCommon/{fabric => react/renderer}/debug/SystraceSection.h (100%) rename ReactCommon/{fabric => react/renderer}/debug/debugStringConvertibleUtils.h (93%) rename ReactCommon/{fabric => react/renderer}/debug/tests/DebugStringConvertibleTest.cpp (98%) rename ReactCommon/{fabric => react/renderer}/element/BUCK (66%) rename ReactCommon/{fabric => react/renderer}/element/ComponentBuilder.cpp (100%) rename ReactCommon/{fabric => react/renderer}/element/ComponentBuilder.h (78%) rename ReactCommon/{fabric => react/renderer}/element/Element.cpp (100%) rename ReactCommon/{fabric => react/renderer}/element/Element.h (97%) rename ReactCommon/{fabric => react/renderer}/element/ElementFragment.cpp (100%) rename ReactCommon/{fabric => react/renderer}/element/ElementFragment.h (96%) rename ReactCommon/{fabric => react/renderer}/element/testUtils.h (71%) rename ReactCommon/{fabric => react/renderer}/element/tests/ElementTest.cpp (88%) rename ReactCommon/{fabric => react/renderer}/graphics/BUCK (94%) rename ReactCommon/{fabric => react/renderer}/graphics/ColorComponents.h (100%) rename ReactCommon/{fabric => react/renderer}/graphics/Geometry.h (56%) rename ReactCommon/{fabric => react/renderer}/graphics/Point.h (97%) rename ReactCommon/{fabric => react/renderer}/graphics/React-graphics.podspec (100%) rename ReactCommon/{fabric => react/renderer}/graphics/Rect.h (95%) rename ReactCommon/{fabric => react/renderer}/graphics/RectangleCorners.h (97%) rename ReactCommon/{fabric => react/renderer}/graphics/RectangleEdges.h (96%) rename ReactCommon/{fabric => react/renderer}/graphics/Size.h (92%) rename ReactCommon/{fabric => react/renderer}/graphics/Transform.cpp (100%) rename ReactCommon/{fabric => react/renderer}/graphics/Transform.h (98%) rename ReactCommon/{fabric => react/renderer}/graphics/conversions.h (97%) rename ReactCommon/{fabric => react/renderer}/graphics/platform/cxx/Color.cpp (100%) rename ReactCommon/{fabric => react/renderer}/graphics/platform/cxx/Color.h (97%) rename ReactCommon/{fabric => react/renderer}/graphics/platform/cxx/Float.h (100%) rename ReactCommon/{fabric => react/renderer}/graphics/platform/ios/Color.cpp (100%) rename ReactCommon/{fabric => react/renderer}/graphics/platform/ios/Color.h (86%) rename ReactCommon/{fabric => react/renderer}/graphics/platform/ios/Float.h (100%) rename ReactCommon/{fabric => react/renderer}/graphics/rounding.h (98%) rename ReactCommon/{fabric => react/renderer}/graphics/tests/GraphicsTest.cpp (100%) rename ReactCommon/{fabric => react/renderer}/graphics/tests/TransformTest.cpp (97%) rename ReactCommon/{fabric => react/renderer}/imagemanager/BUCK (89%) rename ReactCommon/{fabric => react/renderer}/imagemanager/ImageInstrumentation.h (94%) rename ReactCommon/{fabric => react/renderer}/imagemanager/ImageManager.h (82%) rename ReactCommon/{fabric => react/renderer}/imagemanager/ImageRequest.h (90%) rename ReactCommon/{fabric => react/renderer}/imagemanager/ImageResponse.cpp (100%) rename ReactCommon/{fabric => react/renderer}/imagemanager/ImageResponse.h (100%) rename ReactCommon/{fabric => react/renderer}/imagemanager/ImageResponseObserver.h (92%) rename ReactCommon/{fabric => react/renderer}/imagemanager/ImageResponseObserverCoordinator.cpp (100%) rename ReactCommon/{fabric => react/renderer}/imagemanager/ImageResponseObserverCoordinator.h (94%) rename ReactCommon/{fabric => react/renderer}/imagemanager/platform/cxx/ImageManager.cpp (100%) rename ReactCommon/{fabric => react/renderer}/imagemanager/platform/cxx/ImageRequest.cpp (100%) rename ReactCommon/{fabric => react/renderer}/imagemanager/platform/ios/ImageManager.mm (100%) rename ReactCommon/{fabric => react/renderer}/imagemanager/platform/ios/ImageRequest.cpp (100%) rename ReactCommon/{fabric => react/renderer}/imagemanager/platform/ios/RCTImageInstrumentationProxy.h (89%) rename ReactCommon/{fabric => react/renderer}/imagemanager/platform/ios/RCTImageInstrumentationProxy.mm (100%) rename ReactCommon/{fabric => react/renderer}/imagemanager/platform/ios/RCTImageManager.h (100%) rename ReactCommon/{fabric => react/renderer}/imagemanager/platform/ios/RCTImageManager.mm (96%) rename ReactCommon/{fabric => react/renderer}/imagemanager/platform/ios/RCTImageManagerProtocol.h (81%) rename ReactCommon/{fabric => react/renderer}/imagemanager/platform/ios/RCTImagePrimitivesConversions.h (98%) rename ReactCommon/{fabric => react/renderer}/imagemanager/platform/ios/RCTSyncImageManager.h (100%) rename ReactCommon/{fabric => react/renderer}/imagemanager/platform/ios/RCTSyncImageManager.mm (96%) rename ReactCommon/{fabric => react/renderer}/imagemanager/primitives.h (94%) rename ReactCommon/{fabric => react/renderer}/imagemanager/tests/ImageManagerTest.cpp (85%) rename ReactCommon/{fabric => react/renderer}/mapbuffer/BUCK (100%) rename ReactCommon/{fabric => react/renderer}/mapbuffer/MapBuffer.cpp (100%) rename ReactCommon/{fabric => react/renderer}/mapbuffer/MapBuffer.h (100%) rename ReactCommon/{fabric => react/renderer}/mapbuffer/tests/MapBufferTest.cpp (100%) rename ReactCommon/{fabric => react/renderer}/mounting/BUCK (77%) rename ReactCommon/{fabric => react/renderer}/mounting/Differentiator.cpp (99%) rename ReactCommon/{fabric => react/renderer}/mounting/Differentiator.h (89%) rename ReactCommon/{fabric => react/renderer}/mounting/MountingCoordinator.cpp (98%) rename ReactCommon/{fabric => react/renderer}/mounting/MountingCoordinator.h (92%) rename ReactCommon/{fabric => react/renderer}/mounting/MountingOverrideDelegate.h (95%) rename ReactCommon/{fabric => react/renderer}/mounting/MountingTelemetry.cpp (100%) rename ReactCommon/{fabric => react/renderer}/mounting/MountingTelemetry.h (100%) rename ReactCommon/{fabric => react/renderer}/mounting/MountingTransaction.cpp (100%) rename ReactCommon/{fabric => react/renderer}/mounting/MountingTransaction.h (93%) rename ReactCommon/{fabric => react/renderer}/mounting/MountingTransactionMetadata.cpp (100%) rename ReactCommon/{fabric => react/renderer}/mounting/MountingTransactionMetadata.h (87%) rename ReactCommon/{fabric => react/renderer}/mounting/ShadowTree.cpp (96%) rename ReactCommon/{fabric => react/renderer}/mounting/ShadowTree.h (86%) rename ReactCommon/{fabric => react/renderer}/mounting/ShadowTreeDelegate.h (92%) rename ReactCommon/{fabric => react/renderer}/mounting/ShadowTreeRegistry.cpp (100%) rename ReactCommon/{fabric => react/renderer}/mounting/ShadowTreeRegistry.h (95%) rename ReactCommon/{fabric => react/renderer}/mounting/ShadowTreeRevision.cpp (100%) rename ReactCommon/{fabric => react/renderer}/mounting/ShadowTreeRevision.h (86%) rename ReactCommon/{fabric => react/renderer}/mounting/ShadowView.cpp (97%) rename ReactCommon/{fabric => react/renderer}/mounting/ShadowView.h (90%) rename ReactCommon/{fabric => react/renderer}/mounting/ShadowViewMutation.cpp (100%) rename ReactCommon/{fabric => react/renderer}/mounting/ShadowViewMutation.h (97%) rename ReactCommon/{fabric => react/renderer}/mounting/SurfaceTelemetry.cpp (100%) rename ReactCommon/{fabric => react/renderer}/mounting/SurfaceTelemetry.h (95%) rename ReactCommon/{fabric => react/renderer}/mounting/TelemetryController.cpp (96%) rename ReactCommon/{fabric => react/renderer}/mounting/TelemetryController.h (88%) rename ReactCommon/{fabric => react/renderer}/mounting/TreeStateReconciliation.cpp (100%) rename ReactCommon/{fabric => react/renderer}/mounting/TreeStateReconciliation.h (92%) rename ReactCommon/{fabric => react/renderer}/mounting/stubs/StubView.cpp (100%) rename ReactCommon/{fabric => react/renderer}/mounting/stubs/StubView.h (86%) rename ReactCommon/{fabric => react/renderer}/mounting/stubs/StubViewTree.cpp (100%) rename ReactCommon/{fabric => react/renderer}/mounting/stubs/StubViewTree.h (88%) rename ReactCommon/{fabric => react/renderer}/mounting/stubs/stubs.cpp (92%) rename ReactCommon/{fabric => react/renderer}/mounting/stubs/stubs.h (90%) rename ReactCommon/{fabric => react/renderer}/mounting/tests/Entropy.h (100%) rename ReactCommon/{fabric => react/renderer}/mounting/tests/MountingTelemetryTest.cpp (98%) rename ReactCommon/{fabric => react/renderer}/mounting/tests/MountingTest.cpp (98%) rename ReactCommon/{fabric => react/renderer}/mounting/tests/ShadowTreeLifeCycleTest.cpp (95%) rename ReactCommon/{fabric => react/renderer}/mounting/tests/StateReconciliationTest.cpp (91%) rename ReactCommon/{fabric => react/renderer}/mounting/tests/shadowTreeGeneration.h (96%) rename ReactCommon/{fabric => react/renderer}/scheduler/AsynchronousEventBeat.cpp (100%) rename ReactCommon/{fabric => react/renderer}/scheduler/AsynchronousEventBeat.h (96%) rename ReactCommon/{fabric => react/renderer}/scheduler/BUCK (74%) rename ReactCommon/{fabric => react/renderer}/scheduler/Scheduler.cpp (96%) rename ReactCommon/{fabric => react/renderer}/scheduler/Scheduler.h (88%) rename ReactCommon/{fabric => react/renderer}/scheduler/SchedulerDelegate.h (90%) rename ReactCommon/{fabric => react/renderer}/scheduler/SchedulerToolbox.cpp (100%) rename ReactCommon/{fabric => react/renderer}/scheduler/SchedulerToolbox.h (91%) rename ReactCommon/{fabric => react/renderer}/scheduler/SynchronousEventBeat.cpp (100%) rename ReactCommon/{fabric => react/renderer}/scheduler/SynchronousEventBeat.h (96%) rename ReactCommon/{fabric => react/renderer}/templateprocessor/BUCK (75%) rename ReactCommon/{fabric => react/renderer}/templateprocessor/UITemplateProcessor.cpp (92%) rename ReactCommon/{fabric => react/renderer}/templateprocessor/UITemplateProcessor.h (90%) rename ReactCommon/{fabric => react/renderer}/templateprocessor/tests/UITemplateProcessorTest.cpp (89%) rename ReactCommon/{fabric => react/renderer}/textlayoutmanager/BUCK (84%) rename ReactCommon/{fabric => react/renderer}/textlayoutmanager/TextMeasureCache.cpp (100%) rename ReactCommon/{fabric => react/renderer}/textlayoutmanager/TextMeasureCache.h (96%) rename ReactCommon/{fabric => react/renderer}/textlayoutmanager/platform/android/TextLayoutManager.cpp (97%) rename ReactCommon/{fabric => react/renderer}/textlayoutmanager/platform/android/TextLayoutManager.h (85%) rename ReactCommon/{fabric => react/renderer}/textlayoutmanager/platform/cxx/TextLayoutManager.cpp (100%) rename ReactCommon/{fabric => react/renderer}/textlayoutmanager/platform/cxx/TextLayoutManager.h (80%) rename ReactCommon/{fabric => react/renderer}/textlayoutmanager/platform/ios/NSTextStorage+FontScaling.h (100%) rename ReactCommon/{fabric => react/renderer}/textlayoutmanager/platform/ios/NSTextStorage+FontScaling.m (100%) rename ReactCommon/{fabric => react/renderer}/textlayoutmanager/platform/ios/RCTAttributedTextUtils.h (87%) rename ReactCommon/{fabric => react/renderer}/textlayoutmanager/platform/ios/RCTAttributedTextUtils.mm (98%) rename ReactCommon/{fabric => react/renderer}/textlayoutmanager/platform/ios/RCTFontProperties.h (100%) rename ReactCommon/{fabric => react/renderer}/textlayoutmanager/platform/ios/RCTFontUtils.h (86%) rename ReactCommon/{fabric => react/renderer}/textlayoutmanager/platform/ios/RCTFontUtils.mm (100%) rename ReactCommon/{fabric => react/renderer}/textlayoutmanager/platform/ios/RCTTextLayoutManager.h (88%) rename ReactCommon/{fabric => react/renderer}/textlayoutmanager/platform/ios/RCTTextLayoutManager.mm (100%) rename ReactCommon/{fabric => react/renderer}/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h (96%) rename ReactCommon/{fabric => react/renderer}/textlayoutmanager/platform/ios/TextLayoutManager.h (83%) rename ReactCommon/{fabric => react/renderer}/textlayoutmanager/platform/ios/TextLayoutManager.mm (100%) rename ReactCommon/{fabric => react/renderer}/textlayoutmanager/tests/TextLayoutManagerTest.cpp (83%) rename ReactCommon/{fabric => react/renderer}/uimanager/BUCK (73%) rename ReactCommon/{fabric => react/renderer}/uimanager/LayoutAnimationStatusDelegate.h (100%) rename ReactCommon/{fabric => react/renderer}/uimanager/UIManager.cpp (98%) rename ReactCommon/{fabric => react/renderer}/uimanager/UIManager.h (88%) rename ReactCommon/{fabric => react/renderer}/uimanager/UIManagerAnimationDelegate.h (85%) rename ReactCommon/{fabric => react/renderer}/uimanager/UIManagerBinding.cpp (99%) rename ReactCommon/{fabric => react/renderer}/uimanager/UIManagerBinding.h (94%) rename ReactCommon/{fabric => react/renderer}/uimanager/UIManagerDelegate.h (90%) rename ReactCommon/{fabric => react/renderer}/uimanager/primitives.h (96%) rename ReactCommon/{fabric => react/renderer}/uimanager/tests/FabricUIManagerTest.cpp (86%) diff --git a/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.mm index a1eafa66906..dd79102526d 100644 --- a/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.mm @@ -7,9 +7,9 @@ #import "RCTActivityIndicatorViewComponentView.h" -#import -#import -#import +#import +#import +#import #import "FBRCTFabricComponentsPlugins.h" diff --git a/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm b/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm index 4e87e202fab..f0a9ba293aa 100644 --- a/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm @@ -10,13 +10,13 @@ #import #import #import -#import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import +#import #import "RCTConversions.h" #import "RCTFabricComponentsPlugins.h" diff --git a/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.mm b/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.mm index cf24358e274..7ee2f208932 100644 --- a/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.mm @@ -11,8 +11,8 @@ #import #import #import -#import -#import +#import +#import #import "RCTInputAccessoryContentView.h" #import "RCTFabricComponentsPlugins.h" diff --git a/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm b/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm index 10e78de2937..7db1533ca73 100644 --- a/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm @@ -8,8 +8,8 @@ #import "RCTLegacyViewManagerInteropComponentView.h" #import -#import -#import +#import +#import #import #import "RCTLegacyViewManagerInteropCoordinatorAdapter.h" diff --git a/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropCoordinatorAdapter.h b/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropCoordinatorAdapter.h index f919187dc1b..56fc5c6dd4c 100644 --- a/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropCoordinatorAdapter.h +++ b/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropCoordinatorAdapter.h @@ -6,7 +6,7 @@ */ #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm index 29b7b12e899..2599f1a31fb 100644 --- a/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm @@ -8,10 +8,10 @@ #import "RCTModalHostViewComponentView.h" #import -#import -#import -#import -#import +#import +#import +#import +#import #import "FBRCTFabricComponentsPlugins.h" #import "RCTConversions.h" diff --git a/React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.mm b/React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.mm index 9ffd6fb3f8c..820d4dfb628 100644 --- a/React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.mm @@ -7,8 +7,8 @@ #import "RCTRootComponentView.h" -#import -#import +#import +#import using namespace facebook::react; diff --git a/React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.mm index 6886660a73f..b3ef229906d 100644 --- a/React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.mm @@ -8,8 +8,8 @@ #import "RCTSafeAreaViewComponentView.h" #import -#import -#import +#import +#import #import "FBRCTFabricComponentsPlugins.h" #import "RCTConversions.h" #import "RCTFabricComponentsPlugins.h" diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.mm index f8db5e3da23..afcec45afa6 100644 --- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.mm @@ -7,10 +7,10 @@ #import "RCTPullToRefreshViewComponentView.h" -#import -#import -#import -#import +#import +#import +#import +#import #import #import diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm index 2d3e8c3802f..21b7f2e46f1 100644 --- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm @@ -11,12 +11,12 @@ #import #import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import #import "RCTConversions.h" #import "RCTEnhancedScrollView.h" diff --git a/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.mm b/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.mm index 48603345fc5..fea74e18c14 100644 --- a/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.mm @@ -9,9 +9,9 @@ #import #import -#import -#import -#import +#import +#import +#import #import "FBRCTFabricComponentsPlugins.h" diff --git a/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.mm b/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.mm index 4528488f52d..2538f040476 100644 --- a/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.mm @@ -7,10 +7,10 @@ #import "RCTSwitchComponentView.h" -#import -#import -#import -#import +#import +#import +#import +#import #import "FBRCTFabricComponentsPlugins.h" diff --git a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.h b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.h index 87573f789f5..d2b2fc0eb1f 100644 --- a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.h +++ b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.h @@ -7,9 +7,9 @@ #import -#import -#import -#import +#import +#import +#import #import "RCTParagraphComponentView.h" diff --git a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.mm b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.mm index 04adf1159ba..3bffdd2429d 100644 --- a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.mm +++ b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.mm @@ -8,10 +8,10 @@ #import "RCTParagraphComponentAccessibilityProvider.h" #import -#import -#import -#import -#import +#import +#import +#import +#import #import "RCTConversions.h" #import "RCTFabricComponentsPlugins.h" diff --git a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm index ba5a1f34c73..7756a776154 100644 --- a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm @@ -8,15 +8,15 @@ #import "RCTParagraphComponentView.h" #import "RCTParagraphComponentAccessibilityProvider.h" -#import -#import -#import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import +#import +#import +#import #import #import "RCTConversions.h" diff --git a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm index 7a7d7e939ce..6cf72777384 100644 --- a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm @@ -7,10 +7,10 @@ #import "RCTTextInputComponentView.h" -#import -#import -#import -#import +#import +#import +#import +#import #import #import diff --git a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.h b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.h index 054bf41c811..94191bfea35 100644 --- a/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.h +++ b/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.h @@ -9,7 +9,7 @@ #import #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/React/Fabric/Mounting/ComponentViews/UnimplementedComponent/RCTUnimplementedNativeComponentView.mm b/React/Fabric/Mounting/ComponentViews/UnimplementedComponent/RCTUnimplementedNativeComponentView.mm index c6728d57727..09e8e3f7ed8 100644 --- a/React/Fabric/Mounting/ComponentViews/UnimplementedComponent/RCTUnimplementedNativeComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/UnimplementedComponent/RCTUnimplementedNativeComponentView.mm @@ -7,9 +7,9 @@ #import "RCTUnimplementedNativeComponentView.h" -#import -#import -#import +#import +#import +#import using namespace facebook::react; diff --git a/React/Fabric/Mounting/ComponentViews/UnimplementedView/RCTUnimplementedViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/UnimplementedView/RCTUnimplementedViewComponentView.mm index 6f617d0c482..d7eaa6c62a5 100644 --- a/React/Fabric/Mounting/ComponentViews/UnimplementedView/RCTUnimplementedViewComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/UnimplementedView/RCTUnimplementedViewComponentView.mm @@ -7,12 +7,12 @@ #import "RCTUnimplementedViewComponentView.h" -#import -#import -#import +#import +#import +#import -#import -#import +#import +#import #import diff --git a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h index af170a8a8b8..c574b1752c7 100644 --- a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h @@ -10,11 +10,11 @@ #import #import #import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm index dfec3a59937..40bbf2752de 100644 --- a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm @@ -10,9 +10,9 @@ #import #import #import -#import -#import -#import +#import +#import +#import #import "RCTConversions.h" #import "RCTFabricComponentsPlugins.h" diff --git a/React/Fabric/Mounting/RCTComponentViewFactory.h b/React/Fabric/Mounting/RCTComponentViewFactory.h index 638fd4e5bde..745df38f2f4 100644 --- a/React/Fabric/Mounting/RCTComponentViewFactory.h +++ b/React/Fabric/Mounting/RCTComponentViewFactory.h @@ -10,7 +10,7 @@ #import #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/React/Fabric/Mounting/RCTComponentViewFactory.mm b/React/Fabric/Mounting/RCTComponentViewFactory.mm index e1566df29bf..88489f2b3cd 100644 --- a/React/Fabric/Mounting/RCTComponentViewFactory.mm +++ b/React/Fabric/Mounting/RCTComponentViewFactory.mm @@ -13,8 +13,8 @@ #import #import -#import -#import +#import +#import #ifdef RN_DISABLE_OSS_PLUGIN_HEADER #import diff --git a/React/Fabric/Mounting/RCTComponentViewProtocol.h b/React/Fabric/Mounting/RCTComponentViewProtocol.h index 3fd2c3fccf5..180b882a5d6 100644 --- a/React/Fabric/Mounting/RCTComponentViewProtocol.h +++ b/React/Fabric/Mounting/RCTComponentViewProtocol.h @@ -8,11 +8,11 @@ #import #import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/React/Fabric/Mounting/RCTComponentViewRegistry.h b/React/Fabric/Mounting/RCTComponentViewRegistry.h index 44b7773ea73..7119449660d 100644 --- a/React/Fabric/Mounting/RCTComponentViewRegistry.h +++ b/React/Fabric/Mounting/RCTComponentViewRegistry.h @@ -10,7 +10,7 @@ #import #import #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/React/Fabric/Mounting/RCTMountingManager.h b/React/Fabric/Mounting/RCTMountingManager.h index 0e8771b8a8b..0166914bed2 100644 --- a/React/Fabric/Mounting/RCTMountingManager.h +++ b/React/Fabric/Mounting/RCTMountingManager.h @@ -9,10 +9,10 @@ #import #import -#import -#import -#import -#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/React/Fabric/Mounting/RCTMountingManager.mm b/React/Fabric/Mounting/RCTMountingManager.mm index ebc361e849b..6a886530487 100644 --- a/React/Fabric/Mounting/RCTMountingManager.mm +++ b/React/Fabric/Mounting/RCTMountingManager.mm @@ -12,10 +12,10 @@ #import #import #import -#import -#import -#import -#import +#import +#import +#import +#import #import "RCTComponentViewProtocol.h" #import "RCTComponentViewRegistry.h" diff --git a/React/Fabric/Mounting/RCTMountingTransactionObserverCoordinator.h b/React/Fabric/Mounting/RCTMountingTransactionObserverCoordinator.h index 512febedf16..31da581bfdf 100644 --- a/React/Fabric/Mounting/RCTMountingTransactionObserverCoordinator.h +++ b/React/Fabric/Mounting/RCTMountingTransactionObserverCoordinator.h @@ -11,7 +11,7 @@ #import #import -#import +#import class RCTMountingTransactionObserverCoordinator final { public: diff --git a/React/Fabric/Mounting/RCTMountingTransactionObserving.h b/React/Fabric/Mounting/RCTMountingTransactionObserving.h index 0d87ce97de8..477c97df02a 100644 --- a/React/Fabric/Mounting/RCTMountingTransactionObserving.h +++ b/React/Fabric/Mounting/RCTMountingTransactionObserving.h @@ -7,7 +7,7 @@ #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/React/Fabric/RCTConversions.h b/React/Fabric/RCTConversions.h index 421ff298eb5..1882e6af496 100644 --- a/React/Fabric/RCTConversions.h +++ b/React/Fabric/RCTConversions.h @@ -7,12 +7,12 @@ #import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/React/Fabric/RCTImageResponseObserverProxy.h b/React/Fabric/RCTImageResponseObserverProxy.h index 4cc63c8ccdf..c86005206b2 100644 --- a/React/Fabric/RCTImageResponseObserverProxy.h +++ b/React/Fabric/RCTImageResponseObserverProxy.h @@ -9,7 +9,7 @@ #import "RCTImageResponseDelegate.h" -#include +#include NS_ASSUME_NONNULL_BEGIN diff --git a/React/Fabric/RCTImageResponseObserverProxy.mm b/React/Fabric/RCTImageResponseObserverProxy.mm index 9bb1e323fd3..4c74e2ea42f 100644 --- a/React/Fabric/RCTImageResponseObserverProxy.mm +++ b/React/Fabric/RCTImageResponseObserverProxy.mm @@ -8,8 +8,8 @@ #import "RCTImageResponseObserverProxy.h" #import -#import -#import +#import +#import #import namespace facebook { diff --git a/React/Fabric/RCTScheduler.h b/React/Fabric/RCTScheduler.h index f85174c03f3..bcdbf5483f6 100644 --- a/React/Fabric/RCTScheduler.h +++ b/React/Fabric/RCTScheduler.h @@ -9,12 +9,12 @@ #import #import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/React/Fabric/RCTScheduler.mm b/React/Fabric/RCTScheduler.mm index da0a3a5ca5f..27043b3da52 100644 --- a/React/Fabric/RCTScheduler.mm +++ b/React/Fabric/RCTScheduler.mm @@ -7,11 +7,11 @@ #import "RCTScheduler.h" -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import #include #import diff --git a/React/Fabric/RCTSurfacePresenter.mm b/React/Fabric/RCTSurfacePresenter.mm index 838b5f90636..82c1d6a449a 100644 --- a/React/Fabric/RCTSurfacePresenter.mm +++ b/React/Fabric/RCTSurfacePresenter.mm @@ -25,14 +25,14 @@ #import -#import -#import #import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import +#import #import #import diff --git a/React/Fabric/RCTTouchableComponentViewProtocol.h b/React/Fabric/RCTTouchableComponentViewProtocol.h index ed635b41bf3..78eb34c3b59 100644 --- a/React/Fabric/RCTTouchableComponentViewProtocol.h +++ b/React/Fabric/RCTTouchableComponentViewProtocol.h @@ -6,7 +6,7 @@ */ #import -#import +#import @protocol RCTTouchableComponentViewProtocol - (facebook::react::SharedTouchEventEmitter)touchEventEmitterAtPoint:(CGPoint)point; diff --git a/React/Fabric/Surface/RCTFabricSurface.h b/React/Fabric/Surface/RCTFabricSurface.h index 9e2e01117af..a4b7af7f705 100644 --- a/React/Fabric/Surface/RCTFabricSurface.h +++ b/React/Fabric/Surface/RCTFabricSurface.h @@ -7,7 +7,7 @@ #import #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/React/Fabric/Utils/MainRunLoopEventBeat.h b/React/Fabric/Utils/MainRunLoopEventBeat.h index eeb2aeea453..b0b7751f06c 100644 --- a/React/Fabric/Utils/MainRunLoopEventBeat.h +++ b/React/Fabric/Utils/MainRunLoopEventBeat.h @@ -10,7 +10,7 @@ #include #include #include -#include +#include namespace facebook { namespace react { diff --git a/React/Fabric/Utils/RuntimeEventBeat.h b/React/Fabric/Utils/RuntimeEventBeat.h index d55980f40c6..8bfdd0cdf9c 100644 --- a/React/Fabric/Utils/RuntimeEventBeat.h +++ b/React/Fabric/Utils/RuntimeEventBeat.h @@ -8,7 +8,7 @@ #include #include #include -#include +#include namespace facebook { namespace react { diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/AsyncEventBeat.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/AsyncEventBeat.h index cf09e4d5a69..ee02ffc31d8 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/AsyncEventBeat.h +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/AsyncEventBeat.h @@ -8,8 +8,8 @@ #pragma once #include -#include -#include +#include +#include #include "EventBeatManager.h" diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/BUCK b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/BUCK index 7fc222b4702..8652fd3f9ce 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/BUCK @@ -29,11 +29,11 @@ rn_xplat_cxx_library( deps = [ react_native_xplat_target("better:better"), react_native_xplat_target("config:config"), - react_native_xplat_target("fabric/animations:animations"), - react_native_xplat_target("fabric/uimanager:uimanager"), - react_native_xplat_target("fabric/scheduler:scheduler"), - react_native_xplat_target("fabric/componentregistry:componentregistry"), - react_native_xplat_target("fabric/components/scrollview:scrollview"), + react_native_xplat_target("react/renderer/animations:animations"), + react_native_xplat_target("react/renderer/uimanager:uimanager"), + react_native_xplat_target("react/renderer/scheduler:scheduler"), + react_native_xplat_target("react/renderer/componentregistry:componentregistry"), + react_native_xplat_target("react/renderer/components/scrollview:scrollview"), react_native_xplat_target("runtimeexecutor:runtimeexecutor"), react_native_target("jni/react/jni:jni"), "//xplat/fbsystrace:fbsystrace", diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp index 10e22094c15..eae4491ce9b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp @@ -15,17 +15,17 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h index 5c2f33fad27..f4131a9d1de 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h @@ -8,13 +8,13 @@ #pragma once #include -#include #include #include #include -#include -#include -#include +#include +#include +#include +#include #include #include #include "ComponentFactoryDelegate.h" diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ComponentFactoryDelegate.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ComponentFactoryDelegate.cpp index 0f4d4c08fb6..a1ac6e34db6 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ComponentFactoryDelegate.cpp +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ComponentFactoryDelegate.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include using namespace facebook::jsi; diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ComponentFactoryDelegate.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ComponentFactoryDelegate.h index aae5a8e5220..33218569ce9 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ComponentFactoryDelegate.h +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ComponentFactoryDelegate.h @@ -9,8 +9,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventBeatManager.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventBeatManager.h index 5ed943f226c..094424ec260 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventBeatManager.h +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventBeatManager.h @@ -12,7 +12,7 @@ #include #include -#include +#include namespace facebook { namespace react { diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.cpp index fda61cd1c9a..19fe921a46b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.cpp +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.cpp @@ -33,4 +33,4 @@ void EventEmitterWrapper::registerNatives() { } } // namespace react -} // namespace facebook \ No newline at end of file +} // namespace facebook diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.h index 08809945270..dcc84ea6320 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.h +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.h @@ -8,8 +8,8 @@ #pragma once #include -#include #include +#include namespace facebook { namespace react { diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/JBackgroundExecutor.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/JBackgroundExecutor.h index 002c0249d63..31e7b89609f 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/JBackgroundExecutor.h +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/JBackgroundExecutor.h @@ -8,7 +8,7 @@ #pragma once #include -#include +#include namespace facebook { namespace react { diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/NodeStateWrapper.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/NodeStateWrapper.h index da7266e56f8..672b8e95b16 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/NodeStateWrapper.h +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/NodeStateWrapper.h @@ -8,8 +8,8 @@ #pragma once #include -#include #include +#include namespace facebook { namespace react { diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/StateWrapperImpl.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/StateWrapperImpl.h index b2d15a350f5..056a11738ea 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/StateWrapperImpl.h +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/StateWrapperImpl.h @@ -8,8 +8,8 @@ #pragma once #include -#include #include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/.clang-tidy b/ReactCommon/react/renderer/.clang-tidy similarity index 100% rename from ReactCommon/fabric/.clang-tidy rename to ReactCommon/react/renderer/.clang-tidy diff --git a/ReactCommon/fabric/animations/BUCK b/ReactCommon/react/renderer/animations/BUCK similarity index 72% rename from ReactCommon/fabric/animations/BUCK rename to ReactCommon/react/renderer/animations/BUCK index 123fb6c45e2..93bc2e7ef3f 100644 --- a/ReactCommon/fabric/animations/BUCK +++ b/ReactCommon/react/renderer/animations/BUCK @@ -29,7 +29,7 @@ rn_xplat_cxx_library( [ ("", "*.h"), ], - prefix = "react/animations", + prefix = "react/renderer/animations", ), compiler_flags = [ "-fexceptions", @@ -59,12 +59,12 @@ rn_xplat_cxx_library( "//xplat/jsi:JSIDynamic", "//xplat/jsi:jsi", react_native_xplat_target("config:config"), - react_native_xplat_target("fabric/componentregistry:componentregistry"), - react_native_xplat_target("fabric/components/view:view"), - react_native_xplat_target("fabric/core:core"), - react_native_xplat_target("fabric/debug:debug"), - react_native_xplat_target("fabric/mounting:mounting"), - react_native_xplat_target("fabric/uimanager:uimanager"), + react_native_xplat_target("react/renderer/componentregistry:componentregistry"), + react_native_xplat_target("react/renderer/components/view:view"), + react_native_xplat_target("react/renderer/core:core"), + react_native_xplat_target("react/renderer/debug:debug"), + react_native_xplat_target("react/renderer/mounting:mounting"), + react_native_xplat_target("react/renderer/uimanager:uimanager"), react_native_xplat_target("runtimeexecutor:runtimeexecutor"), ], ) @@ -86,11 +86,11 @@ fb_xplat_cxx_test( "//xplat/folly:molly", "//xplat/third-party/gmock:gtest", react_native_xplat_target("config:config"), - react_native_xplat_target("fabric/components/activityindicator:activityindicator"), - react_native_xplat_target("fabric/components/image:image"), - react_native_xplat_target("fabric/components/root:root"), - react_native_xplat_target("fabric/components/scrollview:scrollview"), - react_native_xplat_target("fabric/components/view:view"), + react_native_xplat_target("react/renderer/components/activityindicator:activityindicator"), + react_native_xplat_target("react/renderer/components/image:image"), + react_native_xplat_target("react/renderer/components/root:root"), + react_native_xplat_target("react/renderer/components/scrollview:scrollview"), + react_native_xplat_target("react/renderer/components/view:view"), "//xplat/js/react-native-github:generated_components-rncore", ], ) diff --git a/ReactCommon/fabric/animations/LayoutAnimationDriver.cpp b/ReactCommon/react/renderer/animations/LayoutAnimationDriver.cpp similarity index 90% rename from ReactCommon/fabric/animations/LayoutAnimationDriver.cpp rename to ReactCommon/react/renderer/animations/LayoutAnimationDriver.cpp index a1e1da95644..727ffc49a97 100644 --- a/ReactCommon/fabric/animations/LayoutAnimationDriver.cpp +++ b/ReactCommon/react/renderer/animations/LayoutAnimationDriver.cpp @@ -10,19 +10,19 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/ReactCommon/fabric/animations/LayoutAnimationDriver.h b/ReactCommon/react/renderer/animations/LayoutAnimationDriver.h similarity index 73% rename from ReactCommon/fabric/animations/LayoutAnimationDriver.h rename to ReactCommon/react/renderer/animations/LayoutAnimationDriver.h index 3aa04f99163..525d4a7f804 100644 --- a/ReactCommon/fabric/animations/LayoutAnimationDriver.h +++ b/ReactCommon/react/renderer/animations/LayoutAnimationDriver.h @@ -7,12 +7,12 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/ReactCommon/fabric/animations/LayoutAnimationKeyFrameManager.cpp b/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp similarity index 98% rename from ReactCommon/fabric/animations/LayoutAnimationKeyFrameManager.cpp rename to ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp index 6da7ddcdf89..42c5ff05a94 100644 --- a/ReactCommon/fabric/animations/LayoutAnimationKeyFrameManager.cpp +++ b/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp @@ -10,20 +10,20 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/ReactCommon/fabric/animations/LayoutAnimationKeyFrameManager.h b/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.h similarity index 92% rename from ReactCommon/fabric/animations/LayoutAnimationKeyFrameManager.h rename to ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.h index 73906fb65ef..8de5eef1fd4 100644 --- a/ReactCommon/fabric/animations/LayoutAnimationKeyFrameManager.h +++ b/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.h @@ -7,15 +7,15 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/attributedstring/AttributedString.cpp b/ReactCommon/react/renderer/attributedstring/AttributedString.cpp similarity index 98% rename from ReactCommon/fabric/attributedstring/AttributedString.cpp rename to ReactCommon/react/renderer/attributedstring/AttributedString.cpp index 57120d063c4..e04c041dbd2 100644 --- a/ReactCommon/fabric/attributedstring/AttributedString.cpp +++ b/ReactCommon/react/renderer/attributedstring/AttributedString.cpp @@ -7,7 +7,7 @@ #include "AttributedString.h" -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/attributedstring/AttributedString.h b/ReactCommon/react/renderer/attributedstring/AttributedString.h similarity index 93% rename from ReactCommon/fabric/attributedstring/AttributedString.h rename to ReactCommon/react/renderer/attributedstring/AttributedString.h index 9da9d2f260e..f3ed7922383 100644 --- a/ReactCommon/fabric/attributedstring/AttributedString.h +++ b/ReactCommon/react/renderer/attributedstring/AttributedString.h @@ -12,11 +12,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/attributedstring/AttributedStringBox.cpp b/ReactCommon/react/renderer/attributedstring/AttributedStringBox.cpp similarity index 100% rename from ReactCommon/fabric/attributedstring/AttributedStringBox.cpp rename to ReactCommon/react/renderer/attributedstring/AttributedStringBox.cpp diff --git a/ReactCommon/fabric/attributedstring/AttributedStringBox.h b/ReactCommon/react/renderer/attributedstring/AttributedStringBox.h similarity index 97% rename from ReactCommon/fabric/attributedstring/AttributedStringBox.h rename to ReactCommon/react/renderer/attributedstring/AttributedStringBox.h index 8b7d4da1c59..7965a7d6d28 100644 --- a/ReactCommon/fabric/attributedstring/AttributedStringBox.h +++ b/ReactCommon/react/renderer/attributedstring/AttributedStringBox.h @@ -9,7 +9,7 @@ #include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/attributedstring/BUCK b/ReactCommon/react/renderer/attributedstring/BUCK similarity index 86% rename from ReactCommon/fabric/attributedstring/BUCK rename to ReactCommon/react/renderer/attributedstring/BUCK index f65fe7e2611..971f983506e 100644 --- a/ReactCommon/fabric/attributedstring/BUCK +++ b/ReactCommon/react/renderer/attributedstring/BUCK @@ -29,7 +29,7 @@ rn_xplat_cxx_library( [ ("", "*.h"), ], - prefix = "react/attributedstring", + prefix = "react/renderer/attributedstring", ), compiler_flags = [ "-fexceptions", @@ -56,10 +56,10 @@ rn_xplat_cxx_library( "//xplat/folly:memory", "//xplat/folly:molly", react_native_xplat_target("utils:utils"), - react_native_xplat_target("fabric/debug:debug"), - react_native_xplat_target("fabric/core:core"), - react_native_xplat_target("fabric/graphics:graphics"), - react_native_xplat_target("fabric/mounting:mounting"), + react_native_xplat_target("react/renderer/debug:debug"), + react_native_xplat_target("react/renderer/core:core"), + react_native_xplat_target("react/renderer/graphics:graphics"), + react_native_xplat_target("react/renderer/mounting:mounting"), ], ) diff --git a/ReactCommon/fabric/attributedstring/ParagraphAttributes.cpp b/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.cpp similarity index 91% rename from ReactCommon/fabric/attributedstring/ParagraphAttributes.cpp rename to ReactCommon/react/renderer/attributedstring/ParagraphAttributes.cpp index f33662b81d6..fe64a462aa3 100644 --- a/ReactCommon/fabric/attributedstring/ParagraphAttributes.cpp +++ b/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.cpp @@ -7,9 +7,9 @@ #include "ParagraphAttributes.h" -#include -#include -#include +#include +#include +#include #include namespace facebook { diff --git a/ReactCommon/fabric/attributedstring/ParagraphAttributes.h b/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.h similarity index 93% rename from ReactCommon/fabric/attributedstring/ParagraphAttributes.h rename to ReactCommon/react/renderer/attributedstring/ParagraphAttributes.h index 58569603361..a5666035eff 100644 --- a/ReactCommon/fabric/attributedstring/ParagraphAttributes.h +++ b/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.h @@ -10,9 +10,9 @@ #include #include -#include -#include -#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/attributedstring/TextAttributes.cpp b/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp similarity index 97% rename from ReactCommon/fabric/attributedstring/TextAttributes.cpp rename to ReactCommon/react/renderer/attributedstring/TextAttributes.cpp index c30817a8ea8..5a7de8fbf9a 100644 --- a/ReactCommon/fabric/attributedstring/TextAttributes.cpp +++ b/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp @@ -7,13 +7,13 @@ #include "TextAttributes.h" -#include -#include -#include +#include +#include +#include #include #include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/attributedstring/TextAttributes.h b/ReactCommon/react/renderer/attributedstring/TextAttributes.h similarity index 93% rename from ReactCommon/fabric/attributedstring/TextAttributes.h rename to ReactCommon/react/renderer/attributedstring/TextAttributes.h index cdb2c8fb5cd..f15f11416f3 100644 --- a/ReactCommon/fabric/attributedstring/TextAttributes.h +++ b/ReactCommon/react/renderer/attributedstring/TextAttributes.h @@ -12,12 +12,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/attributedstring/conversions.h b/ReactCommon/react/renderer/attributedstring/conversions.h similarity index 97% rename from ReactCommon/fabric/attributedstring/conversions.h rename to ReactCommon/react/renderer/attributedstring/conversions.h index 9e7d484ade0..26c8b5f37f0 100644 --- a/ReactCommon/fabric/attributedstring/conversions.h +++ b/ReactCommon/react/renderer/attributedstring/conversions.h @@ -9,17 +9,17 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/ReactCommon/fabric/attributedstring/primitives.h b/ReactCommon/react/renderer/attributedstring/primitives.h similarity index 100% rename from ReactCommon/fabric/attributedstring/primitives.h rename to ReactCommon/react/renderer/attributedstring/primitives.h diff --git a/ReactCommon/fabric/attributedstring/tests/AttributedStringTest.cpp b/ReactCommon/react/renderer/attributedstring/tests/AttributedStringTest.cpp similarity index 85% rename from ReactCommon/fabric/attributedstring/tests/AttributedStringTest.cpp rename to ReactCommon/react/renderer/attributedstring/tests/AttributedStringTest.cpp index 4c479302974..9e84969713d 100644 --- a/ReactCommon/fabric/attributedstring/tests/AttributedStringTest.cpp +++ b/ReactCommon/react/renderer/attributedstring/tests/AttributedStringTest.cpp @@ -9,10 +9,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/attributedstring/tests/ParagraphAttributesTest.cpp b/ReactCommon/react/renderer/attributedstring/tests/ParagraphAttributesTest.cpp similarity index 84% rename from ReactCommon/fabric/attributedstring/tests/ParagraphAttributesTest.cpp rename to ReactCommon/react/renderer/attributedstring/tests/ParagraphAttributesTest.cpp index e722045797c..56378937062 100644 --- a/ReactCommon/fabric/attributedstring/tests/ParagraphAttributesTest.cpp +++ b/ReactCommon/react/renderer/attributedstring/tests/ParagraphAttributesTest.cpp @@ -9,9 +9,9 @@ #include #include -#include -#include -#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/attributedstring/tests/TextAttributesTest.cpp b/ReactCommon/react/renderer/attributedstring/tests/TextAttributesTest.cpp similarity index 81% rename from ReactCommon/fabric/attributedstring/tests/TextAttributesTest.cpp rename to ReactCommon/react/renderer/attributedstring/tests/TextAttributesTest.cpp index 3355af62598..7c25e0c7278 100644 --- a/ReactCommon/fabric/attributedstring/tests/TextAttributesTest.cpp +++ b/ReactCommon/react/renderer/attributedstring/tests/TextAttributesTest.cpp @@ -9,10 +9,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/componentregistry/BUCK b/ReactCommon/react/renderer/componentregistry/BUCK similarity index 89% rename from ReactCommon/fabric/componentregistry/BUCK rename to ReactCommon/react/renderer/componentregistry/BUCK index d993cb0e59d..25316447438 100644 --- a/ReactCommon/fabric/componentregistry/BUCK +++ b/ReactCommon/react/renderer/componentregistry/BUCK @@ -28,7 +28,7 @@ rn_xplat_cxx_library( [ ("", "*.h"), ], - prefix = "react/componentregistry", + prefix = "react/renderer/componentregistry", ), compiler_flags = [ "-fexceptions", @@ -55,8 +55,8 @@ rn_xplat_cxx_library( "//xplat/folly:molly", "//xplat/jsi:JSIDynamic", "//xplat/jsi:jsi", - react_native_xplat_target("fabric/core:core"), - react_native_xplat_target("fabric/debug:debug"), + react_native_xplat_target("react/renderer/core:core"), + react_native_xplat_target("react/renderer/debug:debug"), react_native_xplat_target("utils:utils"), ], ) diff --git a/ReactCommon/fabric/componentregistry/ComponentDescriptorFactory.h b/ReactCommon/react/renderer/componentregistry/ComponentDescriptorFactory.h similarity index 89% rename from ReactCommon/fabric/componentregistry/ComponentDescriptorFactory.h rename to ReactCommon/react/renderer/componentregistry/ComponentDescriptorFactory.h index 5b506acfbdf..d152fb981bf 100644 --- a/ReactCommon/fabric/componentregistry/ComponentDescriptorFactory.h +++ b/ReactCommon/react/renderer/componentregistry/ComponentDescriptorFactory.h @@ -9,8 +9,8 @@ #include -#include -#include +#include +#include #include #include "ComponentDescriptorRegistry.h" diff --git a/ReactCommon/fabric/componentregistry/ComponentDescriptorProvider.h b/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProvider.h similarity index 95% rename from ReactCommon/fabric/componentregistry/ComponentDescriptorProvider.h rename to ReactCommon/react/renderer/componentregistry/ComponentDescriptorProvider.h index a1636eba02a..c321d4af916 100644 --- a/ReactCommon/fabric/componentregistry/ComponentDescriptorProvider.h +++ b/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProvider.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include #include namespace facebook { diff --git a/ReactCommon/fabric/componentregistry/ComponentDescriptorProviderRegistry.cpp b/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.cpp similarity index 100% rename from ReactCommon/fabric/componentregistry/ComponentDescriptorProviderRegistry.cpp rename to ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.cpp diff --git a/ReactCommon/fabric/componentregistry/ComponentDescriptorProviderRegistry.h b/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h similarity index 91% rename from ReactCommon/fabric/componentregistry/ComponentDescriptorProviderRegistry.h rename to ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h index 40be7eb6ad0..769f0f3b91c 100644 --- a/ReactCommon/fabric/componentregistry/ComponentDescriptorProviderRegistry.h +++ b/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h @@ -9,9 +9,9 @@ #include -#include -#include -#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/componentregistry/ComponentDescriptorRegistry.cpp b/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.cpp similarity index 98% rename from ReactCommon/fabric/componentregistry/ComponentDescriptorRegistry.cpp rename to ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.cpp index 2081886c660..8499e3ca24c 100644 --- a/ReactCommon/fabric/componentregistry/ComponentDescriptorRegistry.cpp +++ b/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.cpp @@ -7,8 +7,8 @@ #include "ComponentDescriptorRegistry.h" -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/componentregistry/ComponentDescriptorRegistry.h b/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.h similarity index 95% rename from ReactCommon/fabric/componentregistry/ComponentDescriptorRegistry.h rename to ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.h index 07e211d7d0f..29dac6f371e 100644 --- a/ReactCommon/fabric/componentregistry/ComponentDescriptorRegistry.h +++ b/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.h @@ -12,8 +12,8 @@ #include #include -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/activityindicator/BUCK b/ReactCommon/react/renderer/components/activityindicator/BUCK similarity index 84% rename from ReactCommon/fabric/components/activityindicator/BUCK rename to ReactCommon/react/renderer/components/activityindicator/BUCK index 47d57870130..3b69438539e 100644 --- a/ReactCommon/fabric/components/activityindicator/BUCK +++ b/ReactCommon/react/renderer/components/activityindicator/BUCK @@ -27,7 +27,7 @@ rn_xplat_cxx_library( [ ("", "*.h"), ], - prefix = "react/components/activityindicator", + prefix = "react/renderer/components/activityindicator", ), compiler_flags = [ "-fexceptions", @@ -53,10 +53,10 @@ rn_xplat_cxx_library( "//xplat/folly:memory", "//xplat/folly:molly", YOGA_CXX_TARGET, - react_native_xplat_target("fabric/debug:debug"), - react_native_xplat_target("fabric/core:core"), - react_native_xplat_target("fabric/graphics:graphics"), - react_native_xplat_target("fabric/components/view:view"), + react_native_xplat_target("react/renderer/debug:debug"), + react_native_xplat_target("react/renderer/core:core"), + react_native_xplat_target("react/renderer/graphics:graphics"), + react_native_xplat_target("react/renderer/components/view:view"), ], ) diff --git a/ReactCommon/fabric/components/activityindicator/conversions.h b/ReactCommon/react/renderer/components/activityindicator/conversions.h similarity index 92% rename from ReactCommon/fabric/components/activityindicator/conversions.h rename to ReactCommon/react/renderer/components/activityindicator/conversions.h index a985d26419e..f1c2e49ad8d 100644 --- a/ReactCommon/fabric/components/activityindicator/conversions.h +++ b/ReactCommon/react/renderer/components/activityindicator/conversions.h @@ -8,7 +8,7 @@ #pragma once #include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/image/BUCK b/ReactCommon/react/renderer/components/image/BUCK similarity index 82% rename from ReactCommon/fabric/components/image/BUCK rename to ReactCommon/react/renderer/components/image/BUCK index 43b8f547395..682ea9ddb22 100644 --- a/ReactCommon/fabric/components/image/BUCK +++ b/ReactCommon/react/renderer/components/image/BUCK @@ -27,7 +27,7 @@ rn_xplat_cxx_library( [ ("", "*.h"), ], - prefix = "react/components/image", + prefix = "react/renderer/components/image", ), compiler_flags = [ "-fexceptions", @@ -53,11 +53,11 @@ rn_xplat_cxx_library( "//xplat/folly:memory", "//xplat/folly:molly", YOGA_CXX_TARGET, - react_native_xplat_target("fabric/debug:debug"), - react_native_xplat_target("fabric/core:core"), - react_native_xplat_target("fabric/graphics:graphics"), - react_native_xplat_target("fabric/imagemanager:imagemanager"), - react_native_xplat_target("fabric/components/view:view"), + react_native_xplat_target("react/renderer/debug:debug"), + react_native_xplat_target("react/renderer/core:core"), + react_native_xplat_target("react/renderer/graphics:graphics"), + react_native_xplat_target("react/renderer/imagemanager:imagemanager"), + react_native_xplat_target("react/renderer/components/view:view"), ], ) diff --git a/ReactCommon/fabric/components/image/ImageComponentDescriptor.h b/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h similarity index 87% rename from ReactCommon/fabric/components/image/ImageComponentDescriptor.h rename to ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h index 15057a0bff4..1e2b6708649 100644 --- a/ReactCommon/fabric/components/image/ImageComponentDescriptor.h +++ b/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h @@ -7,9 +7,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include namespace facebook { diff --git a/ReactCommon/fabric/components/image/ImageEventEmitter.cpp b/ReactCommon/react/renderer/components/image/ImageEventEmitter.cpp similarity index 100% rename from ReactCommon/fabric/components/image/ImageEventEmitter.cpp rename to ReactCommon/react/renderer/components/image/ImageEventEmitter.cpp diff --git a/ReactCommon/fabric/components/image/ImageEventEmitter.h b/ReactCommon/react/renderer/components/image/ImageEventEmitter.h similarity index 90% rename from ReactCommon/fabric/components/image/ImageEventEmitter.h rename to ReactCommon/react/renderer/components/image/ImageEventEmitter.h index a99fb5d531c..13bc446ee9e 100644 --- a/ReactCommon/fabric/components/image/ImageEventEmitter.h +++ b/ReactCommon/react/renderer/components/image/ImageEventEmitter.h @@ -7,7 +7,7 @@ #pragma once -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/image/ImageProps.cpp b/ReactCommon/react/renderer/components/image/ImageProps.cpp similarity index 86% rename from ReactCommon/fabric/components/image/ImageProps.cpp rename to ReactCommon/react/renderer/components/image/ImageProps.cpp index 109ac9e8c07..c716b786f7d 100644 --- a/ReactCommon/fabric/components/image/ImageProps.cpp +++ b/ReactCommon/react/renderer/components/image/ImageProps.cpp @@ -5,9 +5,9 @@ * LICENSE file in the root directory of this source tree. */ -#include -#include -#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/image/ImageProps.h b/ReactCommon/react/renderer/components/image/ImageProps.h similarity index 82% rename from ReactCommon/fabric/components/image/ImageProps.h rename to ReactCommon/react/renderer/components/image/ImageProps.h index 4edff0dc8d5..7ed6ac4e180 100644 --- a/ReactCommon/fabric/components/image/ImageProps.h +++ b/ReactCommon/react/renderer/components/image/ImageProps.h @@ -5,9 +5,9 @@ * LICENSE file in the root directory of this source tree. */ -#include -#include -#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/image/ImageShadowNode.cpp b/ReactCommon/react/renderer/components/image/ImageShadowNode.cpp similarity index 95% rename from ReactCommon/fabric/components/image/ImageShadowNode.cpp rename to ReactCommon/react/renderer/components/image/ImageShadowNode.cpp index 4a00f2c1bf2..fe20bc78845 100644 --- a/ReactCommon/fabric/components/image/ImageShadowNode.cpp +++ b/ReactCommon/react/renderer/components/image/ImageShadowNode.cpp @@ -8,8 +8,8 @@ #include #include -#include -#include +#include +#include #include "ImageState.h" namespace facebook { diff --git a/ReactCommon/fabric/components/image/ImageShadowNode.h b/ReactCommon/react/renderer/components/image/ImageShadowNode.h similarity index 81% rename from ReactCommon/fabric/components/image/ImageShadowNode.h rename to ReactCommon/react/renderer/components/image/ImageShadowNode.h index 9ebcbdc97ad..0e60f78deef 100644 --- a/ReactCommon/fabric/components/image/ImageShadowNode.h +++ b/ReactCommon/react/renderer/components/image/ImageShadowNode.h @@ -7,12 +7,12 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/image/ImageState.cpp b/ReactCommon/react/renderer/components/image/ImageState.cpp similarity index 100% rename from ReactCommon/fabric/components/image/ImageState.cpp rename to ReactCommon/react/renderer/components/image/ImageState.cpp diff --git a/ReactCommon/fabric/components/image/ImageState.h b/ReactCommon/react/renderer/components/image/ImageState.h similarity index 92% rename from ReactCommon/fabric/components/image/ImageState.h rename to ReactCommon/react/renderer/components/image/ImageState.h index e41a9f5be48..8dfa5d6f902 100644 --- a/ReactCommon/fabric/components/image/ImageState.h +++ b/ReactCommon/react/renderer/components/image/ImageState.h @@ -8,8 +8,8 @@ #pragma once #include -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/image/conversions.h b/ReactCommon/react/renderer/components/image/conversions.h similarity index 97% rename from ReactCommon/fabric/components/image/conversions.h rename to ReactCommon/react/renderer/components/image/conversions.h index 2c0757267d2..a77d40fad48 100644 --- a/ReactCommon/fabric/components/image/conversions.h +++ b/ReactCommon/react/renderer/components/image/conversions.h @@ -9,8 +9,8 @@ #include #include -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/image/tests/ImageTest.cpp b/ReactCommon/react/renderer/components/image/tests/ImageTest.cpp similarity index 100% rename from ReactCommon/fabric/components/image/tests/ImageTest.cpp rename to ReactCommon/react/renderer/components/image/tests/ImageTest.cpp diff --git a/ReactCommon/fabric/components/inputaccessory/BUCK b/ReactCommon/react/renderer/components/inputaccessory/BUCK similarity index 90% rename from ReactCommon/fabric/components/inputaccessory/BUCK rename to ReactCommon/react/renderer/components/inputaccessory/BUCK index 7db6c8ae3e0..c1debab5958 100644 --- a/ReactCommon/fabric/components/inputaccessory/BUCK +++ b/ReactCommon/react/renderer/components/inputaccessory/BUCK @@ -22,7 +22,7 @@ rn_xplat_cxx_library( [ ("", "*.h"), ], - prefix = "react/components/inputaccessory", + prefix = "react/renderer/components/inputaccessory", ), compiler_flags = [ "-fexceptions", @@ -41,7 +41,7 @@ rn_xplat_cxx_library( ], visibility = ["PUBLIC"], deps = [ - react_native_xplat_target("fabric/core:core"), + react_native_xplat_target("react/renderer/core:core"), "//xplat/js/react-native-github:generated_components-rncore", ], ) diff --git a/ReactCommon/fabric/components/inputaccessory/InputAccessoryComponentDescriptor.h b/ReactCommon/react/renderer/components/inputaccessory/InputAccessoryComponentDescriptor.h similarity index 90% rename from ReactCommon/fabric/components/inputaccessory/InputAccessoryComponentDescriptor.h rename to ReactCommon/react/renderer/components/inputaccessory/InputAccessoryComponentDescriptor.h index a850b1639ab..e92cf6e5bf9 100644 --- a/ReactCommon/fabric/components/inputaccessory/InputAccessoryComponentDescriptor.h +++ b/ReactCommon/react/renderer/components/inputaccessory/InputAccessoryComponentDescriptor.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/inputaccessory/InputAccessoryShadowNode.cpp b/ReactCommon/react/renderer/components/inputaccessory/InputAccessoryShadowNode.cpp similarity index 100% rename from ReactCommon/fabric/components/inputaccessory/InputAccessoryShadowNode.cpp rename to ReactCommon/react/renderer/components/inputaccessory/InputAccessoryShadowNode.cpp diff --git a/ReactCommon/fabric/components/inputaccessory/InputAccessoryShadowNode.h b/ReactCommon/react/renderer/components/inputaccessory/InputAccessoryShadowNode.h similarity index 79% rename from ReactCommon/fabric/components/inputaccessory/InputAccessoryShadowNode.h rename to ReactCommon/react/renderer/components/inputaccessory/InputAccessoryShadowNode.h index 5a7f6679c79..d0afebc23ad 100644 --- a/ReactCommon/fabric/components/inputaccessory/InputAccessoryShadowNode.h +++ b/ReactCommon/react/renderer/components/inputaccessory/InputAccessoryShadowNode.h @@ -7,10 +7,10 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/inputaccessory/InputAccessoryState.h b/ReactCommon/react/renderer/components/inputaccessory/InputAccessoryState.h similarity index 78% rename from ReactCommon/fabric/components/inputaccessory/InputAccessoryState.h rename to ReactCommon/react/renderer/components/inputaccessory/InputAccessoryState.h index 5d1ae67a63e..928bff3128e 100644 --- a/ReactCommon/fabric/components/inputaccessory/InputAccessoryState.h +++ b/ReactCommon/react/renderer/components/inputaccessory/InputAccessoryState.h @@ -7,9 +7,9 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/legacyviewmanagerinterop/BUCK b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/BUCK similarity index 86% rename from ReactCommon/fabric/components/legacyviewmanagerinterop/BUCK rename to ReactCommon/react/renderer/components/legacyviewmanagerinterop/BUCK index 3cd958bb178..6a76b109869 100644 --- a/ReactCommon/fabric/components/legacyviewmanagerinterop/BUCK +++ b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/BUCK @@ -25,7 +25,7 @@ rn_xplat_cxx_library( [ ("", "*.h"), ], - prefix = "react/components/legacyviewmanagerinterop", + prefix = "react/renderer/components/legacyviewmanagerinterop", ), compiler_flags = [ "-fexceptions", @@ -46,8 +46,8 @@ rn_xplat_cxx_library( deps = [ "//xplat/folly:headers_only", "//xplat/folly:memory", - react_native_xplat_target("fabric/core:core"), - react_native_xplat_target("fabric/components/view:view"), + react_native_xplat_target("react/renderer/core:core"), + react_native_xplat_target("react/renderer/components/view:view"), "//xplat/js/react-native-github:generated_components-rncore", ], ) diff --git a/ReactCommon/fabric/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.h b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.h similarity index 85% rename from ReactCommon/fabric/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.h rename to ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.h index 8ce315f7cc9..67d1291a10e 100644 --- a/ReactCommon/fabric/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.h +++ b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.mm b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.mm similarity index 100% rename from ReactCommon/fabric/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.mm rename to ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.mm diff --git a/ReactCommon/fabric/components/legacyviewmanagerinterop/LegacyViewManagerInteropShadowNode.cpp b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropShadowNode.cpp similarity index 100% rename from ReactCommon/fabric/components/legacyviewmanagerinterop/LegacyViewManagerInteropShadowNode.cpp rename to ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropShadowNode.cpp diff --git a/ReactCommon/fabric/components/legacyviewmanagerinterop/LegacyViewManagerInteropShadowNode.h b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropShadowNode.h similarity index 61% rename from ReactCommon/fabric/components/legacyviewmanagerinterop/LegacyViewManagerInteropShadowNode.h rename to ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropShadowNode.h index dc357894b26..5667ed003f0 100644 --- a/ReactCommon/fabric/components/legacyviewmanagerinterop/LegacyViewManagerInteropShadowNode.h +++ b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropShadowNode.h @@ -7,10 +7,10 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/legacyviewmanagerinterop/LegacyViewManagerInteropState.h b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropState.h similarity index 100% rename from ReactCommon/fabric/components/legacyviewmanagerinterop/LegacyViewManagerInteropState.h rename to ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropState.h diff --git a/ReactCommon/fabric/components/legacyviewmanagerinterop/LegacyViewManagerInteropState.mm b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropState.mm similarity index 100% rename from ReactCommon/fabric/components/legacyviewmanagerinterop/LegacyViewManagerInteropState.mm rename to ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropState.mm diff --git a/ReactCommon/fabric/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewEventEmitter.cpp b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewEventEmitter.cpp similarity index 100% rename from ReactCommon/fabric/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewEventEmitter.cpp rename to ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewEventEmitter.cpp diff --git a/ReactCommon/fabric/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewEventEmitter.h b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewEventEmitter.h similarity index 87% rename from ReactCommon/fabric/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewEventEmitter.h rename to ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewEventEmitter.h index 031e2765b18..8d0e0e29bb5 100644 --- a/ReactCommon/fabric/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewEventEmitter.h +++ b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewEventEmitter.h @@ -10,8 +10,8 @@ #include #include -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.cpp b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.cpp similarity index 100% rename from ReactCommon/fabric/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.cpp rename to ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.cpp diff --git a/ReactCommon/fabric/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.h b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.h similarity index 92% rename from ReactCommon/fabric/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.h rename to ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.h index bc6827f461c..9b56571e579 100644 --- a/ReactCommon/fabric/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.h +++ b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.h @@ -6,7 +6,7 @@ */ #include -#include +#include #include namespace facebook { diff --git a/ReactCommon/fabric/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.h b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.h similarity index 100% rename from ReactCommon/fabric/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.h rename to ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.h diff --git a/ReactCommon/fabric/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.mm b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.mm similarity index 100% rename from ReactCommon/fabric/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.mm rename to ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.mm diff --git a/ReactCommon/fabric/components/modal/BUCK b/ReactCommon/react/renderer/components/modal/BUCK similarity index 72% rename from ReactCommon/fabric/components/modal/BUCK rename to ReactCommon/react/renderer/components/modal/BUCK index b79d40c04b5..f2865199207 100644 --- a/ReactCommon/fabric/components/modal/BUCK +++ b/ReactCommon/react/renderer/components/modal/BUCK @@ -29,7 +29,7 @@ rn_xplat_cxx_library( [ ("", "*.h"), ], - prefix = "react/components/modal", + prefix = "react/renderer/components/modal", ), compiler_flags = [ "-fexceptions", @@ -42,7 +42,7 @@ rn_xplat_cxx_library( ("", "*.h"), ("platform/android", "*.h"), ], - prefix = "react/components/modal", + prefix = "react/renderer/components/modal", ), fbandroid_headers = glob( ["platform/android/*.h"], @@ -58,7 +58,7 @@ rn_xplat_cxx_library( ("", "*.h"), ("platform/ios", "*.h"), ], - prefix = "react/components/modal", + prefix = "react/renderer/components/modal", ), labels = ["supermodule:xplat/default/public.react_native.infra"], macosx_tests_override = [], @@ -75,14 +75,14 @@ rn_xplat_cxx_library( "//xplat/folly:memory", "//xplat/folly:molly", YOGA_CXX_TARGET, - react_native_xplat_target("fabric/debug:debug"), - react_native_xplat_target("fabric/core:core"), - react_native_xplat_target("fabric/components/image:image"), - react_native_xplat_target("fabric/components/view:view"), - react_native_xplat_target("fabric/graphics:graphics"), - react_native_xplat_target("fabric/imagemanager:imagemanager"), - react_native_xplat_target("fabric/uimanager:uimanager"), - react_native_xplat_target("fabric/componentregistry:componentregistry"), + react_native_xplat_target("react/renderer/debug:debug"), + react_native_xplat_target("react/renderer/core:core"), + react_native_xplat_target("react/renderer/components/image:image"), + react_native_xplat_target("react/renderer/components/view:view"), + react_native_xplat_target("react/renderer/graphics:graphics"), + react_native_xplat_target("react/renderer/imagemanager:imagemanager"), + react_native_xplat_target("react/renderer/uimanager:uimanager"), + react_native_xplat_target("react/renderer/componentregistry:componentregistry"), "//xplat/js/react-native-github:generated_components-rncore", ], ) diff --git a/ReactCommon/fabric/components/modal/ModalHostViewComponentDescriptor.h b/ReactCommon/react/renderer/components/modal/ModalHostViewComponentDescriptor.h similarity index 91% rename from ReactCommon/fabric/components/modal/ModalHostViewComponentDescriptor.h rename to ReactCommon/react/renderer/components/modal/ModalHostViewComponentDescriptor.h index f1616fb7abb..e821c911d38 100644 --- a/ReactCommon/fabric/components/modal/ModalHostViewComponentDescriptor.h +++ b/ReactCommon/react/renderer/components/modal/ModalHostViewComponentDescriptor.h @@ -8,8 +8,8 @@ #pragma once #include -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/modal/ModalHostViewShadowNode.cpp b/ReactCommon/react/renderer/components/modal/ModalHostViewShadowNode.cpp similarity index 76% rename from ReactCommon/fabric/components/modal/ModalHostViewShadowNode.cpp rename to ReactCommon/react/renderer/components/modal/ModalHostViewShadowNode.cpp index 011ad310247..fffaf8047e9 100644 --- a/ReactCommon/fabric/components/modal/ModalHostViewShadowNode.cpp +++ b/ReactCommon/react/renderer/components/modal/ModalHostViewShadowNode.cpp @@ -7,8 +7,8 @@ #include "ModalHostViewShadowNode.h" -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/modal/ModalHostViewShadowNode.h b/ReactCommon/react/renderer/components/modal/ModalHostViewShadowNode.h similarity index 79% rename from ReactCommon/fabric/components/modal/ModalHostViewShadowNode.h rename to ReactCommon/react/renderer/components/modal/ModalHostViewShadowNode.h index a5b6a679741..ad02fd26aaf 100644 --- a/ReactCommon/fabric/components/modal/ModalHostViewShadowNode.h +++ b/ReactCommon/react/renderer/components/modal/ModalHostViewShadowNode.h @@ -7,10 +7,10 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/modal/ModalHostViewState.cpp b/ReactCommon/react/renderer/components/modal/ModalHostViewState.cpp similarity index 100% rename from ReactCommon/fabric/components/modal/ModalHostViewState.cpp rename to ReactCommon/react/renderer/components/modal/ModalHostViewState.cpp diff --git a/ReactCommon/fabric/components/modal/ModalHostViewState.h b/ReactCommon/react/renderer/components/modal/ModalHostViewState.h similarity index 87% rename from ReactCommon/fabric/components/modal/ModalHostViewState.h rename to ReactCommon/react/renderer/components/modal/ModalHostViewState.h index fc0533fbba3..51e3677ff54 100644 --- a/ReactCommon/fabric/components/modal/ModalHostViewState.h +++ b/ReactCommon/react/renderer/components/modal/ModalHostViewState.h @@ -7,9 +7,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #ifdef ANDROID #include diff --git a/ReactCommon/fabric/components/picker/BUCK b/ReactCommon/react/renderer/components/picker/BUCK similarity index 84% rename from ReactCommon/fabric/components/picker/BUCK rename to ReactCommon/react/renderer/components/picker/BUCK index 280aed2d07c..d83a54ff910 100644 --- a/ReactCommon/fabric/components/picker/BUCK +++ b/ReactCommon/react/renderer/components/picker/BUCK @@ -32,7 +32,7 @@ rn_xplat_cxx_library( ("", "*.h"), ("androidpicker", "*.h"), ], - prefix = "react/components/androidpicker", + prefix = "react/renderer/components/androidpicker", ), compiler_flags = [ "-fexceptions", @@ -61,12 +61,12 @@ rn_xplat_cxx_library( "//xplat/folly:memory", "//xplat/folly:molly", YOGA_CXX_TARGET, - react_native_xplat_target("fabric/debug:debug"), - react_native_xplat_target("fabric/core:core"), - react_native_xplat_target("fabric/graphics:graphics"), - react_native_xplat_target("fabric/components/view:view"), - react_native_xplat_target("fabric/uimanager:uimanager"), - react_native_xplat_target("fabric/componentregistry:componentregistry"), + react_native_xplat_target("react/renderer/debug:debug"), + react_native_xplat_target("react/renderer/core:core"), + react_native_xplat_target("react/renderer/graphics:graphics"), + react_native_xplat_target("react/renderer/components/view:view"), + react_native_xplat_target("react/renderer/uimanager:uimanager"), + react_native_xplat_target("react/renderer/componentregistry:componentregistry"), "//xplat/js/react-native-github:generated_components-rncore", ], ) diff --git a/ReactCommon/fabric/components/picker/androidpicker/AndroidDialogPickerComponentDescriptor.h b/ReactCommon/react/renderer/components/picker/androidpicker/AndroidDialogPickerComponentDescriptor.h similarity index 87% rename from ReactCommon/fabric/components/picker/androidpicker/AndroidDialogPickerComponentDescriptor.h rename to ReactCommon/react/renderer/components/picker/androidpicker/AndroidDialogPickerComponentDescriptor.h index c83b7ed3df1..0c5622241fc 100644 --- a/ReactCommon/fabric/components/picker/androidpicker/AndroidDialogPickerComponentDescriptor.h +++ b/ReactCommon/react/renderer/components/picker/androidpicker/AndroidDialogPickerComponentDescriptor.h @@ -9,7 +9,7 @@ #include "AndroidDialogPickerShadowNode.h" -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/picker/androidpicker/AndroidDialogPickerEventEmitter.cpp b/ReactCommon/react/renderer/components/picker/androidpicker/AndroidDialogPickerEventEmitter.cpp similarity index 100% rename from ReactCommon/fabric/components/picker/androidpicker/AndroidDialogPickerEventEmitter.cpp rename to ReactCommon/react/renderer/components/picker/androidpicker/AndroidDialogPickerEventEmitter.cpp diff --git a/ReactCommon/fabric/components/picker/androidpicker/AndroidDialogPickerEventEmitter.h b/ReactCommon/react/renderer/components/picker/androidpicker/AndroidDialogPickerEventEmitter.h similarity index 89% rename from ReactCommon/fabric/components/picker/androidpicker/AndroidDialogPickerEventEmitter.h rename to ReactCommon/react/renderer/components/picker/androidpicker/AndroidDialogPickerEventEmitter.h index 9ea91f192cd..37781f4b5a8 100644 --- a/ReactCommon/fabric/components/picker/androidpicker/AndroidDialogPickerEventEmitter.h +++ b/ReactCommon/react/renderer/components/picker/androidpicker/AndroidDialogPickerEventEmitter.h @@ -7,7 +7,7 @@ #pragma once -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/picker/androidpicker/AndroidDialogPickerProps.cpp b/ReactCommon/react/renderer/components/picker/androidpicker/AndroidDialogPickerProps.cpp similarity index 89% rename from ReactCommon/fabric/components/picker/androidpicker/AndroidDialogPickerProps.cpp rename to ReactCommon/react/renderer/components/picker/androidpicker/AndroidDialogPickerProps.cpp index 8996776d939..c44238843b0 100644 --- a/ReactCommon/fabric/components/picker/androidpicker/AndroidDialogPickerProps.cpp +++ b/ReactCommon/react/renderer/components/picker/androidpicker/AndroidDialogPickerProps.cpp @@ -7,8 +7,8 @@ #include "AndroidDialogPickerProps.h" -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/picker/androidpicker/AndroidDialogPickerProps.h b/ReactCommon/react/renderer/components/picker/androidpicker/AndroidDialogPickerProps.h similarity index 90% rename from ReactCommon/fabric/components/picker/androidpicker/AndroidDialogPickerProps.h rename to ReactCommon/react/renderer/components/picker/androidpicker/AndroidDialogPickerProps.h index 33aa151d871..e4868a7f676 100644 --- a/ReactCommon/fabric/components/picker/androidpicker/AndroidDialogPickerProps.h +++ b/ReactCommon/react/renderer/components/picker/androidpicker/AndroidDialogPickerProps.h @@ -7,10 +7,10 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/ReactCommon/fabric/components/picker/androidpicker/AndroidDialogPickerShadowNode.cpp b/ReactCommon/react/renderer/components/picker/androidpicker/AndroidDialogPickerShadowNode.cpp similarity index 100% rename from ReactCommon/fabric/components/picker/androidpicker/AndroidDialogPickerShadowNode.cpp rename to ReactCommon/react/renderer/components/picker/androidpicker/AndroidDialogPickerShadowNode.cpp diff --git a/ReactCommon/fabric/components/picker/androidpicker/AndroidDialogPickerShadowNode.h b/ReactCommon/react/renderer/components/picker/androidpicker/AndroidDialogPickerShadowNode.h similarity index 90% rename from ReactCommon/fabric/components/picker/androidpicker/AndroidDialogPickerShadowNode.h rename to ReactCommon/react/renderer/components/picker/androidpicker/AndroidDialogPickerShadowNode.h index d0483996dc3..e819b923e80 100644 --- a/ReactCommon/fabric/components/picker/androidpicker/AndroidDialogPickerShadowNode.h +++ b/ReactCommon/react/renderer/components/picker/androidpicker/AndroidDialogPickerShadowNode.h @@ -10,7 +10,7 @@ #include "AndroidDialogPickerEventEmitter.h" #include "AndroidDialogPickerProps.h" -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/picker/androidpicker/AndroidDropdownPickerComponentDescriptor.h b/ReactCommon/react/renderer/components/picker/androidpicker/AndroidDropdownPickerComponentDescriptor.h similarity index 88% rename from ReactCommon/fabric/components/picker/androidpicker/AndroidDropdownPickerComponentDescriptor.h rename to ReactCommon/react/renderer/components/picker/androidpicker/AndroidDropdownPickerComponentDescriptor.h index f3ec83aead8..cbad671add2 100644 --- a/ReactCommon/fabric/components/picker/androidpicker/AndroidDropdownPickerComponentDescriptor.h +++ b/ReactCommon/react/renderer/components/picker/androidpicker/AndroidDropdownPickerComponentDescriptor.h @@ -9,7 +9,7 @@ #include "AndroidDropdownPickerShadowNode.h" -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/picker/androidpicker/AndroidDropdownPickerEventEmitter.cpp b/ReactCommon/react/renderer/components/picker/androidpicker/AndroidDropdownPickerEventEmitter.cpp similarity index 100% rename from ReactCommon/fabric/components/picker/androidpicker/AndroidDropdownPickerEventEmitter.cpp rename to ReactCommon/react/renderer/components/picker/androidpicker/AndroidDropdownPickerEventEmitter.cpp diff --git a/ReactCommon/fabric/components/picker/androidpicker/AndroidDropdownPickerEventEmitter.h b/ReactCommon/react/renderer/components/picker/androidpicker/AndroidDropdownPickerEventEmitter.h similarity index 89% rename from ReactCommon/fabric/components/picker/androidpicker/AndroidDropdownPickerEventEmitter.h rename to ReactCommon/react/renderer/components/picker/androidpicker/AndroidDropdownPickerEventEmitter.h index 01db35b1199..356203b1c6e 100644 --- a/ReactCommon/fabric/components/picker/androidpicker/AndroidDropdownPickerEventEmitter.h +++ b/ReactCommon/react/renderer/components/picker/androidpicker/AndroidDropdownPickerEventEmitter.h @@ -7,7 +7,7 @@ #pragma once -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/picker/androidpicker/AndroidDropdownPickerProps.cpp b/ReactCommon/react/renderer/components/picker/androidpicker/AndroidDropdownPickerProps.cpp similarity index 89% rename from ReactCommon/fabric/components/picker/androidpicker/AndroidDropdownPickerProps.cpp rename to ReactCommon/react/renderer/components/picker/androidpicker/AndroidDropdownPickerProps.cpp index 4aa8883e71c..b305b024210 100644 --- a/ReactCommon/fabric/components/picker/androidpicker/AndroidDropdownPickerProps.cpp +++ b/ReactCommon/react/renderer/components/picker/androidpicker/AndroidDropdownPickerProps.cpp @@ -7,8 +7,8 @@ #include "AndroidDropdownPickerProps.h" -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/picker/androidpicker/AndroidDropdownPickerProps.h b/ReactCommon/react/renderer/components/picker/androidpicker/AndroidDropdownPickerProps.h similarity index 90% rename from ReactCommon/fabric/components/picker/androidpicker/AndroidDropdownPickerProps.h rename to ReactCommon/react/renderer/components/picker/androidpicker/AndroidDropdownPickerProps.h index 94af9d84cf4..3e66603c4ee 100644 --- a/ReactCommon/fabric/components/picker/androidpicker/AndroidDropdownPickerProps.h +++ b/ReactCommon/react/renderer/components/picker/androidpicker/AndroidDropdownPickerProps.h @@ -7,10 +7,10 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/ReactCommon/fabric/components/picker/androidpicker/AndroidDropdownPickerShadowNode.cpp b/ReactCommon/react/renderer/components/picker/androidpicker/AndroidDropdownPickerShadowNode.cpp similarity index 100% rename from ReactCommon/fabric/components/picker/androidpicker/AndroidDropdownPickerShadowNode.cpp rename to ReactCommon/react/renderer/components/picker/androidpicker/AndroidDropdownPickerShadowNode.cpp diff --git a/ReactCommon/fabric/components/picker/androidpicker/AndroidDropdownPickerShadowNode.h b/ReactCommon/react/renderer/components/picker/androidpicker/AndroidDropdownPickerShadowNode.h similarity index 90% rename from ReactCommon/fabric/components/picker/androidpicker/AndroidDropdownPickerShadowNode.h rename to ReactCommon/react/renderer/components/picker/androidpicker/AndroidDropdownPickerShadowNode.h index bf1661414ed..5c4ac182798 100644 --- a/ReactCommon/fabric/components/picker/androidpicker/AndroidDropdownPickerShadowNode.h +++ b/ReactCommon/react/renderer/components/picker/androidpicker/AndroidDropdownPickerShadowNode.h @@ -10,7 +10,7 @@ #include "AndroidDropdownPickerEventEmitter.h" #include "AndroidDropdownPickerProps.h" -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/root/BUCK b/ReactCommon/react/renderer/components/root/BUCK similarity index 85% rename from ReactCommon/fabric/components/root/BUCK rename to ReactCommon/react/renderer/components/root/BUCK index bef67507464..551366f61d5 100644 --- a/ReactCommon/fabric/components/root/BUCK +++ b/ReactCommon/react/renderer/components/root/BUCK @@ -27,7 +27,7 @@ rn_xplat_cxx_library( [ ("", "*.h"), ], - prefix = "react/components/root", + prefix = "react/renderer/components/root", ), compiler_flags = [ "-fexceptions", @@ -53,10 +53,10 @@ rn_xplat_cxx_library( "//xplat/folly:memory", "//xplat/folly:molly", YOGA_CXX_TARGET, - react_native_xplat_target("fabric/debug:debug"), - react_native_xplat_target("fabric/core:core"), - react_native_xplat_target("fabric/graphics:graphics"), - react_native_xplat_target("fabric/components/view:view"), + react_native_xplat_target("react/renderer/debug:debug"), + react_native_xplat_target("react/renderer/core:core"), + react_native_xplat_target("react/renderer/graphics:graphics"), + react_native_xplat_target("react/renderer/components/view:view"), ], ) diff --git a/ReactCommon/fabric/components/root/RootComponentDescriptor.h b/ReactCommon/react/renderer/components/root/RootComponentDescriptor.h similarity index 75% rename from ReactCommon/fabric/components/root/RootComponentDescriptor.h rename to ReactCommon/react/renderer/components/root/RootComponentDescriptor.h index f0b3f5006ca..7d8cb7b2b27 100644 --- a/ReactCommon/fabric/components/root/RootComponentDescriptor.h +++ b/ReactCommon/react/renderer/components/root/RootComponentDescriptor.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/root/RootProps.cpp b/ReactCommon/react/renderer/components/root/RootProps.cpp similarity index 84% rename from ReactCommon/fabric/components/root/RootProps.cpp rename to ReactCommon/react/renderer/components/root/RootProps.cpp index a39298fbb81..beb6af92cbf 100644 --- a/ReactCommon/fabric/components/root/RootProps.cpp +++ b/ReactCommon/react/renderer/components/root/RootProps.cpp @@ -7,8 +7,8 @@ #include "RootProps.h" -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/root/RootProps.h b/ReactCommon/react/renderer/components/root/RootProps.h similarity index 82% rename from ReactCommon/fabric/components/root/RootProps.h rename to ReactCommon/react/renderer/components/root/RootProps.h index 3cffe6256a0..d3e2ea2dc05 100644 --- a/ReactCommon/fabric/components/root/RootProps.h +++ b/ReactCommon/react/renderer/components/root/RootProps.h @@ -9,9 +9,9 @@ #include -#include -#include -#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/root/RootShadowNode.cpp b/ReactCommon/react/renderer/components/root/RootShadowNode.cpp similarity index 91% rename from ReactCommon/fabric/components/root/RootShadowNode.cpp rename to ReactCommon/react/renderer/components/root/RootShadowNode.cpp index 99bbfa2a9e6..511f9ac270e 100644 --- a/ReactCommon/fabric/components/root/RootShadowNode.cpp +++ b/ReactCommon/react/renderer/components/root/RootShadowNode.cpp @@ -7,8 +7,8 @@ #include "RootShadowNode.h" -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/root/RootShadowNode.h b/ReactCommon/react/renderer/components/root/RootShadowNode.h similarity index 88% rename from ReactCommon/fabric/components/root/RootShadowNode.h rename to ReactCommon/react/renderer/components/root/RootShadowNode.h index f1a7b11d901..18bdb393ded 100644 --- a/ReactCommon/fabric/components/root/RootShadowNode.h +++ b/ReactCommon/react/renderer/components/root/RootShadowNode.h @@ -9,9 +9,9 @@ #include -#include -#include -#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/root/tests/RootShadowNodeTest.cpp b/ReactCommon/react/renderer/components/root/tests/RootShadowNodeTest.cpp similarity index 100% rename from ReactCommon/fabric/components/root/tests/RootShadowNodeTest.cpp rename to ReactCommon/react/renderer/components/root/tests/RootShadowNodeTest.cpp diff --git a/ReactCommon/fabric/components/safeareaview/BUCK b/ReactCommon/react/renderer/components/safeareaview/BUCK similarity index 90% rename from ReactCommon/fabric/components/safeareaview/BUCK rename to ReactCommon/react/renderer/components/safeareaview/BUCK index 033f987770f..3c62e99a01a 100644 --- a/ReactCommon/fabric/components/safeareaview/BUCK +++ b/ReactCommon/react/renderer/components/safeareaview/BUCK @@ -22,7 +22,7 @@ rn_xplat_cxx_library( [ ("", "*.h"), ], - prefix = "react/components/safeareaview", + prefix = "react/renderer/components/safeareaview", ), compiler_flags = [ "-fexceptions", @@ -41,7 +41,7 @@ rn_xplat_cxx_library( ], visibility = ["PUBLIC"], deps = [ - react_native_xplat_target("fabric/core:core"), + react_native_xplat_target("react/renderer/core:core"), "//xplat/js/react-native-github:generated_components-rncore", ], ) diff --git a/ReactCommon/fabric/components/safeareaview/SafeAreaViewComponentDescriptor.h b/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewComponentDescriptor.h similarity index 91% rename from ReactCommon/fabric/components/safeareaview/SafeAreaViewComponentDescriptor.h rename to ReactCommon/react/renderer/components/safeareaview/SafeAreaViewComponentDescriptor.h index 23b1e37c289..5cf2f960a8a 100644 --- a/ReactCommon/fabric/components/safeareaview/SafeAreaViewComponentDescriptor.h +++ b/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewComponentDescriptor.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/safeareaview/SafeAreaViewShadowNode.cpp b/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewShadowNode.cpp similarity index 100% rename from ReactCommon/fabric/components/safeareaview/SafeAreaViewShadowNode.cpp rename to ReactCommon/react/renderer/components/safeareaview/SafeAreaViewShadowNode.cpp diff --git a/ReactCommon/fabric/components/safeareaview/SafeAreaViewShadowNode.h b/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewShadowNode.h similarity index 78% rename from ReactCommon/fabric/components/safeareaview/SafeAreaViewShadowNode.h rename to ReactCommon/react/renderer/components/safeareaview/SafeAreaViewShadowNode.h index 1f09c463b63..cbed9509ed7 100644 --- a/ReactCommon/fabric/components/safeareaview/SafeAreaViewShadowNode.h +++ b/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewShadowNode.h @@ -7,10 +7,10 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/safeareaview/SafeAreaViewState.cpp b/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewState.cpp similarity index 100% rename from ReactCommon/fabric/components/safeareaview/SafeAreaViewState.cpp rename to ReactCommon/react/renderer/components/safeareaview/SafeAreaViewState.cpp diff --git a/ReactCommon/fabric/components/safeareaview/SafeAreaViewState.h b/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewState.h similarity index 91% rename from ReactCommon/fabric/components/safeareaview/SafeAreaViewState.h rename to ReactCommon/react/renderer/components/safeareaview/SafeAreaViewState.h index 536341989fc..6b4c0c00805 100644 --- a/ReactCommon/fabric/components/safeareaview/SafeAreaViewState.h +++ b/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewState.h @@ -7,7 +7,7 @@ #pragma once -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/scrollview/BUCK b/ReactCommon/react/renderer/components/scrollview/BUCK similarity index 85% rename from ReactCommon/fabric/components/scrollview/BUCK rename to ReactCommon/react/renderer/components/scrollview/BUCK index 8ffd81f4003..20700db5057 100644 --- a/ReactCommon/fabric/components/scrollview/BUCK +++ b/ReactCommon/react/renderer/components/scrollview/BUCK @@ -30,7 +30,7 @@ rn_xplat_cxx_library( [ ("", "*.h"), ], - prefix = "react/components/scrollview", + prefix = "react/renderer/components/scrollview", ), compiler_flags = [ "-fexceptions", @@ -57,10 +57,10 @@ rn_xplat_cxx_library( "//xplat/folly:memory", "//xplat/folly:molly", YOGA_CXX_TARGET, - react_native_xplat_target("fabric/debug:debug"), - react_native_xplat_target("fabric/core:core"), - react_native_xplat_target("fabric/graphics:graphics"), - react_native_xplat_target("fabric/components/view:view"), + react_native_xplat_target("react/renderer/debug:debug"), + react_native_xplat_target("react/renderer/core:core"), + react_native_xplat_target("react/renderer/graphics:graphics"), + react_native_xplat_target("react/renderer/components/view:view"), ], ) diff --git a/ReactCommon/fabric/components/scrollview/RCTComponentViewHelpers.h b/ReactCommon/react/renderer/components/scrollview/RCTComponentViewHelpers.h similarity index 100% rename from ReactCommon/fabric/components/scrollview/RCTComponentViewHelpers.h rename to ReactCommon/react/renderer/components/scrollview/RCTComponentViewHelpers.h diff --git a/ReactCommon/fabric/components/scrollview/ScrollViewComponentDescriptor.h b/ReactCommon/react/renderer/components/scrollview/ScrollViewComponentDescriptor.h similarity index 74% rename from ReactCommon/fabric/components/scrollview/ScrollViewComponentDescriptor.h rename to ReactCommon/react/renderer/components/scrollview/ScrollViewComponentDescriptor.h index b81cb510b10..43b74b08dc3 100644 --- a/ReactCommon/fabric/components/scrollview/ScrollViewComponentDescriptor.h +++ b/ReactCommon/react/renderer/components/scrollview/ScrollViewComponentDescriptor.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.cpp b/ReactCommon/react/renderer/components/scrollview/ScrollViewEventEmitter.cpp similarity index 100% rename from ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.cpp rename to ReactCommon/react/renderer/components/scrollview/ScrollViewEventEmitter.cpp diff --git a/ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.h b/ReactCommon/react/renderer/components/scrollview/ScrollViewEventEmitter.h similarity index 89% rename from ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.h rename to ReactCommon/react/renderer/components/scrollview/ScrollViewEventEmitter.h index f03f5dc2849..f822702a5a7 100644 --- a/ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.h +++ b/ReactCommon/react/renderer/components/scrollview/ScrollViewEventEmitter.h @@ -10,9 +10,9 @@ #include #include -#include -#include -#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/scrollview/ScrollViewProps.cpp b/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp similarity index 97% rename from ReactCommon/fabric/components/scrollview/ScrollViewProps.cpp rename to ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp index fdedc739e7c..51a772ee56e 100644 --- a/ReactCommon/fabric/components/scrollview/ScrollViewProps.cpp +++ b/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp @@ -7,11 +7,11 @@ #include "ScrollViewProps.h" -#include -#include -#include +#include +#include +#include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/scrollview/ScrollViewProps.h b/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.h similarity index 93% rename from ReactCommon/fabric/components/scrollview/ScrollViewProps.h rename to ReactCommon/react/renderer/components/scrollview/ScrollViewProps.h index a6c08781f91..8513bab4a4a 100644 --- a/ReactCommon/fabric/components/scrollview/ScrollViewProps.h +++ b/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.cpp b/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.cpp similarity index 96% rename from ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.cpp rename to ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.cpp index c21c6d9128a..a421f8c9de0 100644 --- a/ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.cpp +++ b/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.cpp @@ -7,7 +7,7 @@ #include "ScrollViewShadowNode.h" -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.h b/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.h similarity index 74% rename from ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.h rename to ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.h index b448f2964db..19172a9e74b 100644 --- a/ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.h +++ b/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.h @@ -7,11 +7,11 @@ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/scrollview/ScrollViewState.cpp b/ReactCommon/react/renderer/components/scrollview/ScrollViewState.cpp similarity index 100% rename from ReactCommon/fabric/components/scrollview/ScrollViewState.cpp rename to ReactCommon/react/renderer/components/scrollview/ScrollViewState.cpp diff --git a/ReactCommon/fabric/components/scrollview/ScrollViewState.h b/ReactCommon/react/renderer/components/scrollview/ScrollViewState.h similarity index 95% rename from ReactCommon/fabric/components/scrollview/ScrollViewState.h rename to ReactCommon/react/renderer/components/scrollview/ScrollViewState.h index 3a6023499e6..d2ec294a239 100644 --- a/ReactCommon/fabric/components/scrollview/ScrollViewState.h +++ b/ReactCommon/react/renderer/components/scrollview/ScrollViewState.h @@ -7,7 +7,7 @@ #pragma once -#include +#include #include diff --git a/ReactCommon/fabric/components/scrollview/conversions.h b/ReactCommon/react/renderer/components/scrollview/conversions.h similarity index 97% rename from ReactCommon/fabric/components/scrollview/conversions.h rename to ReactCommon/react/renderer/components/scrollview/conversions.h index f3fb5206366..4d23000e23c 100644 --- a/ReactCommon/fabric/components/scrollview/conversions.h +++ b/ReactCommon/react/renderer/components/scrollview/conversions.h @@ -8,7 +8,7 @@ #pragma once #include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/scrollview/primitives.h b/ReactCommon/react/renderer/components/scrollview/primitives.h similarity index 100% rename from ReactCommon/fabric/components/scrollview/primitives.h rename to ReactCommon/react/renderer/components/scrollview/primitives.h diff --git a/ReactCommon/fabric/components/scrollview/tests/ScrollViewTest.cpp b/ReactCommon/react/renderer/components/scrollview/tests/ScrollViewTest.cpp similarity index 100% rename from ReactCommon/fabric/components/scrollview/tests/ScrollViewTest.cpp rename to ReactCommon/react/renderer/components/scrollview/tests/ScrollViewTest.cpp diff --git a/ReactCommon/fabric/components/slider/BUCK b/ReactCommon/react/renderer/components/slider/BUCK similarity index 79% rename from ReactCommon/fabric/components/slider/BUCK rename to ReactCommon/react/renderer/components/slider/BUCK index 4f736a12d51..05c3232fda5 100644 --- a/ReactCommon/fabric/components/slider/BUCK +++ b/ReactCommon/react/renderer/components/slider/BUCK @@ -31,7 +31,7 @@ rn_xplat_cxx_library( [ ("", "*.h"), ], - prefix = "react/components/slider", + prefix = "react/renderer/components/slider", ), compiler_flags = [ "-fexceptions", @@ -48,7 +48,7 @@ rn_xplat_cxx_library( ("", "*.h"), ("platform/android", "*.h"), ], - prefix = "react/components/slider", + prefix = "react/renderer/components/slider", ), fbandroid_headers = glob( ["platform/android/*.h"], @@ -64,7 +64,7 @@ rn_xplat_cxx_library( ("", "*.h"), ("platform/ios", "*.h"), ], - prefix = "react/components/slider", + prefix = "react/renderer/components/slider", ), ios_headers = glob( ["platform/ios/*.h"], @@ -86,14 +86,14 @@ rn_xplat_cxx_library( "//xplat/folly:memory", "//xplat/folly:molly", YOGA_CXX_TARGET, - react_native_xplat_target("fabric/debug:debug"), - react_native_xplat_target("fabric/core:core"), - react_native_xplat_target("fabric/components/image:image"), - react_native_xplat_target("fabric/components/view:view"), - react_native_xplat_target("fabric/graphics:graphics"), - react_native_xplat_target("fabric/imagemanager:imagemanager"), - react_native_xplat_target("fabric/uimanager:uimanager"), - react_native_xplat_target("fabric/componentregistry:componentregistry"), + react_native_xplat_target("react/renderer/debug:debug"), + react_native_xplat_target("react/renderer/core:core"), + react_native_xplat_target("react/renderer/components/image:image"), + react_native_xplat_target("react/renderer/components/view:view"), + react_native_xplat_target("react/renderer/graphics:graphics"), + react_native_xplat_target("react/renderer/imagemanager:imagemanager"), + react_native_xplat_target("react/renderer/uimanager:uimanager"), + react_native_xplat_target("react/renderer/componentregistry:componentregistry"), "//xplat/js/react-native-github:generated_components-rncore", ], ) diff --git a/ReactCommon/fabric/components/slider/SliderComponentDescriptor.h b/ReactCommon/react/renderer/components/slider/SliderComponentDescriptor.h similarity index 90% rename from ReactCommon/fabric/components/slider/SliderComponentDescriptor.h rename to ReactCommon/react/renderer/components/slider/SliderComponentDescriptor.h index 30f8fd43459..687ea411a0c 100644 --- a/ReactCommon/fabric/components/slider/SliderComponentDescriptor.h +++ b/ReactCommon/react/renderer/components/slider/SliderComponentDescriptor.h @@ -7,9 +7,9 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/slider/SliderShadowNode.cpp b/ReactCommon/react/renderer/components/slider/SliderShadowNode.cpp similarity index 98% rename from ReactCommon/fabric/components/slider/SliderShadowNode.cpp rename to ReactCommon/react/renderer/components/slider/SliderShadowNode.cpp index 38929b89cfc..15803f26f3d 100644 --- a/ReactCommon/fabric/components/slider/SliderShadowNode.cpp +++ b/ReactCommon/react/renderer/components/slider/SliderShadowNode.cpp @@ -7,7 +7,7 @@ #include "SliderShadowNode.h" -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/slider/SliderShadowNode.h b/ReactCommon/react/renderer/components/slider/SliderShadowNode.h similarity index 83% rename from ReactCommon/fabric/components/slider/SliderShadowNode.h rename to ReactCommon/react/renderer/components/slider/SliderShadowNode.h index 53ed30d82d0..82ab4d0b1dc 100644 --- a/ReactCommon/fabric/components/slider/SliderShadowNode.h +++ b/ReactCommon/react/renderer/components/slider/SliderShadowNode.h @@ -7,13 +7,13 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/slider/SliderState.cpp b/ReactCommon/react/renderer/components/slider/SliderState.cpp similarity index 100% rename from ReactCommon/fabric/components/slider/SliderState.cpp rename to ReactCommon/react/renderer/components/slider/SliderState.cpp diff --git a/ReactCommon/fabric/components/slider/SliderState.h b/ReactCommon/react/renderer/components/slider/SliderState.h similarity index 95% rename from ReactCommon/fabric/components/slider/SliderState.h rename to ReactCommon/react/renderer/components/slider/SliderState.h index 1d5c803a404..4aa4927faf6 100644 --- a/ReactCommon/fabric/components/slider/SliderState.h +++ b/ReactCommon/react/renderer/components/slider/SliderState.h @@ -8,8 +8,8 @@ #pragma once #include -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/slider/platform/android/SliderMeasurementsManager.cpp b/ReactCommon/react/renderer/components/slider/platform/android/SliderMeasurementsManager.cpp similarity index 97% rename from ReactCommon/fabric/components/slider/platform/android/SliderMeasurementsManager.cpp rename to ReactCommon/react/renderer/components/slider/platform/android/SliderMeasurementsManager.cpp index 60640edf579..0f7322ad0ef 100644 --- a/ReactCommon/fabric/components/slider/platform/android/SliderMeasurementsManager.cpp +++ b/ReactCommon/react/renderer/components/slider/platform/android/SliderMeasurementsManager.cpp @@ -8,8 +8,8 @@ #include "SliderMeasurementsManager.h" #include -#include #include +#include using namespace facebook::jni; diff --git a/ReactCommon/fabric/components/slider/platform/android/SliderMeasurementsManager.h b/ReactCommon/react/renderer/components/slider/platform/android/SliderMeasurementsManager.h similarity index 89% rename from ReactCommon/fabric/components/slider/platform/android/SliderMeasurementsManager.h rename to ReactCommon/react/renderer/components/slider/platform/android/SliderMeasurementsManager.h index 8bd4db64f97..19ba0c4f7de 100644 --- a/ReactCommon/fabric/components/slider/platform/android/SliderMeasurementsManager.h +++ b/ReactCommon/react/renderer/components/slider/platform/android/SliderMeasurementsManager.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include #include namespace facebook { diff --git a/ReactCommon/fabric/components/slider/platform/ios/SliderMeasurementsManager.cpp b/ReactCommon/react/renderer/components/slider/platform/ios/SliderMeasurementsManager.cpp similarity index 100% rename from ReactCommon/fabric/components/slider/platform/ios/SliderMeasurementsManager.cpp rename to ReactCommon/react/renderer/components/slider/platform/ios/SliderMeasurementsManager.cpp diff --git a/ReactCommon/fabric/components/slider/platform/ios/SliderMeasurementsManager.h b/ReactCommon/react/renderer/components/slider/platform/ios/SliderMeasurementsManager.h similarity index 87% rename from ReactCommon/fabric/components/slider/platform/ios/SliderMeasurementsManager.h rename to ReactCommon/react/renderer/components/slider/platform/ios/SliderMeasurementsManager.h index fb37871c7cb..f78ff2bb270 100644 --- a/ReactCommon/fabric/components/slider/platform/ios/SliderMeasurementsManager.h +++ b/ReactCommon/react/renderer/components/slider/platform/ios/SliderMeasurementsManager.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include #include namespace facebook { diff --git a/ReactCommon/fabric/components/slider/tests/SliderTest.cpp b/ReactCommon/react/renderer/components/slider/tests/SliderTest.cpp similarity index 100% rename from ReactCommon/fabric/components/slider/tests/SliderTest.cpp rename to ReactCommon/react/renderer/components/slider/tests/SliderTest.cpp diff --git a/ReactCommon/fabric/components/switch/BUCK b/ReactCommon/react/renderer/components/switch/BUCK similarity index 84% rename from ReactCommon/fabric/components/switch/BUCK rename to ReactCommon/react/renderer/components/switch/BUCK index c3a23b78118..67b258e98a6 100644 --- a/ReactCommon/fabric/components/switch/BUCK +++ b/ReactCommon/react/renderer/components/switch/BUCK @@ -32,7 +32,7 @@ rn_xplat_cxx_library( ("", "*.h"), ("androidswitch", "*.h"), ], - prefix = "react/components/androidswitch", + prefix = "react/renderer/components/androidswitch", ), compiler_flags = [ "-fexceptions", @@ -61,12 +61,12 @@ rn_xplat_cxx_library( "//xplat/folly:memory", "//xplat/folly:molly", YOGA_CXX_TARGET, - react_native_xplat_target("fabric/debug:debug"), - react_native_xplat_target("fabric/core:core"), - react_native_xplat_target("fabric/graphics:graphics"), - react_native_xplat_target("fabric/components/view:view"), - react_native_xplat_target("fabric/uimanager:uimanager"), - react_native_xplat_target("fabric/componentregistry:componentregistry"), + react_native_xplat_target("react/renderer/debug:debug"), + react_native_xplat_target("react/renderer/core:core"), + react_native_xplat_target("react/renderer/graphics:graphics"), + react_native_xplat_target("react/renderer/components/view:view"), + react_native_xplat_target("react/renderer/uimanager:uimanager"), + react_native_xplat_target("react/renderer/componentregistry:componentregistry"), "//xplat/js/react-native-github:generated_components-rncore", ], ) diff --git a/ReactCommon/fabric/components/switch/androidswitch/AndroidSwitchComponentDescriptor.h b/ReactCommon/react/renderer/components/switch/androidswitch/AndroidSwitchComponentDescriptor.h similarity index 96% rename from ReactCommon/fabric/components/switch/androidswitch/AndroidSwitchComponentDescriptor.h rename to ReactCommon/react/renderer/components/switch/androidswitch/AndroidSwitchComponentDescriptor.h index 0cc69dee54c..42a249017da 100644 --- a/ReactCommon/fabric/components/switch/androidswitch/AndroidSwitchComponentDescriptor.h +++ b/ReactCommon/react/renderer/components/switch/androidswitch/AndroidSwitchComponentDescriptor.h @@ -10,7 +10,7 @@ #include "AndroidSwitchMeasurementsManager.h" #include "AndroidSwitchShadowNode.h" -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/switch/androidswitch/AndroidSwitchMeasurementsManager.cpp b/ReactCommon/react/renderer/components/switch/androidswitch/AndroidSwitchMeasurementsManager.cpp similarity index 97% rename from ReactCommon/fabric/components/switch/androidswitch/AndroidSwitchMeasurementsManager.cpp rename to ReactCommon/react/renderer/components/switch/androidswitch/AndroidSwitchMeasurementsManager.cpp index b16f62b3f16..1d8d53e9c16 100644 --- a/ReactCommon/fabric/components/switch/androidswitch/AndroidSwitchMeasurementsManager.cpp +++ b/ReactCommon/react/renderer/components/switch/androidswitch/AndroidSwitchMeasurementsManager.cpp @@ -8,8 +8,8 @@ #include "AndroidSwitchMeasurementsManager.h" #include -#include #include +#include using namespace facebook::jni; diff --git a/ReactCommon/fabric/components/switch/androidswitch/AndroidSwitchMeasurementsManager.h b/ReactCommon/react/renderer/components/switch/androidswitch/AndroidSwitchMeasurementsManager.h similarity index 87% rename from ReactCommon/fabric/components/switch/androidswitch/AndroidSwitchMeasurementsManager.h rename to ReactCommon/react/renderer/components/switch/androidswitch/AndroidSwitchMeasurementsManager.h index f13d4c9c01f..1d7672df504 100644 --- a/ReactCommon/fabric/components/switch/androidswitch/AndroidSwitchMeasurementsManager.h +++ b/ReactCommon/react/renderer/components/switch/androidswitch/AndroidSwitchMeasurementsManager.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include #include namespace facebook { diff --git a/ReactCommon/fabric/components/switch/androidswitch/AndroidSwitchShadowNode.cpp b/ReactCommon/react/renderer/components/switch/androidswitch/AndroidSwitchShadowNode.cpp similarity index 100% rename from ReactCommon/fabric/components/switch/androidswitch/AndroidSwitchShadowNode.cpp rename to ReactCommon/react/renderer/components/switch/androidswitch/AndroidSwitchShadowNode.cpp diff --git a/ReactCommon/fabric/components/switch/androidswitch/AndroidSwitchShadowNode.h b/ReactCommon/react/renderer/components/switch/androidswitch/AndroidSwitchShadowNode.h similarity index 87% rename from ReactCommon/fabric/components/switch/androidswitch/AndroidSwitchShadowNode.h rename to ReactCommon/react/renderer/components/switch/androidswitch/AndroidSwitchShadowNode.h index e65ce7caabf..f002902dd64 100644 --- a/ReactCommon/fabric/components/switch/androidswitch/AndroidSwitchShadowNode.h +++ b/ReactCommon/react/renderer/components/switch/androidswitch/AndroidSwitchShadowNode.h @@ -9,9 +9,9 @@ #include "AndroidSwitchMeasurementsManager.h" -#include -#include -#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/text/BUCK b/ReactCommon/react/renderer/components/text/BUCK similarity index 79% rename from ReactCommon/fabric/components/text/BUCK rename to ReactCommon/react/renderer/components/text/BUCK index f7d5ded2085..f8a47669a4c 100644 --- a/ReactCommon/fabric/components/text/BUCK +++ b/ReactCommon/react/renderer/components/text/BUCK @@ -34,7 +34,7 @@ rn_xplat_cxx_library( ("text", "*.h"), ("rawtext", "*.h"), ], - prefix = "react/components/text", + prefix = "react/renderer/components/text", ), compiler_flags = [ "-fexceptions", @@ -62,14 +62,14 @@ rn_xplat_cxx_library( "//xplat/folly:molly", YOGA_CXX_TARGET, react_native_xplat_target("utils:utils"), - react_native_xplat_target("fabric/attributedstring:attributedstring"), - react_native_xplat_target("fabric/core:core"), - react_native_xplat_target("fabric/debug:debug"), - react_native_xplat_target("fabric/graphics:graphics"), - react_native_xplat_target("fabric/textlayoutmanager:textlayoutmanager"), - react_native_xplat_target("fabric/components/view:view"), - react_native_xplat_target("fabric/uimanager:uimanager"), - react_native_xplat_target("fabric/componentregistry:componentregistry"), + react_native_xplat_target("react/renderer/attributedstring:attributedstring"), + react_native_xplat_target("react/renderer/core:core"), + react_native_xplat_target("react/renderer/debug:debug"), + react_native_xplat_target("react/renderer/graphics:graphics"), + react_native_xplat_target("react/renderer/textlayoutmanager:textlayoutmanager"), + react_native_xplat_target("react/renderer/components/view:view"), + react_native_xplat_target("react/renderer/uimanager:uimanager"), + react_native_xplat_target("react/renderer/componentregistry:componentregistry"), ], ) diff --git a/ReactCommon/fabric/components/text/basetext/BaseTextProps.cpp b/ReactCommon/react/renderer/components/text/basetext/BaseTextProps.cpp similarity index 95% rename from ReactCommon/fabric/components/text/basetext/BaseTextProps.cpp rename to ReactCommon/react/renderer/components/text/basetext/BaseTextProps.cpp index 51fd3821e23..cae5c975a3d 100644 --- a/ReactCommon/fabric/components/text/basetext/BaseTextProps.cpp +++ b/ReactCommon/react/renderer/components/text/basetext/BaseTextProps.cpp @@ -7,10 +7,10 @@ #include "BaseTextProps.h" -#include -#include -#include -#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/text/basetext/BaseTextProps.h b/ReactCommon/react/renderer/components/text/basetext/BaseTextProps.h similarity index 80% rename from ReactCommon/fabric/components/text/basetext/BaseTextProps.h rename to ReactCommon/react/renderer/components/text/basetext/BaseTextProps.h index 5554277f2da..4e4fefbafe5 100644 --- a/ReactCommon/fabric/components/text/basetext/BaseTextProps.h +++ b/ReactCommon/react/renderer/components/text/basetext/BaseTextProps.h @@ -7,10 +7,10 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/text/basetext/BaseTextShadowNode.cpp b/ReactCommon/react/renderer/components/text/basetext/BaseTextShadowNode.cpp similarity index 90% rename from ReactCommon/fabric/components/text/basetext/BaseTextShadowNode.cpp rename to ReactCommon/react/renderer/components/text/basetext/BaseTextShadowNode.cpp index e892881c43d..638317f19a4 100644 --- a/ReactCommon/fabric/components/text/basetext/BaseTextShadowNode.cpp +++ b/ReactCommon/react/renderer/components/text/basetext/BaseTextShadowNode.cpp @@ -7,11 +7,11 @@ #include "BaseTextShadowNode.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/text/basetext/BaseTextShadowNode.h b/ReactCommon/react/renderer/components/text/basetext/BaseTextShadowNode.h similarity index 93% rename from ReactCommon/fabric/components/text/basetext/BaseTextShadowNode.h rename to ReactCommon/react/renderer/components/text/basetext/BaseTextShadowNode.h index be95f4cacf1..49d8733645c 100644 --- a/ReactCommon/fabric/components/text/basetext/BaseTextShadowNode.h +++ b/ReactCommon/react/renderer/components/text/basetext/BaseTextShadowNode.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/text/paragraph/ParagraphComponentDescriptor.h b/ReactCommon/react/renderer/components/text/paragraph/ParagraphComponentDescriptor.h similarity index 91% rename from ReactCommon/fabric/components/text/paragraph/ParagraphComponentDescriptor.h rename to ReactCommon/react/renderer/components/text/paragraph/ParagraphComponentDescriptor.h index 0ec89c56831..d2e925f4c8c 100644 --- a/ReactCommon/fabric/components/text/paragraph/ParagraphComponentDescriptor.h +++ b/ReactCommon/react/renderer/components/text/paragraph/ParagraphComponentDescriptor.h @@ -9,10 +9,10 @@ #include "ParagraphShadowNode.h" -#include #include -#include -#include +#include +#include +#include #include namespace facebook { diff --git a/ReactCommon/fabric/components/text/paragraph/ParagraphProps.cpp b/ReactCommon/react/renderer/components/text/paragraph/ParagraphProps.cpp similarity index 85% rename from ReactCommon/fabric/components/text/paragraph/ParagraphProps.cpp rename to ReactCommon/react/renderer/components/text/paragraph/ParagraphProps.cpp index fc731707084..5d8652d2f1f 100644 --- a/ReactCommon/fabric/components/text/paragraph/ParagraphProps.cpp +++ b/ReactCommon/react/renderer/components/text/paragraph/ParagraphProps.cpp @@ -7,10 +7,10 @@ #include "ParagraphProps.h" -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/ReactCommon/fabric/components/text/paragraph/ParagraphProps.h b/ReactCommon/react/renderer/components/text/paragraph/ParagraphProps.h similarity index 83% rename from ReactCommon/fabric/components/text/paragraph/ParagraphProps.h rename to ReactCommon/react/renderer/components/text/paragraph/ParagraphProps.h index 235b80c13b2..07622f7e99f 100644 --- a/ReactCommon/fabric/components/text/paragraph/ParagraphProps.h +++ b/ReactCommon/react/renderer/components/text/paragraph/ParagraphProps.h @@ -10,10 +10,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/text/paragraph/ParagraphShadowNode.cpp b/ReactCommon/react/renderer/components/text/paragraph/ParagraphShadowNode.cpp similarity index 97% rename from ReactCommon/fabric/components/text/paragraph/ParagraphShadowNode.cpp rename to ReactCommon/react/renderer/components/text/paragraph/ParagraphShadowNode.cpp index c81e1c1b4f0..6ad8568534c 100644 --- a/ReactCommon/fabric/components/text/paragraph/ParagraphShadowNode.cpp +++ b/ReactCommon/react/renderer/components/text/paragraph/ParagraphShadowNode.cpp @@ -9,10 +9,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include "ParagraphState.h" diff --git a/ReactCommon/fabric/components/text/paragraph/ParagraphShadowNode.h b/ReactCommon/react/renderer/components/text/paragraph/ParagraphShadowNode.h similarity index 86% rename from ReactCommon/fabric/components/text/paragraph/ParagraphShadowNode.h rename to ReactCommon/react/renderer/components/text/paragraph/ParagraphShadowNode.h index 3e4441b0075..a3d0ce0c6e9 100644 --- a/ReactCommon/fabric/components/text/paragraph/ParagraphShadowNode.h +++ b/ReactCommon/react/renderer/components/text/paragraph/ParagraphShadowNode.h @@ -8,14 +8,14 @@ #pragma once #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/text/paragraph/ParagraphState.cpp b/ReactCommon/react/renderer/components/text/paragraph/ParagraphState.cpp similarity index 77% rename from ReactCommon/fabric/components/text/paragraph/ParagraphState.cpp rename to ReactCommon/react/renderer/components/text/paragraph/ParagraphState.cpp index 59f4072defa..c91bb6e480f 100644 --- a/ReactCommon/fabric/components/text/paragraph/ParagraphState.cpp +++ b/ReactCommon/react/renderer/components/text/paragraph/ParagraphState.cpp @@ -7,8 +7,8 @@ #include "ParagraphState.h" -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/text/paragraph/ParagraphState.h b/ReactCommon/react/renderer/components/text/paragraph/ParagraphState.h similarity index 88% rename from ReactCommon/fabric/components/text/paragraph/ParagraphState.h rename to ReactCommon/react/renderer/components/text/paragraph/ParagraphState.h index f3dcf3abfa1..8f320af68e6 100644 --- a/ReactCommon/fabric/components/text/paragraph/ParagraphState.h +++ b/ReactCommon/react/renderer/components/text/paragraph/ParagraphState.h @@ -7,9 +7,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #ifdef ANDROID #include diff --git a/ReactCommon/fabric/components/text/paragraph/conversions.h b/ReactCommon/react/renderer/components/text/paragraph/conversions.h similarity index 85% rename from ReactCommon/fabric/components/text/paragraph/conversions.h rename to ReactCommon/react/renderer/components/text/paragraph/conversions.h index 9e1f2f1f918..0d44cd76214 100644 --- a/ReactCommon/fabric/components/text/paragraph/conversions.h +++ b/ReactCommon/react/renderer/components/text/paragraph/conversions.h @@ -6,8 +6,8 @@ */ #include -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/text/rawtext/RawTextComponentDescriptor.h b/ReactCommon/react/renderer/components/text/rawtext/RawTextComponentDescriptor.h similarity index 75% rename from ReactCommon/fabric/components/text/rawtext/RawTextComponentDescriptor.h rename to ReactCommon/react/renderer/components/text/rawtext/RawTextComponentDescriptor.h index 1f002070346..5a437ec8961 100644 --- a/ReactCommon/fabric/components/text/rawtext/RawTextComponentDescriptor.h +++ b/ReactCommon/react/renderer/components/text/rawtext/RawTextComponentDescriptor.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/text/rawtext/RawTextProps.cpp b/ReactCommon/react/renderer/components/text/rawtext/RawTextProps.cpp similarity index 86% rename from ReactCommon/fabric/components/text/rawtext/RawTextProps.cpp rename to ReactCommon/react/renderer/components/text/rawtext/RawTextProps.cpp index 71cc7ded956..d54292bc527 100644 --- a/ReactCommon/fabric/components/text/rawtext/RawTextProps.cpp +++ b/ReactCommon/react/renderer/components/text/rawtext/RawTextProps.cpp @@ -7,8 +7,8 @@ #include "RawTextProps.h" -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/text/rawtext/RawTextProps.h b/ReactCommon/react/renderer/components/text/rawtext/RawTextProps.h similarity index 88% rename from ReactCommon/fabric/components/text/rawtext/RawTextProps.h rename to ReactCommon/react/renderer/components/text/rawtext/RawTextProps.h index 838d8f00c91..4b98953a0a2 100644 --- a/ReactCommon/fabric/components/text/rawtext/RawTextProps.h +++ b/ReactCommon/react/renderer/components/text/rawtext/RawTextProps.h @@ -9,8 +9,8 @@ #include -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/text/rawtext/RawTextShadowNode.cpp b/ReactCommon/react/renderer/components/text/rawtext/RawTextShadowNode.cpp similarity index 100% rename from ReactCommon/fabric/components/text/rawtext/RawTextShadowNode.cpp rename to ReactCommon/react/renderer/components/text/rawtext/RawTextShadowNode.cpp diff --git a/ReactCommon/fabric/components/text/rawtext/RawTextShadowNode.h b/ReactCommon/react/renderer/components/text/rawtext/RawTextShadowNode.h similarity index 86% rename from ReactCommon/fabric/components/text/rawtext/RawTextShadowNode.h rename to ReactCommon/react/renderer/components/text/rawtext/RawTextShadowNode.h index e93368a8c69..b11297ee353 100644 --- a/ReactCommon/fabric/components/text/rawtext/RawTextShadowNode.h +++ b/ReactCommon/react/renderer/components/text/rawtext/RawTextShadowNode.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/text/tests/ParagraphLocalDataTest.cpp b/ReactCommon/react/renderer/components/text/tests/ParagraphLocalDataTest.cpp similarity index 83% rename from ReactCommon/fabric/components/text/tests/ParagraphLocalDataTest.cpp rename to ReactCommon/react/renderer/components/text/tests/ParagraphLocalDataTest.cpp index 36692ac33e4..24e51148450 100644 --- a/ReactCommon/fabric/components/text/tests/ParagraphLocalDataTest.cpp +++ b/ReactCommon/react/renderer/components/text/tests/ParagraphLocalDataTest.cpp @@ -9,11 +9,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/text/tests/TextTest.cpp b/ReactCommon/react/renderer/components/text/tests/TextTest.cpp similarity index 100% rename from ReactCommon/fabric/components/text/tests/TextTest.cpp rename to ReactCommon/react/renderer/components/text/tests/TextTest.cpp diff --git a/ReactCommon/fabric/components/text/text/TextComponentDescriptor.h b/ReactCommon/react/renderer/components/text/text/TextComponentDescriptor.h similarity index 75% rename from ReactCommon/fabric/components/text/text/TextComponentDescriptor.h rename to ReactCommon/react/renderer/components/text/text/TextComponentDescriptor.h index c43013b4b6c..12e6b54512e 100644 --- a/ReactCommon/fabric/components/text/text/TextComponentDescriptor.h +++ b/ReactCommon/react/renderer/components/text/text/TextComponentDescriptor.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/text/text/TextProps.cpp b/ReactCommon/react/renderer/components/text/text/TextProps.cpp similarity index 100% rename from ReactCommon/fabric/components/text/text/TextProps.cpp rename to ReactCommon/react/renderer/components/text/text/TextProps.cpp diff --git a/ReactCommon/fabric/components/text/text/TextProps.h b/ReactCommon/react/renderer/components/text/text/TextProps.h similarity index 70% rename from ReactCommon/fabric/components/text/text/TextProps.h rename to ReactCommon/react/renderer/components/text/text/TextProps.h index 3960004baee..31e7be2a84f 100644 --- a/ReactCommon/fabric/components/text/text/TextProps.h +++ b/ReactCommon/react/renderer/components/text/text/TextProps.h @@ -7,11 +7,11 @@ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/text/text/TextShadowNode.cpp b/ReactCommon/react/renderer/components/text/text/TextShadowNode.cpp similarity index 100% rename from ReactCommon/fabric/components/text/text/TextShadowNode.cpp rename to ReactCommon/react/renderer/components/text/text/TextShadowNode.cpp diff --git a/ReactCommon/fabric/components/text/text/TextShadowNode.h b/ReactCommon/react/renderer/components/text/text/TextShadowNode.h similarity index 85% rename from ReactCommon/fabric/components/text/text/TextShadowNode.h rename to ReactCommon/react/renderer/components/text/text/TextShadowNode.h index 76d333223ab..15d1fc308c5 100644 --- a/ReactCommon/fabric/components/text/text/TextShadowNode.h +++ b/ReactCommon/react/renderer/components/text/text/TextShadowNode.h @@ -9,10 +9,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/textinput/BUCK b/ReactCommon/react/renderer/components/textinput/BUCK similarity index 74% rename from ReactCommon/fabric/components/textinput/BUCK rename to ReactCommon/react/renderer/components/textinput/BUCK index 49df25270c9..c495d90365e 100644 --- a/ReactCommon/fabric/components/textinput/BUCK +++ b/ReactCommon/react/renderer/components/textinput/BUCK @@ -31,7 +31,7 @@ rn_xplat_cxx_library( ("", "*.h"), ("androidtextinput", "*.h"), ], - prefix = "react/components/androidtextinput", + prefix = "react/renderer/components/androidtextinput", ), compiler_flags = [ "-fexceptions", @@ -59,17 +59,17 @@ rn_xplat_cxx_library( "//xplat/folly:molly", YOGA_CXX_TARGET, react_native_xplat_target("utils:utils"), - react_native_xplat_target("fabric/attributedstring:attributedstring"), - react_native_xplat_target("fabric/core:core"), - react_native_xplat_target("fabric/debug:debug"), - react_native_xplat_target("fabric/graphics:graphics"), - react_native_xplat_target("fabric/textlayoutmanager:textlayoutmanager"), - react_native_xplat_target("fabric/components/text:text"), - react_native_xplat_target("fabric/components/view:view"), - react_native_xplat_target("fabric/components/image:image"), - react_native_xplat_target("fabric/uimanager:uimanager"), - react_native_xplat_target("fabric/componentregistry:componentregistry"), - react_native_xplat_target("fabric/imagemanager:imagemanager"), + react_native_xplat_target("react/renderer/attributedstring:attributedstring"), + react_native_xplat_target("react/renderer/core:core"), + react_native_xplat_target("react/renderer/debug:debug"), + react_native_xplat_target("react/renderer/graphics:graphics"), + react_native_xplat_target("react/renderer/textlayoutmanager:textlayoutmanager"), + react_native_xplat_target("react/renderer/components/text:text"), + react_native_xplat_target("react/renderer/components/view:view"), + react_native_xplat_target("react/renderer/components/image:image"), + react_native_xplat_target("react/renderer/uimanager:uimanager"), + react_native_xplat_target("react/renderer/componentregistry:componentregistry"), + react_native_xplat_target("react/renderer/imagemanager:imagemanager"), ], ) diff --git a/ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputComponentDescriptor.h b/ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputComponentDescriptor.h similarity index 99% rename from ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputComponentDescriptor.h rename to ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputComponentDescriptor.h index 1644fc6b625..3918684ed60 100644 --- a/ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputComponentDescriptor.h +++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputComponentDescriptor.h @@ -8,7 +8,7 @@ #pragma once #include -#include +#include #include "AndroidTextInputShadowNode.h" #include diff --git a/ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputEventEmitter.cpp b/ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputEventEmitter.cpp similarity index 100% rename from ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputEventEmitter.cpp rename to ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputEventEmitter.cpp diff --git a/ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputEventEmitter.h b/ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputEventEmitter.h similarity index 98% rename from ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputEventEmitter.h rename to ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputEventEmitter.h index fd643e44c9c..b99192b244f 100644 --- a/ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputEventEmitter.h +++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputEventEmitter.h @@ -7,7 +7,7 @@ #pragma once -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputProps.cpp b/ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputProps.cpp similarity index 98% rename from ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputProps.cpp rename to ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputProps.cpp index 670bbffa36e..c3907cd9a70 100644 --- a/ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputProps.cpp +++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputProps.cpp @@ -6,9 +6,9 @@ */ #include "AndroidTextInputProps.h" -#include -#include -#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputProps.h b/ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputProps.h similarity index 89% rename from ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputProps.h rename to ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputProps.h index acd185b0d85..18f0bcf4ac6 100644 --- a/ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputProps.h +++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputProps.h @@ -7,18 +7,18 @@ #pragma once -// #include -#include -#include -#include +// #include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputShadowNode.cpp b/ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputShadowNode.cpp similarity index 95% rename from ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputShadowNode.cpp rename to ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputShadowNode.cpp index dadeb8977b2..ca3a97dc96a 100644 --- a/ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputShadowNode.cpp +++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputShadowNode.cpp @@ -8,13 +8,13 @@ #include "AndroidTextInputShadowNode.h" #include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include using namespace facebook::jni; diff --git a/ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputShadowNode.h b/ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputShadowNode.h similarity index 95% rename from ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputShadowNode.h rename to ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputShadowNode.h index 39f3a6a4777..ac322666e0f 100644 --- a/ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputShadowNode.h +++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputShadowNode.h @@ -11,10 +11,10 @@ #include "AndroidTextInputProps.h" #include "AndroidTextInputState.h" -#include +#include #include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputState.cpp b/ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputState.cpp similarity index 86% rename from ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputState.cpp rename to ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputState.cpp index 4e37be0aa6f..d5106ef5fed 100644 --- a/ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputState.cpp +++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputState.cpp @@ -7,8 +7,8 @@ #include "AndroidTextInputState.h" -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputState.h b/ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputState.h similarity index 97% rename from ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputState.h rename to ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputState.h index d9505729de8..3f60eb0bbab 100644 --- a/ReactCommon/fabric/components/textinput/androidtextinput/AndroidTextInputState.h +++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputState.h @@ -7,9 +7,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #ifdef ANDROID #include diff --git a/ReactCommon/fabric/components/textinput/iostextinput/BUCK b/ReactCommon/react/renderer/components/textinput/iostextinput/BUCK similarity index 74% rename from ReactCommon/fabric/components/textinput/iostextinput/BUCK rename to ReactCommon/react/renderer/components/textinput/iostextinput/BUCK index f432474e0b2..058e8b60db4 100644 --- a/ReactCommon/fabric/components/textinput/iostextinput/BUCK +++ b/ReactCommon/react/renderer/components/textinput/iostextinput/BUCK @@ -31,7 +31,7 @@ rn_xplat_cxx_library( ("", "*.h"), ], # TODO(shergin) T26519801 Figure out better directories structure - prefix = "react/components/iostextinput", + prefix = "react/renderer/components/iostextinput", ), compiler_flags = [ "-fexceptions", @@ -59,17 +59,17 @@ rn_xplat_cxx_library( "//xplat/folly:molly", YOGA_CXX_TARGET, react_native_xplat_target("utils:utils"), - react_native_xplat_target("fabric/attributedstring:attributedstring"), - react_native_xplat_target("fabric/core:core"), - react_native_xplat_target("fabric/debug:debug"), - react_native_xplat_target("fabric/graphics:graphics"), - react_native_xplat_target("fabric/textlayoutmanager:textlayoutmanager"), - react_native_xplat_target("fabric/components/text:text"), - react_native_xplat_target("fabric/components/view:view"), - react_native_xplat_target("fabric/components/image:image"), - react_native_xplat_target("fabric/uimanager:uimanager"), - react_native_xplat_target("fabric/componentregistry:componentregistry"), - react_native_xplat_target("fabric/imagemanager:imagemanager"), + react_native_xplat_target("react/renderer/attributedstring:attributedstring"), + react_native_xplat_target("react/renderer/core:core"), + react_native_xplat_target("react/renderer/debug:debug"), + react_native_xplat_target("react/renderer/graphics:graphics"), + react_native_xplat_target("react/renderer/textlayoutmanager:textlayoutmanager"), + react_native_xplat_target("react/renderer/components/text:text"), + react_native_xplat_target("react/renderer/components/view:view"), + react_native_xplat_target("react/renderer/components/image:image"), + react_native_xplat_target("react/renderer/uimanager:uimanager"), + react_native_xplat_target("react/renderer/componentregistry:componentregistry"), + react_native_xplat_target("react/renderer/imagemanager:imagemanager"), ], ) diff --git a/ReactCommon/fabric/components/textinput/iostextinput/TextInputComponentDescriptor.h b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputComponentDescriptor.h similarity index 90% rename from ReactCommon/fabric/components/textinput/iostextinput/TextInputComponentDescriptor.h rename to ReactCommon/react/renderer/components/textinput/iostextinput/TextInputComponentDescriptor.h index d602d027041..9614fd5712d 100644 --- a/ReactCommon/fabric/components/textinput/iostextinput/TextInputComponentDescriptor.h +++ b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputComponentDescriptor.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/textinput/iostextinput/TextInputEventEmitter.cpp b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputEventEmitter.cpp similarity index 100% rename from ReactCommon/fabric/components/textinput/iostextinput/TextInputEventEmitter.cpp rename to ReactCommon/react/renderer/components/textinput/iostextinput/TextInputEventEmitter.cpp diff --git a/ReactCommon/fabric/components/textinput/iostextinput/TextInputEventEmitter.h b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputEventEmitter.h similarity index 92% rename from ReactCommon/fabric/components/textinput/iostextinput/TextInputEventEmitter.h rename to ReactCommon/react/renderer/components/textinput/iostextinput/TextInputEventEmitter.h index 3a143dfbd1d..6e5ecd44342 100644 --- a/ReactCommon/fabric/components/textinput/iostextinput/TextInputEventEmitter.h +++ b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputEventEmitter.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/textinput/iostextinput/TextInputProps.cpp b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.cpp similarity index 92% rename from ReactCommon/fabric/components/textinput/iostextinput/TextInputProps.cpp rename to ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.cpp index 972c3768e0d..e102f463bf4 100644 --- a/ReactCommon/fabric/components/textinput/iostextinput/TextInputProps.cpp +++ b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.cpp @@ -7,10 +7,10 @@ #include "TextInputProps.h" -#include -#include -#include -#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/textinput/iostextinput/TextInputProps.h b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.h similarity index 71% rename from ReactCommon/fabric/components/textinput/iostextinput/TextInputProps.h rename to ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.h index 9109a2ae49d..a12503ff669 100644 --- a/ReactCommon/fabric/components/textinput/iostextinput/TextInputProps.h +++ b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.h @@ -7,16 +7,16 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include namespace facebook { diff --git a/ReactCommon/fabric/components/textinput/iostextinput/TextInputShadowNode.cpp b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputShadowNode.cpp similarity index 93% rename from ReactCommon/fabric/components/textinput/iostextinput/TextInputShadowNode.cpp rename to ReactCommon/react/renderer/components/textinput/iostextinput/TextInputShadowNode.cpp index 8cce95c0af4..4e771d9e5e5 100644 --- a/ReactCommon/fabric/components/textinput/iostextinput/TextInputShadowNode.cpp +++ b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputShadowNode.cpp @@ -7,11 +7,11 @@ #include "TextInputShadowNode.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/textinput/iostextinput/TextInputShadowNode.h b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputShadowNode.h similarity index 82% rename from ReactCommon/fabric/components/textinput/iostextinput/TextInputShadowNode.h rename to ReactCommon/react/renderer/components/textinput/iostextinput/TextInputShadowNode.h index 035d692379a..4924c4f8b6b 100644 --- a/ReactCommon/fabric/components/textinput/iostextinput/TextInputShadowNode.h +++ b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputShadowNode.h @@ -7,13 +7,13 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include namespace facebook { diff --git a/ReactCommon/fabric/components/textinput/iostextinput/TextInputState.cpp b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputState.cpp similarity index 100% rename from ReactCommon/fabric/components/textinput/iostextinput/TextInputState.cpp rename to ReactCommon/react/renderer/components/textinput/iostextinput/TextInputState.cpp diff --git a/ReactCommon/fabric/components/textinput/iostextinput/TextInputState.h b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputState.h similarity index 87% rename from ReactCommon/fabric/components/textinput/iostextinput/TextInputState.h rename to ReactCommon/react/renderer/components/textinput/iostextinput/TextInputState.h index d5085854f06..31ea9c77a2a 100644 --- a/ReactCommon/fabric/components/textinput/iostextinput/TextInputState.h +++ b/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputState.h @@ -7,9 +7,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #ifdef ANDROID #include diff --git a/ReactCommon/fabric/components/textinput/iostextinput/conversions.h b/ReactCommon/react/renderer/components/textinput/iostextinput/conversions.h similarity index 97% rename from ReactCommon/fabric/components/textinput/iostextinput/conversions.h rename to ReactCommon/react/renderer/components/textinput/iostextinput/conversions.h index e4daf98f4c6..85d2fe926e7 100644 --- a/ReactCommon/fabric/components/textinput/iostextinput/conversions.h +++ b/ReactCommon/react/renderer/components/textinput/iostextinput/conversions.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/textinput/iostextinput/primitives.h b/ReactCommon/react/renderer/components/textinput/iostextinput/primitives.h similarity index 100% rename from ReactCommon/fabric/components/textinput/iostextinput/primitives.h rename to ReactCommon/react/renderer/components/textinput/iostextinput/primitives.h diff --git a/ReactCommon/fabric/components/textinput/iostextinput/propsConversions.h b/ReactCommon/react/renderer/components/textinput/iostextinput/propsConversions.h similarity index 96% rename from ReactCommon/fabric/components/textinput/iostextinput/propsConversions.h rename to ReactCommon/react/renderer/components/textinput/iostextinput/propsConversions.h index 6b5150d0aae..4de4dc98d98 100644 --- a/ReactCommon/fabric/components/textinput/iostextinput/propsConversions.h +++ b/ReactCommon/react/renderer/components/textinput/iostextinput/propsConversions.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/unimplementedview/BUCK b/ReactCommon/react/renderer/components/unimplementedview/BUCK similarity index 87% rename from ReactCommon/fabric/components/unimplementedview/BUCK rename to ReactCommon/react/renderer/components/unimplementedview/BUCK index 001f9607cdc..128195f1d94 100644 --- a/ReactCommon/fabric/components/unimplementedview/BUCK +++ b/ReactCommon/react/renderer/components/unimplementedview/BUCK @@ -27,7 +27,7 @@ rn_xplat_cxx_library( [ ("", "*.h"), ], - prefix = "react/components/unimplementedview", + prefix = "react/renderer/components/unimplementedview", ), compiler_flags = [ "-fexceptions", @@ -53,9 +53,9 @@ rn_xplat_cxx_library( "//xplat/folly:memory", "//xplat/folly:molly", YOGA_CXX_TARGET, - react_native_xplat_target("fabric/debug:debug"), - react_native_xplat_target("fabric/core:core"), - react_native_xplat_target("fabric/components/view:view"), + react_native_xplat_target("react/renderer/debug:debug"), + react_native_xplat_target("react/renderer/core:core"), + react_native_xplat_target("react/renderer/components/view:view"), ], ) diff --git a/ReactCommon/fabric/components/unimplementedview/UnimplementedViewComponentDescriptor.cpp b/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.cpp similarity index 100% rename from ReactCommon/fabric/components/unimplementedview/UnimplementedViewComponentDescriptor.cpp rename to ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.cpp diff --git a/ReactCommon/fabric/components/unimplementedview/UnimplementedViewComponentDescriptor.h b/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.h similarity index 87% rename from ReactCommon/fabric/components/unimplementedview/UnimplementedViewComponentDescriptor.h rename to ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.h index 53b1235959f..b2de61f3b1c 100644 --- a/ReactCommon/fabric/components/unimplementedview/UnimplementedViewComponentDescriptor.h +++ b/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/unimplementedview/UnimplementedViewProps.cpp b/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewProps.cpp similarity index 85% rename from ReactCommon/fabric/components/unimplementedview/UnimplementedViewProps.cpp rename to ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewProps.cpp index 2d0d01c7a46..b5033818f15 100644 --- a/ReactCommon/fabric/components/unimplementedview/UnimplementedViewProps.cpp +++ b/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewProps.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/unimplementedview/UnimplementedViewProps.h b/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewProps.h similarity index 93% rename from ReactCommon/fabric/components/unimplementedview/UnimplementedViewProps.h rename to ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewProps.h index 610157276ec..637769f62f1 100644 --- a/ReactCommon/fabric/components/unimplementedview/UnimplementedViewProps.h +++ b/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewProps.h @@ -7,7 +7,7 @@ #pragma once -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/unimplementedview/UnimplementedViewShadowNode.cpp b/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewShadowNode.cpp similarity index 100% rename from ReactCommon/fabric/components/unimplementedview/UnimplementedViewShadowNode.cpp rename to ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewShadowNode.cpp diff --git a/ReactCommon/fabric/components/unimplementedview/UnimplementedViewShadowNode.h b/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewShadowNode.h similarity index 76% rename from ReactCommon/fabric/components/unimplementedview/UnimplementedViewShadowNode.h rename to ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewShadowNode.h index 136b5e08e51..f176f68fc4a 100644 --- a/ReactCommon/fabric/components/unimplementedview/UnimplementedViewShadowNode.h +++ b/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewShadowNode.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/view/BUCK b/ReactCommon/react/renderer/components/view/BUCK similarity index 81% rename from ReactCommon/fabric/components/view/BUCK rename to ReactCommon/react/renderer/components/view/BUCK index 49b6f316598..b729ca907ce 100644 --- a/ReactCommon/fabric/components/view/BUCK +++ b/ReactCommon/react/renderer/components/view/BUCK @@ -33,7 +33,7 @@ rn_xplat_cxx_library( ("root", "*.h"), ("yoga", "*.h"), ], - prefix = "react/components/view", + prefix = "react/renderer/components/view", ), compiler_flags = [ "-fexceptions", @@ -60,9 +60,9 @@ rn_xplat_cxx_library( "//xplat/folly:memory", "//xplat/folly:molly", YOGA_CXX_TARGET, - react_native_xplat_target("fabric/core:core"), - react_native_xplat_target("fabric/debug:debug"), - react_native_xplat_target("fabric/graphics:graphics"), + react_native_xplat_target("react/renderer/core:core"), + react_native_xplat_target("react/renderer/debug:debug"), + react_native_xplat_target("react/renderer/graphics:graphics"), ], ) @@ -80,8 +80,8 @@ fb_xplat_cxx_test( platforms = (ANDROID, APPLE, CXX), deps = [ "//xplat/third-party/gmock:gtest", - react_native_xplat_target("fabric/element:element"), - react_native_xplat_target("fabric/components/root:root"), - react_native_xplat_target("fabric/components/view:view"), + react_native_xplat_target("react/renderer/element:element"), + react_native_xplat_target("react/renderer/components/root:root"), + react_native_xplat_target("react/renderer/components/view:view"), ], ) diff --git a/ReactCommon/fabric/components/view/ConcreteViewShadowNode.h b/ReactCommon/react/renderer/components/view/ConcreteViewShadowNode.h similarity index 88% rename from ReactCommon/fabric/components/view/ConcreteViewShadowNode.h rename to ReactCommon/react/renderer/components/view/ConcreteViewShadowNode.h index 7c090491000..0fe2def64c9 100644 --- a/ReactCommon/fabric/components/view/ConcreteViewShadowNode.h +++ b/ReactCommon/react/renderer/components/view/ConcreteViewShadowNode.h @@ -7,14 +7,14 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/view/Touch.cpp b/ReactCommon/react/renderer/components/view/Touch.cpp similarity index 100% rename from ReactCommon/fabric/components/view/Touch.cpp rename to ReactCommon/react/renderer/components/view/Touch.cpp diff --git a/ReactCommon/fabric/components/view/Touch.h b/ReactCommon/react/renderer/components/view/Touch.h similarity index 93% rename from ReactCommon/fabric/components/view/Touch.h rename to ReactCommon/react/renderer/components/view/Touch.h index 866850deb3d..91b6db7522b 100644 --- a/ReactCommon/fabric/components/view/Touch.h +++ b/ReactCommon/react/renderer/components/view/Touch.h @@ -7,9 +7,9 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/view/TouchEvent.cpp b/ReactCommon/react/renderer/components/view/TouchEvent.cpp similarity index 100% rename from ReactCommon/fabric/components/view/TouchEvent.cpp rename to ReactCommon/react/renderer/components/view/TouchEvent.cpp diff --git a/ReactCommon/fabric/components/view/TouchEvent.h b/ReactCommon/react/renderer/components/view/TouchEvent.h similarity index 91% rename from ReactCommon/fabric/components/view/TouchEvent.h rename to ReactCommon/react/renderer/components/view/TouchEvent.h index 86022f2b875..4725fa4eec4 100644 --- a/ReactCommon/fabric/components/view/TouchEvent.h +++ b/ReactCommon/react/renderer/components/view/TouchEvent.h @@ -7,11 +7,11 @@ #pragma once -#include +#include #include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/view/TouchEventEmitter.cpp b/ReactCommon/react/renderer/components/view/TouchEventEmitter.cpp similarity index 100% rename from ReactCommon/fabric/components/view/TouchEventEmitter.cpp rename to ReactCommon/react/renderer/components/view/TouchEventEmitter.cpp diff --git a/ReactCommon/fabric/components/view/TouchEventEmitter.h b/ReactCommon/react/renderer/components/view/TouchEventEmitter.h similarity index 76% rename from ReactCommon/fabric/components/view/TouchEventEmitter.h rename to ReactCommon/react/renderer/components/view/TouchEventEmitter.h index f43d5a3037f..54a29049039 100644 --- a/ReactCommon/fabric/components/view/TouchEventEmitter.h +++ b/ReactCommon/react/renderer/components/view/TouchEventEmitter.h @@ -7,11 +7,11 @@ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/view/ViewComponentDescriptor.h b/ReactCommon/react/renderer/components/view/ViewComponentDescriptor.h similarity index 88% rename from ReactCommon/fabric/components/view/ViewComponentDescriptor.h rename to ReactCommon/react/renderer/components/view/ViewComponentDescriptor.h index 006081daf3d..fd078e656c8 100644 --- a/ReactCommon/fabric/components/view/ViewComponentDescriptor.h +++ b/ReactCommon/react/renderer/components/view/ViewComponentDescriptor.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include #include "ViewProps.h" #include "ViewPropsInterpolation.h" diff --git a/ReactCommon/fabric/components/view/ViewEventEmitter.cpp b/ReactCommon/react/renderer/components/view/ViewEventEmitter.cpp similarity index 100% rename from ReactCommon/fabric/components/view/ViewEventEmitter.cpp rename to ReactCommon/react/renderer/components/view/ViewEventEmitter.cpp diff --git a/ReactCommon/fabric/components/view/ViewEventEmitter.h b/ReactCommon/react/renderer/components/view/ViewEventEmitter.h similarity index 90% rename from ReactCommon/fabric/components/view/ViewEventEmitter.h rename to ReactCommon/react/renderer/components/view/ViewEventEmitter.h index 608755c5053..0aa1f5e588e 100644 --- a/ReactCommon/fabric/components/view/ViewEventEmitter.h +++ b/ReactCommon/react/renderer/components/view/ViewEventEmitter.h @@ -10,8 +10,8 @@ #include #include -#include -#include +#include +#include #include "TouchEventEmitter.h" diff --git a/ReactCommon/fabric/components/view/ViewProps.cpp b/ReactCommon/react/renderer/components/view/ViewProps.cpp similarity index 96% rename from ReactCommon/fabric/components/view/ViewProps.cpp rename to ReactCommon/react/renderer/components/view/ViewProps.cpp index 311f0a0e763..a7c4a4b0b72 100644 --- a/ReactCommon/fabric/components/view/ViewProps.cpp +++ b/ReactCommon/react/renderer/components/view/ViewProps.cpp @@ -9,11 +9,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/view/ViewProps.h b/ReactCommon/react/renderer/components/view/ViewProps.h similarity index 80% rename from ReactCommon/fabric/components/view/ViewProps.h rename to ReactCommon/react/renderer/components/view/ViewProps.h index 59fb492e240..997353b23b7 100644 --- a/ReactCommon/fabric/components/view/ViewProps.h +++ b/ReactCommon/react/renderer/components/view/ViewProps.h @@ -7,14 +7,14 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/view/ViewPropsInterpolation.h b/ReactCommon/react/renderer/components/view/ViewPropsInterpolation.h similarity index 100% rename from ReactCommon/fabric/components/view/ViewPropsInterpolation.h rename to ReactCommon/react/renderer/components/view/ViewPropsInterpolation.h diff --git a/ReactCommon/fabric/components/view/ViewShadowNode.cpp b/ReactCommon/react/renderer/components/view/ViewShadowNode.cpp similarity index 97% rename from ReactCommon/fabric/components/view/ViewShadowNode.cpp rename to ReactCommon/react/renderer/components/view/ViewShadowNode.cpp index 060de546cba..60aa53f5dbd 100644 --- a/ReactCommon/fabric/components/view/ViewShadowNode.cpp +++ b/ReactCommon/react/renderer/components/view/ViewShadowNode.cpp @@ -6,7 +6,7 @@ */ #include "ViewShadowNode.h" -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/view/ViewShadowNode.h b/ReactCommon/react/renderer/components/view/ViewShadowNode.h similarity index 89% rename from ReactCommon/fabric/components/view/ViewShadowNode.h rename to ReactCommon/react/renderer/components/view/ViewShadowNode.h index 8d27e37143f..0ccf2116e44 100644 --- a/ReactCommon/fabric/components/view/ViewShadowNode.h +++ b/ReactCommon/react/renderer/components/view/ViewShadowNode.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/view/accessibility/AccessibilityPrimitives.h b/ReactCommon/react/renderer/components/view/accessibility/AccessibilityPrimitives.h similarity index 100% rename from ReactCommon/fabric/components/view/accessibility/AccessibilityPrimitives.h rename to ReactCommon/react/renderer/components/view/accessibility/AccessibilityPrimitives.h diff --git a/ReactCommon/fabric/components/view/accessibility/AccessibilityProps.cpp b/ReactCommon/react/renderer/components/view/accessibility/AccessibilityProps.cpp similarity index 92% rename from ReactCommon/fabric/components/view/accessibility/AccessibilityProps.cpp rename to ReactCommon/react/renderer/components/view/accessibility/AccessibilityProps.cpp index 584e599b2df..aa4c1f47795 100644 --- a/ReactCommon/fabric/components/view/accessibility/AccessibilityProps.cpp +++ b/ReactCommon/react/renderer/components/view/accessibility/AccessibilityProps.cpp @@ -7,10 +7,10 @@ #include "AccessibilityProps.h" -#include -#include -#include -#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/view/accessibility/AccessibilityProps.h b/ReactCommon/react/renderer/components/view/accessibility/AccessibilityProps.h similarity index 85% rename from ReactCommon/fabric/components/view/accessibility/AccessibilityProps.h rename to ReactCommon/react/renderer/components/view/accessibility/AccessibilityProps.h index 59537b1d018..4235e7cdd6c 100644 --- a/ReactCommon/fabric/components/view/accessibility/AccessibilityProps.h +++ b/ReactCommon/react/renderer/components/view/accessibility/AccessibilityProps.h @@ -7,10 +7,10 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/view/accessibility/accessibilityPropsConversions.h b/ReactCommon/react/renderer/components/view/accessibility/accessibilityPropsConversions.h similarity index 97% rename from ReactCommon/fabric/components/view/accessibility/accessibilityPropsConversions.h rename to ReactCommon/react/renderer/components/view/accessibility/accessibilityPropsConversions.h index 1f259de9f3d..e112ec34e20 100644 --- a/ReactCommon/fabric/components/view/accessibility/accessibilityPropsConversions.h +++ b/ReactCommon/react/renderer/components/view/accessibility/accessibilityPropsConversions.h @@ -8,8 +8,8 @@ #pragma once #include -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/view/conversions.h b/ReactCommon/react/renderer/components/view/conversions.h similarity index 99% rename from ReactCommon/fabric/components/view/conversions.h rename to ReactCommon/react/renderer/components/view/conversions.h index 73eee9b2cee..93eb658be34 100644 --- a/ReactCommon/fabric/components/view/conversions.h +++ b/ReactCommon/react/renderer/components/view/conversions.h @@ -12,10 +12,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/ReactCommon/fabric/components/view/primitives.h b/ReactCommon/react/renderer/components/view/primitives.h similarity index 98% rename from ReactCommon/fabric/components/view/primitives.h rename to ReactCommon/react/renderer/components/view/primitives.h index 9ffde856a2b..f50f37e71fa 100644 --- a/ReactCommon/fabric/components/view/primitives.h +++ b/ReactCommon/react/renderer/components/view/primitives.h @@ -8,8 +8,8 @@ #pragma once #include -#include -#include +#include +#include #include #include diff --git a/ReactCommon/fabric/components/view/propsConversions.h b/ReactCommon/react/renderer/components/view/propsConversions.h similarity index 98% rename from ReactCommon/fabric/components/view/propsConversions.h rename to ReactCommon/react/renderer/components/view/propsConversions.h index a21e3a95937..89acb27348a 100644 --- a/ReactCommon/fabric/components/view/propsConversions.h +++ b/ReactCommon/react/renderer/components/view/propsConversions.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/view/tests/LayoutTest.cpp b/ReactCommon/react/renderer/components/view/tests/LayoutTest.cpp similarity index 96% rename from ReactCommon/fabric/components/view/tests/LayoutTest.cpp rename to ReactCommon/react/renderer/components/view/tests/LayoutTest.cpp index f309557e5d1..840547d8e66 100644 --- a/ReactCommon/fabric/components/view/tests/LayoutTest.cpp +++ b/ReactCommon/react/renderer/components/view/tests/LayoutTest.cpp @@ -7,12 +7,12 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/view/tests/ViewTest.cpp b/ReactCommon/react/renderer/components/view/tests/ViewTest.cpp similarity index 94% rename from ReactCommon/fabric/components/view/tests/ViewTest.cpp rename to ReactCommon/react/renderer/components/view/tests/ViewTest.cpp index 993a7097215..0b99e926242 100644 --- a/ReactCommon/fabric/components/view/tests/ViewTest.cpp +++ b/ReactCommon/react/renderer/components/view/tests/ViewTest.cpp @@ -10,13 +10,13 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.cpp b/ReactCommon/react/renderer/components/view/yoga/YogaLayoutableShadowNode.cpp similarity index 98% rename from ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.cpp rename to ReactCommon/react/renderer/components/view/yoga/YogaLayoutableShadowNode.cpp index f17a8e41bed..b1bf74c1f33 100644 --- a/ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.cpp +++ b/ReactCommon/react/renderer/components/view/yoga/YogaLayoutableShadowNode.cpp @@ -6,12 +6,12 @@ */ #include "YogaLayoutableShadowNode.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.h b/ReactCommon/react/renderer/components/view/yoga/YogaLayoutableShadowNode.h similarity index 95% rename from ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.h rename to ReactCommon/react/renderer/components/view/yoga/YogaLayoutableShadowNode.h index 5566e10590f..634c839df48 100644 --- a/ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.h +++ b/ReactCommon/react/renderer/components/view/yoga/YogaLayoutableShadowNode.h @@ -12,12 +12,12 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/view/yoga/YogaStylableProps.cpp b/ReactCommon/react/renderer/components/view/yoga/YogaStylableProps.cpp similarity index 93% rename from ReactCommon/fabric/components/view/yoga/YogaStylableProps.cpp rename to ReactCommon/react/renderer/components/view/yoga/YogaStylableProps.cpp index 08da2474757..8fe909a188a 100644 --- a/ReactCommon/fabric/components/view/yoga/YogaStylableProps.cpp +++ b/ReactCommon/react/renderer/components/view/yoga/YogaStylableProps.cpp @@ -7,10 +7,10 @@ #include "YogaStylableProps.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/ReactCommon/fabric/components/view/yoga/YogaStylableProps.h b/ReactCommon/react/renderer/components/view/yoga/YogaStylableProps.h similarity index 87% rename from ReactCommon/fabric/components/view/yoga/YogaStylableProps.h rename to ReactCommon/react/renderer/components/view/yoga/YogaStylableProps.h index d45b23713aa..d272f069346 100644 --- a/ReactCommon/fabric/components/view/yoga/YogaStylableProps.h +++ b/ReactCommon/react/renderer/components/view/yoga/YogaStylableProps.h @@ -9,8 +9,8 @@ #include -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/BUCK b/ReactCommon/react/renderer/core/BUCK similarity index 82% rename from ReactCommon/fabric/core/BUCK rename to ReactCommon/react/renderer/core/BUCK index 948f56912cb..7d5f6c65bde 100644 --- a/ReactCommon/fabric/core/BUCK +++ b/ReactCommon/react/renderer/core/BUCK @@ -36,7 +36,7 @@ rn_xplat_cxx_library( ("shadownode", "*.h"), ("state", "*.h"), ], - prefix = "react/core", + prefix = "react/renderer/core", ), compiler_flags = [ "-fexceptions", @@ -65,8 +65,8 @@ rn_xplat_cxx_library( "//xplat/jsi:JSIDynamic", "//xplat/jsi:jsi", react_native_xplat_target("utils:utils"), - react_native_xplat_target("fabric/debug:debug"), - react_native_xplat_target("fabric/graphics:graphics"), + react_native_xplat_target("react/renderer/debug:debug"), + react_native_xplat_target("react/renderer/graphics:graphics"), ], ) @@ -84,12 +84,12 @@ fb_xplat_cxx_test( platforms = (ANDROID, APPLE, CXX), deps = [ "//xplat/folly:molly", - "//xplat/js/react-native-github/ReactCommon/fabric/element:element", - react_native_xplat_target("fabric/components/view:view"), - react_native_xplat_target("fabric/components/scrollview:scrollview"), - react_native_xplat_target("fabric/components/text:text"), + "//xplat/js/react-native-github/ReactCommon/react/renderer/element:element", + react_native_xplat_target("react/renderer/components/view:view"), + react_native_xplat_target("react/renderer/components/scrollview:scrollview"), + react_native_xplat_target("react/renderer/components/text:text"), "//xplat/third-party/gmock:gtest", - react_native_xplat_target("fabric/components/view:view"), + react_native_xplat_target("react/renderer/components/view:view"), ":core", ], ) @@ -112,7 +112,7 @@ fb_xplat_cxx_binary( deps = [ "//xplat/third-party/benchmark:benchmark", react_native_xplat_target("utils:utils"), - react_native_xplat_target("fabric/components/view:view"), + react_native_xplat_target("react/renderer/components/view:view"), ":core", ], ) diff --git a/ReactCommon/fabric/core/componentdescriptor/ComponentDescriptor.cpp b/ReactCommon/react/renderer/core/componentdescriptor/ComponentDescriptor.cpp similarity index 100% rename from ReactCommon/fabric/core/componentdescriptor/ComponentDescriptor.cpp rename to ReactCommon/react/renderer/core/componentdescriptor/ComponentDescriptor.cpp diff --git a/ReactCommon/fabric/core/componentdescriptor/ComponentDescriptor.h b/ReactCommon/react/renderer/core/componentdescriptor/ComponentDescriptor.h similarity index 94% rename from ReactCommon/fabric/core/componentdescriptor/ComponentDescriptor.h rename to ReactCommon/react/renderer/core/componentdescriptor/ComponentDescriptor.h index 9d47425bc9b..04ad7f27bb5 100644 --- a/ReactCommon/fabric/core/componentdescriptor/ComponentDescriptor.h +++ b/ReactCommon/react/renderer/core/componentdescriptor/ComponentDescriptor.h @@ -7,12 +7,12 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include namespace facebook { diff --git a/ReactCommon/fabric/core/componentdescriptor/ConcreteComponentDescriptor.h b/ReactCommon/react/renderer/core/componentdescriptor/ConcreteComponentDescriptor.h similarity index 95% rename from ReactCommon/fabric/core/componentdescriptor/ConcreteComponentDescriptor.h rename to ReactCommon/react/renderer/core/componentdescriptor/ConcreteComponentDescriptor.h index e987de792eb..497cf561e3d 100644 --- a/ReactCommon/fabric/core/componentdescriptor/ConcreteComponentDescriptor.h +++ b/ReactCommon/react/renderer/core/componentdescriptor/ConcreteComponentDescriptor.h @@ -10,12 +10,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/conversions.h b/ReactCommon/react/renderer/core/conversions.h similarity index 96% rename from ReactCommon/fabric/core/conversions.h rename to ReactCommon/react/renderer/core/conversions.h index 6dada1df0b3..9dc3daa994f 100644 --- a/ReactCommon/fabric/core/conversions.h +++ b/ReactCommon/react/renderer/core/conversions.h @@ -7,7 +7,7 @@ #pragma once -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/events/BatchedEventQueue.cpp b/ReactCommon/react/renderer/core/events/BatchedEventQueue.cpp similarity index 100% rename from ReactCommon/fabric/core/events/BatchedEventQueue.cpp rename to ReactCommon/react/renderer/core/events/BatchedEventQueue.cpp diff --git a/ReactCommon/fabric/core/events/BatchedEventQueue.h b/ReactCommon/react/renderer/core/events/BatchedEventQueue.h similarity index 94% rename from ReactCommon/fabric/core/events/BatchedEventQueue.h rename to ReactCommon/react/renderer/core/events/BatchedEventQueue.h index af8348c0d66..2acabd8600b 100644 --- a/ReactCommon/fabric/core/events/BatchedEventQueue.h +++ b/ReactCommon/react/renderer/core/events/BatchedEventQueue.h @@ -7,7 +7,7 @@ #pragma once -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/events/EventBeat.cpp b/ReactCommon/react/renderer/core/events/EventBeat.cpp similarity index 100% rename from ReactCommon/fabric/core/events/EventBeat.cpp rename to ReactCommon/react/renderer/core/events/EventBeat.cpp diff --git a/ReactCommon/fabric/core/events/EventBeat.h b/ReactCommon/react/renderer/core/events/EventBeat.h similarity index 100% rename from ReactCommon/fabric/core/events/EventBeat.h rename to ReactCommon/react/renderer/core/events/EventBeat.h diff --git a/ReactCommon/fabric/core/events/EventDispatcher.cpp b/ReactCommon/react/renderer/core/events/EventDispatcher.cpp similarity index 98% rename from ReactCommon/fabric/core/events/EventDispatcher.cpp rename to ReactCommon/react/renderer/core/events/EventDispatcher.cpp index 5ccd35e5691..8ece2ab3a07 100644 --- a/ReactCommon/fabric/core/events/EventDispatcher.cpp +++ b/ReactCommon/react/renderer/core/events/EventDispatcher.cpp @@ -7,7 +7,7 @@ #include "EventDispatcher.h" -#include +#include #include "BatchedEventQueue.h" #include "RawEvent.h" diff --git a/ReactCommon/fabric/core/events/EventDispatcher.h b/ReactCommon/react/renderer/core/events/EventDispatcher.h similarity index 84% rename from ReactCommon/fabric/core/events/EventDispatcher.h rename to ReactCommon/react/renderer/core/events/EventDispatcher.h index f9f161bd50e..d3fb37c1327 100644 --- a/ReactCommon/fabric/core/events/EventDispatcher.h +++ b/ReactCommon/react/renderer/core/events/EventDispatcher.h @@ -10,13 +10,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/events/EventEmitter.cpp b/ReactCommon/react/renderer/core/events/EventEmitter.cpp similarity index 98% rename from ReactCommon/fabric/core/events/EventEmitter.cpp rename to ReactCommon/react/renderer/core/events/EventEmitter.cpp index 007911fcc59..54a0c8154b2 100644 --- a/ReactCommon/fabric/core/events/EventEmitter.cpp +++ b/ReactCommon/react/renderer/core/events/EventEmitter.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include "RawEvent.h" diff --git a/ReactCommon/fabric/core/events/EventEmitter.h b/ReactCommon/react/renderer/core/events/EventEmitter.h similarity index 93% rename from ReactCommon/fabric/core/events/EventEmitter.h rename to ReactCommon/react/renderer/core/events/EventEmitter.h index 14475e01a01..55bdf8f0401 100644 --- a/ReactCommon/fabric/core/events/EventEmitter.h +++ b/ReactCommon/react/renderer/core/events/EventEmitter.h @@ -11,10 +11,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/events/EventHandler.h b/ReactCommon/react/renderer/core/events/EventHandler.h similarity index 100% rename from ReactCommon/fabric/core/events/EventHandler.h rename to ReactCommon/react/renderer/core/events/EventHandler.h diff --git a/ReactCommon/fabric/core/events/EventPipe.h b/ReactCommon/react/renderer/core/events/EventPipe.h similarity index 85% rename from ReactCommon/fabric/core/events/EventPipe.h rename to ReactCommon/react/renderer/core/events/EventPipe.h index c539f60590b..b0264579ae0 100644 --- a/ReactCommon/fabric/core/events/EventPipe.h +++ b/ReactCommon/react/renderer/core/events/EventPipe.h @@ -11,8 +11,8 @@ #include #include -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/events/EventPriority.h b/ReactCommon/react/renderer/core/events/EventPriority.h similarity index 100% rename from ReactCommon/fabric/core/events/EventPriority.h rename to ReactCommon/react/renderer/core/events/EventPriority.h diff --git a/ReactCommon/fabric/core/events/EventQueue.cpp b/ReactCommon/react/renderer/core/events/EventQueue.cpp similarity index 100% rename from ReactCommon/fabric/core/events/EventQueue.cpp rename to ReactCommon/react/renderer/core/events/EventQueue.cpp diff --git a/ReactCommon/fabric/core/events/EventQueue.h b/ReactCommon/react/renderer/core/events/EventQueue.h similarity index 88% rename from ReactCommon/fabric/core/events/EventQueue.h rename to ReactCommon/react/renderer/core/events/EventQueue.h index 64722d7e02b..ab6bac9ac3b 100644 --- a/ReactCommon/fabric/core/events/EventQueue.h +++ b/ReactCommon/react/renderer/core/events/EventQueue.h @@ -12,11 +12,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/events/EventTarget.cpp b/ReactCommon/react/renderer/core/events/EventTarget.cpp similarity index 100% rename from ReactCommon/fabric/core/events/EventTarget.cpp rename to ReactCommon/react/renderer/core/events/EventTarget.cpp diff --git a/ReactCommon/fabric/core/events/EventTarget.h b/ReactCommon/react/renderer/core/events/EventTarget.h similarity index 100% rename from ReactCommon/fabric/core/events/EventTarget.h rename to ReactCommon/react/renderer/core/events/EventTarget.h diff --git a/ReactCommon/fabric/core/events/RawEvent.cpp b/ReactCommon/react/renderer/core/events/RawEvent.cpp similarity index 100% rename from ReactCommon/fabric/core/events/RawEvent.cpp rename to ReactCommon/react/renderer/core/events/RawEvent.cpp diff --git a/ReactCommon/fabric/core/events/RawEvent.h b/ReactCommon/react/renderer/core/events/RawEvent.h similarity index 86% rename from ReactCommon/fabric/core/events/RawEvent.h rename to ReactCommon/react/renderer/core/events/RawEvent.h index 8ac0800b586..03286a2ac08 100644 --- a/ReactCommon/fabric/core/events/RawEvent.h +++ b/ReactCommon/react/renderer/core/events/RawEvent.h @@ -10,8 +10,8 @@ #include #include -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/events/UnbatchedEventQueue.cpp b/ReactCommon/react/renderer/core/events/UnbatchedEventQueue.cpp similarity index 100% rename from ReactCommon/fabric/core/events/UnbatchedEventQueue.cpp rename to ReactCommon/react/renderer/core/events/UnbatchedEventQueue.cpp diff --git a/ReactCommon/fabric/core/events/UnbatchedEventQueue.h b/ReactCommon/react/renderer/core/events/UnbatchedEventQueue.h similarity index 92% rename from ReactCommon/fabric/core/events/UnbatchedEventQueue.h rename to ReactCommon/react/renderer/core/events/UnbatchedEventQueue.h index d4158862d8f..7bf94054658 100644 --- a/ReactCommon/fabric/core/events/UnbatchedEventQueue.h +++ b/ReactCommon/react/renderer/core/events/UnbatchedEventQueue.h @@ -7,7 +7,7 @@ #pragma once -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/events/ValueFactory.h b/ReactCommon/react/renderer/core/events/ValueFactory.h similarity index 100% rename from ReactCommon/fabric/core/events/ValueFactory.h rename to ReactCommon/react/renderer/core/events/ValueFactory.h diff --git a/ReactCommon/fabric/core/layout/LayoutConstraints.cpp b/ReactCommon/react/renderer/core/layout/LayoutConstraints.cpp similarity index 100% rename from ReactCommon/fabric/core/layout/LayoutConstraints.cpp rename to ReactCommon/react/renderer/core/layout/LayoutConstraints.cpp diff --git a/ReactCommon/fabric/core/layout/LayoutConstraints.h b/ReactCommon/react/renderer/core/layout/LayoutConstraints.h similarity index 93% rename from ReactCommon/fabric/core/layout/LayoutConstraints.h rename to ReactCommon/react/renderer/core/layout/LayoutConstraints.h index cb483e5bd28..5f838b5e4f2 100644 --- a/ReactCommon/fabric/core/layout/LayoutConstraints.h +++ b/ReactCommon/react/renderer/core/layout/LayoutConstraints.h @@ -10,8 +10,8 @@ #include #include -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/layout/LayoutContext.h b/ReactCommon/react/renderer/core/layout/LayoutContext.h similarity index 94% rename from ReactCommon/fabric/core/layout/LayoutContext.h rename to ReactCommon/react/renderer/core/layout/LayoutContext.h index 42b011fca7f..e23ac5aceb6 100644 --- a/ReactCommon/fabric/core/layout/LayoutContext.h +++ b/ReactCommon/react/renderer/core/layout/LayoutContext.h @@ -9,8 +9,8 @@ #include -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/layout/LayoutMetrics.h b/ReactCommon/react/renderer/core/layout/LayoutMetrics.h similarity index 94% rename from ReactCommon/fabric/core/layout/LayoutMetrics.h rename to ReactCommon/react/renderer/core/layout/LayoutMetrics.h index d4708a899fb..603a56beab8 100644 --- a/ReactCommon/fabric/core/layout/LayoutMetrics.h +++ b/ReactCommon/react/renderer/core/layout/LayoutMetrics.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/layout/LayoutPrimitives.h b/ReactCommon/react/renderer/core/layout/LayoutPrimitives.h similarity index 100% rename from ReactCommon/fabric/core/layout/LayoutPrimitives.h rename to ReactCommon/react/renderer/core/layout/LayoutPrimitives.h diff --git a/ReactCommon/fabric/core/layout/LayoutableShadowNode.cpp b/ReactCommon/react/renderer/core/layout/LayoutableShadowNode.cpp similarity index 96% rename from ReactCommon/fabric/core/layout/LayoutableShadowNode.cpp rename to ReactCommon/react/renderer/core/layout/LayoutableShadowNode.cpp index 710f51a524c..46c7388ee43 100644 --- a/ReactCommon/fabric/core/layout/LayoutableShadowNode.cpp +++ b/ReactCommon/react/renderer/core/layout/LayoutableShadowNode.cpp @@ -7,12 +7,12 @@ #include "LayoutableShadowNode.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/layout/LayoutableShadowNode.h b/ReactCommon/react/renderer/core/layout/LayoutableShadowNode.h similarity index 95% rename from ReactCommon/fabric/core/layout/LayoutableShadowNode.h rename to ReactCommon/react/renderer/core/layout/LayoutableShadowNode.h index b0c7e176406..37625bfae87 100644 --- a/ReactCommon/fabric/core/layout/LayoutableShadowNode.h +++ b/ReactCommon/react/renderer/core/layout/LayoutableShadowNode.h @@ -13,12 +13,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/primitives/RawProps.cpp b/ReactCommon/react/renderer/core/primitives/RawProps.cpp similarity index 97% rename from ReactCommon/fabric/core/primitives/RawProps.cpp rename to ReactCommon/react/renderer/core/primitives/RawProps.cpp index 6588e753e93..fd55f40c0c5 100644 --- a/ReactCommon/fabric/core/primitives/RawProps.cpp +++ b/ReactCommon/react/renderer/core/primitives/RawProps.cpp @@ -7,7 +7,7 @@ #include "RawProps.h" -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/primitives/RawProps.h b/ReactCommon/react/renderer/core/primitives/RawProps.h similarity index 96% rename from ReactCommon/fabric/core/primitives/RawProps.h rename to ReactCommon/react/renderer/core/primitives/RawProps.h index 3b518176f89..152f7528f9d 100644 --- a/ReactCommon/fabric/core/primitives/RawProps.h +++ b/ReactCommon/react/renderer/core/primitives/RawProps.h @@ -16,9 +16,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include namespace facebook { diff --git a/ReactCommon/fabric/core/primitives/RawPropsKey.cpp b/ReactCommon/react/renderer/core/primitives/RawPropsKey.cpp similarity index 96% rename from ReactCommon/fabric/core/primitives/RawPropsKey.cpp rename to ReactCommon/react/renderer/core/primitives/RawPropsKey.cpp index 5b1683e0b4a..505eca510eb 100644 --- a/ReactCommon/fabric/core/primitives/RawPropsKey.cpp +++ b/ReactCommon/react/renderer/core/primitives/RawPropsKey.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/primitives/RawPropsKey.h b/ReactCommon/react/renderer/core/primitives/RawPropsKey.h similarity index 94% rename from ReactCommon/fabric/core/primitives/RawPropsKey.h rename to ReactCommon/react/renderer/core/primitives/RawPropsKey.h index b05b7f4e783..097b153dd51 100644 --- a/ReactCommon/fabric/core/primitives/RawPropsKey.h +++ b/ReactCommon/react/renderer/core/primitives/RawPropsKey.h @@ -9,7 +9,7 @@ #include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/primitives/RawPropsKeyMap.cpp b/ReactCommon/react/renderer/core/primitives/RawPropsKeyMap.cpp similarity index 100% rename from ReactCommon/fabric/core/primitives/RawPropsKeyMap.cpp rename to ReactCommon/react/renderer/core/primitives/RawPropsKeyMap.cpp diff --git a/ReactCommon/fabric/core/primitives/RawPropsKeyMap.h b/ReactCommon/react/renderer/core/primitives/RawPropsKeyMap.h similarity index 94% rename from ReactCommon/fabric/core/primitives/RawPropsKeyMap.h rename to ReactCommon/react/renderer/core/primitives/RawPropsKeyMap.h index 82dd163f34a..3c300a31409 100644 --- a/ReactCommon/fabric/core/primitives/RawPropsKeyMap.h +++ b/ReactCommon/react/renderer/core/primitives/RawPropsKeyMap.h @@ -9,8 +9,8 @@ #include -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/primitives/RawPropsParser.cpp b/ReactCommon/react/renderer/core/primitives/RawPropsParser.cpp similarity index 99% rename from ReactCommon/fabric/core/primitives/RawPropsParser.cpp rename to ReactCommon/react/renderer/core/primitives/RawPropsParser.cpp index 3fa24485e62..96fe38b8ccd 100644 --- a/ReactCommon/fabric/core/primitives/RawPropsParser.cpp +++ b/ReactCommon/react/renderer/core/primitives/RawPropsParser.cpp @@ -8,7 +8,7 @@ #include "RawPropsParser.h" #include -#include +#include #ifndef NDEBUG #include diff --git a/ReactCommon/fabric/core/primitives/RawPropsParser.h b/ReactCommon/react/renderer/core/primitives/RawPropsParser.h similarity index 86% rename from ReactCommon/fabric/core/primitives/RawPropsParser.h rename to ReactCommon/react/renderer/core/primitives/RawPropsParser.h index 38f43495e5d..4dc557b708f 100644 --- a/ReactCommon/fabric/core/primitives/RawPropsParser.h +++ b/ReactCommon/react/renderer/core/primitives/RawPropsParser.h @@ -9,12 +9,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/primitives/RawPropsPrimitives.h b/ReactCommon/react/renderer/core/primitives/RawPropsPrimitives.h similarity index 100% rename from ReactCommon/fabric/core/primitives/RawPropsPrimitives.h rename to ReactCommon/react/renderer/core/primitives/RawPropsPrimitives.h diff --git a/ReactCommon/fabric/core/primitives/RawValue.cpp b/ReactCommon/react/renderer/core/primitives/RawValue.cpp similarity index 100% rename from ReactCommon/fabric/core/primitives/RawValue.cpp rename to ReactCommon/react/renderer/core/primitives/RawValue.cpp diff --git a/ReactCommon/fabric/core/primitives/RawValue.h b/ReactCommon/react/renderer/core/primitives/RawValue.h similarity index 100% rename from ReactCommon/fabric/core/primitives/RawValue.h rename to ReactCommon/react/renderer/core/primitives/RawValue.h diff --git a/ReactCommon/fabric/core/primitives/ReactPrimitives.h b/ReactCommon/react/renderer/core/primitives/ReactPrimitives.h similarity index 92% rename from ReactCommon/fabric/core/primitives/ReactPrimitives.h rename to ReactCommon/react/renderer/core/primitives/ReactPrimitives.h index f38489dc3c7..d72fa25d593 100644 --- a/ReactCommon/fabric/core/primitives/ReactPrimitives.h +++ b/ReactCommon/react/renderer/core/primitives/ReactPrimitives.h @@ -8,8 +8,8 @@ #pragma once #include -#include -#include +#include +#include #include #include diff --git a/ReactCommon/fabric/core/primitives/Sealable.cpp b/ReactCommon/react/renderer/core/primitives/Sealable.cpp similarity index 100% rename from ReactCommon/fabric/core/primitives/Sealable.cpp rename to ReactCommon/react/renderer/core/primitives/Sealable.cpp diff --git a/ReactCommon/fabric/core/primitives/Sealable.h b/ReactCommon/react/renderer/core/primitives/Sealable.h similarity index 100% rename from ReactCommon/fabric/core/primitives/Sealable.h rename to ReactCommon/react/renderer/core/primitives/Sealable.h diff --git a/ReactCommon/fabric/core/propsConversions.h b/ReactCommon/react/renderer/core/propsConversions.h similarity index 94% rename from ReactCommon/fabric/core/propsConversions.h rename to ReactCommon/react/renderer/core/propsConversions.h index 468c83a6ded..cb3f1665fc0 100644 --- a/ReactCommon/fabric/core/propsConversions.h +++ b/ReactCommon/react/renderer/core/propsConversions.h @@ -10,10 +10,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/shadownode/ConcreteShadowNode.h b/ReactCommon/react/renderer/core/shadownode/ConcreteShadowNode.h similarity index 95% rename from ReactCommon/fabric/core/shadownode/ConcreteShadowNode.h rename to ReactCommon/react/renderer/core/shadownode/ConcreteShadowNode.h index 7edb2e56783..bc23ed0cfca 100644 --- a/ReactCommon/fabric/core/shadownode/ConcreteShadowNode.h +++ b/ReactCommon/react/renderer/core/shadownode/ConcreteShadowNode.h @@ -7,10 +7,10 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/shadownode/Props.cpp b/ReactCommon/react/renderer/core/shadownode/Props.cpp similarity index 92% rename from ReactCommon/fabric/core/shadownode/Props.cpp rename to ReactCommon/react/renderer/core/shadownode/Props.cpp index bb4a057b628..79d6777691f 100644 --- a/ReactCommon/fabric/core/shadownode/Props.cpp +++ b/ReactCommon/react/renderer/core/shadownode/Props.cpp @@ -8,7 +8,7 @@ #include "Props.h" #include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/shadownode/Props.h b/ReactCommon/react/renderer/core/shadownode/Props.h similarity index 88% rename from ReactCommon/fabric/core/shadownode/Props.h rename to ReactCommon/react/renderer/core/shadownode/Props.h index 6e0f46b3785..5653509fd7a 100644 --- a/ReactCommon/fabric/core/shadownode/Props.h +++ b/ReactCommon/react/renderer/core/shadownode/Props.h @@ -9,9 +9,9 @@ #include -#include -#include -#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/shadownode/ShadowNode.cpp b/ReactCommon/react/renderer/core/shadownode/ShadowNode.cpp similarity index 97% rename from ReactCommon/fabric/core/shadownode/ShadowNode.cpp rename to ReactCommon/react/renderer/core/shadownode/ShadowNode.cpp index 9f3618ddf46..8d93a0f9ec0 100644 --- a/ReactCommon/fabric/core/shadownode/ShadowNode.cpp +++ b/ReactCommon/react/renderer/core/shadownode/ShadowNode.cpp @@ -10,10 +10,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/shadownode/ShadowNode.h b/ReactCommon/react/renderer/core/shadownode/ShadowNode.h similarity index 95% rename from ReactCommon/fabric/core/shadownode/ShadowNode.h rename to ReactCommon/react/renderer/core/shadownode/ShadowNode.h index 30710ec0e46..ce83ccf1e5b 100644 --- a/ReactCommon/fabric/core/shadownode/ShadowNode.h +++ b/ReactCommon/react/renderer/core/shadownode/ShadowNode.h @@ -12,14 +12,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/shadownode/ShadowNodeFamily.cpp b/ReactCommon/react/renderer/core/shadownode/ShadowNodeFamily.cpp similarity index 97% rename from ReactCommon/fabric/core/shadownode/ShadowNodeFamily.cpp rename to ReactCommon/react/renderer/core/shadownode/ShadowNodeFamily.cpp index fe2aaa84a75..c76b3ab8d3a 100644 --- a/ReactCommon/fabric/core/shadownode/ShadowNodeFamily.cpp +++ b/ReactCommon/react/renderer/core/shadownode/ShadowNodeFamily.cpp @@ -8,8 +8,8 @@ #include "ShadowNodeFamily.h" #include "ShadowNode.h" -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/shadownode/ShadowNodeFamily.h b/ReactCommon/react/renderer/core/shadownode/ShadowNodeFamily.h similarity index 96% rename from ReactCommon/fabric/core/shadownode/ShadowNodeFamily.h rename to ReactCommon/react/renderer/core/shadownode/ShadowNodeFamily.h index 1bf431061cb..ad3ecf0e36d 100644 --- a/ReactCommon/fabric/core/shadownode/ShadowNodeFamily.h +++ b/ReactCommon/react/renderer/core/shadownode/ShadowNodeFamily.h @@ -11,9 +11,9 @@ #include -#include -#include -#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/shadownode/ShadowNodeFamilyFragment.cpp b/ReactCommon/react/renderer/core/shadownode/ShadowNodeFamilyFragment.cpp similarity index 94% rename from ReactCommon/fabric/core/shadownode/ShadowNodeFamilyFragment.cpp rename to ReactCommon/react/renderer/core/shadownode/ShadowNodeFamilyFragment.cpp index 5ef1494d006..a16da431773 100644 --- a/ReactCommon/fabric/core/shadownode/ShadowNodeFamilyFragment.cpp +++ b/ReactCommon/react/renderer/core/shadownode/ShadowNodeFamilyFragment.cpp @@ -7,7 +7,7 @@ #include "ShadowNodeFamilyFragment.h" -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/shadownode/ShadowNodeFamilyFragment.h b/ReactCommon/react/renderer/core/shadownode/ShadowNodeFamilyFragment.h similarity index 93% rename from ReactCommon/fabric/core/shadownode/ShadowNodeFamilyFragment.h rename to ReactCommon/react/renderer/core/shadownode/ShadowNodeFamilyFragment.h index 3c9c667d0b5..af380d6ff6c 100644 --- a/ReactCommon/fabric/core/shadownode/ShadowNodeFamilyFragment.h +++ b/ReactCommon/react/renderer/core/shadownode/ShadowNodeFamilyFragment.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/shadownode/ShadowNodeFragment.cpp b/ReactCommon/react/renderer/core/shadownode/ShadowNodeFragment.cpp similarity index 100% rename from ReactCommon/fabric/core/shadownode/ShadowNodeFragment.cpp rename to ReactCommon/react/renderer/core/shadownode/ShadowNodeFragment.cpp diff --git a/ReactCommon/fabric/core/shadownode/ShadowNodeFragment.h b/ReactCommon/react/renderer/core/shadownode/ShadowNodeFragment.h similarity index 89% rename from ReactCommon/fabric/core/shadownode/ShadowNodeFragment.h rename to ReactCommon/react/renderer/core/shadownode/ShadowNodeFragment.h index afa54425b95..6fbdc49451c 100644 --- a/ReactCommon/fabric/core/shadownode/ShadowNodeFragment.h +++ b/ReactCommon/react/renderer/core/shadownode/ShadowNodeFragment.h @@ -7,11 +7,11 @@ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/shadownode/ShadowNodeTraits.cpp b/ReactCommon/react/renderer/core/shadownode/ShadowNodeTraits.cpp similarity index 100% rename from ReactCommon/fabric/core/shadownode/ShadowNodeTraits.cpp rename to ReactCommon/react/renderer/core/shadownode/ShadowNodeTraits.cpp diff --git a/ReactCommon/fabric/core/shadownode/ShadowNodeTraits.h b/ReactCommon/react/renderer/core/shadownode/ShadowNodeTraits.h similarity index 100% rename from ReactCommon/fabric/core/shadownode/ShadowNodeTraits.h rename to ReactCommon/react/renderer/core/shadownode/ShadowNodeTraits.h diff --git a/ReactCommon/fabric/core/state/ConcreteState.h b/ReactCommon/react/renderer/core/state/ConcreteState.h similarity index 98% rename from ReactCommon/fabric/core/state/ConcreteState.h rename to ReactCommon/react/renderer/core/state/ConcreteState.h index 8f5c582ce14..6b8c73cbc35 100644 --- a/ReactCommon/fabric/core/state/ConcreteState.h +++ b/ReactCommon/react/renderer/core/state/ConcreteState.h @@ -10,7 +10,7 @@ #include #include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/state/State.cpp b/ReactCommon/react/renderer/core/state/State.cpp similarity index 85% rename from ReactCommon/fabric/core/state/State.cpp rename to ReactCommon/react/renderer/core/state/State.cpp index d8407cb7e64..e740557d362 100644 --- a/ReactCommon/fabric/core/state/State.cpp +++ b/ReactCommon/react/renderer/core/state/State.cpp @@ -7,10 +7,10 @@ #include "State.h" -#include -#include -#include -#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/state/State.h b/ReactCommon/react/renderer/core/state/State.h similarity index 98% rename from ReactCommon/fabric/core/state/State.h rename to ReactCommon/react/renderer/core/state/State.h index 7e700da7e87..c0472fec057 100644 --- a/ReactCommon/fabric/core/state/State.h +++ b/ReactCommon/react/renderer/core/state/State.h @@ -11,7 +11,7 @@ #include #endif -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/state/StateData.h b/ReactCommon/react/renderer/core/state/StateData.h similarity index 100% rename from ReactCommon/fabric/core/state/StateData.h rename to ReactCommon/react/renderer/core/state/StateData.h diff --git a/ReactCommon/fabric/core/state/StatePipe.h b/ReactCommon/react/renderer/core/state/StatePipe.h similarity index 89% rename from ReactCommon/fabric/core/state/StatePipe.h rename to ReactCommon/react/renderer/core/state/StatePipe.h index 1b0436cfbd3..ac79fad1a1d 100644 --- a/ReactCommon/fabric/core/state/StatePipe.h +++ b/ReactCommon/react/renderer/core/state/StatePipe.h @@ -9,7 +9,7 @@ #include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/state/StateUpdate.cpp b/ReactCommon/react/renderer/core/state/StateUpdate.cpp similarity index 100% rename from ReactCommon/fabric/core/state/StateUpdate.cpp rename to ReactCommon/react/renderer/core/state/StateUpdate.cpp diff --git a/ReactCommon/fabric/core/state/StateUpdate.h b/ReactCommon/react/renderer/core/state/StateUpdate.h similarity index 93% rename from ReactCommon/fabric/core/state/StateUpdate.h rename to ReactCommon/react/renderer/core/state/StateUpdate.h index 3873890b610..5e52cdc575a 100644 --- a/ReactCommon/fabric/core/state/StateUpdate.h +++ b/ReactCommon/react/renderer/core/state/StateUpdate.h @@ -9,7 +9,7 @@ #include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/tests/ComponentDescriptorTest.cpp b/ReactCommon/react/renderer/core/tests/ComponentDescriptorTest.cpp similarity index 100% rename from ReactCommon/fabric/core/tests/ComponentDescriptorTest.cpp rename to ReactCommon/react/renderer/core/tests/ComponentDescriptorTest.cpp diff --git a/ReactCommon/fabric/core/tests/FindNodeAtPointTest.cpp b/ReactCommon/react/renderer/core/tests/FindNodeAtPointTest.cpp similarity index 100% rename from ReactCommon/fabric/core/tests/FindNodeAtPointTest.cpp rename to ReactCommon/react/renderer/core/tests/FindNodeAtPointTest.cpp diff --git a/ReactCommon/fabric/core/tests/LayoutableShadowNodeTest.cpp b/ReactCommon/react/renderer/core/tests/LayoutableShadowNodeTest.cpp similarity index 100% rename from ReactCommon/fabric/core/tests/LayoutableShadowNodeTest.cpp rename to ReactCommon/react/renderer/core/tests/LayoutableShadowNodeTest.cpp diff --git a/ReactCommon/fabric/core/tests/PrimitivesTest.cpp b/ReactCommon/react/renderer/core/tests/PrimitivesTest.cpp similarity index 96% rename from ReactCommon/fabric/core/tests/PrimitivesTest.cpp rename to ReactCommon/react/renderer/core/tests/PrimitivesTest.cpp index 49c4f4bd933..f3b4d9bafbe 100644 --- a/ReactCommon/fabric/core/tests/PrimitivesTest.cpp +++ b/ReactCommon/react/renderer/core/tests/PrimitivesTest.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include using namespace facebook::react; diff --git a/ReactCommon/fabric/core/tests/RawPropsTest.cpp b/ReactCommon/react/renderer/core/tests/RawPropsTest.cpp similarity index 98% rename from ReactCommon/fabric/core/tests/RawPropsTest.cpp rename to ReactCommon/react/renderer/core/tests/RawPropsTest.cpp index 7a5ecb1f94b..48a8726662b 100644 --- a/ReactCommon/fabric/core/tests/RawPropsTest.cpp +++ b/ReactCommon/react/renderer/core/tests/RawPropsTest.cpp @@ -8,9 +8,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "TestComponent.h" diff --git a/ReactCommon/fabric/core/tests/ShadowNodeFamilyTest.cpp b/ReactCommon/react/renderer/core/tests/ShadowNodeFamilyTest.cpp similarity index 89% rename from ReactCommon/fabric/core/tests/ShadowNodeFamilyTest.cpp rename to ReactCommon/react/renderer/core/tests/ShadowNodeFamilyTest.cpp index 26f5c861fa2..0009baeed7b 100644 --- a/ReactCommon/fabric/core/tests/ShadowNodeFamilyTest.cpp +++ b/ReactCommon/react/renderer/core/tests/ShadowNodeFamilyTest.cpp @@ -9,10 +9,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace facebook::react; diff --git a/ReactCommon/fabric/core/tests/ShadowNodeTest.cpp b/ReactCommon/react/renderer/core/tests/ShadowNodeTest.cpp similarity index 98% rename from ReactCommon/fabric/core/tests/ShadowNodeTest.cpp rename to ReactCommon/react/renderer/core/tests/ShadowNodeTest.cpp index 3f0c74ebc28..7039e56cfdf 100644 --- a/ReactCommon/fabric/core/tests/ShadowNodeTest.cpp +++ b/ReactCommon/react/renderer/core/tests/ShadowNodeTest.cpp @@ -8,8 +8,8 @@ #include #include -#include -#include +#include +#include #include "TestComponent.h" diff --git a/ReactCommon/fabric/core/tests/TestComponent.h b/ReactCommon/react/renderer/core/tests/TestComponent.h similarity index 82% rename from ReactCommon/fabric/core/tests/TestComponent.h rename to ReactCommon/react/renderer/core/tests/TestComponent.h index 5e01fd2286f..936fe0167cb 100644 --- a/ReactCommon/fabric/core/tests/TestComponent.h +++ b/ReactCommon/react/renderer/core/tests/TestComponent.h @@ -10,12 +10,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include using namespace facebook::react; diff --git a/ReactCommon/fabric/core/tests/benchmarks/RawPropsBenchmark.cpp b/ReactCommon/react/renderer/core/tests/benchmarks/RawPropsBenchmark.cpp similarity index 93% rename from ReactCommon/fabric/core/tests/benchmarks/RawPropsBenchmark.cpp rename to ReactCommon/react/renderer/core/tests/benchmarks/RawPropsBenchmark.cpp index 457c769ee8c..2f7f6e96242 100644 --- a/ReactCommon/fabric/core/tests/benchmarks/RawPropsBenchmark.cpp +++ b/ReactCommon/react/renderer/core/tests/benchmarks/RawPropsBenchmark.cpp @@ -8,9 +8,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/ReactCommon/fabric/core/tests/traitCastTest.cpp b/ReactCommon/react/renderer/core/tests/traitCastTest.cpp similarity index 89% rename from ReactCommon/fabric/core/tests/traitCastTest.cpp rename to ReactCommon/react/renderer/core/tests/traitCastTest.cpp index 49a2f64d47a..f4af650f499 100644 --- a/ReactCommon/fabric/core/tests/traitCastTest.cpp +++ b/ReactCommon/react/renderer/core/tests/traitCastTest.cpp @@ -7,14 +7,14 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include +#include +#include using namespace facebook::react; diff --git a/ReactCommon/fabric/debug/BUCK b/ReactCommon/react/renderer/debug/BUCK similarity index 98% rename from ReactCommon/fabric/debug/BUCK rename to ReactCommon/react/renderer/debug/BUCK index 863158f8bbd..9950f239cc5 100644 --- a/ReactCommon/fabric/debug/BUCK +++ b/ReactCommon/react/renderer/debug/BUCK @@ -32,7 +32,7 @@ rn_xplat_cxx_library( [ ("", "*.h"), ], - prefix = "react/debug", + prefix = "react/renderer/debug", ), compiler_flags = [ "-fexceptions", diff --git a/ReactCommon/fabric/debug/DebugStringConvertible.cpp b/ReactCommon/react/renderer/debug/DebugStringConvertible.cpp similarity index 100% rename from ReactCommon/fabric/debug/DebugStringConvertible.cpp rename to ReactCommon/react/renderer/debug/DebugStringConvertible.cpp diff --git a/ReactCommon/fabric/debug/DebugStringConvertible.h b/ReactCommon/react/renderer/debug/DebugStringConvertible.h similarity index 100% rename from ReactCommon/fabric/debug/DebugStringConvertible.h rename to ReactCommon/react/renderer/debug/DebugStringConvertible.h diff --git a/ReactCommon/fabric/debug/DebugStringConvertibleItem.cpp b/ReactCommon/react/renderer/debug/DebugStringConvertibleItem.cpp similarity index 100% rename from ReactCommon/fabric/debug/DebugStringConvertibleItem.cpp rename to ReactCommon/react/renderer/debug/DebugStringConvertibleItem.cpp diff --git a/ReactCommon/fabric/debug/DebugStringConvertibleItem.h b/ReactCommon/react/renderer/debug/DebugStringConvertibleItem.h similarity index 95% rename from ReactCommon/fabric/debug/DebugStringConvertibleItem.h rename to ReactCommon/react/renderer/debug/DebugStringConvertibleItem.h index 6769aa6b564..600113d810a 100644 --- a/ReactCommon/fabric/debug/DebugStringConvertibleItem.h +++ b/ReactCommon/react/renderer/debug/DebugStringConvertibleItem.h @@ -9,7 +9,7 @@ #include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/debug/SystraceSection.h b/ReactCommon/react/renderer/debug/SystraceSection.h similarity index 100% rename from ReactCommon/fabric/debug/SystraceSection.h rename to ReactCommon/react/renderer/debug/SystraceSection.h diff --git a/ReactCommon/fabric/debug/debugStringConvertibleUtils.h b/ReactCommon/react/renderer/debug/debugStringConvertibleUtils.h similarity index 93% rename from ReactCommon/fabric/debug/debugStringConvertibleUtils.h rename to ReactCommon/react/renderer/debug/debugStringConvertibleUtils.h index 76080290fe5..a41054e2207 100644 --- a/ReactCommon/fabric/debug/debugStringConvertibleUtils.h +++ b/ReactCommon/react/renderer/debug/debugStringConvertibleUtils.h @@ -13,8 +13,8 @@ #include #include -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/debug/tests/DebugStringConvertibleTest.cpp b/ReactCommon/react/renderer/debug/tests/DebugStringConvertibleTest.cpp similarity index 98% rename from ReactCommon/fabric/debug/tests/DebugStringConvertibleTest.cpp rename to ReactCommon/react/renderer/debug/tests/DebugStringConvertibleTest.cpp index f0d64744fcb..1220542c01e 100644 --- a/ReactCommon/fabric/debug/tests/DebugStringConvertibleTest.cpp +++ b/ReactCommon/react/renderer/debug/tests/DebugStringConvertibleTest.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include using namespace facebook::react; diff --git a/ReactCommon/fabric/element/BUCK b/ReactCommon/react/renderer/element/BUCK similarity index 66% rename from ReactCommon/fabric/element/BUCK rename to ReactCommon/react/renderer/element/BUCK index c5fc20db81a..23db67759ae 100644 --- a/ReactCommon/fabric/element/BUCK +++ b/ReactCommon/react/renderer/element/BUCK @@ -29,7 +29,7 @@ rn_xplat_cxx_library( [ ("", "*.h"), ], - prefix = "react/element", + prefix = "react/renderer/element", ), compiler_flags = [ "-fexceptions", @@ -51,15 +51,15 @@ rn_xplat_cxx_library( visibility = ["PUBLIC"], deps = [ "//xplat/fbsystrace:fbsystrace", - react_native_xplat_target("fabric/components/view:view"), - react_native_xplat_target("fabric/components/root:root"), - react_native_xplat_target("fabric/components/view:view"), - react_native_xplat_target("fabric/components/scrollview:scrollview"), - react_native_xplat_target("fabric/components/text:text"), - react_native_xplat_target("fabric/uimanager:uimanager"), - react_native_xplat_target("fabric/componentregistry:componentregistry"), - react_native_xplat_target("fabric/core:core"), - react_native_xplat_target("fabric/debug:debug"), + react_native_xplat_target("react/renderer/components/view:view"), + react_native_xplat_target("react/renderer/components/root:root"), + react_native_xplat_target("react/renderer/components/view:view"), + react_native_xplat_target("react/renderer/components/scrollview:scrollview"), + react_native_xplat_target("react/renderer/components/text:text"), + react_native_xplat_target("react/renderer/uimanager:uimanager"), + react_native_xplat_target("react/renderer/componentregistry:componentregistry"), + react_native_xplat_target("react/renderer/core:core"), + react_native_xplat_target("react/renderer/debug:debug"), react_native_xplat_target("utils:utils"), ], ) @@ -79,8 +79,8 @@ fb_xplat_cxx_test( deps = [ ":element", "//xplat/third-party/gmock:gtest", - react_native_xplat_target("fabric/components/root:root"), - react_native_xplat_target("fabric/components/view:view"), - react_native_xplat_target("fabric/components/scrollview:scrollview"), + react_native_xplat_target("react/renderer/components/root:root"), + react_native_xplat_target("react/renderer/components/view:view"), + react_native_xplat_target("react/renderer/components/scrollview:scrollview"), ], ) diff --git a/ReactCommon/fabric/element/ComponentBuilder.cpp b/ReactCommon/react/renderer/element/ComponentBuilder.cpp similarity index 100% rename from ReactCommon/fabric/element/ComponentBuilder.cpp rename to ReactCommon/react/renderer/element/ComponentBuilder.cpp diff --git a/ReactCommon/fabric/element/ComponentBuilder.h b/ReactCommon/react/renderer/element/ComponentBuilder.h similarity index 78% rename from ReactCommon/fabric/element/ComponentBuilder.h rename to ReactCommon/react/renderer/element/ComponentBuilder.h index cafbaaa019c..b47ba81bd5c 100644 --- a/ReactCommon/fabric/element/ComponentBuilder.h +++ b/ReactCommon/react/renderer/element/ComponentBuilder.h @@ -9,14 +9,14 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/element/Element.cpp b/ReactCommon/react/renderer/element/Element.cpp similarity index 100% rename from ReactCommon/fabric/element/Element.cpp rename to ReactCommon/react/renderer/element/Element.cpp diff --git a/ReactCommon/fabric/element/Element.h b/ReactCommon/react/renderer/element/Element.h similarity index 97% rename from ReactCommon/fabric/element/Element.h rename to ReactCommon/react/renderer/element/Element.h index 156716880f5..babe33cd6e4 100644 --- a/ReactCommon/fabric/element/Element.h +++ b/ReactCommon/react/renderer/element/Element.h @@ -10,9 +10,9 @@ #include #include -#include +#include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/element/ElementFragment.cpp b/ReactCommon/react/renderer/element/ElementFragment.cpp similarity index 100% rename from ReactCommon/fabric/element/ElementFragment.cpp rename to ReactCommon/react/renderer/element/ElementFragment.cpp diff --git a/ReactCommon/fabric/element/ElementFragment.h b/ReactCommon/react/renderer/element/ElementFragment.h similarity index 96% rename from ReactCommon/fabric/element/ElementFragment.h rename to ReactCommon/react/renderer/element/ElementFragment.h index b1438698a49..7fee1e01be6 100644 --- a/ReactCommon/fabric/element/ElementFragment.h +++ b/ReactCommon/react/renderer/element/ElementFragment.h @@ -11,7 +11,7 @@ #include #include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/element/testUtils.h b/ReactCommon/react/renderer/element/testUtils.h similarity index 71% rename from ReactCommon/fabric/element/testUtils.h rename to ReactCommon/react/renderer/element/testUtils.h index 2c32cbd60e8..e6fc9446c58 100644 --- a/ReactCommon/fabric/element/testUtils.h +++ b/ReactCommon/react/renderer/element/testUtils.h @@ -7,14 +7,14 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/element/tests/ElementTest.cpp b/ReactCommon/react/renderer/element/tests/ElementTest.cpp similarity index 88% rename from ReactCommon/fabric/element/tests/ElementTest.cpp rename to ReactCommon/react/renderer/element/tests/ElementTest.cpp index 3ed6c7f8fcc..ad79f4b6565 100644 --- a/ReactCommon/fabric/element/tests/ElementTest.cpp +++ b/ReactCommon/react/renderer/element/tests/ElementTest.cpp @@ -9,12 +9,12 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include using namespace facebook::react; diff --git a/ReactCommon/fabric/graphics/BUCK b/ReactCommon/react/renderer/graphics/BUCK similarity index 94% rename from ReactCommon/fabric/graphics/BUCK rename to ReactCommon/react/renderer/graphics/BUCK index a495bd817ac..9760d341a23 100644 --- a/ReactCommon/fabric/graphics/BUCK +++ b/ReactCommon/react/renderer/graphics/BUCK @@ -31,7 +31,7 @@ rn_xplat_cxx_library( [ ("", "*.h"), ], - prefix = "react/graphics", + prefix = "react/renderer/graphics", ), compiler_flags = [ "-fexceptions", @@ -43,7 +43,7 @@ rn_xplat_cxx_library( [ ("platform/cxx", "**/*.h"), ], - prefix = "react/graphics", + prefix = "react/renderer/graphics", ), cxx_srcs = glob( [ @@ -54,7 +54,7 @@ rn_xplat_cxx_library( [ ("platform/cxx", "**/*.h"), ], - prefix = "react/graphics", + prefix = "react/renderer/graphics", ), fbandroid_srcs = glob( [ @@ -72,7 +72,7 @@ rn_xplat_cxx_library( [ ("platform/ios", "*.h"), ], - prefix = "react/graphics", + prefix = "react/renderer/graphics", ), ios_frameworks = [ "$SDKROOT/System/Library/Frameworks/CoreGraphics.framework", diff --git a/ReactCommon/fabric/graphics/ColorComponents.h b/ReactCommon/react/renderer/graphics/ColorComponents.h similarity index 100% rename from ReactCommon/fabric/graphics/ColorComponents.h rename to ReactCommon/react/renderer/graphics/ColorComponents.h diff --git a/ReactCommon/fabric/graphics/Geometry.h b/ReactCommon/react/renderer/graphics/Geometry.h similarity index 56% rename from ReactCommon/fabric/graphics/Geometry.h rename to ReactCommon/react/renderer/graphics/Geometry.h index 16777b67855..db3c3de4ffb 100644 --- a/ReactCommon/fabric/graphics/Geometry.h +++ b/ReactCommon/react/renderer/graphics/Geometry.h @@ -7,12 +7,12 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/graphics/Point.h b/ReactCommon/react/renderer/graphics/Point.h similarity index 97% rename from ReactCommon/fabric/graphics/Point.h rename to ReactCommon/react/renderer/graphics/Point.h index a0637ac54b7..41c0c4d0e28 100644 --- a/ReactCommon/fabric/graphics/Point.h +++ b/ReactCommon/react/renderer/graphics/Point.h @@ -10,7 +10,7 @@ #include #include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/graphics/React-graphics.podspec b/ReactCommon/react/renderer/graphics/React-graphics.podspec similarity index 100% rename from ReactCommon/fabric/graphics/React-graphics.podspec rename to ReactCommon/react/renderer/graphics/React-graphics.podspec diff --git a/ReactCommon/fabric/graphics/Rect.h b/ReactCommon/react/renderer/graphics/Rect.h similarity index 95% rename from ReactCommon/fabric/graphics/Rect.h rename to ReactCommon/react/renderer/graphics/Rect.h index 93b049b5c2b..20efdfddf9a 100644 --- a/ReactCommon/fabric/graphics/Rect.h +++ b/ReactCommon/react/renderer/graphics/Rect.h @@ -10,9 +10,9 @@ #include #include -#include -#include -#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/graphics/RectangleCorners.h b/ReactCommon/react/renderer/graphics/RectangleCorners.h similarity index 97% rename from ReactCommon/fabric/graphics/RectangleCorners.h rename to ReactCommon/react/renderer/graphics/RectangleCorners.h index 6d174f92142..c3932cd6762 100644 --- a/ReactCommon/fabric/graphics/RectangleCorners.h +++ b/ReactCommon/react/renderer/graphics/RectangleCorners.h @@ -10,7 +10,7 @@ #include #include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/graphics/RectangleEdges.h b/ReactCommon/react/renderer/graphics/RectangleEdges.h similarity index 96% rename from ReactCommon/fabric/graphics/RectangleEdges.h rename to ReactCommon/react/renderer/graphics/RectangleEdges.h index d4db57752a5..b99b8645576 100644 --- a/ReactCommon/fabric/graphics/RectangleEdges.h +++ b/ReactCommon/react/renderer/graphics/RectangleEdges.h @@ -10,8 +10,8 @@ #include #include -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/graphics/Size.h b/ReactCommon/react/renderer/graphics/Size.h similarity index 92% rename from ReactCommon/fabric/graphics/Size.h rename to ReactCommon/react/renderer/graphics/Size.h index ad537db1771..9c093cfd8ca 100644 --- a/ReactCommon/fabric/graphics/Size.h +++ b/ReactCommon/react/renderer/graphics/Size.h @@ -10,8 +10,8 @@ #include #include -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/graphics/Transform.cpp b/ReactCommon/react/renderer/graphics/Transform.cpp similarity index 100% rename from ReactCommon/fabric/graphics/Transform.cpp rename to ReactCommon/react/renderer/graphics/Transform.cpp diff --git a/ReactCommon/fabric/graphics/Transform.h b/ReactCommon/react/renderer/graphics/Transform.h similarity index 98% rename from ReactCommon/fabric/graphics/Transform.h rename to ReactCommon/react/renderer/graphics/Transform.h index 7d14a635afb..993f188a815 100644 --- a/ReactCommon/fabric/graphics/Transform.h +++ b/ReactCommon/react/renderer/graphics/Transform.h @@ -11,8 +11,8 @@ #include #include -#include -#include +#include +#include #ifdef ANDROID #include diff --git a/ReactCommon/fabric/graphics/conversions.h b/ReactCommon/react/renderer/graphics/conversions.h similarity index 97% rename from ReactCommon/fabric/graphics/conversions.h rename to ReactCommon/react/renderer/graphics/conversions.h index 2cf79682794..6fa241a4fa3 100644 --- a/ReactCommon/fabric/graphics/conversions.h +++ b/ReactCommon/react/renderer/graphics/conversions.h @@ -9,9 +9,9 @@ #include #include -#include -#include -#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/graphics/platform/cxx/Color.cpp b/ReactCommon/react/renderer/graphics/platform/cxx/Color.cpp similarity index 100% rename from ReactCommon/fabric/graphics/platform/cxx/Color.cpp rename to ReactCommon/react/renderer/graphics/platform/cxx/Color.cpp diff --git a/ReactCommon/fabric/graphics/platform/cxx/Color.h b/ReactCommon/react/renderer/graphics/platform/cxx/Color.h similarity index 97% rename from ReactCommon/fabric/graphics/platform/cxx/Color.h rename to ReactCommon/react/renderer/graphics/platform/cxx/Color.h index b4a2dd3cf30..86196c6a404 100644 --- a/ReactCommon/fabric/graphics/platform/cxx/Color.h +++ b/ReactCommon/react/renderer/graphics/platform/cxx/Color.h @@ -10,7 +10,7 @@ #include #include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/graphics/platform/cxx/Float.h b/ReactCommon/react/renderer/graphics/platform/cxx/Float.h similarity index 100% rename from ReactCommon/fabric/graphics/platform/cxx/Float.h rename to ReactCommon/react/renderer/graphics/platform/cxx/Float.h diff --git a/ReactCommon/fabric/graphics/platform/ios/Color.cpp b/ReactCommon/react/renderer/graphics/platform/ios/Color.cpp similarity index 100% rename from ReactCommon/fabric/graphics/platform/ios/Color.cpp rename to ReactCommon/react/renderer/graphics/platform/ios/Color.cpp diff --git a/ReactCommon/fabric/graphics/platform/ios/Color.h b/ReactCommon/react/renderer/graphics/platform/ios/Color.h similarity index 86% rename from ReactCommon/fabric/graphics/platform/ios/Color.h rename to ReactCommon/react/renderer/graphics/platform/ios/Color.h index 54da5a4c9c0..abaf98f4245 100644 --- a/ReactCommon/fabric/graphics/platform/ios/Color.h +++ b/ReactCommon/react/renderer/graphics/platform/ios/Color.h @@ -10,8 +10,8 @@ #include #include -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/graphics/platform/ios/Float.h b/ReactCommon/react/renderer/graphics/platform/ios/Float.h similarity index 100% rename from ReactCommon/fabric/graphics/platform/ios/Float.h rename to ReactCommon/react/renderer/graphics/platform/ios/Float.h diff --git a/ReactCommon/fabric/graphics/rounding.h b/ReactCommon/react/renderer/graphics/rounding.h similarity index 98% rename from ReactCommon/fabric/graphics/rounding.h rename to ReactCommon/react/renderer/graphics/rounding.h index 4d948213be2..8427303fe8a 100644 --- a/ReactCommon/fabric/graphics/rounding.h +++ b/ReactCommon/react/renderer/graphics/rounding.h @@ -7,7 +7,7 @@ #pragma once -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/graphics/tests/GraphicsTest.cpp b/ReactCommon/react/renderer/graphics/tests/GraphicsTest.cpp similarity index 100% rename from ReactCommon/fabric/graphics/tests/GraphicsTest.cpp rename to ReactCommon/react/renderer/graphics/tests/GraphicsTest.cpp diff --git a/ReactCommon/fabric/graphics/tests/TransformTest.cpp b/ReactCommon/react/renderer/graphics/tests/TransformTest.cpp similarity index 97% rename from ReactCommon/fabric/graphics/tests/TransformTest.cpp rename to ReactCommon/react/renderer/graphics/tests/TransformTest.cpp index 29188bd1fc9..c11c0c2b701 100644 --- a/ReactCommon/fabric/graphics/tests/TransformTest.cpp +++ b/ReactCommon/react/renderer/graphics/tests/TransformTest.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#include +#include #include #include diff --git a/ReactCommon/fabric/imagemanager/BUCK b/ReactCommon/react/renderer/imagemanager/BUCK similarity index 89% rename from ReactCommon/fabric/imagemanager/BUCK rename to ReactCommon/react/renderer/imagemanager/BUCK index 0e1749e9973..167893665c2 100644 --- a/ReactCommon/fabric/imagemanager/BUCK +++ b/ReactCommon/react/renderer/imagemanager/BUCK @@ -36,7 +36,7 @@ rn_xplat_cxx_library( ("", "*.h"), ("platform/cxx", "**/*.h"), ], - prefix = "react/imagemanager", + prefix = "react/renderer/imagemanager", ), fbandroid_headers = subdir_glob( [ @@ -66,7 +66,7 @@ rn_xplat_cxx_library( ("platform/ios", "RCTImageInstrumentationProxy.h"), ("platform/ios", "RCTImagePrimitivesConversions.h"), ], - prefix = "react/imagemanager", + prefix = "react/renderer/imagemanager", ), ios_frameworks = [ "$SDKROOT/System/Library/Frameworks/CoreGraphics.framework", @@ -102,10 +102,10 @@ rn_xplat_cxx_library( "//xplat/folly:memory", "//xplat/folly:molly", YOGA_CXX_TARGET, - react_native_xplat_target("fabric/core:core"), - react_native_xplat_target("fabric/mounting:mounting"), - react_native_xplat_target("fabric/debug:debug"), - react_native_xplat_target("fabric/graphics:graphics"), + react_native_xplat_target("react/renderer/core:core"), + react_native_xplat_target("react/renderer/mounting:mounting"), + react_native_xplat_target("react/renderer/debug:debug"), + react_native_xplat_target("react/renderer/graphics:graphics"), ], ) diff --git a/ReactCommon/fabric/imagemanager/ImageInstrumentation.h b/ReactCommon/react/renderer/imagemanager/ImageInstrumentation.h similarity index 94% rename from ReactCommon/fabric/imagemanager/ImageInstrumentation.h rename to ReactCommon/react/renderer/imagemanager/ImageInstrumentation.h index 577d18d97fe..c1671cb6790 100644 --- a/ReactCommon/fabric/imagemanager/ImageInstrumentation.h +++ b/ReactCommon/react/renderer/imagemanager/ImageInstrumentation.h @@ -7,7 +7,7 @@ #pragma once -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/imagemanager/ImageManager.h b/ReactCommon/react/renderer/imagemanager/ImageManager.h similarity index 82% rename from ReactCommon/fabric/imagemanager/ImageManager.h rename to ReactCommon/react/renderer/imagemanager/ImageManager.h index 704451052b2..a6023e8e3d9 100644 --- a/ReactCommon/fabric/imagemanager/ImageManager.h +++ b/ReactCommon/react/renderer/imagemanager/ImageManager.h @@ -9,9 +9,9 @@ #include -#include -#include -#include +#include +#include +#include #include namespace facebook { diff --git a/ReactCommon/fabric/imagemanager/ImageRequest.h b/ReactCommon/react/renderer/imagemanager/ImageRequest.h similarity index 90% rename from ReactCommon/fabric/imagemanager/ImageRequest.h rename to ReactCommon/react/renderer/imagemanager/ImageRequest.h index 76195165ce6..8c5dc8d5fe8 100644 --- a/ReactCommon/fabric/imagemanager/ImageRequest.h +++ b/ReactCommon/react/renderer/imagemanager/ImageRequest.h @@ -7,11 +7,11 @@ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/imagemanager/ImageResponse.cpp b/ReactCommon/react/renderer/imagemanager/ImageResponse.cpp similarity index 100% rename from ReactCommon/fabric/imagemanager/ImageResponse.cpp rename to ReactCommon/react/renderer/imagemanager/ImageResponse.cpp diff --git a/ReactCommon/fabric/imagemanager/ImageResponse.h b/ReactCommon/react/renderer/imagemanager/ImageResponse.h similarity index 100% rename from ReactCommon/fabric/imagemanager/ImageResponse.h rename to ReactCommon/react/renderer/imagemanager/ImageResponse.h diff --git a/ReactCommon/fabric/imagemanager/ImageResponseObserver.h b/ReactCommon/react/renderer/imagemanager/ImageResponseObserver.h similarity index 92% rename from ReactCommon/fabric/imagemanager/ImageResponseObserver.h rename to ReactCommon/react/renderer/imagemanager/ImageResponseObserver.h index 6832e31341f..edb94835c7b 100644 --- a/ReactCommon/fabric/imagemanager/ImageResponseObserver.h +++ b/ReactCommon/react/renderer/imagemanager/ImageResponseObserver.h @@ -7,7 +7,7 @@ #pragma once -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/imagemanager/ImageResponseObserverCoordinator.cpp b/ReactCommon/react/renderer/imagemanager/ImageResponseObserverCoordinator.cpp similarity index 100% rename from ReactCommon/fabric/imagemanager/ImageResponseObserverCoordinator.cpp rename to ReactCommon/react/renderer/imagemanager/ImageResponseObserverCoordinator.cpp diff --git a/ReactCommon/fabric/imagemanager/ImageResponseObserverCoordinator.h b/ReactCommon/react/renderer/imagemanager/ImageResponseObserverCoordinator.h similarity index 94% rename from ReactCommon/fabric/imagemanager/ImageResponseObserverCoordinator.h rename to ReactCommon/react/renderer/imagemanager/ImageResponseObserverCoordinator.h index ab8d04261e4..f28e7e5805c 100644 --- a/ReactCommon/fabric/imagemanager/ImageResponseObserverCoordinator.h +++ b/ReactCommon/react/renderer/imagemanager/ImageResponseObserverCoordinator.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include #include #include diff --git a/ReactCommon/fabric/imagemanager/platform/cxx/ImageManager.cpp b/ReactCommon/react/renderer/imagemanager/platform/cxx/ImageManager.cpp similarity index 100% rename from ReactCommon/fabric/imagemanager/platform/cxx/ImageManager.cpp rename to ReactCommon/react/renderer/imagemanager/platform/cxx/ImageManager.cpp diff --git a/ReactCommon/fabric/imagemanager/platform/cxx/ImageRequest.cpp b/ReactCommon/react/renderer/imagemanager/platform/cxx/ImageRequest.cpp similarity index 100% rename from ReactCommon/fabric/imagemanager/platform/cxx/ImageRequest.cpp rename to ReactCommon/react/renderer/imagemanager/platform/cxx/ImageRequest.cpp diff --git a/ReactCommon/fabric/imagemanager/platform/ios/ImageManager.mm b/ReactCommon/react/renderer/imagemanager/platform/ios/ImageManager.mm similarity index 100% rename from ReactCommon/fabric/imagemanager/platform/ios/ImageManager.mm rename to ReactCommon/react/renderer/imagemanager/platform/ios/ImageManager.mm diff --git a/ReactCommon/fabric/imagemanager/platform/ios/ImageRequest.cpp b/ReactCommon/react/renderer/imagemanager/platform/ios/ImageRequest.cpp similarity index 100% rename from ReactCommon/fabric/imagemanager/platform/ios/ImageRequest.cpp rename to ReactCommon/react/renderer/imagemanager/platform/ios/ImageRequest.cpp diff --git a/ReactCommon/fabric/imagemanager/platform/ios/RCTImageInstrumentationProxy.h b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageInstrumentationProxy.h similarity index 89% rename from ReactCommon/fabric/imagemanager/platform/ios/RCTImageInstrumentationProxy.h rename to ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageInstrumentationProxy.h index 5d8f84f0f76..95726a5ff0c 100644 --- a/ReactCommon/fabric/imagemanager/platform/ios/RCTImageInstrumentationProxy.h +++ b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageInstrumentationProxy.h @@ -9,8 +9,8 @@ #include -#include -#include +#include +#include NS_ASSUME_NONNULL_BEGIN diff --git a/ReactCommon/fabric/imagemanager/platform/ios/RCTImageInstrumentationProxy.mm b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageInstrumentationProxy.mm similarity index 100% rename from ReactCommon/fabric/imagemanager/platform/ios/RCTImageInstrumentationProxy.mm rename to ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageInstrumentationProxy.mm diff --git a/ReactCommon/fabric/imagemanager/platform/ios/RCTImageManager.h b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManager.h similarity index 100% rename from ReactCommon/fabric/imagemanager/platform/ios/RCTImageManager.h rename to ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManager.h diff --git a/ReactCommon/fabric/imagemanager/platform/ios/RCTImageManager.mm b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManager.mm similarity index 96% rename from ReactCommon/fabric/imagemanager/platform/ios/RCTImageManager.mm rename to ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManager.mm index 9691162f65d..9ad64c68fd2 100644 --- a/ReactCommon/fabric/imagemanager/platform/ios/RCTImageManager.mm +++ b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManager.mm @@ -7,14 +7,14 @@ #import "RCTImageManager.h" -#import +#import #import #import #import -#import -#import +#import +#import #import "RCTImageInstrumentationProxy.h" #import "RCTImagePrimitivesConversions.h" diff --git a/ReactCommon/fabric/imagemanager/platform/ios/RCTImageManagerProtocol.h b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManagerProtocol.h similarity index 81% rename from ReactCommon/fabric/imagemanager/platform/ios/RCTImageManagerProtocol.h rename to ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManagerProtocol.h index d69c2d3f34c..a48d24ed313 100644 --- a/ReactCommon/fabric/imagemanager/platform/ios/RCTImageManagerProtocol.h +++ b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManagerProtocol.h @@ -6,8 +6,8 @@ */ #import -#import -#import +#import +#import @protocol RCTImageManagerProtocol diff --git a/ReactCommon/fabric/imagemanager/platform/ios/RCTImagePrimitivesConversions.h b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImagePrimitivesConversions.h similarity index 98% rename from ReactCommon/fabric/imagemanager/platform/ios/RCTImagePrimitivesConversions.h rename to ReactCommon/react/renderer/imagemanager/platform/ios/RCTImagePrimitivesConversions.h index db9d498dfe6..f769d4d686a 100644 --- a/ReactCommon/fabric/imagemanager/platform/ios/RCTImagePrimitivesConversions.h +++ b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImagePrimitivesConversions.h @@ -8,7 +8,7 @@ #import #import -#import +#import using namespace facebook::react; diff --git a/ReactCommon/fabric/imagemanager/platform/ios/RCTSyncImageManager.h b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTSyncImageManager.h similarity index 100% rename from ReactCommon/fabric/imagemanager/platform/ios/RCTSyncImageManager.h rename to ReactCommon/react/renderer/imagemanager/platform/ios/RCTSyncImageManager.h diff --git a/ReactCommon/fabric/imagemanager/platform/ios/RCTSyncImageManager.mm b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTSyncImageManager.mm similarity index 96% rename from ReactCommon/fabric/imagemanager/platform/ios/RCTSyncImageManager.mm rename to ReactCommon/react/renderer/imagemanager/platform/ios/RCTSyncImageManager.mm index a703977c687..6f8c54d492c 100644 --- a/ReactCommon/fabric/imagemanager/platform/ios/RCTSyncImageManager.mm +++ b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTSyncImageManager.mm @@ -13,8 +13,8 @@ #import #import #import -#import -#import +#import +#import #import "RCTImagePrimitivesConversions.h" diff --git a/ReactCommon/fabric/imagemanager/primitives.h b/ReactCommon/react/renderer/imagemanager/primitives.h similarity index 94% rename from ReactCommon/fabric/imagemanager/primitives.h rename to ReactCommon/react/renderer/imagemanager/primitives.h index 76638f8943a..dd95a542e46 100644 --- a/ReactCommon/fabric/imagemanager/primitives.h +++ b/ReactCommon/react/renderer/imagemanager/primitives.h @@ -10,7 +10,7 @@ #include #include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/imagemanager/tests/ImageManagerTest.cpp b/ReactCommon/react/renderer/imagemanager/tests/ImageManagerTest.cpp similarity index 85% rename from ReactCommon/fabric/imagemanager/tests/ImageManagerTest.cpp rename to ReactCommon/react/renderer/imagemanager/tests/ImageManagerTest.cpp index 608c1d7da5f..d9395d56473 100644 --- a/ReactCommon/fabric/imagemanager/tests/ImageManagerTest.cpp +++ b/ReactCommon/react/renderer/imagemanager/tests/ImageManagerTest.cpp @@ -9,7 +9,7 @@ #include -#include +#include using namespace facebook::react; diff --git a/ReactCommon/fabric/mapbuffer/BUCK b/ReactCommon/react/renderer/mapbuffer/BUCK similarity index 100% rename from ReactCommon/fabric/mapbuffer/BUCK rename to ReactCommon/react/renderer/mapbuffer/BUCK diff --git a/ReactCommon/fabric/mapbuffer/MapBuffer.cpp b/ReactCommon/react/renderer/mapbuffer/MapBuffer.cpp similarity index 100% rename from ReactCommon/fabric/mapbuffer/MapBuffer.cpp rename to ReactCommon/react/renderer/mapbuffer/MapBuffer.cpp diff --git a/ReactCommon/fabric/mapbuffer/MapBuffer.h b/ReactCommon/react/renderer/mapbuffer/MapBuffer.h similarity index 100% rename from ReactCommon/fabric/mapbuffer/MapBuffer.h rename to ReactCommon/react/renderer/mapbuffer/MapBuffer.h diff --git a/ReactCommon/fabric/mapbuffer/tests/MapBufferTest.cpp b/ReactCommon/react/renderer/mapbuffer/tests/MapBufferTest.cpp similarity index 100% rename from ReactCommon/fabric/mapbuffer/tests/MapBufferTest.cpp rename to ReactCommon/react/renderer/mapbuffer/tests/MapBufferTest.cpp diff --git a/ReactCommon/fabric/mounting/BUCK b/ReactCommon/react/renderer/mounting/BUCK similarity index 77% rename from ReactCommon/fabric/mounting/BUCK rename to ReactCommon/react/renderer/mounting/BUCK index 46531cf3e49..f84c9bc4c08 100644 --- a/ReactCommon/fabric/mounting/BUCK +++ b/ReactCommon/react/renderer/mounting/BUCK @@ -30,7 +30,7 @@ rn_xplat_cxx_library( ("", "*.h"), ("stubs", "*.h"), ], - prefix = "react/mounting", + prefix = "react/renderer/mounting", ), compiler_flags = [ "-fexceptions", @@ -57,10 +57,10 @@ rn_xplat_cxx_library( "//xplat/folly:memory", "//xplat/folly:molly", react_native_xplat_target("better:better"), - react_native_xplat_target("fabric/components/root:root"), - react_native_xplat_target("fabric/components/view:view"), - react_native_xplat_target("fabric/core:core"), - react_native_xplat_target("fabric/debug:debug"), + react_native_xplat_target("react/renderer/components/root:root"), + react_native_xplat_target("react/renderer/components/view:view"), + react_native_xplat_target("react/renderer/core:core"), + react_native_xplat_target("react/renderer/debug:debug"), react_native_xplat_target("utils:utils"), ], ) @@ -82,9 +82,9 @@ fb_xplat_cxx_test( ":mounting", "//xplat/folly:molly", "//xplat/third-party/gmock:gtest", - react_native_xplat_target("fabric/element:element"), - react_native_xplat_target("fabric/components/root:root"), - react_native_xplat_target("fabric/components/view:view"), - react_native_xplat_target("fabric/components/scrollview:scrollview"), + react_native_xplat_target("react/renderer/element:element"), + react_native_xplat_target("react/renderer/components/root:root"), + react_native_xplat_target("react/renderer/components/view:view"), + react_native_xplat_target("react/renderer/components/scrollview:scrollview"), ], ) diff --git a/ReactCommon/fabric/mounting/Differentiator.cpp b/ReactCommon/react/renderer/mounting/Differentiator.cpp similarity index 99% rename from ReactCommon/fabric/mounting/Differentiator.cpp rename to ReactCommon/react/renderer/mounting/Differentiator.cpp index 62cfd94522f..fce2a721d1a 100644 --- a/ReactCommon/fabric/mounting/Differentiator.cpp +++ b/ReactCommon/react/renderer/mounting/Differentiator.cpp @@ -9,8 +9,8 @@ #include #include -#include -#include +#include +#include #include #include "ShadowView.h" diff --git a/ReactCommon/fabric/mounting/Differentiator.h b/ReactCommon/react/renderer/mounting/Differentiator.h similarity index 89% rename from ReactCommon/fabric/mounting/Differentiator.h rename to ReactCommon/react/renderer/mounting/Differentiator.h index a7afd4f21c6..3befbd72b06 100644 --- a/ReactCommon/fabric/mounting/Differentiator.h +++ b/ReactCommon/react/renderer/mounting/Differentiator.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/mounting/MountingCoordinator.cpp b/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp similarity index 98% rename from ReactCommon/fabric/mounting/MountingCoordinator.cpp rename to ReactCommon/react/renderer/mounting/MountingCoordinator.cpp index 3ffc83ac1cc..05bfa4adbf5 100644 --- a/ReactCommon/fabric/mounting/MountingCoordinator.cpp +++ b/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp @@ -14,7 +14,7 @@ #include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/mounting/MountingCoordinator.h b/ReactCommon/react/renderer/mounting/MountingCoordinator.h similarity index 92% rename from ReactCommon/fabric/mounting/MountingCoordinator.h rename to ReactCommon/react/renderer/mounting/MountingCoordinator.h index ed3ffb1a9d3..88d2bf19d3f 100644 --- a/ReactCommon/fabric/mounting/MountingCoordinator.h +++ b/ReactCommon/react/renderer/mounting/MountingCoordinator.h @@ -10,15 +10,15 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "ShadowTreeRevision.h" #ifdef RN_SHADOW_TREE_INTROSPECTION -#include +#include #endif namespace facebook { diff --git a/ReactCommon/fabric/mounting/MountingOverrideDelegate.h b/ReactCommon/react/renderer/mounting/MountingOverrideDelegate.h similarity index 95% rename from ReactCommon/fabric/mounting/MountingOverrideDelegate.h rename to ReactCommon/react/renderer/mounting/MountingOverrideDelegate.h index 7f642078101..679ca97379a 100644 --- a/ReactCommon/fabric/mounting/MountingOverrideDelegate.h +++ b/ReactCommon/react/renderer/mounting/MountingOverrideDelegate.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#include +#include #pragma once diff --git a/ReactCommon/fabric/mounting/MountingTelemetry.cpp b/ReactCommon/react/renderer/mounting/MountingTelemetry.cpp similarity index 100% rename from ReactCommon/fabric/mounting/MountingTelemetry.cpp rename to ReactCommon/react/renderer/mounting/MountingTelemetry.cpp diff --git a/ReactCommon/fabric/mounting/MountingTelemetry.h b/ReactCommon/react/renderer/mounting/MountingTelemetry.h similarity index 100% rename from ReactCommon/fabric/mounting/MountingTelemetry.h rename to ReactCommon/react/renderer/mounting/MountingTelemetry.h diff --git a/ReactCommon/fabric/mounting/MountingTransaction.cpp b/ReactCommon/react/renderer/mounting/MountingTransaction.cpp similarity index 100% rename from ReactCommon/fabric/mounting/MountingTransaction.cpp rename to ReactCommon/react/renderer/mounting/MountingTransaction.cpp diff --git a/ReactCommon/fabric/mounting/MountingTransaction.h b/ReactCommon/react/renderer/mounting/MountingTransaction.h similarity index 93% rename from ReactCommon/fabric/mounting/MountingTransaction.h rename to ReactCommon/react/renderer/mounting/MountingTransaction.h index f5e58616239..3f34b5e7835 100644 --- a/ReactCommon/fabric/mounting/MountingTransaction.h +++ b/ReactCommon/react/renderer/mounting/MountingTransaction.h @@ -7,9 +7,9 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/mounting/MountingTransactionMetadata.cpp b/ReactCommon/react/renderer/mounting/MountingTransactionMetadata.cpp similarity index 100% rename from ReactCommon/fabric/mounting/MountingTransactionMetadata.cpp rename to ReactCommon/react/renderer/mounting/MountingTransactionMetadata.cpp diff --git a/ReactCommon/fabric/mounting/MountingTransactionMetadata.h b/ReactCommon/react/renderer/mounting/MountingTransactionMetadata.h similarity index 87% rename from ReactCommon/fabric/mounting/MountingTransactionMetadata.h rename to ReactCommon/react/renderer/mounting/MountingTransactionMetadata.h index 300fda9bb6e..c5ca956c0de 100644 --- a/ReactCommon/fabric/mounting/MountingTransactionMetadata.h +++ b/ReactCommon/react/renderer/mounting/MountingTransactionMetadata.h @@ -7,8 +7,8 @@ #pragma once -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/mounting/ShadowTree.cpp b/ReactCommon/react/renderer/mounting/ShadowTree.cpp similarity index 96% rename from ReactCommon/fabric/mounting/ShadowTree.cpp rename to ReactCommon/react/renderer/mounting/ShadowTree.cpp index a834310e1db..4be53bf4252 100644 --- a/ReactCommon/fabric/mounting/ShadowTree.cpp +++ b/ReactCommon/react/renderer/mounting/ShadowTree.cpp @@ -7,14 +7,14 @@ #include "ShadowTree.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "ShadowTreeDelegate.h" #include "TreeStateReconciliation.h" diff --git a/ReactCommon/fabric/mounting/ShadowTree.h b/ReactCommon/react/renderer/mounting/ShadowTree.h similarity index 86% rename from ReactCommon/fabric/mounting/ShadowTree.h rename to ReactCommon/react/renderer/mounting/ShadowTree.h index 5090aeafd70..6bbe1631cf7 100644 --- a/ReactCommon/fabric/mounting/ShadowTree.h +++ b/ReactCommon/react/renderer/mounting/ShadowTree.h @@ -10,14 +10,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "MountingOverrideDelegate.h" namespace facebook { diff --git a/ReactCommon/fabric/mounting/ShadowTreeDelegate.h b/ReactCommon/react/renderer/mounting/ShadowTreeDelegate.h similarity index 92% rename from ReactCommon/fabric/mounting/ShadowTreeDelegate.h rename to ReactCommon/react/renderer/mounting/ShadowTreeDelegate.h index ae2a0645d7b..e7e5880e1de 100644 --- a/ReactCommon/fabric/mounting/ShadowTreeDelegate.h +++ b/ReactCommon/react/renderer/mounting/ShadowTreeDelegate.h @@ -7,7 +7,7 @@ #pragma once -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/mounting/ShadowTreeRegistry.cpp b/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.cpp similarity index 100% rename from ReactCommon/fabric/mounting/ShadowTreeRegistry.cpp rename to ReactCommon/react/renderer/mounting/ShadowTreeRegistry.cpp diff --git a/ReactCommon/fabric/mounting/ShadowTreeRegistry.h b/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.h similarity index 95% rename from ReactCommon/fabric/mounting/ShadowTreeRegistry.h rename to ReactCommon/react/renderer/mounting/ShadowTreeRegistry.h index 6ef6ae2e62c..21bcc0fca07 100644 --- a/ReactCommon/fabric/mounting/ShadowTreeRegistry.h +++ b/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.h @@ -10,8 +10,8 @@ #include #include -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/mounting/ShadowTreeRevision.cpp b/ReactCommon/react/renderer/mounting/ShadowTreeRevision.cpp similarity index 100% rename from ReactCommon/fabric/mounting/ShadowTreeRevision.cpp rename to ReactCommon/react/renderer/mounting/ShadowTreeRevision.cpp diff --git a/ReactCommon/fabric/mounting/ShadowTreeRevision.h b/ReactCommon/react/renderer/mounting/ShadowTreeRevision.h similarity index 86% rename from ReactCommon/fabric/mounting/ShadowTreeRevision.h rename to ReactCommon/react/renderer/mounting/ShadowTreeRevision.h index ba89dc784f8..1fe84fb9fe3 100644 --- a/ReactCommon/fabric/mounting/ShadowTreeRevision.h +++ b/ReactCommon/react/renderer/mounting/ShadowTreeRevision.h @@ -9,10 +9,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/mounting/ShadowView.cpp b/ReactCommon/react/renderer/mounting/ShadowView.cpp similarity index 97% rename from ReactCommon/fabric/mounting/ShadowView.cpp rename to ReactCommon/react/renderer/mounting/ShadowView.cpp index a5436df7dc3..f717a28fe66 100644 --- a/ReactCommon/fabric/mounting/ShadowView.cpp +++ b/ReactCommon/react/renderer/mounting/ShadowView.cpp @@ -7,7 +7,7 @@ #include "ShadowView.h" -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/mounting/ShadowView.h b/ReactCommon/react/renderer/mounting/ShadowView.h similarity index 90% rename from ReactCommon/fabric/mounting/ShadowView.h rename to ReactCommon/react/renderer/mounting/ShadowView.h index fc51f9e9b1b..55027683bec 100644 --- a/ReactCommon/fabric/mounting/ShadowView.h +++ b/ReactCommon/react/renderer/mounting/ShadowView.h @@ -9,11 +9,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/mounting/ShadowViewMutation.cpp b/ReactCommon/react/renderer/mounting/ShadowViewMutation.cpp similarity index 100% rename from ReactCommon/fabric/mounting/ShadowViewMutation.cpp rename to ReactCommon/react/renderer/mounting/ShadowViewMutation.cpp diff --git a/ReactCommon/fabric/mounting/ShadowViewMutation.h b/ReactCommon/react/renderer/mounting/ShadowViewMutation.h similarity index 97% rename from ReactCommon/fabric/mounting/ShadowViewMutation.h rename to ReactCommon/react/renderer/mounting/ShadowViewMutation.h index 8250a223984..65b52beff39 100644 --- a/ReactCommon/fabric/mounting/ShadowViewMutation.h +++ b/ReactCommon/react/renderer/mounting/ShadowViewMutation.h @@ -9,7 +9,7 @@ #include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/mounting/SurfaceTelemetry.cpp b/ReactCommon/react/renderer/mounting/SurfaceTelemetry.cpp similarity index 100% rename from ReactCommon/fabric/mounting/SurfaceTelemetry.cpp rename to ReactCommon/react/renderer/mounting/SurfaceTelemetry.cpp diff --git a/ReactCommon/fabric/mounting/SurfaceTelemetry.h b/ReactCommon/react/renderer/mounting/SurfaceTelemetry.h similarity index 95% rename from ReactCommon/fabric/mounting/SurfaceTelemetry.h rename to ReactCommon/react/renderer/mounting/SurfaceTelemetry.h index 0151ceb8f9d..d10f7853a47 100644 --- a/ReactCommon/fabric/mounting/SurfaceTelemetry.h +++ b/ReactCommon/react/renderer/mounting/SurfaceTelemetry.h @@ -7,7 +7,7 @@ #pragma once -#include +#include #include namespace facebook { diff --git a/ReactCommon/fabric/mounting/TelemetryController.cpp b/ReactCommon/react/renderer/mounting/TelemetryController.cpp similarity index 96% rename from ReactCommon/fabric/mounting/TelemetryController.cpp rename to ReactCommon/react/renderer/mounting/TelemetryController.cpp index 43c91b5eb85..a39989cb69d 100644 --- a/ReactCommon/fabric/mounting/TelemetryController.cpp +++ b/ReactCommon/react/renderer/mounting/TelemetryController.cpp @@ -7,7 +7,7 @@ #include "TelemetryController.h" -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/mounting/TelemetryController.h b/ReactCommon/react/renderer/mounting/TelemetryController.h similarity index 88% rename from ReactCommon/fabric/mounting/TelemetryController.h rename to ReactCommon/react/renderer/mounting/TelemetryController.h index f5af79c0de0..6d878d7d7b2 100644 --- a/ReactCommon/fabric/mounting/TelemetryController.h +++ b/ReactCommon/react/renderer/mounting/TelemetryController.h @@ -10,9 +10,9 @@ #include #include -#include -#include -#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/mounting/TreeStateReconciliation.cpp b/ReactCommon/react/renderer/mounting/TreeStateReconciliation.cpp similarity index 100% rename from ReactCommon/fabric/mounting/TreeStateReconciliation.cpp rename to ReactCommon/react/renderer/mounting/TreeStateReconciliation.cpp diff --git a/ReactCommon/fabric/mounting/TreeStateReconciliation.h b/ReactCommon/react/renderer/mounting/TreeStateReconciliation.h similarity index 92% rename from ReactCommon/fabric/mounting/TreeStateReconciliation.h rename to ReactCommon/react/renderer/mounting/TreeStateReconciliation.h index 6775df1906d..ff95b7e763d 100644 --- a/ReactCommon/fabric/mounting/TreeStateReconciliation.h +++ b/ReactCommon/react/renderer/mounting/TreeStateReconciliation.h @@ -5,8 +5,8 @@ * LICENSE file in the root directory of this source tree. */ -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/mounting/stubs/StubView.cpp b/ReactCommon/react/renderer/mounting/stubs/StubView.cpp similarity index 100% rename from ReactCommon/fabric/mounting/stubs/StubView.cpp rename to ReactCommon/react/renderer/mounting/stubs/StubView.cpp diff --git a/ReactCommon/fabric/mounting/stubs/StubView.h b/ReactCommon/react/renderer/mounting/stubs/StubView.h similarity index 86% rename from ReactCommon/fabric/mounting/stubs/StubView.h rename to ReactCommon/react/renderer/mounting/stubs/StubView.h index 7ee54645270..8546baa157a 100644 --- a/ReactCommon/fabric/mounting/stubs/StubView.h +++ b/ReactCommon/react/renderer/mounting/stubs/StubView.h @@ -10,10 +10,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/mounting/stubs/StubViewTree.cpp b/ReactCommon/react/renderer/mounting/stubs/StubViewTree.cpp similarity index 100% rename from ReactCommon/fabric/mounting/stubs/StubViewTree.cpp rename to ReactCommon/react/renderer/mounting/stubs/StubViewTree.cpp diff --git a/ReactCommon/fabric/mounting/stubs/StubViewTree.h b/ReactCommon/react/renderer/mounting/stubs/StubViewTree.h similarity index 88% rename from ReactCommon/fabric/mounting/stubs/StubViewTree.h rename to ReactCommon/react/renderer/mounting/stubs/StubViewTree.h index 7a708e4b391..6ffb00e63ce 100644 --- a/ReactCommon/fabric/mounting/stubs/StubViewTree.h +++ b/ReactCommon/react/renderer/mounting/stubs/StubViewTree.h @@ -10,8 +10,8 @@ #include #include -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/mounting/stubs/stubs.cpp b/ReactCommon/react/renderer/mounting/stubs/stubs.cpp similarity index 92% rename from ReactCommon/fabric/mounting/stubs/stubs.cpp rename to ReactCommon/react/renderer/mounting/stubs/stubs.cpp index d6ecc11b4af..370989a21a8 100644 --- a/ReactCommon/fabric/mounting/stubs/stubs.cpp +++ b/ReactCommon/react/renderer/mounting/stubs/stubs.cpp @@ -7,9 +7,9 @@ #include "stubs.h" -#include -#include -#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/mounting/stubs/stubs.h b/ReactCommon/react/renderer/mounting/stubs/stubs.h similarity index 90% rename from ReactCommon/fabric/mounting/stubs/stubs.h rename to ReactCommon/react/renderer/mounting/stubs/stubs.h index 46cda72c1f4..8a7b564c081 100644 --- a/ReactCommon/fabric/mounting/stubs/stubs.h +++ b/ReactCommon/react/renderer/mounting/stubs/stubs.h @@ -7,7 +7,7 @@ #pragma once -#include +#include #include "StubView.h" #include "StubViewTree.h" diff --git a/ReactCommon/fabric/mounting/tests/Entropy.h b/ReactCommon/react/renderer/mounting/tests/Entropy.h similarity index 100% rename from ReactCommon/fabric/mounting/tests/Entropy.h rename to ReactCommon/react/renderer/mounting/tests/Entropy.h diff --git a/ReactCommon/fabric/mounting/tests/MountingTelemetryTest.cpp b/ReactCommon/react/renderer/mounting/tests/MountingTelemetryTest.cpp similarity index 98% rename from ReactCommon/fabric/mounting/tests/MountingTelemetryTest.cpp rename to ReactCommon/react/renderer/mounting/tests/MountingTelemetryTest.cpp index cf31109a38f..849efa8ac6f 100644 --- a/ReactCommon/fabric/mounting/tests/MountingTelemetryTest.cpp +++ b/ReactCommon/react/renderer/mounting/tests/MountingTelemetryTest.cpp @@ -10,7 +10,7 @@ #include -#include +#include #include using namespace facebook::react; diff --git a/ReactCommon/fabric/mounting/tests/MountingTest.cpp b/ReactCommon/react/renderer/mounting/tests/MountingTest.cpp similarity index 98% rename from ReactCommon/fabric/mounting/tests/MountingTest.cpp rename to ReactCommon/react/renderer/mounting/tests/MountingTest.cpp index 51734798661..275daa6b60f 100644 --- a/ReactCommon/fabric/mounting/tests/MountingTest.cpp +++ b/ReactCommon/react/renderer/mounting/tests/MountingTest.cpp @@ -7,10 +7,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include "shadowTreeGeneration.h" diff --git a/ReactCommon/fabric/mounting/tests/ShadowTreeLifeCycleTest.cpp b/ReactCommon/react/renderer/mounting/tests/ShadowTreeLifeCycleTest.cpp similarity index 95% rename from ReactCommon/fabric/mounting/tests/ShadowTreeLifeCycleTest.cpp rename to ReactCommon/react/renderer/mounting/tests/ShadowTreeLifeCycleTest.cpp index c3aef70d4ab..1def45c3cad 100644 --- a/ReactCommon/fabric/mounting/tests/ShadowTreeLifeCycleTest.cpp +++ b/ReactCommon/react/renderer/mounting/tests/ShadowTreeLifeCycleTest.cpp @@ -8,10 +8,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "Entropy.h" #include "shadowTreeGeneration.h" diff --git a/ReactCommon/fabric/mounting/tests/StateReconciliationTest.cpp b/ReactCommon/react/renderer/mounting/tests/StateReconciliationTest.cpp similarity index 91% rename from ReactCommon/fabric/mounting/tests/StateReconciliationTest.cpp rename to ReactCommon/react/renderer/mounting/tests/StateReconciliationTest.cpp index eb6129f5bf4..d32e1d69a5c 100644 --- a/ReactCommon/fabric/mounting/tests/StateReconciliationTest.cpp +++ b/ReactCommon/react/renderer/mounting/tests/StateReconciliationTest.cpp @@ -9,16 +9,16 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include -#include -#include +#include +#include +#include using namespace facebook::react; diff --git a/ReactCommon/fabric/mounting/tests/shadowTreeGeneration.h b/ReactCommon/react/renderer/mounting/tests/shadowTreeGeneration.h similarity index 96% rename from ReactCommon/fabric/mounting/tests/shadowTreeGeneration.h rename to ReactCommon/react/renderer/mounting/tests/shadowTreeGeneration.h index 36673ff2497..8a2c326d157 100644 --- a/ReactCommon/fabric/mounting/tests/shadowTreeGeneration.h +++ b/ReactCommon/react/renderer/mounting/tests/shadowTreeGeneration.h @@ -13,11 +13,11 @@ #include #include -#include -#include +#include +#include -#include -#include +#include +#include #include "Entropy.h" diff --git a/ReactCommon/fabric/scheduler/AsynchronousEventBeat.cpp b/ReactCommon/react/renderer/scheduler/AsynchronousEventBeat.cpp similarity index 100% rename from ReactCommon/fabric/scheduler/AsynchronousEventBeat.cpp rename to ReactCommon/react/renderer/scheduler/AsynchronousEventBeat.cpp diff --git a/ReactCommon/fabric/scheduler/AsynchronousEventBeat.h b/ReactCommon/react/renderer/scheduler/AsynchronousEventBeat.h similarity index 96% rename from ReactCommon/fabric/scheduler/AsynchronousEventBeat.h rename to ReactCommon/react/renderer/scheduler/AsynchronousEventBeat.h index 6e95c9b8f79..1acdcbb02d0 100644 --- a/ReactCommon/fabric/scheduler/AsynchronousEventBeat.h +++ b/ReactCommon/react/renderer/scheduler/AsynchronousEventBeat.h @@ -6,7 +6,7 @@ */ #include -#include +#include #include namespace facebook { diff --git a/ReactCommon/fabric/scheduler/BUCK b/ReactCommon/react/renderer/scheduler/BUCK similarity index 74% rename from ReactCommon/fabric/scheduler/BUCK rename to ReactCommon/react/renderer/scheduler/BUCK index fc4a94488bd..87f147704f5 100644 --- a/ReactCommon/fabric/scheduler/BUCK +++ b/ReactCommon/react/renderer/scheduler/BUCK @@ -28,7 +28,7 @@ rn_xplat_cxx_library( [ ("", "*.h"), ], - prefix = "react/scheduler", + prefix = "react/renderer/scheduler", ), compiler_flags = [ "-fexceptions", @@ -55,14 +55,14 @@ rn_xplat_cxx_library( "//xplat/folly:molly", "//xplat/jsi:JSIDynamic", "//xplat/jsi:jsi", - react_native_xplat_target("fabric/core:core"), - react_native_xplat_target("fabric/mounting:mounting"), - react_native_xplat_target("fabric/uimanager:uimanager"), - react_native_xplat_target("fabric/templateprocessor:templateprocessor"), + react_native_xplat_target("react/renderer/core:core"), + react_native_xplat_target("react/renderer/mounting:mounting"), + react_native_xplat_target("react/renderer/uimanager:uimanager"), + react_native_xplat_target("react/renderer/templateprocessor:templateprocessor"), react_native_xplat_target("config:config"), - react_native_xplat_target("fabric/componentregistry:componentregistry"), - react_native_xplat_target("fabric/debug:debug"), - react_native_xplat_target("fabric/components/root:root"), + react_native_xplat_target("react/renderer/componentregistry:componentregistry"), + react_native_xplat_target("react/renderer/debug:debug"), + react_native_xplat_target("react/renderer/components/root:root"), react_native_xplat_target("utils:utils"), ], ) diff --git a/ReactCommon/fabric/scheduler/Scheduler.cpp b/ReactCommon/react/renderer/scheduler/Scheduler.cpp similarity index 96% rename from ReactCommon/fabric/scheduler/Scheduler.cpp rename to ReactCommon/react/renderer/scheduler/Scheduler.cpp index 74c849f77d8..6b251264267 100644 --- a/ReactCommon/fabric/scheduler/Scheduler.cpp +++ b/ReactCommon/react/renderer/scheduler/Scheduler.cpp @@ -10,17 +10,17 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef RN_SHADOW_TREE_INTROSPECTION -#include +#include #include #endif diff --git a/ReactCommon/fabric/scheduler/Scheduler.h b/ReactCommon/react/renderer/scheduler/Scheduler.h similarity index 88% rename from ReactCommon/fabric/scheduler/Scheduler.h rename to ReactCommon/react/renderer/scheduler/Scheduler.h index 2693b821939..86496494d6d 100644 --- a/ReactCommon/fabric/scheduler/Scheduler.h +++ b/ReactCommon/react/renderer/scheduler/Scheduler.h @@ -11,17 +11,17 @@ #include #include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include namespace facebook { diff --git a/ReactCommon/fabric/scheduler/SchedulerDelegate.h b/ReactCommon/react/renderer/scheduler/SchedulerDelegate.h similarity index 90% rename from ReactCommon/fabric/scheduler/SchedulerDelegate.h rename to ReactCommon/react/renderer/scheduler/SchedulerDelegate.h index b0e43fe3e86..33be7dcb6e3 100644 --- a/ReactCommon/fabric/scheduler/SchedulerDelegate.h +++ b/ReactCommon/react/renderer/scheduler/SchedulerDelegate.h @@ -9,9 +9,9 @@ #include -#include -#include -#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/scheduler/SchedulerToolbox.cpp b/ReactCommon/react/renderer/scheduler/SchedulerToolbox.cpp similarity index 100% rename from ReactCommon/fabric/scheduler/SchedulerToolbox.cpp rename to ReactCommon/react/renderer/scheduler/SchedulerToolbox.cpp diff --git a/ReactCommon/fabric/scheduler/SchedulerToolbox.h b/ReactCommon/react/renderer/scheduler/SchedulerToolbox.h similarity index 91% rename from ReactCommon/fabric/scheduler/SchedulerToolbox.h rename to ReactCommon/react/renderer/scheduler/SchedulerToolbox.h index f94f410a3c3..a98d450f373 100644 --- a/ReactCommon/fabric/scheduler/SchedulerToolbox.h +++ b/ReactCommon/react/renderer/scheduler/SchedulerToolbox.h @@ -8,9 +8,9 @@ #pragma once #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/ReactCommon/fabric/scheduler/SynchronousEventBeat.cpp b/ReactCommon/react/renderer/scheduler/SynchronousEventBeat.cpp similarity index 100% rename from ReactCommon/fabric/scheduler/SynchronousEventBeat.cpp rename to ReactCommon/react/renderer/scheduler/SynchronousEventBeat.cpp diff --git a/ReactCommon/fabric/scheduler/SynchronousEventBeat.h b/ReactCommon/react/renderer/scheduler/SynchronousEventBeat.h similarity index 96% rename from ReactCommon/fabric/scheduler/SynchronousEventBeat.h rename to ReactCommon/react/renderer/scheduler/SynchronousEventBeat.h index bf192e9078a..109a6ddf0b6 100644 --- a/ReactCommon/fabric/scheduler/SynchronousEventBeat.h +++ b/ReactCommon/react/renderer/scheduler/SynchronousEventBeat.h @@ -8,7 +8,7 @@ #pragma once #include -#include +#include #include namespace facebook { diff --git a/ReactCommon/fabric/templateprocessor/BUCK b/ReactCommon/react/renderer/templateprocessor/BUCK similarity index 75% rename from ReactCommon/fabric/templateprocessor/BUCK rename to ReactCommon/react/renderer/templateprocessor/BUCK index ea5518b3818..b4562085b1e 100644 --- a/ReactCommon/fabric/templateprocessor/BUCK +++ b/ReactCommon/react/renderer/templateprocessor/BUCK @@ -29,7 +29,7 @@ rn_xplat_cxx_library( [ ("", "*.h"), ], - prefix = "react/templateprocessor", + prefix = "react/renderer/templateprocessor", ), compiler_flags = [ "-fexceptions", @@ -57,10 +57,10 @@ rn_xplat_cxx_library( "//xplat/folly:molly", "//xplat/jsi:JSIDynamic", "//xplat/jsi:jsi", - react_native_xplat_target("fabric/core:core"), - react_native_xplat_target("fabric/uimanager:uimanager"), - react_native_xplat_target("fabric/componentregistry:componentregistry"), - react_native_xplat_target("fabric/debug:debug"), + react_native_xplat_target("react/renderer/core:core"), + react_native_xplat_target("react/renderer/uimanager:uimanager"), + react_native_xplat_target("react/renderer/componentregistry:componentregistry"), + react_native_xplat_target("react/renderer/debug:debug"), react_native_xplat_target("config:config"), react_native_xplat_target("utils:utils"), ], @@ -83,11 +83,11 @@ fb_xplat_cxx_test( "//xplat/folly:molly", "//xplat/third-party/gmock:gtest", react_native_xplat_target("config:config"), - react_native_xplat_target("fabric/components/activityindicator:activityindicator"), - react_native_xplat_target("fabric/components/image:image"), - react_native_xplat_target("fabric/components/root:root"), - react_native_xplat_target("fabric/components/scrollview:scrollview"), - react_native_xplat_target("fabric/components/view:view"), + react_native_xplat_target("react/renderer/components/activityindicator:activityindicator"), + react_native_xplat_target("react/renderer/components/image:image"), + react_native_xplat_target("react/renderer/components/root:root"), + react_native_xplat_target("react/renderer/components/scrollview:scrollview"), + react_native_xplat_target("react/renderer/components/view:view"), "//xplat/js/react-native-github:generated_components-rncore", ], ) diff --git a/ReactCommon/fabric/templateprocessor/UITemplateProcessor.cpp b/ReactCommon/react/renderer/templateprocessor/UITemplateProcessor.cpp similarity index 92% rename from ReactCommon/fabric/templateprocessor/UITemplateProcessor.cpp rename to ReactCommon/react/renderer/templateprocessor/UITemplateProcessor.cpp index 35854e58996..22d506efdcf 100644 --- a/ReactCommon/fabric/templateprocessor/UITemplateProcessor.cpp +++ b/ReactCommon/react/renderer/templateprocessor/UITemplateProcessor.cpp @@ -9,14 +9,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/templateprocessor/UITemplateProcessor.h b/ReactCommon/react/renderer/templateprocessor/UITemplateProcessor.h similarity index 90% rename from ReactCommon/fabric/templateprocessor/UITemplateProcessor.h rename to ReactCommon/react/renderer/templateprocessor/UITemplateProcessor.h index 4f9a892acf9..384c572a699 100644 --- a/ReactCommon/fabric/templateprocessor/UITemplateProcessor.h +++ b/ReactCommon/react/renderer/templateprocessor/UITemplateProcessor.h @@ -11,10 +11,10 @@ #include -#include #include -#include -#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/templateprocessor/tests/UITemplateProcessorTest.cpp b/ReactCommon/react/renderer/templateprocessor/tests/UITemplateProcessorTest.cpp similarity index 89% rename from ReactCommon/fabric/templateprocessor/tests/UITemplateProcessorTest.cpp rename to ReactCommon/react/renderer/templateprocessor/tests/UITemplateProcessorTest.cpp index 743b203a6b0..5c7220f52a4 100644 --- a/ReactCommon/fabric/templateprocessor/tests/UITemplateProcessorTest.cpp +++ b/ReactCommon/react/renderer/templateprocessor/tests/UITemplateProcessorTest.cpp @@ -9,18 +9,18 @@ #include #include -#include -#include +#include +#include using namespace facebook::react; -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include #include namespace facebook { diff --git a/ReactCommon/fabric/textlayoutmanager/BUCK b/ReactCommon/react/renderer/textlayoutmanager/BUCK similarity index 84% rename from ReactCommon/fabric/textlayoutmanager/BUCK rename to ReactCommon/react/renderer/textlayoutmanager/BUCK index 90db8d8d71e..747d108e18e 100644 --- a/ReactCommon/fabric/textlayoutmanager/BUCK +++ b/ReactCommon/react/renderer/textlayoutmanager/BUCK @@ -34,7 +34,7 @@ rn_xplat_cxx_library( [ ("", "*.h"), ], - prefix = "react/textlayoutmanager", + prefix = "react/renderer/textlayoutmanager", ), compiler_flags = [ "-fexceptions", @@ -46,7 +46,7 @@ rn_xplat_cxx_library( [ ("platform/cxx", "*.h"), ], - prefix = "react/textlayoutmanager", + prefix = "react/renderer/textlayoutmanager", ), cxx_headers = subdir_glob( [ @@ -67,7 +67,7 @@ rn_xplat_cxx_library( [ ("platform/android", "*.h"), ], - prefix = "react/textlayoutmanager", + prefix = "react/renderer/textlayoutmanager", ), fbandroid_headers = subdir_glob( [ @@ -89,7 +89,7 @@ rn_xplat_cxx_library( [ ("platform/ios", "*.h"), ], - prefix = "react/textlayoutmanager", + prefix = "react/renderer/textlayoutmanager", ), ios_frameworks = [ "$SDKROOT/System/Library/Frameworks/CoreGraphics.framework", @@ -123,13 +123,13 @@ rn_xplat_cxx_library( "//xplat/folly:memory", "//xplat/folly:molly", YOGA_CXX_TARGET, - react_native_xplat_target("fabric/attributedstring:attributedstring"), - react_native_xplat_target("fabric/core:core"), + react_native_xplat_target("react/renderer/attributedstring:attributedstring"), + react_native_xplat_target("react/renderer/core:core"), react_native_xplat_target("utils:utils"), - react_native_xplat_target("fabric/debug:debug"), - react_native_xplat_target("fabric/graphics:graphics"), - react_native_xplat_target("fabric/uimanager:uimanager"), - react_native_xplat_target("fabric/componentregistry:componentregistry"), + react_native_xplat_target("react/renderer/debug:debug"), + react_native_xplat_target("react/renderer/graphics:graphics"), + react_native_xplat_target("react/renderer/uimanager:uimanager"), + react_native_xplat_target("react/renderer/componentregistry:componentregistry"), ], ) diff --git a/ReactCommon/fabric/textlayoutmanager/TextMeasureCache.cpp b/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.cpp similarity index 100% rename from ReactCommon/fabric/textlayoutmanager/TextMeasureCache.cpp rename to ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.cpp diff --git a/ReactCommon/fabric/textlayoutmanager/TextMeasureCache.h b/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h similarity index 96% rename from ReactCommon/fabric/textlayoutmanager/TextMeasureCache.h rename to ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h index 71b1c07a3d0..460bcce9fd0 100644 --- a/ReactCommon/fabric/textlayoutmanager/TextMeasureCache.h +++ b/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h @@ -7,9 +7,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include #include diff --git a/ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.cpp b/ReactCommon/react/renderer/textlayoutmanager/platform/android/TextLayoutManager.cpp similarity index 97% rename from ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.cpp rename to ReactCommon/react/renderer/textlayoutmanager/platform/android/TextLayoutManager.cpp index 52fda0f7cd8..9d7bc047540 100644 --- a/ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.cpp +++ b/ReactCommon/react/renderer/textlayoutmanager/platform/android/TextLayoutManager.cpp @@ -7,9 +7,9 @@ #include "TextLayoutManager.h" -#include -#include #include +#include +#include using namespace facebook::jni; diff --git a/ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.h b/ReactCommon/react/renderer/textlayoutmanager/platform/android/TextLayoutManager.h similarity index 85% rename from ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.h rename to ReactCommon/react/renderer/textlayoutmanager/platform/android/TextLayoutManager.h index c8939d3f075..0136e7084ba 100644 --- a/ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.h +++ b/ReactCommon/react/renderer/textlayoutmanager/platform/android/TextLayoutManager.h @@ -7,10 +7,10 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include #include namespace facebook { diff --git a/ReactCommon/fabric/textlayoutmanager/platform/cxx/TextLayoutManager.cpp b/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/TextLayoutManager.cpp similarity index 100% rename from ReactCommon/fabric/textlayoutmanager/platform/cxx/TextLayoutManager.cpp rename to ReactCommon/react/renderer/textlayoutmanager/platform/cxx/TextLayoutManager.cpp diff --git a/ReactCommon/fabric/textlayoutmanager/platform/cxx/TextLayoutManager.h b/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/TextLayoutManager.h similarity index 80% rename from ReactCommon/fabric/textlayoutmanager/platform/cxx/TextLayoutManager.h rename to ReactCommon/react/renderer/textlayoutmanager/platform/cxx/TextLayoutManager.h index 57d301995b3..7033cdeafe3 100644 --- a/ReactCommon/fabric/textlayoutmanager/platform/cxx/TextLayoutManager.h +++ b/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/TextLayoutManager.h @@ -9,11 +9,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include namespace facebook { diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/NSTextStorage+FontScaling.h b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/NSTextStorage+FontScaling.h similarity index 100% rename from ReactCommon/fabric/textlayoutmanager/platform/ios/NSTextStorage+FontScaling.h rename to ReactCommon/react/renderer/textlayoutmanager/platform/ios/NSTextStorage+FontScaling.h diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/NSTextStorage+FontScaling.m b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/NSTextStorage+FontScaling.m similarity index 100% rename from ReactCommon/fabric/textlayoutmanager/platform/ios/NSTextStorage+FontScaling.m rename to ReactCommon/react/renderer/textlayoutmanager/platform/ios/NSTextStorage+FontScaling.m diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTAttributedTextUtils.h b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTAttributedTextUtils.h similarity index 87% rename from ReactCommon/fabric/textlayoutmanager/platform/ios/RCTAttributedTextUtils.h rename to ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTAttributedTextUtils.h index eda44cf6ff6..373e78daac3 100644 --- a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTAttributedTextUtils.h +++ b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTAttributedTextUtils.h @@ -7,9 +7,9 @@ #import -#include -#include -#include +#include +#include +#include NS_ASSUME_NONNULL_BEGIN diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTAttributedTextUtils.mm b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTAttributedTextUtils.mm similarity index 98% rename from ReactCommon/fabric/textlayoutmanager/platform/ios/RCTAttributedTextUtils.mm rename to ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTAttributedTextUtils.mm index f9a6537abe2..0f23297ad4a 100644 --- a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTAttributedTextUtils.mm +++ b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTAttributedTextUtils.mm @@ -7,10 +7,10 @@ #import "RCTAttributedTextUtils.h" -#include -#include -#include -#include +#include +#include +#include +#include #include using namespace facebook::react; diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTFontProperties.h b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTFontProperties.h similarity index 100% rename from ReactCommon/fabric/textlayoutmanager/platform/ios/RCTFontProperties.h rename to ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTFontProperties.h diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTFontUtils.h b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTFontUtils.h similarity index 86% rename from ReactCommon/fabric/textlayoutmanager/platform/ios/RCTFontUtils.h rename to ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTFontUtils.h index e8b40b10073..eafaa4e6f08 100644 --- a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTFontUtils.h +++ b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTFontUtils.h @@ -7,7 +7,7 @@ #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTFontUtils.mm b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTFontUtils.mm similarity index 100% rename from ReactCommon/fabric/textlayoutmanager/platform/ios/RCTFontUtils.mm rename to ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTFontUtils.mm diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTTextLayoutManager.h b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextLayoutManager.h similarity index 88% rename from ReactCommon/fabric/textlayoutmanager/platform/ios/RCTTextLayoutManager.h rename to ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextLayoutManager.h index eb495776e8c..805e0bab08c 100644 --- a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTTextLayoutManager.h +++ b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextLayoutManager.h @@ -7,11 +7,11 @@ #import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTTextLayoutManager.mm b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextLayoutManager.mm similarity index 100% rename from ReactCommon/fabric/textlayoutmanager/platform/ios/RCTTextLayoutManager.mm rename to ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextLayoutManager.mm diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h similarity index 96% rename from ReactCommon/fabric/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h rename to ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h index 1b69bbf2c7e..fdfb6e2ce61 100644 --- a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h +++ b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h @@ -7,8 +7,8 @@ #import -#include -#include +#include +#include using namespace facebook::react; diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/TextLayoutManager.h b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/TextLayoutManager.h similarity index 83% rename from ReactCommon/fabric/textlayoutmanager/platform/ios/TextLayoutManager.h rename to ReactCommon/react/renderer/textlayoutmanager/platform/ios/TextLayoutManager.h index 02a9ff7a9e6..42b56603c11 100644 --- a/ReactCommon/fabric/textlayoutmanager/platform/ios/TextLayoutManager.h +++ b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/TextLayoutManager.h @@ -9,10 +9,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include namespace facebook { diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/TextLayoutManager.mm b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/TextLayoutManager.mm similarity index 100% rename from ReactCommon/fabric/textlayoutmanager/platform/ios/TextLayoutManager.mm rename to ReactCommon/react/renderer/textlayoutmanager/platform/ios/TextLayoutManager.mm diff --git a/ReactCommon/fabric/textlayoutmanager/tests/TextLayoutManagerTest.cpp b/ReactCommon/react/renderer/textlayoutmanager/tests/TextLayoutManagerTest.cpp similarity index 83% rename from ReactCommon/fabric/textlayoutmanager/tests/TextLayoutManagerTest.cpp rename to ReactCommon/react/renderer/textlayoutmanager/tests/TextLayoutManagerTest.cpp index 7f99ab3a57b..ab4974c7631 100644 --- a/ReactCommon/fabric/textlayoutmanager/tests/TextLayoutManagerTest.cpp +++ b/ReactCommon/react/renderer/textlayoutmanager/tests/TextLayoutManagerTest.cpp @@ -9,7 +9,7 @@ #include -#include +#include using namespace facebook::react; diff --git a/ReactCommon/fabric/uimanager/BUCK b/ReactCommon/react/renderer/uimanager/BUCK similarity index 73% rename from ReactCommon/fabric/uimanager/BUCK rename to ReactCommon/react/renderer/uimanager/BUCK index aa31fcae2af..6cddfe741ab 100644 --- a/ReactCommon/fabric/uimanager/BUCK +++ b/ReactCommon/react/renderer/uimanager/BUCK @@ -29,7 +29,7 @@ rn_xplat_cxx_library( [ ("", "*.h"), ], - prefix = "react/uimanager", + prefix = "react/renderer/uimanager", ), compiler_flags = [ "-fexceptions", @@ -58,11 +58,11 @@ rn_xplat_cxx_library( "//xplat/jsi:JSIDynamic", "//xplat/jsi:jsi", react_native_xplat_target("config:config"), - react_native_xplat_target("fabric/components/view:view"), - react_native_xplat_target("fabric/mounting:mounting"), - react_native_xplat_target("fabric/core:core"), - react_native_xplat_target("fabric/componentregistry:componentregistry"), - react_native_xplat_target("fabric/debug:debug"), + react_native_xplat_target("react/renderer/components/view:view"), + react_native_xplat_target("react/renderer/mounting:mounting"), + react_native_xplat_target("react/renderer/core:core"), + react_native_xplat_target("react/renderer/componentregistry:componentregistry"), + react_native_xplat_target("react/renderer/debug:debug"), react_native_xplat_target("runtimeexecutor:runtimeexecutor"), ], ) @@ -84,11 +84,11 @@ fb_xplat_cxx_test( "//xplat/folly:molly", "//xplat/third-party/gmock:gtest", react_native_xplat_target("config:config"), - react_native_xplat_target("fabric/components/activityindicator:activityindicator"), - react_native_xplat_target("fabric/components/image:image"), - react_native_xplat_target("fabric/components/root:root"), - react_native_xplat_target("fabric/components/scrollview:scrollview"), - react_native_xplat_target("fabric/components/view:view"), + react_native_xplat_target("react/renderer/components/activityindicator:activityindicator"), + react_native_xplat_target("react/renderer/components/image:image"), + react_native_xplat_target("react/renderer/components/root:root"), + react_native_xplat_target("react/renderer/components/scrollview:scrollview"), + react_native_xplat_target("react/renderer/components/view:view"), "//xplat/js/react-native-github:generated_components-rncore", ], ) diff --git a/ReactCommon/fabric/uimanager/LayoutAnimationStatusDelegate.h b/ReactCommon/react/renderer/uimanager/LayoutAnimationStatusDelegate.h similarity index 100% rename from ReactCommon/fabric/uimanager/LayoutAnimationStatusDelegate.h rename to ReactCommon/react/renderer/uimanager/LayoutAnimationStatusDelegate.h diff --git a/ReactCommon/fabric/uimanager/UIManager.cpp b/ReactCommon/react/renderer/uimanager/UIManager.cpp similarity index 98% rename from ReactCommon/fabric/uimanager/UIManager.cpp rename to ReactCommon/react/renderer/uimanager/UIManager.cpp index a5f2554f72f..3444273d6c3 100644 --- a/ReactCommon/fabric/uimanager/UIManager.cpp +++ b/ReactCommon/react/renderer/uimanager/UIManager.cpp @@ -7,9 +7,9 @@ #include "UIManager.h" -#include -#include -#include +#include +#include +#include #include diff --git a/ReactCommon/fabric/uimanager/UIManager.h b/ReactCommon/react/renderer/uimanager/UIManager.h similarity index 88% rename from ReactCommon/fabric/uimanager/UIManager.h rename to ReactCommon/react/renderer/uimanager/UIManager.h index 29dda87d431..26081a1236f 100644 --- a/ReactCommon/fabric/uimanager/UIManager.h +++ b/ReactCommon/react/renderer/uimanager/UIManager.h @@ -11,16 +11,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/uimanager/UIManagerAnimationDelegate.h b/ReactCommon/react/renderer/uimanager/UIManagerAnimationDelegate.h similarity index 85% rename from ReactCommon/fabric/uimanager/UIManagerAnimationDelegate.h rename to ReactCommon/react/renderer/uimanager/UIManagerAnimationDelegate.h index 9dcbef33e12..735a73fe513 100644 --- a/ReactCommon/fabric/uimanager/UIManagerAnimationDelegate.h +++ b/ReactCommon/react/renderer/uimanager/UIManagerAnimationDelegate.h @@ -7,9 +7,9 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/uimanager/UIManagerBinding.cpp b/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp similarity index 99% rename from ReactCommon/fabric/uimanager/UIManagerBinding.cpp rename to ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp index 5d9c128d3e8..0cf68d55f93 100644 --- a/ReactCommon/fabric/uimanager/UIManagerBinding.cpp +++ b/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp @@ -7,7 +7,7 @@ #include "UIManagerBinding.h" -#include +#include #include #include diff --git a/ReactCommon/fabric/uimanager/UIManagerBinding.h b/ReactCommon/react/renderer/uimanager/UIManagerBinding.h similarity index 94% rename from ReactCommon/fabric/uimanager/UIManagerBinding.h rename to ReactCommon/react/renderer/uimanager/UIManagerBinding.h index 0ecf00c9dd9..d4e133f59d3 100644 --- a/ReactCommon/fabric/uimanager/UIManagerBinding.h +++ b/ReactCommon/react/renderer/uimanager/UIManagerBinding.h @@ -9,9 +9,9 @@ #include #include -#include -#include -#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/uimanager/UIManagerDelegate.h b/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h similarity index 90% rename from ReactCommon/fabric/uimanager/UIManagerDelegate.h rename to ReactCommon/react/renderer/uimanager/UIManagerDelegate.h index 99fc0f41354..ad0c9e27f5b 100644 --- a/ReactCommon/fabric/uimanager/UIManagerDelegate.h +++ b/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h @@ -7,9 +7,9 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/uimanager/primitives.h b/ReactCommon/react/renderer/uimanager/primitives.h similarity index 96% rename from ReactCommon/fabric/uimanager/primitives.h rename to ReactCommon/react/renderer/uimanager/primitives.h index f5d29a34bb2..cd9dde4a662 100644 --- a/ReactCommon/fabric/uimanager/primitives.h +++ b/ReactCommon/react/renderer/uimanager/primitives.h @@ -10,8 +10,8 @@ #include #include #include -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/uimanager/tests/FabricUIManagerTest.cpp b/ReactCommon/react/renderer/uimanager/tests/FabricUIManagerTest.cpp similarity index 86% rename from ReactCommon/fabric/uimanager/tests/FabricUIManagerTest.cpp rename to ReactCommon/react/renderer/uimanager/tests/FabricUIManagerTest.cpp index 474a8ba295d..de35870cd30 100644 --- a/ReactCommon/fabric/uimanager/tests/FabricUIManagerTest.cpp +++ b/ReactCommon/react/renderer/uimanager/tests/FabricUIManagerTest.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include using namespace facebook::react; diff --git a/packages/react-native-codegen/DEFS.bzl b/packages/react-native-codegen/DEFS.bzl index ade9c179400..5409d6c76b8 100644 --- a/packages/react-native-codegen/DEFS.bzl +++ b/packages/react-native-codegen/DEFS.bzl @@ -201,7 +201,7 @@ def rn_codegen_components( ":{}".format(generate_props_h_name), ":{}".format(generate_shadow_node_h_name), ], - header_namespace = "react/components/{}".format(name), + header_namespace = "react/renderer/components/{}".format(name), exported_headers = { "ComponentDescriptors.h": ":{}".format(generate_component_descriptor_h_name), "EventEmitters.h": ":{}".format(generate_event_emitter_h_name), @@ -238,12 +238,12 @@ def rn_codegen_components( "//xplat/folly:memory", "//xplat/folly:molly", YOGA_CXX_TARGET, - react_native_xplat_target("fabric/debug:debug"), - react_native_xplat_target("fabric/core:core"), - react_native_xplat_target("fabric/graphics:graphics"), - react_native_xplat_target("fabric/components/image:image"), - react_native_xplat_target("fabric/imagemanager:imagemanager"), - react_native_xplat_target("fabric/components/view:view"), + react_native_xplat_target("react/renderer/debug:debug"), + react_native_xplat_target("react/renderer/core:core"), + react_native_xplat_target("react/renderer/graphics:graphics"), + react_native_xplat_target("react/renderer/components/image:image"), + react_native_xplat_target("react/renderer/imagemanager:imagemanager"), + react_native_xplat_target("react/renderer/components/view:view"), ], ) diff --git a/packages/react-native-codegen/buck_tests/emptyFile.cpp b/packages/react-native-codegen/buck_tests/emptyFile.cpp index 2a994074b3d..a68c679491a 100644 --- a/packages/react-native-codegen/buck_tests/emptyFile.cpp +++ b/packages/react-native-codegen/buck_tests/emptyFile.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import +#import // TODO: Import every prop and event to asset they're generated diff --git a/packages/react-native-codegen/buck_tests/emptyFile.mm b/packages/react-native-codegen/buck_tests/emptyFile.mm index 929a261b27c..a7713b5da4d 100644 --- a/packages/react-native-codegen/buck_tests/emptyFile.mm +++ b/packages/react-native-codegen/buck_tests/emptyFile.mm @@ -5,8 +5,8 @@ * LICENSE file in the root directory of this source tree. */ -#import -#import +#import +#import #import #import diff --git a/packages/react-native-codegen/src/generators/components/CppHelpers.js b/packages/react-native-codegen/src/generators/components/CppHelpers.js index 75b259ab84f..f6e7077a416 100644 --- a/packages/react-native-codegen/src/generators/components/CppHelpers.js +++ b/packages/react-native-codegen/src/generators/components/CppHelpers.js @@ -67,7 +67,7 @@ function getImports(properties: $ReadOnlyArray): Set { case 'EdgeInsetsPrimitive': return; case 'ImageSourcePrimitive': - imports.add('#include '); + imports.add('#include '); return; default: (name: empty); diff --git a/packages/react-native-codegen/src/generators/components/GenerateComponentDescriptorH.js b/packages/react-native-codegen/src/generators/components/GenerateComponentDescriptorH.js index 2bd7a7817d2..9fb720b0156 100644 --- a/packages/react-native-codegen/src/generators/components/GenerateComponentDescriptorH.js +++ b/packages/react-native-codegen/src/generators/components/GenerateComponentDescriptorH.js @@ -25,8 +25,8 @@ const template = ` #pragma once -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/packages/react-native-codegen/src/generators/components/GenerateEventEmitterCpp.js b/packages/react-native-codegen/src/generators/components/GenerateEventEmitterCpp.js index 052315baaf4..ecf717e7d6d 100644 --- a/packages/react-native-codegen/src/generators/components/GenerateEventEmitterCpp.js +++ b/packages/react-native-codegen/src/generators/components/GenerateEventEmitterCpp.js @@ -34,7 +34,7 @@ const template = ` * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { diff --git a/packages/react-native-codegen/src/generators/components/GenerateEventEmitterH.js b/packages/react-native-codegen/src/generators/components/GenerateEventEmitterH.js index 6c90069677f..6d687cbb81f 100644 --- a/packages/react-native-codegen/src/generators/components/GenerateEventEmitterH.js +++ b/packages/react-native-codegen/src/generators/components/GenerateEventEmitterH.js @@ -43,7 +43,7 @@ const template = ` */ #pragma once -#include +#include namespace facebook { namespace react { diff --git a/packages/react-native-codegen/src/generators/components/GeneratePropsCpp.js b/packages/react-native-codegen/src/generators/components/GeneratePropsCpp.js index b6b03eb7d36..287a51d3c11 100644 --- a/packages/react-native-codegen/src/generators/components/GeneratePropsCpp.js +++ b/packages/react-native-codegen/src/generators/components/GeneratePropsCpp.js @@ -24,7 +24,7 @@ const template = ` * LICENSE file in the root directory of this source tree. */ -#include +#include ::_IMPORTS_:: namespace facebook { @@ -87,7 +87,7 @@ module.exports = { ): FilesOutput { const fileName = 'Props.cpp'; const allImports: Set = new Set([ - '#include ', + '#include ', ]); const componentProps = Object.keys(schema.modules) diff --git a/packages/react-native-codegen/src/generators/components/GeneratePropsH.js b/packages/react-native-codegen/src/generators/components/GeneratePropsH.js index a7ff3f9d77c..8e2b724a2bd 100644 --- a/packages/react-native-codegen/src/generators/components/GeneratePropsH.js +++ b/packages/react-native-codegen/src/generators/components/GeneratePropsH.js @@ -467,7 +467,9 @@ function getExtendsImports( case 'ReactNativeBuiltInType': switch (extendProps.knownTypeName) { case 'ReactNativeCoreViewProps': - imports.add('#include '); + imports.add( + '#include ', + ); return; default: (extendProps.knownTypeName: empty); @@ -490,16 +492,16 @@ function getLocalImports( function addImportsForNativeName(name) { switch (name) { case 'ColorPrimitive': - imports.add('#include '); + imports.add('#include '); return; case 'ImageSourcePrimitive': - imports.add('#include '); + imports.add('#include '); return; case 'PointPrimitive': - imports.add('#include '); + imports.add('#include '); return; case 'EdgeInsetsPrimitive': - imports.add('#include '); + imports.add('#include '); return; default: (name: empty); @@ -540,7 +542,7 @@ function getLocalImports( } if (typeAnnotation.type === 'ObjectTypeAnnotation') { - imports.add('#include '); + imports.add('#include '); const objectImports = getImports(typeAnnotation.properties); const localImports = getLocalImports(typeAnnotation.properties); objectImports.forEach(imports.add, imports); diff --git a/packages/react-native-codegen/src/generators/components/GenerateShadowNodeCpp.js b/packages/react-native-codegen/src/generators/components/GenerateShadowNodeCpp.js index 8784849619f..4968da1f466 100644 --- a/packages/react-native-codegen/src/generators/components/GenerateShadowNodeCpp.js +++ b/packages/react-native-codegen/src/generators/components/GenerateShadowNodeCpp.js @@ -23,7 +23,7 @@ const template = ` * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { diff --git a/packages/react-native-codegen/src/generators/components/GenerateShadowNodeH.js b/packages/react-native-codegen/src/generators/components/GenerateShadowNodeH.js index 84c22bc3190..a020896ff9d 100644 --- a/packages/react-native-codegen/src/generators/components/GenerateShadowNodeH.js +++ b/packages/react-native-codegen/src/generators/components/GenerateShadowNodeH.js @@ -25,8 +25,8 @@ const template = ` #pragma once -::_IMPORTS_::#include -#include +::_IMPORTS_::#include +#include namespace facebook { namespace react { @@ -94,7 +94,7 @@ module.exports = { .filter(Boolean) .join('\n\n'); - const eventEmitterImport = `#include \n`; + const eventEmitterImport = `#include \n`; const replacedTemplate = template .replace(/::_COMPONENT_CLASSES_::/g, moduleResults) diff --git a/packages/react-native-codegen/src/generators/components/GenerateTests.js b/packages/react-native-codegen/src/generators/components/GenerateTests.js index 25c0cfa59a9..75ea5ae8fda 100644 --- a/packages/react-native-codegen/src/generators/components/GenerateTests.js +++ b/packages/react-native-codegen/src/generators/components/GenerateTests.js @@ -32,7 +32,7 @@ const fileTemplate = ` */ #include -#include +#include ::_IMPORTS_:: using namespace facebook::react; @@ -140,9 +140,9 @@ module.exports = { ): FilesOutput { const fileName = 'Tests.cpp'; const allImports = new Set([ - '#include ', - '#include ', - '#include ', + '#include ', + '#include ', + '#include ', ]); const componentTests = Object.keys(schema.modules) diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateComponentDescriptorH-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateComponentDescriptorH-test.js.snap index e23ae48953f..c75e3cd513c 100644 --- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateComponentDescriptorH-test.js.snap +++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateComponentDescriptorH-test.js.snap @@ -12,8 +12,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -38,8 +38,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -64,8 +64,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -90,8 +90,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -116,8 +116,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -142,8 +142,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -168,8 +168,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -194,8 +194,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -220,8 +220,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -246,8 +246,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -272,8 +272,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -298,8 +298,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -324,8 +324,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -350,8 +350,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -376,8 +376,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -402,8 +402,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -428,8 +428,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -454,8 +454,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -480,8 +480,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -506,8 +506,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -532,8 +532,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -558,8 +558,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -584,8 +584,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -610,8 +610,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -636,8 +636,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -663,8 +663,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateEventEmitterCpp-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateEventEmitterCpp-test.js.snap index c70dc86ce28..a8c65fe6224 100644 --- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateEventEmitterCpp-test.js.snap +++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateEventEmitterCpp-test.js.snap @@ -10,7 +10,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -33,7 +33,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -56,7 +56,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -79,7 +79,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -102,7 +102,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -125,7 +125,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -148,7 +148,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -171,7 +171,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -212,7 +212,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -261,7 +261,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -297,7 +297,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -320,7 +320,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -343,7 +343,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -366,7 +366,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -389,7 +389,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -412,7 +412,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -435,7 +435,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -458,7 +458,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -487,7 +487,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -510,7 +510,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -533,7 +533,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -556,7 +556,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -579,7 +579,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -602,7 +602,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -625,7 +625,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -649,7 +649,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateEventEmitterH-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateEventEmitterH-test.js.snap index 229c08c3f15..18c1ccc473f 100644 --- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateEventEmitterH-test.js.snap +++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateEventEmitterH-test.js.snap @@ -11,7 +11,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -35,7 +35,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -59,7 +59,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -83,7 +83,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -107,7 +107,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -131,7 +131,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -155,7 +155,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -179,7 +179,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -222,7 +222,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -284,7 +284,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -323,7 +323,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -347,7 +347,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -371,7 +371,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -395,7 +395,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -419,7 +419,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -443,7 +443,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -467,7 +467,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -491,7 +491,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -524,7 +524,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -548,7 +548,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -572,7 +572,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -596,7 +596,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -620,7 +620,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -644,7 +644,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -668,7 +668,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -692,7 +692,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsCpp-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsCpp-test.js.snap index 27ce7d45df9..84911ff29e3 100644 --- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsCpp-test.js.snap +++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsCpp-test.js.snap @@ -10,9 +10,9 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include -#include -#include +#include +#include +#include namespace facebook { namespace react { @@ -50,8 +50,8 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include -#include +#include +#include namespace facebook { namespace react { @@ -79,8 +79,8 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include -#include +#include +#include namespace facebook { namespace react { @@ -108,8 +108,8 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include -#include +#include +#include namespace facebook { namespace react { @@ -137,8 +137,8 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include -#include +#include +#include namespace facebook { namespace react { @@ -166,8 +166,8 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include -#include +#include +#include namespace facebook { namespace react { @@ -195,8 +195,8 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include -#include +#include +#include namespace facebook { namespace react { @@ -229,8 +229,8 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include -#include +#include +#include namespace facebook { namespace react { @@ -258,8 +258,8 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include -#include +#include +#include namespace facebook { namespace react { @@ -287,8 +287,8 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include -#include +#include +#include namespace facebook { namespace react { @@ -316,8 +316,8 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include -#include +#include +#include namespace facebook { namespace react { @@ -345,8 +345,8 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include -#include +#include +#include namespace facebook { namespace react { @@ -369,8 +369,8 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include -#include +#include +#include namespace facebook { namespace react { @@ -403,9 +403,9 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include -#include -#include +#include +#include +#include namespace facebook { namespace react { @@ -433,8 +433,8 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include -#include +#include +#include namespace facebook { namespace react { @@ -462,8 +462,8 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include -#include +#include +#include namespace facebook { namespace react { @@ -491,8 +491,8 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include -#include +#include +#include namespace facebook { namespace react { @@ -522,8 +522,8 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include -#include +#include +#include namespace facebook { namespace react { @@ -551,9 +551,9 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include -#include -#include +#include +#include +#include namespace facebook { namespace react { @@ -584,8 +584,8 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include -#include +#include +#include namespace facebook { namespace react { @@ -613,9 +613,9 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include -#include -#include +#include +#include +#include namespace facebook { namespace react { @@ -643,8 +643,8 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include -#include +#include +#include namespace facebook { namespace react { @@ -672,8 +672,8 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include -#include +#include +#include namespace facebook { namespace react { @@ -701,8 +701,8 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include -#include +#include +#include namespace facebook { namespace react { @@ -731,8 +731,8 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include -#include +#include +#include namespace facebook { namespace react { @@ -766,8 +766,8 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsH-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsH-test.js.snap index 3071e0e70ed..9129a7df326 100644 --- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsH-test.js.snap +++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GeneratePropsH-test.js.snap @@ -12,10 +12,10 @@ Map { #pragma once #include -#include -#include -#include -#include +#include +#include +#include +#include #include namespace facebook { @@ -224,11 +224,11 @@ Map { */ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include namespace facebook { @@ -297,7 +297,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -329,8 +329,8 @@ Map { */ #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -362,7 +362,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -394,7 +394,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -426,7 +426,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -463,7 +463,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -495,7 +495,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -527,7 +527,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -559,7 +559,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -615,7 +615,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -652,8 +652,8 @@ Map { */ #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -685,8 +685,8 @@ Map { */ #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -718,7 +718,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -777,7 +777,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -811,7 +811,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -843,10 +843,10 @@ Map { */ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include namespace facebook { namespace react { @@ -881,7 +881,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -913,12 +913,12 @@ Map { */ #pragma once -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include namespace facebook { @@ -1165,8 +1165,8 @@ Map { */ #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -1198,7 +1198,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -1248,7 +1248,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -1281,7 +1281,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { @@ -1323,7 +1323,7 @@ Map { */ #pragma once -#include +#include namespace facebook { namespace react { diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateShadowNodeCpp-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateShadowNodeCpp-test.js.snap index 22043570482..94ce4a3e64a 100644 --- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateShadowNodeCpp-test.js.snap +++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateShadowNodeCpp-test.js.snap @@ -10,7 +10,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -33,7 +33,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -56,7 +56,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -79,7 +79,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -102,7 +102,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -125,7 +125,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -148,7 +148,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -171,7 +171,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -194,7 +194,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -217,7 +217,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -240,7 +240,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -263,7 +263,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -286,7 +286,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -309,7 +309,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -332,7 +332,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -355,7 +355,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -378,7 +378,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -401,7 +401,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -424,7 +424,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -447,7 +447,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -470,7 +470,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -493,7 +493,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -516,7 +516,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -539,7 +539,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -562,7 +562,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { @@ -586,7 +586,7 @@ Map { * LICENSE file in the root directory of this source tree. */ -#include +#include namespace facebook { namespace react { diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateShadowNodeH-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateShadowNodeH-test.js.snap index 5327702796d..ff15cf0d55a 100644 --- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateShadowNodeH-test.js.snap +++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateShadowNodeH-test.js.snap @@ -12,8 +12,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -45,8 +45,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -78,8 +78,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -111,8 +111,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -144,8 +144,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -177,8 +177,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -210,8 +210,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -243,9 +243,9 @@ Map { #pragma once -#include -#include -#include +#include +#include +#include namespace facebook { namespace react { @@ -278,9 +278,9 @@ Map { #pragma once -#include -#include -#include +#include +#include +#include namespace facebook { namespace react { @@ -313,8 +313,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -339,8 +339,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -372,8 +372,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -405,8 +405,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -438,8 +438,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -471,8 +471,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -504,8 +504,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -537,8 +537,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -570,8 +570,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -596,8 +596,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -629,8 +629,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -662,8 +662,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -695,8 +695,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -728,8 +728,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -761,8 +761,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -794,8 +794,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { @@ -836,8 +836,8 @@ Map { #pragma once -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateTests-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateTests-test.js.snap index 8f73a0c8250..d08b35e6fa0 100644 --- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateTests-test.js.snap +++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateTests-test.js.snap @@ -10,11 +10,11 @@ Map { */ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include using namespace facebook::react; @@ -39,10 +39,10 @@ Map { */ #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace facebook::react; @@ -67,10 +67,10 @@ Map { */ #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace facebook::react; @@ -104,10 +104,10 @@ Map { */ #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace facebook::react; @@ -141,10 +141,10 @@ Map { */ #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace facebook::react; @@ -169,10 +169,10 @@ Map { */ #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace facebook::react; @@ -206,10 +206,10 @@ Map { */ #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace facebook::react; @@ -234,10 +234,10 @@ Map { */ #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace facebook::react; @@ -271,10 +271,10 @@ Map { */ #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace facebook::react; @@ -308,10 +308,10 @@ Map { */ #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace facebook::react; @@ -336,10 +336,10 @@ Map { */ #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace facebook::react; @@ -364,10 +364,10 @@ Map { */ #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace facebook::react; @@ -392,10 +392,10 @@ Map { */ #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace facebook::react; @@ -474,11 +474,11 @@ Map { */ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include using namespace facebook::react; @@ -512,10 +512,10 @@ Map { */ #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace facebook::react; @@ -540,10 +540,10 @@ Map { */ #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace facebook::react; @@ -568,10 +568,10 @@ Map { */ #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace facebook::react; @@ -596,10 +596,10 @@ Map { */ #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace facebook::react; @@ -633,11 +633,11 @@ Map { */ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include using namespace facebook::react; @@ -698,10 +698,10 @@ Map { */ #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace facebook::react; @@ -726,11 +726,11 @@ Map { */ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include using namespace facebook::react; @@ -755,10 +755,10 @@ Map { */ #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace facebook::react; @@ -792,10 +792,10 @@ Map { */ #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace facebook::react; @@ -847,10 +847,10 @@ Map { */ #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace facebook::react; @@ -893,10 +893,10 @@ Map { */ #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace facebook::react; @@ -948,10 +948,10 @@ Map { */ #include -#include -#include -#include -#include +#include +#include +#include +#include using namespace facebook::react;