diff --git a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h index 3e85e52aa..a289ed2e8 100644 --- a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h +++ b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h @@ -12,9 +12,9 @@ #import #import #import +#import #import #import -#import NS_ASSUME_NONNULL_BEGIN diff --git a/React/Fabric/Mounting/MountItems/RCTUpdateEventEmitterMountItem.h b/React/Fabric/Mounting/MountItems/RCTUpdateEventEmitterMountItem.h index 7d16a9dc2..5c0595f7f 100644 --- a/React/Fabric/Mounting/MountItems/RCTUpdateEventEmitterMountItem.h +++ b/React/Fabric/Mounting/MountItems/RCTUpdateEventEmitterMountItem.h @@ -9,7 +9,7 @@ #import #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/React/Fabric/Mounting/RCTComponentViewProtocol.h b/React/Fabric/Mounting/RCTComponentViewProtocol.h index 116f6ef42..127941d01 100644 --- a/React/Fabric/Mounting/RCTComponentViewProtocol.h +++ b/React/Fabric/Mounting/RCTComponentViewProtocol.h @@ -8,10 +8,10 @@ #import #import +#import #import #import #import -#import NS_ASSUME_NONNULL_BEGIN diff --git a/React/Fabric/Utils/MainRunLoopEventBeat.h b/React/Fabric/Utils/MainRunLoopEventBeat.h index eb7c94694..b2878d9a1 100644 --- a/React/Fabric/Utils/MainRunLoopEventBeat.h +++ b/React/Fabric/Utils/MainRunLoopEventBeat.h @@ -7,7 +7,7 @@ #include #include -#include +#include #include namespace facebook { diff --git a/React/Fabric/Utils/RuntimeEventBeat.h b/React/Fabric/Utils/RuntimeEventBeat.h index ed7055a37..0fbecf47b 100644 --- a/React/Fabric/Utils/RuntimeEventBeat.h +++ b/React/Fabric/Utils/RuntimeEventBeat.h @@ -7,7 +7,7 @@ #include #include -#include +#include #include namespace facebook { diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/AsyncEventBeat.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/AsyncEventBeat.h index 8f07aa6a9..a87d53608 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/AsyncEventBeat.h +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/AsyncEventBeat.h @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include "EventBeatManager.h" namespace facebook { diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/Binding.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/Binding.cpp index 5ec998075..5e29c0cd4 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/Binding.cpp +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/Binding.cpp @@ -13,8 +13,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/EventBeatManager.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/EventBeatManager.h index 2e49a9aa3..ad6839864 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/EventBeatManager.h +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/EventBeatManager.h @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/EventEmitterWrapper.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/EventEmitterWrapper.h index 62db21813..ce43653ea 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/EventEmitterWrapper.h +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/EventEmitterWrapper.h @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include namespace facebook { diff --git a/ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.h b/ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.h index 91d419a0b..7ee44bfc0 100644 --- a/ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.h +++ b/ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.h @@ -10,7 +10,7 @@ #include #include -#include +#include #include namespace facebook { diff --git a/ReactCommon/fabric/components/view/TouchEventEmitter.h b/ReactCommon/fabric/components/view/TouchEventEmitter.h index 00471e5da..9edfd51c7 100644 --- a/ReactCommon/fabric/components/view/TouchEventEmitter.h +++ b/ReactCommon/fabric/components/view/TouchEventEmitter.h @@ -6,9 +6,9 @@ */ #pragma once +#include #include #include -#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/BUCK b/ReactCommon/fabric/core/BUCK index 81ef44668..f965af370 100644 --- a/ReactCommon/fabric/core/BUCK +++ b/ReactCommon/fabric/core/BUCK @@ -47,10 +47,11 @@ rn_xplat_cxx_library( "fbsource//xplat/folly:headers_only", "fbsource//xplat/folly:memory", "fbsource//xplat/folly:molly", + "fbsource//xplat/jsi:JSIDynamic", + "fbsource//xplat/jsi:jsi", "fbsource//xplat/third-party/glog:glog", react_native_xplat_target("utils:utils"), react_native_xplat_target("fabric/debug:debug"), - react_native_xplat_target("fabric/events:events"), react_native_xplat_target("fabric/graphics:graphics"), ], ) diff --git a/ReactCommon/fabric/core/componentdescriptor/ConcreteComponentDescriptor.h b/ReactCommon/fabric/core/componentdescriptor/ConcreteComponentDescriptor.h index 7a52cb2d2..35c973849 100644 --- a/ReactCommon/fabric/core/componentdescriptor/ConcreteComponentDescriptor.h +++ b/ReactCommon/fabric/core/componentdescriptor/ConcreteComponentDescriptor.h @@ -11,10 +11,10 @@ #include #include +#include #include #include #include -#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/events/BatchedEventQueue.cpp b/ReactCommon/fabric/core/events/BatchedEventQueue.cpp similarity index 100% rename from ReactCommon/fabric/events/BatchedEventQueue.cpp rename to ReactCommon/fabric/core/events/BatchedEventQueue.cpp diff --git a/ReactCommon/fabric/events/BatchedEventQueue.h b/ReactCommon/fabric/core/events/BatchedEventQueue.h similarity index 93% rename from ReactCommon/fabric/events/BatchedEventQueue.h rename to ReactCommon/fabric/core/events/BatchedEventQueue.h index c73490a52..2c4300519 100644 --- a/ReactCommon/fabric/events/BatchedEventQueue.h +++ b/ReactCommon/fabric/core/events/BatchedEventQueue.h @@ -7,7 +7,7 @@ #pragma once -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/events/EventBeat.cpp b/ReactCommon/fabric/core/events/EventBeat.cpp similarity index 100% rename from ReactCommon/fabric/events/EventBeat.cpp rename to ReactCommon/fabric/core/events/EventBeat.cpp diff --git a/ReactCommon/fabric/events/EventBeat.h b/ReactCommon/fabric/core/events/EventBeat.h similarity index 100% rename from ReactCommon/fabric/events/EventBeat.h rename to ReactCommon/fabric/core/events/EventBeat.h diff --git a/ReactCommon/fabric/events/EventBeatBasedExecutor.cpp b/ReactCommon/fabric/core/events/EventBeatBasedExecutor.cpp similarity index 100% rename from ReactCommon/fabric/events/EventBeatBasedExecutor.cpp rename to ReactCommon/fabric/core/events/EventBeatBasedExecutor.cpp diff --git a/ReactCommon/fabric/events/EventBeatBasedExecutor.h b/ReactCommon/fabric/core/events/EventBeatBasedExecutor.h similarity index 96% rename from ReactCommon/fabric/events/EventBeatBasedExecutor.h rename to ReactCommon/fabric/core/events/EventBeatBasedExecutor.h index 7ef5a2d74..ea281ae73 100644 --- a/ReactCommon/fabric/events/EventBeatBasedExecutor.h +++ b/ReactCommon/fabric/core/events/EventBeatBasedExecutor.h @@ -11,7 +11,7 @@ #include #include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/events/EventDispatcher.cpp b/ReactCommon/fabric/core/events/EventDispatcher.cpp similarity index 100% rename from ReactCommon/fabric/events/EventDispatcher.cpp rename to ReactCommon/fabric/core/events/EventDispatcher.cpp diff --git a/ReactCommon/fabric/events/EventDispatcher.h b/ReactCommon/fabric/core/events/EventDispatcher.h similarity index 85% rename from ReactCommon/fabric/events/EventDispatcher.h rename to ReactCommon/fabric/core/events/EventDispatcher.h index 44b8cadf4..49290ad9f 100644 --- a/ReactCommon/fabric/events/EventDispatcher.h +++ b/ReactCommon/fabric/core/events/EventDispatcher.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/events/EventEmitter.cpp b/ReactCommon/fabric/core/events/EventEmitter.cpp similarity index 100% rename from ReactCommon/fabric/events/EventEmitter.cpp rename to ReactCommon/fabric/core/events/EventEmitter.cpp diff --git a/ReactCommon/fabric/events/EventEmitter.h b/ReactCommon/fabric/core/events/EventEmitter.h similarity index 95% rename from ReactCommon/fabric/events/EventEmitter.h rename to ReactCommon/fabric/core/events/EventEmitter.h index 724372bb0..5891c18b2 100644 --- a/ReactCommon/fabric/events/EventEmitter.h +++ b/ReactCommon/fabric/core/events/EventEmitter.h @@ -10,9 +10,9 @@ #include #include -#include -#include -#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/events/EventHandler.h b/ReactCommon/fabric/core/events/EventHandler.h similarity index 100% rename from ReactCommon/fabric/events/EventHandler.h rename to ReactCommon/fabric/core/events/EventHandler.h diff --git a/ReactCommon/fabric/events/EventPipe.h b/ReactCommon/fabric/core/events/EventPipe.h similarity index 87% rename from ReactCommon/fabric/events/EventPipe.h rename to ReactCommon/fabric/core/events/EventPipe.h index eafe8472d..9190fdcd7 100644 --- a/ReactCommon/fabric/events/EventPipe.h +++ b/ReactCommon/fabric/core/events/EventPipe.h @@ -11,8 +11,8 @@ #include #include -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/events/EventPriority.h b/ReactCommon/fabric/core/events/EventPriority.h similarity index 100% rename from ReactCommon/fabric/events/EventPriority.h rename to ReactCommon/fabric/core/events/EventPriority.h diff --git a/ReactCommon/fabric/events/EventQueue.cpp b/ReactCommon/fabric/core/events/EventQueue.cpp similarity index 100% rename from ReactCommon/fabric/events/EventQueue.cpp rename to ReactCommon/fabric/core/events/EventQueue.cpp diff --git a/ReactCommon/fabric/events/EventQueue.h b/ReactCommon/fabric/core/events/EventQueue.h similarity index 90% rename from ReactCommon/fabric/events/EventQueue.h rename to ReactCommon/fabric/core/events/EventQueue.h index e6fe6b2c7..8ebe3652a 100644 --- a/ReactCommon/fabric/events/EventQueue.h +++ b/ReactCommon/fabric/core/events/EventQueue.h @@ -12,9 +12,9 @@ #include #include -#include -#include -#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/events/EventTarget.cpp b/ReactCommon/fabric/core/events/EventTarget.cpp similarity index 100% rename from ReactCommon/fabric/events/EventTarget.cpp rename to ReactCommon/fabric/core/events/EventTarget.cpp diff --git a/ReactCommon/fabric/events/EventTarget.h b/ReactCommon/fabric/core/events/EventTarget.h similarity index 100% rename from ReactCommon/fabric/events/EventTarget.h rename to ReactCommon/fabric/core/events/EventTarget.h diff --git a/ReactCommon/fabric/events/RawEvent.cpp b/ReactCommon/fabric/core/events/RawEvent.cpp similarity index 100% rename from ReactCommon/fabric/events/RawEvent.cpp rename to ReactCommon/fabric/core/events/RawEvent.cpp diff --git a/ReactCommon/fabric/events/RawEvent.h b/ReactCommon/fabric/core/events/RawEvent.h similarity index 88% rename from ReactCommon/fabric/events/RawEvent.h rename to ReactCommon/fabric/core/events/RawEvent.h index e8a14dc60..4305d78ee 100644 --- a/ReactCommon/fabric/events/RawEvent.h +++ b/ReactCommon/fabric/core/events/RawEvent.h @@ -9,8 +9,8 @@ #include #include -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/events/UnbatchedEventQueue.cpp b/ReactCommon/fabric/core/events/UnbatchedEventQueue.cpp similarity index 100% rename from ReactCommon/fabric/events/UnbatchedEventQueue.cpp rename to ReactCommon/fabric/core/events/UnbatchedEventQueue.cpp diff --git a/ReactCommon/fabric/events/UnbatchedEventQueue.h b/ReactCommon/fabric/core/events/UnbatchedEventQueue.h similarity index 93% rename from ReactCommon/fabric/events/UnbatchedEventQueue.h rename to ReactCommon/fabric/core/events/UnbatchedEventQueue.h index 46f2392e9..b1658ab09 100644 --- a/ReactCommon/fabric/events/UnbatchedEventQueue.h +++ b/ReactCommon/fabric/core/events/UnbatchedEventQueue.h @@ -7,7 +7,7 @@ #pragma once -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/events/ValueFactory.h b/ReactCommon/fabric/core/events/ValueFactory.h similarity index 100% rename from ReactCommon/fabric/events/ValueFactory.h rename to ReactCommon/fabric/core/events/ValueFactory.h diff --git a/ReactCommon/fabric/core/shadownode/ShadowNode.h b/ReactCommon/fabric/core/shadownode/ShadowNode.h index ea12b5f72..56112c762 100644 --- a/ReactCommon/fabric/core/shadownode/ShadowNode.h +++ b/ReactCommon/fabric/core/shadownode/ShadowNode.h @@ -11,12 +11,12 @@ #include #include +#include #include #include #include #include #include -#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/core/shadownode/ShadowNodeFragment.h b/ReactCommon/fabric/core/shadownode/ShadowNodeFragment.h index 9db4cd45c..bb151ffa7 100644 --- a/ReactCommon/fabric/core/shadownode/ShadowNodeFragment.h +++ b/ReactCommon/fabric/core/shadownode/ShadowNodeFragment.h @@ -7,11 +7,11 @@ #pragma once +#include #include #include #include #include -#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/events/BUCK b/ReactCommon/fabric/events/BUCK deleted file mode 100644 index e8271c4e8..000000000 --- a/ReactCommon/fabric/events/BUCK +++ /dev/null @@ -1,80 +0,0 @@ -load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_debug_preprocessor_flags") -load( - "//tools/build_defs/oss:rn_defs.bzl", - "ANDROID", - "APPLE", - "fb_xplat_cxx_test", - "get_apple_compiler_flags", - "get_apple_inspector_flags", - "react_native_xplat_target", - "rn_xplat_cxx_library", - "subdir_glob", -) - -APPLE_COMPILER_FLAGS = get_apple_compiler_flags() - -rn_xplat_cxx_library( - name = "events", - srcs = glob( - ["**/*.cpp"], - exclude = glob(["tests/**/*.cpp"]), - ), - headers = glob( - ["**/*.h"], - exclude = glob(["tests/**/*.h"]), - ), - header_namespace = "", - exported_headers = subdir_glob( - [ - ("", "*.h"), - ], - prefix = "react/events", - ), - compiler_flags = [ - "-fexceptions", - "-frtti", - "-std=c++14", - "-Wall", - ], - fbobjc_compiler_flags = APPLE_COMPILER_FLAGS, - fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + get_apple_inspector_flags(), - force_static = True, - macosx_tests_override = [], - platforms = (ANDROID, APPLE), - preprocessor_flags = [ - "-DLOG_TAG=\"ReactNative\"", - # Systraces are temporary disabled. - # "-DWITH_FBSYSTRACE=1", - ], - tests = [":tests"], - visibility = ["PUBLIC"], - deps = [ - "fbsource//xplat/fbsystrace:fbsystrace", - "fbsource//xplat/folly:headers_only", - "fbsource//xplat/folly:memory", - "fbsource//xplat/folly:molly", - "fbsource//xplat/jsi:JSIDynamic", - "fbsource//xplat/jsi:jsi", - "fbsource//xplat/third-party/glog:glog", - react_native_xplat_target("fabric/debug:debug"), - ], -) - -fb_xplat_cxx_test( - name = "tests", - srcs = glob(["tests/**/*.cpp"]), - headers = glob(["tests/**/*.h"]), - compiler_flags = [ - "-fexceptions", - "-frtti", - "-std=c++14", - "-Wall", - ], - contacts = ["oncall+react_native@xmail.facebook.com"], - platforms = (ANDROID, APPLE), - deps = [ - "fbsource//xplat/folly:molly", - "fbsource//xplat/third-party/gmock:gtest", - ":events", - ], -) diff --git a/ReactCommon/fabric/events/tests/EventsTest.cpp b/ReactCommon/fabric/events/tests/EventsTest.cpp deleted file mode 100644 index c6fe25b84..000000000 --- a/ReactCommon/fabric/events/tests/EventsTest.cpp +++ /dev/null @@ -1,14 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -#include - -#include - -TEST(EventsTest, testSomething) { - // TODO -} diff --git a/ReactCommon/fabric/mounting/BUCK b/ReactCommon/fabric/mounting/BUCK index 31c5798c1..674ad5b56 100644 --- a/ReactCommon/fabric/mounting/BUCK +++ b/ReactCommon/fabric/mounting/BUCK @@ -57,7 +57,6 @@ rn_xplat_cxx_library( react_native_xplat_target("better:better"), react_native_xplat_target("fabric/core:core"), react_native_xplat_target("fabric/debug:debug"), - react_native_xplat_target("fabric/events:events"), ], ) diff --git a/ReactCommon/fabric/mounting/ShadowView.h b/ReactCommon/fabric/mounting/ShadowView.h index 8f242effa..9bff55de7 100644 --- a/ReactCommon/fabric/mounting/ShadowView.h +++ b/ReactCommon/fabric/mounting/ShadowView.h @@ -6,12 +6,12 @@ #pragma once #include +#include #include #include #include #include #include -#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/uimanager/BUCK b/ReactCommon/fabric/uimanager/BUCK index a6a2f978b..1b99a5e63 100644 --- a/ReactCommon/fabric/uimanager/BUCK +++ b/ReactCommon/fabric/uimanager/BUCK @@ -62,7 +62,6 @@ rn_xplat_cxx_library( react_native_xplat_target("fabric/mounting:mounting"), react_native_xplat_target("fabric/core:core"), react_native_xplat_target("fabric/debug:debug"), - react_native_xplat_target("fabric/events:events"), ], ) diff --git a/ReactCommon/fabric/uimanager/ComponentDescriptorFactory.h b/ReactCommon/fabric/uimanager/ComponentDescriptorFactory.h index 94e4260f6..9a11b4d82 100644 --- a/ReactCommon/fabric/uimanager/ComponentDescriptorFactory.h +++ b/ReactCommon/fabric/uimanager/ComponentDescriptorFactory.h @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include "ComponentDescriptorRegistry.h" diff --git a/ReactCommon/fabric/uimanager/primitives.h b/ReactCommon/fabric/uimanager/primitives.h index b3044f030..c427f0428 100644 --- a/ReactCommon/fabric/uimanager/primitives.h +++ b/ReactCommon/fabric/uimanager/primitives.h @@ -5,8 +5,8 @@ #include #include #include +#include #include -#include namespace facebook { namespace react {