Fabric: `view` module was moved to `components` subdirectory

Summary: @public Trivial. We move all components into `/components/` subdirectory. Reviewed By: mdvacca Differential Revision: D8757011 fbshipit-source-id: 6a7da09e01184d41d37a1e1782c20d3c79371ae3
2018-07-15 16:46:31 -07:00 · 2018-07-15 16:46:31 -07:00 · 57b0e68a2c
parent b42e674c2f
commit 57b0e68a2c
55 changed files with 64 additions and 62 deletions
--- a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h
+++ b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h
@ -12,7 +12,7 @@
 #import <fabric/core/EventEmitter.h>
 #import <fabric/core/LayoutMetrics.h>
 #import <fabric/core/Props.h>
-#import <fabric/view/ViewEventEmitter.h>
+#import <fabric/components/view/ViewEventEmitter.h>

 NS_ASSUME_NONNULL_BEGIN

--- a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
@ -7,8 +7,8 @@

 #import "RCTViewComponentView.h"

-#import <fabric/view/ViewProps.h>
-#import <fabric/view/ViewEventEmitter.h>
+#import <fabric/components/view/ViewProps.h>
+#import <fabric/components/view/ViewEventEmitter.h>

 #import "RCTConversions.h"

--- a/React/Fabric/RCTConversions.h
+++ b/React/Fabric/RCTConversions.h
@ -7,9 +7,9 @@

 #import <UIKit/UIKit.h>

+#import <fabric/components/view/primitives.h>
 #import <fabric/graphics/Color.h>
 #import <fabric/graphics/Geometry.h>
