From 57b0e68a2c965b7e7f0b1278eeb5828282c71f93 Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Sun, 15 Jul 2018 16:46:31 -0700
Subject: [PATCH] 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
---
 .../Mounting/ComponentViews/View/RCTViewComponentView.h   | 2 +-
 .../Mounting/ComponentViews/View/RCTViewComponentView.mm  | 4 ++--
 React/Fabric/RCTConversions.h                             | 2 +-
 React/Fabric/RCTSurfaceTouchHandler.mm                    | 2 +-
 .../fabric/activityindicator/ActivityIndicatorViewProps.h | 2 +-
 .../activityindicator/ActivityIndicatorViewShadowNode.h   | 2 +-
 ReactCommon/fabric/activityindicator/BUCK                 | 2 +-
 ReactCommon/fabric/components/image/BUCK                  | 2 +-
 ReactCommon/fabric/components/image/ImageEventEmitter.h   | 2 +-
 ReactCommon/fabric/components/image/ImageProps.h          | 2 +-
 ReactCommon/fabric/components/image/ImageShadowNode.h     | 2 +-
 ReactCommon/fabric/components/scrollview/BUCK             | 2 +-
 .../fabric/components/scrollview/ScrollViewEventEmitter.h | 2 +-
 .../fabric/components/scrollview/ScrollViewProps.h        | 2 +-
 .../fabric/components/scrollview/ScrollViewShadowNode.h   | 2 +-
 ReactCommon/fabric/components/switch/BUCK                 | 2 +-
 ReactCommon/fabric/components/switch/SwitchEventEmitter.h | 2 +-
 ReactCommon/fabric/components/switch/SwitchProps.h        | 2 +-
 ReactCommon/fabric/components/switch/SwitchShadowNode.h   | 2 +-
 ReactCommon/fabric/components/text/BUCK                   | 2 +-
 .../fabric/components/text/paragraph/ParagraphProps.h     | 2 +-
 .../components/text/paragraph/ParagraphShadowNode.h       | 2 +-
 ReactCommon/fabric/{ => components}/view/BUCK             | 2 +-
 .../fabric/{ => components}/view/ConcreteViewShadowNode.h | 8 ++++----
 .../{ => components}/view/ViewComponentDescriptor.h       | 2 +-
 .../fabric/{ => components}/view/ViewEventEmitter.cpp     | 0
 .../fabric/{ => components}/view/ViewEventEmitter.h       | 0
 ReactCommon/fabric/{ => components}/view/ViewProps.cpp    | 2 +-
 ReactCommon/fabric/{ => components}/view/ViewProps.h      | 6 +++---
 .../fabric/{ => components}/view/ViewShadowNode.cpp       | 0
 ReactCommon/fabric/{ => components}/view/ViewShadowNode.h | 4 ++--
 .../view/accessibility/AccessibilityPrimitives.h          | 2 ++
 .../view/accessibility/AccessibilityProps.cpp             | 0
 .../view/accessibility/AccessibilityProps.h               | 2 +-
 .../view/accessibility/AccessibleShadowNode.cpp           | 0
 .../view/accessibility/AccessibleShadowNode.h             | 2 +-
 .../view/accessibility/accessibilityValuesConversions.cpp | 0
 .../view/accessibility/accessibilityValuesConversions.h   | 3 +--
 ReactCommon/fabric/{ => components}/view/conversions.h    | 2 +-
 ReactCommon/fabric/{ => components}/view/primitives.h     | 1 +
 .../fabric/{ => components}/view/propsConversions.h       | 2 +-
 .../fabric/{ => components}/view/root/RootProps.cpp       | 4 ++--
 ReactCommon/fabric/{ => components}/view/root/RootProps.h | 2 +-
 .../fabric/{ => components}/view/root/RootShadowNode.cpp  | 2 +-
 .../fabric/{ => components}/view/root/RootShadowNode.h    | 4 ++--
 .../fabric/{ => components}/view/tests/ViewTest.cpp       | 2 +-
 .../view/yoga/YogaLayoutableShadowNode.cpp                | 2 +-
 .../{ => components}/view/yoga/YogaLayoutableShadowNode.h | 2 +-
 .../{ => components}/view/yoga/YogaStylableProps.cpp      | 4 ++--
 .../fabric/{ => components}/view/yoga/YogaStylableProps.h | 0
 ReactCommon/fabric/uimanager/BUCK                         | 2 +-
 ReactCommon/fabric/uimanager/FabricUIManager.cpp          | 6 +++---
 ReactCommon/fabric/uimanager/Scheduler.cpp                | 6 +++---
 ReactCommon/fabric/uimanager/Scheduler.h                  | 4 ++--
 ReactCommon/fabric/uimanager/ShadowTree.h                 | 2 +-
 55 files changed, 64 insertions(+), 62 deletions(-)
 rename ReactCommon/fabric/{ => components}/view/BUCK (98%)
 rename ReactCommon/fabric/{ => components}/view/ConcreteViewShadowNode.h (95%)
 rename ReactCommon/fabric/{ => components}/view/ViewComponentDescriptor.h (89%)
 rename ReactCommon/fabric/{ => components}/view/ViewEventEmitter.cpp (100%)
 rename ReactCommon/fabric/{ => components}/view/ViewEventEmitter.h (100%)
 rename ReactCommon/fabric/{ => components}/view/ViewProps.cpp (98%)
 rename ReactCommon/fabric/{ => components}/view/ViewProps.h (90%)
 rename ReactCommon/fabric/{ => components}/view/ViewShadowNode.cpp (100%)
 rename ReactCommon/fabric/{ => components}/view/ViewShadowNode.h (85%)
 rename ReactCommon/fabric/{ => components}/view/accessibility/AccessibilityPrimitives.h (97%)
 rename ReactCommon/fabric/{ => components}/view/accessibility/AccessibilityProps.cpp (100%)
 rename ReactCommon/fabric/{ => components}/view/accessibility/AccessibilityProps.h (94%)
 rename ReactCommon/fabric/{ => components}/view/accessibility/AccessibleShadowNode.cpp (100%)
 rename ReactCommon/fabric/{ => components}/view/accessibility/AccessibleShadowNode.h (93%)
 rename ReactCommon/fabric/{ => components}/view/accessibility/accessibilityValuesConversions.cpp (100%)
 rename ReactCommon/fabric/{ => components}/view/accessibility/accessibilityValuesConversions.h (86%)
 rename ReactCommon/fabric/{ => components}/view/conversions.h (99%)
 rename ReactCommon/fabric/{ => components}/view/primitives.h (99%)
 rename ReactCommon/fabric/{ => components}/view/propsConversions.h (98%)
 rename ReactCommon/fabric/{ => components}/view/root/RootProps.cpp (91%)
 rename ReactCommon/fabric/{ => components}/view/root/RootProps.h (94%)
 rename ReactCommon/fabric/{ => components}/view/root/RootShadowNode.cpp (93%)
 rename ReactCommon/fabric/{ => components}/view/root/RootShadowNode.h (90%)
 rename ReactCommon/fabric/{ => components}/view/tests/ViewTest.cpp (83%)
 rename ReactCommon/fabric/{ => components}/view/yoga/YogaLayoutableShadowNode.cpp (99%)
 rename ReactCommon/fabric/{ => components}/view/yoga/YogaLayoutableShadowNode.h (98%)
 rename ReactCommon/fabric/{ => components}/view/yoga/YogaStylableProps.cpp (96%)
 rename ReactCommon/fabric/{ => components}/view/yoga/YogaStylableProps.h (100%)

