Fabric: Codemod: All <fabric/... includes were renamed to <react/...

Summary: We are moving to more stable APIs removing all mentiones of the effort name from the codebase. Reviewed By: mdvacca Differential Revision: D12912894 fbshipit-source-id: 4a0c6b9e7454b8b14e62d419e9e9311dc0c56e7a
facebook · Nov 10, 2018 · 94d49e5 · 94d49e5
1 parent 9f9390d
commit 94d49e5
Show file tree

Hide file tree

Showing 191 changed files with 528 additions and 524 deletions.
diff --git a/...Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.mm b/...Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.mm
@@ -7,7 +7,7 @@
 
 #import "RCTActivityIndicatorViewComponentView.h"
 
-#import <fabric/components/activityindicator/ActivityIndicatorViewProps.h>
+#import <react/components/activityindicator/ActivityIndicatorViewProps.h>
 
 using namespace facebook::react;
 

diff --git a/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm b/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm
@@ -7,12 +7,12 @@
 
 #import "RCTImageComponentView.h"
 
-#import <fabric/components/image/ImageEventEmitter.h>
-#import <fabric/components/image/ImageLocalData.h>
-#import <fabric/components/image/ImageProps.h>
-#import <fabric/imagemanager/ImageRequest.h>
-#import <fabric/imagemanager/ImageResponse.h>
-#import <fabric/imagemanager/RCTImagePrimitivesConversions.h>
+#import <react/components/image/ImageEventEmitter.h>
+#import <react/components/image/ImageLocalData.h>
+#import <react/components/image/ImageProps.h>
+#import <react/imagemanager/ImageRequest.h>
+#import <react/imagemanager/ImageResponse.h>
+#import <react/imagemanager/RCTImagePrimitivesConversions.h>
 
 #import "RCTConversions.h"
 #import "MainQueueExecutor.h"

diff --git a/React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.mm b/React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.mm
@@ -7,7 +7,7 @@
 
 #import "RCTRootComponentView.h"
 
-#import <fabric/components/root/RootProps.h>
+#import <react/components/root/RootProps.h>
 
 using namespace facebook::react;
 

diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
@@ -8,10 +8,10 @@
 #import "RCTScrollViewComponentView.h"
 
 #import <React/RCTAssert.h>
-#import <fabric/components/scrollview/ScrollViewLocalData.h>
-#import <fabric/components/scrollview/ScrollViewProps.h>
-#import <fabric/components/scrollview/ScrollViewEventEmitter.h>
-#import <fabric/graphics/Geometry.h>
+#import <react/components/scrollview/ScrollViewLocalData.h>
+#import <react/components/scrollview/ScrollViewProps.h>
+#import <react/components/scrollview/ScrollViewEventEmitter.h>
+#import <react/graphics/Geometry.h>
 
 #import "RCTConversions.h"
 #import "RCTEnhancedScrollView.h"

diff --git a/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.mm b/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.mm
@@ -7,8 +7,8 @@
 
 #import "RCTSwitchComponentView.h"
 
-#import <fabric/components/switch/SwitchEventEmitter.h>
-#import <fabric/components/switch/SwitchProps.h>
+#import <react/components/switch/SwitchEventEmitter.h>
+#import <react/components/switch/SwitchProps.h>
 
 using namespace facebook::react;
 

diff --git a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm
@@ -7,12 +7,12 @@
 
 #import "RCTParagraphComponentView.h"
 
-#import <fabric/components/text/ParagraphLocalData.h>
-#import <fabric/components/text/ParagraphProps.h>
-#import <fabric/core/LocalData.h>
-#import <fabric/graphics/Geometry.h>
-#import <fabric/textlayoutmanager/TextLayoutManager.h>
-#import <fabric/textlayoutmanager/RCTTextLayoutManager.h>
+#import <react/components/text/ParagraphLocalData.h>
+#import <react/components/text/ParagraphProps.h>
+#import <react/core/LocalData.h>
+#import <react/graphics/Geometry.h>
+#import <react/textlayoutmanager/TextLayoutManager.h>
+#import <react/textlayoutmanager/RCTTextLayoutManager.h>
 #import "RCTConversions.h"
 
 using namespace facebook::react;

diff --git a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h
@@ -9,11 +9,11 @@
 
 #import <React/RCTComponentViewProtocol.h>
 #import <React/UIView+ComponentViewProtocol.h>
-#import <fabric/core/LayoutMetrics.h>
-#import <fabric/core/Props.h>
-#import <fabric/components/view/ViewEventEmitter.h>
-#import <fabric/components/view/ViewProps.h>
-#import <fabric/events/EventEmitter.h>
+#import <react/core/LayoutMetrics.h>
+#import <react/core/Props.h>
+#import <react/components/view/ViewEventEmitter.h>
+#import <react/components/view/ViewProps.h>
+#import <react/events/EventEmitter.h>
 #import <React/RCTTouchableComponentViewProtocol.h>
 
 NS_ASSUME_NONNULL_BEGIN