-#import <fabric/view/primitives.h>

 inline NSString *_Nullable RCTNSStringFromString(const std::string &string, const NSStringEncoding &encoding = NSUTF8StringEncoding) {
  return [NSString stringWithCString:string.c_str() encoding:encoding];
--- a/React/Fabric/RCTSurfaceTouchHandler.mm
+++ b/React/Fabric/RCTSurfaceTouchHandler.mm
@ -8,7 +8,7 @@
 #import "RCTSurfaceTouchHandler.h"

 #import <UIKit/UIGestureRecognizerSubclass.h>
-#import <fabric/view/ViewEventEmitter.h>
+#import <fabric/components/view/ViewEventEmitter.h>
 #import <React/RCTUtils.h>
 #import <React/RCTViewComponentView.h>

--- a/ReactCommon/fabric/activityindicator/ActivityIndicatorViewProps.h
+++ b/ReactCommon/fabric/activityindicator/ActivityIndicatorViewProps.h
@ -6,8 +6,8 @@
 */

 #include <fabric/activityindicator/primitives.h>
+#include <fabric/components/view/ViewProps.h>
 #include <fabric/graphics/Color.h>
-#include <fabric/view/ViewProps.h>

 namespace facebook {
 namespace react {
--- a/ReactCommon/fabric/activityindicator/ActivityIndicatorViewShadowNode.h
+++ b/ReactCommon/fabric/activityindicator/ActivityIndicatorViewShadowNode.h
@ -8,7 +8,7 @@
 #pragma once

 #include <fabric/activityindicator/ActivityIndicatorViewProps.h>
-#include <fabric/view/ConcreteViewShadowNode.h>
+#include <fabric/components/view/ConcreteViewShadowNode.h>

 namespace facebook {
 namespace react {
--- a/ReactCommon/fabric/activityindicator/BUCK
+++ b/ReactCommon/fabric/activityindicator/BUCK
@ -46,7 +46,7 @@ rn_xplat_cxx_library(
        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/view:view"),
+        react_native_xplat_target("fabric/components/view:view"),
    ],
 )

--- a/ReactCommon/fabric/components/image/BUCK
+++ b/ReactCommon/fabric/components/image/BUCK
@ -58,7 +58,7 @@ rn_xplat_cxx_library(
        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/view:view"),
+        react_native_xplat_target("fabric/components/view:view"),
    ],
 )

--- a/ReactCommon/fabric/components/image/ImageEventEmitter.h
+++ b/ReactCommon/fabric/components/image/ImageEventEmitter.h
@ -6,7 +6,7 @@
 */
 #pragma once

-#include <fabric/view/ViewEventEmitter.h>
+#include <fabric/components/view/ViewEventEmitter.h>

 namespace facebook {
 namespace react {
--- a/ReactCommon/fabric/components/image/ImageProps.h
+++ b/ReactCommon/fabric/components/image/ImageProps.h
@ -5,9 +5,9 @@
 * LICENSE file in the root directory of this source tree.
 */

+#include <fabric/components/view/ViewProps.h>
 #include <fabric/graphics/Color.h>
 #include <fabric/imagemanager/primitives.h>
-#include <fabric/view/ViewProps.h>

 namespace facebook {
 namespace react {
--- a/ReactCommon/fabric/components/image/ImageShadowNode.h
+++ b/ReactCommon/fabric/components/image/ImageShadowNode.h
@ -9,9 +9,9 @@

 #include <fabric/components/image/ImageEventEmitter.h>
 #include <fabric/components/image/ImageProps.h>
+#include <fabric/components/view/ConcreteViewShadowNode.h>
 #include <fabric/imagemanager/ImageManager.h>
 #include <fabric/imagemanager/primitives.h>
-#include <fabric/view/ConcreteViewShadowNode.h>

 namespace facebook {
 namespace react {
--- a/ReactCommon/fabric/components/scrollview/BUCK
+++ b/ReactCommon/fabric/components/scrollview/BUCK
@ -60,7 +60,7 @@ rn_xplat_cxx_library(
        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/view:view"),
+        react_native_xplat_target("fabric/components/view:view"),
    ],
 )

--- a/ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.h
+++ b/ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.h
@ -8,9 +8,9 @@

 #include <memory>

+#include <fabric/components/view/ViewEventEmitter.h>
 #include <fabric/graphics/Geometry.h>
 #include <fabric/core/EventEmitter.h>
-#include <fabric/view/ViewEventEmitter.h>

 #include <folly/dynamic.h>

--- a/ReactCommon/fabric/components/scrollview/ScrollViewProps.h
+++ b/ReactCommon/fabric/components/scrollview/ScrollViewProps.h
@ -8,7 +8,7 @@
 #pragma once

 #include <fabric/components/scrollview/primitives.h>
-#include <fabric/view/ViewProps.h>
+#include <fabric/components/view/ViewProps.h>

 namespace facebook {
 namespace react {
--- a/ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.h
+++ b/ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.h
@ -11,8 +11,8 @@

 #include <fabric/components/scrollview/ScrollViewEventEmitter.h>
 #include <fabric/components/scrollview/ScrollViewProps.h>
+#include <fabric/components/view/ConcreteViewShadowNode.h>
 #include <fabric/core/LayoutContext.h>
-#include <fabric/view/ConcreteViewShadowNode.h>

 namespace facebook {
 namespace react {
--- a/ReactCommon/fabric/components/switch/BUCK
+++ b/ReactCommon/fabric/components/switch/BUCK
@ -56,7 +56,7 @@ rn_xplat_cxx_library(
        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/view:view"),
+        react_native_xplat_target("fabric/components/view:view"),
    ],
 )

--- a/ReactCommon/fabric/components/switch/SwitchEventEmitter.h
+++ b/ReactCommon/fabric/components/switch/SwitchEventEmitter.h
@ -6,7 +6,7 @@
 */
 #pragma once

-#include <fabric/view/ViewEventEmitter.h>
+#include <fabric/components/view/ViewEventEmitter.h>

 namespace facebook {
 namespace react {
--- a/ReactCommon/fabric/components/switch/SwitchProps.h
+++ b/ReactCommon/fabric/components/switch/SwitchProps.h
@ -5,8 +5,8 @@
 * LICENSE file in the root directory of this source tree.
 */

+#include <fabric/components/view/ViewProps.h>
 #include <fabric/graphics/Color.h>
-#include <fabric/view/ViewProps.h>

 namespace facebook {
 namespace react {
--- a/ReactCommon/fabric/components/switch/SwitchShadowNode.h
+++ b/ReactCommon/fabric/components/switch/SwitchShadowNode.h
@ -9,7 +9,7 @@

 #include <fabric/components/switch/SwitchEventEmitter.h>
 #include <fabric/components/switch/SwitchProps.h>
-#include <fabric/view/ConcreteViewShadowNode.h>
+#include <fabric/components/view/ConcreteViewShadowNode.h>

 namespace facebook {
 namespace react {
--- a/ReactCommon/fabric/components/text/BUCK
+++ b/ReactCommon/fabric/components/text/BUCK
@ -66,7 +66,7 @@ rn_xplat_cxx_library(
        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/view:view"),
+        react_native_xplat_target("fabric/components/view:view"),
    ],
 )

--- a/ReactCommon/fabric/components/text/paragraph/ParagraphProps.h
+++ b/ReactCommon/fabric/components/text/paragraph/ParagraphProps.h
@ -12,8 +12,8 @@

 #include <fabric/attributedstring/ParagraphAttributes.h>
 #include <fabric/components/text/BaseTextProps.h>
+#include <fabric/components/view/ViewProps.h>
 #include <fabric/core/Props.h>
-#include <fabric/view/ViewProps.h>

 namespace facebook {
 namespace react {
--- a/ReactCommon/fabric/components/text/paragraph/ParagraphShadowNode.h
+++ b/ReactCommon/fabric/components/text/paragraph/ParagraphShadowNode.h
@ -9,11 +9,11 @@

 #include <fabric/components/text/ParagraphProps.h>
 #include <fabric/components/text/TextShadowNode.h>
+#include <fabric/components/view/ConcreteViewShadowNode.h>
 #include <fabric/core/ConcreteShadowNode.h>
 #include <fabric/core/ShadowNode.h>
 #include <fabric/core/LayoutContext.h>
 #include <fabric/textlayoutmanager/TextLayoutManager.h>
-#include <fabric/view/ConcreteViewShadowNode.h>
 #include <folly/Optional.h>

 namespace facebook {
--- a/ReactCommon/fabric/components/view/BUCK
+++ b/ReactCommon/fabric/components/view/BUCK
@ -31,7 +31,7 @@ rn_xplat_cxx_library(
            ("root", "*.h"),
            ("yoga", "*.h"),
        ],
-        prefix = "fabric/view",
+        prefix = "fabric/components/view",
    ),
    compiler_flags = [
        "-fexceptions",
--- a/ReactCommon/fabric/components/view/ConcreteViewShadowNode.h
+++ b/ReactCommon/fabric/components/view/ConcreteViewShadowNode.h
@ -7,14 +7,14 @@

 #pragma once

+#include <fabric/components/view/AccessibleShadowNode.h>
+#include <fabric/components/view/ViewEventEmitter.h>
+#include <fabric/components/view/ViewProps.h>
+#include <fabric/components/view/YogaLayoutableShadowNode.h>
 #include <fabric/core/ConcreteShadowNode.h>
 #include <fabric/core/LayoutableShadowNode.h>
 #include <fabric/core/ShadowNode.h>
 #include <fabric/debug/DebugStringConvertibleItem.h>
-#include <fabric/view/AccessibleShadowNode.h>
-#include <fabric/view/ViewEventEmitter.h>
-#include <fabric/view/ViewProps.h>
-#include <fabric/view/YogaLayoutableShadowNode.h>

 namespace facebook {
 namespace react {
--- a/ReactCommon/fabric/components/view/ViewComponentDescriptor.h
+++ b/ReactCommon/fabric/components/view/ViewComponentDescriptor.h
@ -7,8 +7,8 @@

 #pragma once

+#include <fabric/components/view/ViewShadowNode.h>
 #include <fabric/core/ConcreteComponentDescriptor.h>
-#include <fabric/view/ViewShadowNode.h>

 namespace facebook {
 namespace react {
--- a/ReactCommon/fabric/components/view/ViewEventEmitter.cpp
+++ b/ReactCommon/fabric/components/view/ViewEventEmitter.cpp
--- a/ReactCommon/fabric/components/view/ViewEventEmitter.h
+++ b/ReactCommon/fabric/components/view/ViewEventEmitter.h
--- a/ReactCommon/fabric/components/view/ViewProps.cpp
+++ b/ReactCommon/fabric/components/view/ViewProps.cpp
@ -7,10 +7,10 @@

 #include "ViewProps.h"

+#include <fabric/components/view/conversions.h>
 #include <fabric/core/propsConversions.h>
 #include <fabric/debug/debugStringConvertibleUtils.h>
 #include <fabric/graphics/conversions.h>
-#include <fabric/view/conversions.h>

 namespace facebook {
 namespace react {
--- a/ReactCommon/fabric/components/view/ViewProps.h
+++ b/ReactCommon/fabric/components/view/ViewProps.h
@ -7,12 +7,12 @@

 #pragma once

+#include <fabric/components/view/AccessibilityProps.h>
+#include <fabric/components/view/primitives.h>
+#include <fabric/components/view/YogaStylableProps.h>
 #include <fabric/core/Props.h>
 #include <fabric/graphics/Geometry.h>
 #include <fabric/graphics/Color.h>
-#include <fabric/view/AccessibilityProps.h>
-#include <fabric/view/primitives.h>
-#include <fabric/view/YogaStylableProps.h>

 namespace facebook {
 namespace react {
--- a/ReactCommon/fabric/components/view/ViewShadowNode.cpp
+++ b/ReactCommon/fabric/components/view/ViewShadowNode.cpp
--- a/ReactCommon/fabric/components/view/ViewShadowNode.h
+++ b/ReactCommon/fabric/components/view/ViewShadowNode.h
@ -9,8 +9,8 @@

 #include <memory>

-#include <fabric/view/ViewProps.h>
-#include <fabric/view/ConcreteViewShadowNode.h>
+#include <fabric/components/view/ViewProps.h>
+#include <fabric/components/view/ConcreteViewShadowNode.h>

 namespace facebook {
 namespace react {
--- a/ReactCommon/fabric/components/view/accessibility/AccessibilityPrimitives.h
+++ b/ReactCommon/fabric/components/view/accessibility/AccessibilityPrimitives.h
@ -7,6 +7,8 @@

 #pragma once

+#include <cinttypes>
+
 namespace facebook {
 namespace react {

--- a/ReactCommon/fabric/components/view/accessibility/AccessibilityProps.cpp
+++ b/ReactCommon/fabric/components/view/accessibility/AccessibilityProps.cpp
--- a/ReactCommon/fabric/components/view/accessibility/AccessibilityProps.h
+++ b/ReactCommon/fabric/components/view/accessibility/AccessibilityProps.h
@ -7,10 +7,10 @@

 #pragma once

+#include <fabric/components/view/AccessibilityPrimitives.h>
 #include <fabric/core/Props.h>
 #include <fabric/core/ReactPrimitives.h>
 #include <fabric/debug/DebugStringConvertible.h>
-#include <fabric/view/AccessibilityPrimitives.h>

 namespace facebook {
 namespace react {
--- a/ReactCommon/fabric/components/view/accessibility/AccessibleShadowNode.cpp
+++ b/ReactCommon/fabric/components/view/accessibility/AccessibleShadowNode.cpp
--- a/ReactCommon/fabric/components/view/accessibility/AccessibleShadowNode.h
+++ b/ReactCommon/fabric/components/view/accessibility/AccessibleShadowNode.h
@ -9,8 +9,8 @@

 #include <memory>

+#include <fabric/components/view/AccessibilityProps.h>
 #include <fabric/core/ShadowNode.h>
-#include <fabric/view/AccessibilityProps.h>

 namespace facebook {
 namespace react {
--- a/ReactCommon/fabric/components/view/accessibility/accessibilityValuesConversions.cpp
+++ b/ReactCommon/fabric/components/view/accessibility/accessibilityValuesConversions.cpp
--- a/ReactCommon/fabric/components/view/accessibility/accessibilityValuesConversions.h
+++ b/ReactCommon/fabric/components/view/accessibility/accessibilityValuesConversions.h
@ -7,10 +7,9 @@

 #pragma once

+#include <fabric/components/view/AccessibilityPrimitives.h>
 #include <folly/dynamic.h>

-#include <fabric/view/AccessibilityPrimitives.h>
-
 namespace facebook {
 namespace react {

--- a/ReactCommon/fabric/components/view/conversions.h
+++ b/ReactCommon/fabric/components/view/conversions.h
@ -7,9 +7,9 @@

 #pragma once

+#include <fabric/components/view/primitives.h>
 #include <fabric/core/LayoutMetrics.h>
 #include <fabric/graphics/Geometry.h>
-#include <fabric/view/primitives.h>
 #include <folly/dynamic.h>
 #include <folly/Conv.h>
 #include <yoga/Yoga.h>
--- a/ReactCommon/fabric/components/view/primitives.h
+++ b/ReactCommon/fabric/components/view/primitives.h
@ -8,6 +8,7 @@
 #pragma once

 #include <cmath>
+#include <fabric/graphics/Geometry.h>

 namespace facebook {
 namespace react {
--- a/ReactCommon/fabric/components/view/propsConversions.h
+++ b/ReactCommon/fabric/components/view/propsConversions.h
@ -7,8 +7,8 @@

 #pragma once

+#include <fabric/components/view/conversions.h>
 #include <fabric/core/propsConversions.h>
-#include <fabric/view/conversions.h>

 namespace facebook {
 namespace react {
--- a/ReactCommon/fabric/components/view/root/RootProps.cpp
+++ b/ReactCommon/fabric/components/view/root/RootProps.cpp
@ -7,8 +7,8 @@

 #include "RootProps.h"

-#include <fabric/view/conversions.h>
-#include <fabric/view/YogaLayoutableShadowNode.h>
+#include <fabric/components/view/conversions.h>
+#include <fabric/components/view/YogaLayoutableShadowNode.h>

 namespace facebook {
 namespace react {
--- a/ReactCommon/fabric/components/view/root/RootProps.h
+++ b/ReactCommon/fabric/components/view/root/RootProps.h
@ -9,9 +9,9 @@

 #include <memory>

+#include <fabric/components/view/ViewProps.h>
 #include <fabric/core/LayoutConstraints.h>
 #include <fabric/core/LayoutContext.h>
-#include <fabric/view/ViewProps.h>

 namespace facebook {
 namespace react {
--- a/ReactCommon/fabric/components/view/root/RootShadowNode.cpp
+++ b/ReactCommon/fabric/components/view/root/RootShadowNode.cpp
@ -7,7 +7,7 @@

 #include "RootShadowNode.h"

-#include <fabric/view/conversions.h>
+#include <fabric/components/view/conversions.h>

 namespace facebook {
 namespace react {
--- a/ReactCommon/fabric/components/view/root/RootShadowNode.h
+++ b/ReactCommon/fabric/components/view/root/RootShadowNode.h
@ -9,9 +9,9 @@

 #include <memory>

+#include <fabric/components/view/RootProps.h>
+#include <fabric/components/view/ConcreteViewShadowNode.h>
 #include <fabric/core/LayoutContext.h>
-#include <fabric/view/RootProps.h>
-#include <fabric/view/ConcreteViewShadowNode.h>

 namespace facebook {
 namespace react {
--- a/ReactCommon/fabric/components/view/tests/ViewTest.cpp
+++ b/ReactCommon/fabric/components/view/tests/ViewTest.cpp
@ -7,7 +7,7 @@

 #include <memory>

-#include <fabric/view/ViewComponentDescriptor.h>
+#include <fabric/components/view/ViewComponentDescriptor.h>
 #include <gtest/gtest.h>

 using namespace facebook::react;
--- a/ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.cpp
+++ b/ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.cpp
@ -10,10 +10,10 @@
 #include <algorithm>
 #include <memory>

+#include <fabric/components/view/conversions.h>
 #include <fabric/core/LayoutContext.h>
 #include <fabric/core/LayoutConstraints.h>
 #include <fabric/debug/DebugStringConvertibleItem.h>
-#include <fabric/view/conversions.h>
 #include <yoga/Yoga.h>

 namespace facebook {
--- a/ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.h
+++ b/ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.h
@ -12,11 +12,11 @@

 #include <yoga/YGNode.h>

+#include <fabric/components/view/YogaStylableProps.h>
 #include <fabric/core/LayoutableShadowNode.h>
 #include <fabric/core/Sealable.h>
 #include <fabric/core/ShadowNode.h>
 #include <fabric/debug/DebugStringConvertible.h>
-#include <fabric/view/YogaStylableProps.h>

 namespace facebook {
 namespace react {
--- a/ReactCommon/fabric/components/view/yoga/YogaStylableProps.cpp
+++ b/ReactCommon/fabric/components/view/yoga/YogaStylableProps.cpp
@ -7,9 +7,9 @@

 #include "YogaStylableProps.h"

-#include <fabric/view/conversions.h>
+#include <fabric/components/view/conversions.h>
 #include <fabric/core/propsConversions.h>
-#include <fabric/view/propsConversions.h>
+#include <fabric/components/view/propsConversions.h>
 #include <fabric/debug/debugStringConvertibleUtils.h>
 #include <yoga/YGNode.h>
 #include <yoga/Yoga.h>
--- a/ReactCommon/fabric/components/view/yoga/YogaStylableProps.h
+++ b/ReactCommon/fabric/components/view/yoga/YogaStylableProps.h
--- a/ReactCommon/fabric/uimanager/BUCK
+++ b/ReactCommon/fabric/uimanager/BUCK
@ -60,7 +60,7 @@ rn_xplat_cxx_library(
        react_native_xplat_target("fabric/components/text:text"),
        react_native_xplat_target("fabric/core:core"),
        react_native_xplat_target("fabric/debug:debug"),
-        react_native_xplat_target("fabric/view:view"),
+        react_native_xplat_target("fabric/components/view:view"),
    ],
 )

--- a/ReactCommon/fabric/uimanager/FabricUIManager.cpp
+++ b/ReactCommon/fabric/uimanager/FabricUIManager.cpp
@ -9,13 +9,13 @@

 #include <glog/logging.h>

+#include <fabric/components/view/ViewComponentDescriptor.h>
+#include <fabric/components/view/ViewProps.h>
+#include <fabric/components/view/ViewShadowNode.h>
 #include <fabric/core/componentDescriptor.h>
 #include <fabric/core/LayoutContext.h>
 #include <fabric/debug/DebugStringConvertible.h>
 #include <fabric/debug/DebugStringConvertibleItem.h>
-#include <fabric/view/ViewComponentDescriptor.h>
-#include <fabric/view/ViewProps.h>
-#include <fabric/view/ViewShadowNode.h>

 namespace facebook {
 namespace react {
--- a/ReactCommon/fabric/uimanager/Scheduler.cpp
+++ b/ReactCommon/fabric/uimanager/Scheduler.cpp
@ -9,12 +9,12 @@
 #include <fabric/components/text/ParagraphComponentDescriptor.h>
 #include <fabric/components/text/RawTextComponentDescriptor.h>
 #include <fabric/components/text/TextComponentDescriptor.h>
+#include <fabric/components/view/ViewComponentDescriptor.h>
+#include <fabric/components/view/ViewProps.h>
+#include <fabric/components/view/ViewShadowNode.h>
 #include <fabric/core/LayoutContext.h>
 #include <fabric/uimanager/ComponentDescriptorRegistry.h>
 #include <fabric/uimanager/FabricUIManager.h>
-#include <fabric/view/ViewComponentDescriptor.h>
-#include <fabric/view/ViewProps.h>
-#include <fabric/view/ViewShadowNode.h>

 #include "ComponentDescriptorFactory.h"
 #include "Differentiator.h"
--- a/ReactCommon/fabric/uimanager/Scheduler.h
+++ b/ReactCommon/fabric/uimanager/Scheduler.h
@ -7,6 +7,8 @@

 #include <memory>

+#include <fabric/components/view/ViewShadowNode.h>
+#include <fabric/components/view/RootShadowNode.h>
 #include <fabric/core/ComponentDescriptor.h>
 #include <fabric/core/LayoutConstraints.h>
 #include <fabric/uimanager/ContextContainer.h>
@ -15,8 +17,6 @@
 #include <fabric/uimanager/UIManagerDelegate.h>
 #include <fabric/uimanager/ShadowTree.h>
 #include <fabric/uimanager/ShadowTreeDelegate.h>
-#include <fabric/view/ViewShadowNode.h>
-#include <fabric/view/RootShadowNode.h>

 namespace facebook {
 namespace react {
--- a/ReactCommon/fabric/uimanager/ShadowTree.h
+++ b/ReactCommon/fabric/uimanager/ShadowTree.h
@ -8,11 +8,11 @@
 #include <memory>
 #include <mutex>

+#include <fabric/components/view/RootShadowNode.h>
 #include <fabric/core/LayoutConstraints.h>
 #include <fabric/core/ReactPrimitives.h>
 #include <fabric/core/ShadowNode.h>
 #include <fabric/uimanager/ShadowTreeDelegate.h>
-#include <fabric/view/RootShadowNode.h>

 namespace facebook {
 namespace react {