diff --git a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h
index d43973049..2fa543e88 100644
--- 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
 
diff --git a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
index 61ce1ccdc..7b1538f9d 100644
--- 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"
 
diff --git a/React/Fabric/RCTConversions.h b/React/Fabric/RCTConversions.h
index 10cb38fb8..e38cd04fe 100644
--- 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];
diff --git a/React/Fabric/RCTSurfaceTouchHandler.mm b/React/Fabric/RCTSurfaceTouchHandler.mm
index c26f15bb7..569521123 100644
--- 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>
 
diff --git a/ReactCommon/fabric/activityindicator/ActivityIndicatorViewProps.h b/ReactCommon/fabric/activityindicator/ActivityIndicatorViewProps.h
index 470d86e7d..7b128b308 100644
--- 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 {
diff --git a/ReactCommon/fabric/activityindicator/ActivityIndicatorViewShadowNode.h b/ReactCommon/fabric/activityindicator/ActivityIndicatorViewShadowNode.h
index 2cb71f2a7..0e57b37f7 100644
--- 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 {
diff --git a/ReactCommon/fabric/activityindicator/BUCK b/ReactCommon/fabric/activityindicator/BUCK
index aa4cd53f6..3131363a7 100644
--- 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"),
     ],
 )
 
diff --git a/ReactCommon/fabric/components/image/BUCK b/ReactCommon/fabric/components/image/BUCK
index 896bd5ff0..51b83be2f 100644
--- 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"),
     ],
 )
 