diff --git 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/components/view/ViewProps.h>
-#import <fabric/components/view/ViewEventEmitter.h>
+#import <react/components/view/ViewProps.h>
+#import <react/components/view/ViewEventEmitter.h>
 #import <objc/runtime.h>
 #import <React/RCTAssert.h>
 #import <React/RCTBorderDrawing.h>

diff --git a/React/Fabric/Mounting/MountItems/RCTUpdateEventEmitterMountItem.h b/React/Fabric/Mounting/MountItems/RCTUpdateEventEmitterMountItem.h
@@ -9,7 +9,7 @@
 
 #import <React/RCTMountItemProtocol.h>
 #import <React/RCTPrimitives.h>
-#import <fabric/events/EventEmitter.h>
+#import <react/events/EventEmitter.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/React/Fabric/Mounting/MountItems/RCTUpdateLayoutMetricsMountItem.h b/React/Fabric/Mounting/MountItems/RCTUpdateLayoutMetricsMountItem.h
@@ -9,7 +9,7 @@
 
 #import <React/RCTMountItemProtocol.h>
 #import <React/RCTPrimitives.h>
-#import <fabric/core/LayoutMetrics.h>
+#import <react/core/LayoutMetrics.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/React/Fabric/Mounting/MountItems/RCTUpdateLocalDataMountItem.h b/React/Fabric/Mounting/MountItems/RCTUpdateLocalDataMountItem.h
@@ -9,7 +9,7 @@
 
 #import <React/RCTMountItemProtocol.h>
 #import <React/RCTPrimitives.h>
-#import <fabric/core/LocalData.h>
+#import <react/core/LocalData.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/React/Fabric/Mounting/MountItems/RCTUpdatePropsMountItem.h b/React/Fabric/Mounting/MountItems/RCTUpdatePropsMountItem.h
@@ -9,7 +9,7 @@
 
 #import <React/RCTMountItemProtocol.h>
 #import <React/RCTPrimitives.h>
-#import <fabric/core/Props.h>
+#import <react/core/Props.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/React/Fabric/Mounting/RCTComponentViewProtocol.h b/React/Fabric/Mounting/RCTComponentViewProtocol.h
@@ -7,10 +7,10 @@
 
 #import <UIKit/UIKit.h>
 
-#import <fabric/core/LocalData.h>
-#import <fabric/core/Props.h>
-#import <fabric/core/LayoutMetrics.h>
-#import <fabric/events/EventEmitter.h>
+#import <react/core/LocalData.h>
+#import <react/core/Props.h>
+#import <react/core/LayoutMetrics.h>
+#import <react/events/EventEmitter.h>
 #import <React/RCTPrimitives.h>
 
 NS_ASSUME_NONNULL_BEGIN

diff --git a/React/Fabric/Mounting/RCTMountingManager.h b/React/Fabric/Mounting/RCTMountingManager.h
@@ -7,8 +7,8 @@
 
 #import <UIKit/UIKit.h>
 
-#import <fabric/uimanager/ShadowView.h>
-#import <fabric/uimanager/ShadowViewMutation.h>
+#import <react/uimanager/ShadowView.h>
+#import <react/uimanager/ShadowViewMutation.h>
 #import <React/RCTPrimitives.h>
 #import <React/RCTMountingManagerDelegate.h>
 

diff --git a/React/Fabric/Mounting/RCTMountingManager.mm b/React/Fabric/Mounting/RCTMountingManager.mm
@@ -7,7 +7,7 @@
 
 #import "RCTMountingManager.h"
 
-#import <fabric/core/LayoutableShadowNode.h>
+#import <react/core/LayoutableShadowNode.h>
 #import <React/RCTAssert.h>
 #import <React/RCTUtils.h>
 

diff --git a/React/Fabric/RCTConversions.h b/React/Fabric/RCTConversions.h
@@ -7,10 +7,10 @@
 
 #import <UIKit/UIKit.h>
 
-#import <fabric/components/view/primitives.h>
-#import <fabric/components/view/AccessibilityPrimitives.h>
-#import <fabric/graphics/Color.h>
-#import <fabric/graphics/Geometry.h>
+#import <react/components/view/primitives.h>
+#import <react/components/view/AccessibilityPrimitives.h>
+#import <react/graphics/Color.h>
+#import <react/graphics/Geometry.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/React/Fabric/RCTScheduler.h b/React/Fabric/RCTScheduler.h
@@ -9,9 +9,9 @@
 #import <memory>
 
 #import <React/RCTPrimitives.h>