diff --git a/ReactCommon/fabric/components/image/ImageEventEmitter.h b/ReactCommon/fabric/components/image/ImageEventEmitter.h
index f06fb837e..4cb2625ae 100644
--- 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 {
diff --git a/ReactCommon/fabric/components/image/ImageProps.h b/ReactCommon/fabric/components/image/ImageProps.h
index 6d772d1c9..fb1724817 100644
--- 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 {
diff --git a/ReactCommon/fabric/components/image/ImageShadowNode.h b/ReactCommon/fabric/components/image/ImageShadowNode.h
index 2c2d39bfc..f8148c94d 100644
--- 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 {
diff --git a/ReactCommon/fabric/components/scrollview/BUCK b/ReactCommon/fabric/components/scrollview/BUCK
index 007249e5f..e340c2945 100644
--- 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"),
     ],
 )
 
diff --git a/ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.h b/ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.h
index c9bd52543..e72c47b1d 100644
--- 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>
 
diff --git a/ReactCommon/fabric/components/scrollview/ScrollViewProps.h b/ReactCommon/fabric/components/scrollview/ScrollViewProps.h
index ff5562a6a..5ad6d08b9 100644
--- 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 {
diff --git a/ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.h b/ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.h
index 1c8f77830..aa4ed58df 100644
--- 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 {
diff --git a/ReactCommon/fabric/components/switch/BUCK b/ReactCommon/fabric/components/switch/BUCK
index 3026a7061..52d146dc4 100644
--- 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"),
     ],
 )
 
diff --git a/ReactCommon/fabric/components/switch/SwitchEventEmitter.h b/ReactCommon/fabric/components/switch/SwitchEventEmitter.h
index 2f1cf3733..6e2a0c68d 100644
--- 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 {
diff --git a/ReactCommon/fabric/components/switch/SwitchProps.h b/ReactCommon/fabric/components/switch/SwitchProps.h
index 6ddac619b..83f4aa212 100644
--- 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 {
diff --git a/ReactCommon/fabric/components/switch/SwitchShadowNode.h b/ReactCommon/fabric/components/switch/SwitchShadowNode.h
index b94256c74..be4d6f5e7 100644
--- 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 {
diff --git a/ReactCommon/fabric/components/text/BUCK b/ReactCommon/fabric/components/text/BUCK
index c9711245d..fdba22d64 100644
--- 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"),
     ],
 )
 
diff --git a/ReactCommon/fabric/components/text/paragraph/ParagraphProps.h b/ReactCommon/fabric/components/text/paragraph/ParagraphProps.h
index f31789eac..f7e533d20 100644
--- 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 {
diff --git a/ReactCommon/fabric/components/text/paragraph/ParagraphShadowNode.h b/ReactCommon/fabric/components/text/paragraph/ParagraphShadowNode.h
index c18be91d7..bb81b9175 100644
--- 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 {
diff --git a/ReactCommon/fabric/view/BUCK b/ReactCommon/fabric/components/view/BUCK
similarity index 98%
rename from ReactCommon/fabric/view/BUCK
rename to ReactCommon/fabric/components/view/BUCK
index 54dc9ef20..0aa0b6b3c 100644
--- a/ReactCommon/fabric/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",
diff --git a/ReactCommon/fabric/view/ConcreteViewShadowNode.h b/ReactCommon/fabric/components/view/ConcreteViewShadowNode.h
similarity index 95%
rename from ReactCommon/fabric/view/ConcreteViewShadowNode.h
rename to ReactCommon/fabric/components/view/ConcreteViewShadowNode.h
index 38f0c966d..db7b9a660 100644
--- a/ReactCommon/fabric/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 {
diff --git a/ReactCommon/fabric/view/ViewComponentDescriptor.h b/ReactCommon/fabric/components/view/ViewComponentDescriptor.h
similarity index 89%
rename from ReactCommon/fabric/view/ViewComponentDescriptor.h
rename to ReactCommon/fabric/components/view/ViewComponentDescriptor.h
index 4c25d8b94..47cbe2e57 100644
--- a/ReactCommon/fabric/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 {
diff --git a/ReactCommon/fabric/view/ViewEventEmitter.cpp b/ReactCommon/fabric/components/view/ViewEventEmitter.cpp
similarity index 100%
rename from ReactCommon/fabric/view/ViewEventEmitter.cpp
rename to ReactCommon/fabric/components/view/ViewEventEmitter.cpp
diff --git a/ReactCommon/fabric/view/ViewEventEmitter.h b/ReactCommon/fabric/components/view/ViewEventEmitter.h
similarity index 100%
rename from ReactCommon/fabric/view/ViewEventEmitter.h
rename to ReactCommon/fabric/components/view/ViewEventEmitter.h
diff --git a/ReactCommon/fabric/view/ViewProps.cpp b/ReactCommon/fabric/components/view/ViewProps.cpp
similarity index 98%
rename from ReactCommon/fabric/view/ViewProps.cpp
rename to ReactCommon/fabric/components/view/ViewProps.cpp
index 36d332160..72af1c675 100644
--- a/ReactCommon/fabric/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 {
diff --git a/ReactCommon/fabric/view/ViewProps.h b/ReactCommon/fabric/components/view/ViewProps.h
similarity index 90%
rename from ReactCommon/fabric/view/ViewProps.h
rename to ReactCommon/fabric/components/view/ViewProps.h
index a533b051f..d9d9e6143 100644
--- a/ReactCommon/fabric/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 {
diff --git a/ReactCommon/fabric/view/ViewShadowNode.cpp b/ReactCommon/fabric/components/view/ViewShadowNode.cpp
similarity index 100%
rename from ReactCommon/fabric/view/ViewShadowNode.cpp
rename to ReactCommon/fabric/components/view/ViewShadowNode.cpp
diff --git a/ReactCommon/fabric/view/ViewShadowNode.h b/ReactCommon/fabric/components/view/ViewShadowNode.h
similarity index 85%
rename from ReactCommon/fabric/view/ViewShadowNode.h
rename to ReactCommon/fabric/components/view/ViewShadowNode.h
index a406f34de..8fa20ebad 100644
--- a/ReactCommon/fabric/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 {
diff --git a/ReactCommon/fabric/view/accessibility/AccessibilityPrimitives.h b/ReactCommon/fabric/components/view/accessibility/AccessibilityPrimitives.h
similarity index 97%
rename from ReactCommon/fabric/view/accessibility/AccessibilityPrimitives.h
rename to ReactCommon/fabric/components/view/accessibility/AccessibilityPrimitives.h
index 60e73f1c4..01ddabb9e 100644
--- a/ReactCommon/fabric/view/accessibility/AccessibilityPrimitives.h
+++ b/ReactCommon/fabric/components/view/accessibility/AccessibilityPrimitives.h
@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include <cinttypes>
+
 namespace facebook {
 namespace react {
 
diff --git a/ReactCommon/fabric/view/accessibility/AccessibilityProps.cpp b/ReactCommon/fabric/components/view/accessibility/AccessibilityProps.cpp
similarity index 100%
rename from ReactCommon/fabric/view/accessibility/AccessibilityProps.cpp
rename to ReactCommon/fabric/components/view/accessibility/AccessibilityProps.cpp
diff --git a/ReactCommon/fabric/view/accessibility/AccessibilityProps.h b/ReactCommon/fabric/components/view/accessibility/AccessibilityProps.h
similarity index 94%
rename from ReactCommon/fabric/view/accessibility/AccessibilityProps.h
rename to ReactCommon/fabric/components/view/accessibility/AccessibilityProps.h
index 931edc8d3..d1682c687 100644
--- a/ReactCommon/fabric/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 {
diff --git a/ReactCommon/fabric/view/accessibility/AccessibleShadowNode.cpp b/ReactCommon/fabric/components/view/accessibility/AccessibleShadowNode.cpp
similarity index 100%
rename from ReactCommon/fabric/view/accessibility/AccessibleShadowNode.cpp
rename to ReactCommon/fabric/components/view/accessibility/AccessibleShadowNode.cpp
diff --git a/ReactCommon/fabric/view/accessibility/AccessibleShadowNode.h b/ReactCommon/fabric/components/view/accessibility/AccessibleShadowNode.h
similarity index 93%
rename from ReactCommon/fabric/view/accessibility/AccessibleShadowNode.h
rename to ReactCommon/fabric/components/view/accessibility/AccessibleShadowNode.h
index 1fa8316ba..f893b0dcd 100644
--- a/ReactCommon/fabric/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 {
diff --git a/ReactCommon/fabric/view/accessibility/accessibilityValuesConversions.cpp b/ReactCommon/fabric/components/view/accessibility/accessibilityValuesConversions.cpp
similarity index 100%
rename from ReactCommon/fabric/view/accessibility/accessibilityValuesConversions.cpp
rename to ReactCommon/fabric/components/view/accessibility/accessibilityValuesConversions.cpp
diff --git a/ReactCommon/fabric/view/accessibility/accessibilityValuesConversions.h b/ReactCommon/fabric/components/view/accessibility/accessibilityValuesConversions.h
similarity index 86%
rename from ReactCommon/fabric/view/accessibility/accessibilityValuesConversions.h
rename to ReactCommon/fabric/components/view/accessibility/accessibilityValuesConversions.h
index 7240a7cd9..97913d3e2 100644
--- a/ReactCommon/fabric/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 {
 
diff --git a/ReactCommon/fabric/view/conversions.h b/ReactCommon/fabric/components/view/conversions.h
similarity index 99%
rename from ReactCommon/fabric/view/conversions.h
rename to ReactCommon/fabric/components/view/conversions.h
index 64f1478d4..e34b65f1c 100644
--- a/ReactCommon/fabric/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>
diff --git a/ReactCommon/fabric/view/primitives.h b/ReactCommon/fabric/components/view/primitives.h
similarity index 99%
rename from ReactCommon/fabric/view/primitives.h
rename to ReactCommon/fabric/components/view/primitives.h
index f7814c041..c7239ec3e 100644
--- a/ReactCommon/fabric/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 {
diff --git a/ReactCommon/fabric/view/propsConversions.h b/ReactCommon/fabric/components/view/propsConversions.h
similarity index 98%
rename from ReactCommon/fabric/view/propsConversions.h
rename to ReactCommon/fabric/components/view/propsConversions.h
index 8a8cfe099..80146b59f 100644
--- a/ReactCommon/fabric/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 {
diff --git a/ReactCommon/fabric/view/root/RootProps.cpp b/ReactCommon/fabric/components/view/root/RootProps.cpp
similarity index 91%
rename from ReactCommon/fabric/view/root/RootProps.cpp
rename to ReactCommon/fabric/components/view/root/RootProps.cpp
index fe9f711d3..f3c65e38d 100644
--- a/ReactCommon/fabric/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 {
diff --git a/ReactCommon/fabric/view/root/RootProps.h b/ReactCommon/fabric/components/view/root/RootProps.h
similarity index 94%
rename from ReactCommon/fabric/view/root/RootProps.h
rename to ReactCommon/fabric/components/view/root/RootProps.h
index f26c53c71..b6c4a2ae5 100644
--- a/ReactCommon/fabric/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 {
diff --git a/ReactCommon/fabric/view/root/RootShadowNode.cpp b/ReactCommon/fabric/components/view/root/RootShadowNode.cpp
similarity index 93%
rename from ReactCommon/fabric/view/root/RootShadowNode.cpp
rename to ReactCommon/fabric/components/view/root/RootShadowNode.cpp
index 970eb8db7..045be4569 100644
--- a/ReactCommon/fabric/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 {
diff --git a/ReactCommon/fabric/view/root/RootShadowNode.h b/ReactCommon/fabric/components/view/root/RootShadowNode.h
similarity index 90%
rename from ReactCommon/fabric/view/root/RootShadowNode.h
rename to ReactCommon/fabric/components/view/root/RootShadowNode.h
index 6508fa587..535b8bdb8 100644
--- a/ReactCommon/fabric/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 {
diff --git a/ReactCommon/fabric/view/tests/ViewTest.cpp b/ReactCommon/fabric/components/view/tests/ViewTest.cpp
similarity index 83%
rename from ReactCommon/fabric/view/tests/ViewTest.cpp
rename to ReactCommon/fabric/components/view/tests/ViewTest.cpp
index 6ea577d8f..af1468dc6 100644
--- a/ReactCommon/fabric/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;
diff --git a/ReactCommon/fabric/view/yoga/YogaLayoutableShadowNode.cpp b/ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.cpp
similarity index 99%
rename from ReactCommon/fabric/view/yoga/YogaLayoutableShadowNode.cpp
rename to ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.cpp
index 34b0f372f..7106ccf65 100644
--- a/ReactCommon/fabric/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 {
diff --git a/ReactCommon/fabric/view/yoga/YogaLayoutableShadowNode.h b/ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.h
similarity index 98%
rename from ReactCommon/fabric/view/yoga/YogaLayoutableShadowNode.h
rename to ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.h
index c35b812af..a61b20c3a 100644
--- a/ReactCommon/fabric/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 {
diff --git a/ReactCommon/fabric/view/yoga/YogaStylableProps.cpp b/ReactCommon/fabric/components/view/yoga/YogaStylableProps.cpp
similarity index 96%
rename from ReactCommon/fabric/view/yoga/YogaStylableProps.cpp
rename to ReactCommon/fabric/components/view/yoga/YogaStylableProps.cpp
index d89686b53..165c7195c 100644
--- a/ReactCommon/fabric/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>
diff --git a/ReactCommon/fabric/view/yoga/YogaStylableProps.h b/ReactCommon/fabric/components/view/yoga/YogaStylableProps.h
similarity index 100%
rename from ReactCommon/fabric/view/yoga/YogaStylableProps.h
rename to ReactCommon/fabric/components/view/yoga/YogaStylableProps.h
diff --git a/ReactCommon/fabric/uimanager/BUCK b/ReactCommon/fabric/uimanager/BUCK
index 49af8f32c..727fbbd0c 100644
--- 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"),
     ],
 )
 
diff --git a/ReactCommon/fabric/uimanager/FabricUIManager.cpp b/ReactCommon/fabric/uimanager/FabricUIManager.cpp
index 9e20dd056..0d6511d6e 100644
--- 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 {
diff --git a/ReactCommon/fabric/uimanager/Scheduler.cpp b/ReactCommon/fabric/uimanager/Scheduler.cpp
index 027f7cade..ad1b42d75 100644
--- 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"
diff --git a/ReactCommon/fabric/uimanager/Scheduler.h b/ReactCommon/fabric/uimanager/Scheduler.h
index 036d3cef4..ed13ba2de 100644
--- 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 {
diff --git a/ReactCommon/fabric/uimanager/ShadowTree.h b/ReactCommon/fabric/uimanager/ShadowTree.h
index 26927fc8b..f9bb361d6 100644
--- 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 {