-#import <fabric/core/LayoutConstraints.h>
-#import <fabric/core/LayoutContext.h>
-#import <fabric/uimanager/ShadowViewMutation.h>
+#import <react/core/LayoutConstraints.h>
+#import <react/core/LayoutContext.h>
+#import <react/uimanager/ShadowViewMutation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/React/Fabric/RCTScheduler.mm b/React/Fabric/RCTScheduler.mm
@@ -7,9 +7,9 @@
 
 #import "RCTScheduler.h"
 
-#import <fabric/uimanager/ContextContainer.h>
-#import <fabric/uimanager/Scheduler.h>
-#import <fabric/uimanager/SchedulerDelegate.h>
+#import <react/uimanager/ContextContainer.h>
+#import <react/uimanager/Scheduler.h>
+#import <react/uimanager/SchedulerDelegate.h>
 
 #import <React/RCTFollyConvert.h>
 

diff --git a/React/Fabric/RCTSurfacePresenter.mm b/React/Fabric/RCTSurfacePresenter.mm
@@ -24,10 +24,10 @@
 #import <React/RCTSurfaceView.h>
 #import <React/RCTSurfaceView+Internal.h>
 #import <React/RCTUtils.h>
-#import <fabric/core/LayoutContext.h>
-#import <fabric/core/LayoutConstraints.h>
-#import <fabric/imagemanager/ImageManager.h>
-#import <fabric/uimanager/ContextContainer.h>
+#import <react/core/LayoutContext.h>
+#import <react/core/LayoutConstraints.h>
+#import <react/imagemanager/ImageManager.h>
+#import <react/uimanager/ContextContainer.h>
 
 #import "MainRunLoopEventBeat.h"
 #import "RuntimeEventBeat.h"

diff --git a/React/Fabric/RCTTouchableComponentViewProtocol.h b/React/Fabric/RCTTouchableComponentViewProtocol.h
@@ -6,7 +6,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <fabric/components/view/TouchEventEmitter.h>
+#import <react/components/view/TouchEventEmitter.h>
 
 @protocol RCTTouchableComponentViewProtocol <NSObject>
 - (facebook::react::SharedTouchEventEmitter)touchEventEmitterAtPoint:(CGPoint)point;

diff --git a/React/Fabric/Utils/MainRunLoopEventBeat.h b/React/Fabric/Utils/MainRunLoopEventBeat.h
@@ -7,8 +7,8 @@
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <CoreFoundation/CFRunLoop.h>
-#include <fabric/uimanager/primitives.h>
-#include <fabric/events/EventBeat.h>
+#include <react/uimanager/primitives.h>
+#include <react/events/EventBeat.h>
 
 namespace facebook {
 namespace react {

diff --git a/React/Fabric/Utils/RuntimeEventBeat.h b/React/Fabric/Utils/RuntimeEventBeat.h
@@ -7,8 +7,8 @@
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <CoreFoundation/CFRunLoop.h>
-#include <fabric/uimanager/primitives.h>
-#include <fabric/events/EventBeat.h>
+#include <react/uimanager/primitives.h>
+#include <react/events/EventBeat.h>
 
 namespace facebook {
 namespace react {

diff --git a/ReactCommon/fabric/attributedstring/AttributedString.cpp b/ReactCommon/fabric/attributedstring/AttributedString.cpp
@@ -7,7 +7,7 @@
 
 #include "AttributedString.h"
 
-#include <fabric/debug/DebugStringConvertibleItem.h>
+#include <react/debug/DebugStringConvertibleItem.h>
 
 namespace facebook {
 namespace react {

diff --git a/ReactCommon/fabric/attributedstring/AttributedString.h b/ReactCommon/fabric/attributedstring/AttributedString.h
@@ -10,11 +10,11 @@
 #include <functional>
 #include <memory>
 
-#include <fabric/attributedstring/TextAttributes.h>
-#include <fabric/core/Sealable.h>
-#include <fabric/core/ShadowNode.h>
-#include <fabric/debug/DebugStringConvertible.h>
 #include <folly/Optional.h>
+#include <react/attributedstring/TextAttributes.h>
+#include <react/core/Sealable.h>
+#include <react/core/ShadowNode.h>
+#include <react/debug/DebugStringConvertible.h>
 
 namespace facebook {
 namespace react {

diff --git a/ReactCommon/fabric/attributedstring/BUCK b/ReactCommon/fabric/attributedstring/BUCK
@@ -28,7 +28,7 @@ rn_xplat_cxx_library(
         [
             ("", "*.h"),
         ],
-        prefix = "fabric/attributedstring",
+        prefix = "react/attributedstring",
     ),
     compiler_flags = [
         "-fexceptions",

diff --git a/ReactCommon/fabric/attributedstring/ParagraphAttributes.cpp b/ReactCommon/fabric/attributedstring/ParagraphAttributes.cpp
@@ -7,9 +7,9 @@
 
 #include "ParagraphAttributes.h"
 
-#include <fabric/attributedstring/conversions.h>
-#include <fabric/debug/debugStringConvertibleUtils.h>
-#include <fabric/graphics/conversions.h>
+#include <react/attributedstring/conversions.h>
+#include <react/debug/debugStringConvertibleUtils.h>
+#include <react/graphics/conversions.h>
 
 namespace facebook {
 namespace react {

diff --git a/ReactCommon/fabric/attributedstring/ParagraphAttributes.h b/ReactCommon/fabric/attributedstring/ParagraphAttributes.h
@@ -9,9 +9,9 @@
 
 #include <limits>
 
-#include <fabric/attributedstring/primitives.h>
-#include <fabric/debug/DebugStringConvertible.h>
-#include <fabric/graphics/Geometry.h>
+#include <react/attributedstring/primitives.h>
+#include <react/debug/DebugStringConvertible.h>
+#include <react/graphics/Geometry.h>
 
 namespace facebook {
 namespace react {

diff --git a/ReactCommon/fabric/attributedstring/TextAttributes.cpp b/ReactCommon/fabric/attributedstring/TextAttributes.cpp
@@ -7,11 +7,12 @@
 
 #include "TextAttributes.h"
 
-#include <fabric/attributedstring/conversions.h>
-#include <fabric/core/conversions.h>
-#include <fabric/graphics/conversions.h>
+#include <react/attributedstring/conversions.h>
+#include <react/core/conversions.h>
+#include <react/graphics/conversions.h>
+#include <cmath>
 
-#include <fabric/debug/debugStringConvertibleUtils.h>
+#include <react/debug/debugStringConvertibleUtils.h>
 
 namespace facebook {
 namespace react {
@@ -24,14 +25,15 @@ void TextAttributes::apply(TextAttributes textAttributes) {
   backgroundColor = textAttributes.backgroundColor
       ? textAttributes.backgroundColor
       : backgroundColor;
-  opacity = !isnan(textAttributes.opacity) ? textAttributes.opacity : opacity;
+  opacity =
+      !std::isnan(textAttributes.opacity) ? textAttributes.opacity : opacity;
 
   // Font
   fontFamily = !textAttributes.fontFamily.empty() ? textAttributes.fontFamily
                                                   : fontFamily;
   fontSize =
-      !isnan(textAttributes.fontSize) ? textAttributes.fontSize : fontSize;
-  fontSizeMultiplier = !isnan(textAttributes.fontSizeMultiplier)
+      !std::isnan(textAttributes.fontSize) ? textAttributes.fontSize : fontSize;
+  fontSizeMultiplier = !std::isnan(textAttributes.fontSizeMultiplier)
       ? textAttributes.fontSizeMultiplier
       : fontSizeMultiplier;
   fontWeight = textAttributes.fontWeight.hasValue() ? textAttributes.fontWeight
@@ -44,13 +46,14 @@ void TextAttributes::apply(TextAttributes textAttributes) {
   allowFontScaling = textAttributes.allowFontScaling.hasValue()
       ? textAttributes.allowFontScaling
       : allowFontScaling;
-  letterSpacing = !isnan(textAttributes.letterSpacing)
+  letterSpacing = !std::isnan(textAttributes.letterSpacing)
       ? textAttributes.letterSpacing
       : letterSpacing;
 
   // Paragraph Styles
-  lineHeight = !isnan(textAttributes.lineHeight) ? textAttributes.lineHeight
-                                                 : lineHeight;
+  lineHeight = !std::isnan(textAttributes.lineHeight)
+      ? textAttributes.lineHeight
+      : lineHeight;
   alignment = textAttributes.alignment.hasValue() ? textAttributes.alignment
                                                   : alignment;
   baseWritingDirection = textAttributes.baseWritingDirection.hasValue()
@@ -76,7 +79,7 @@ void TextAttributes::apply(TextAttributes textAttributes) {
   textShadowOffset = textAttributes.textShadowOffset.hasValue()
       ? textAttributes.textShadowOffset.value()
       : textShadowOffset;
-  textShadowRadius = !isnan(textAttributes.textShadowRadius)
+  textShadowRadius = !std::isnan(textAttributes.textShadowRadius)
       ? textAttributes.textShadowRadius
       : textShadowRadius;
   textShadowColor = textAttributes.textShadowColor