react-native 0.74.0-nightly-20240128-cfc0ba04a → 1000.0.0

package/ReactCommon/jsinspector-modern/PageTarget.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #include <jsinspector-modern/InspectorInterfaces.h>
+#include <jsinspector-modern/InstanceTarget.h>
 
 #include <list>
 #include <optional>
@@ -83,6 +84,8 @@ class PageTargetController {
 
   PageTargetDelegate& getDelegate();
 
+  bool hasInstance() const;
+
  private:
   PageTarget& target_;
 };
@@ -107,7 +110,7 @@ class JSINSPECTOR_EXPORT PageTarget {
   explicit PageTarget(PageTargetDelegate& delegate);
 
   PageTarget(const PageTarget&) = delete;
-  PageTarget(PageTarget&&) = default;
+  PageTarget(PageTarget&&) = delete;
   PageTarget& operator=(const PageTarget&) = delete;
   PageTarget& operator=(PageTarget&&) = delete;
   ~PageTarget();
@@ -123,11 +126,31 @@ class JSINSPECTOR_EXPORT PageTarget {
       std::unique_ptr<IRemoteConnection> connectionToFrontend,
       SessionMetadata sessionMetadata = {});
 
+  /**
+   * Registers an instance with this PageTarget.
+   * \param delegate The InstanceTargetDelegate that will receive events from
+   * this InstanceTarget. The caller is responsible for ensuring that the
+   * InstanceTargetDelegate outlives this object.
+   * \return An InstanceTarget reference representing the newly created
+   * instance. This reference is only valid until unregisterInstance is called
+   * (or the PageTarget is destroyed). \pre There isn't currently an instance
+   * registered with this PageTarget.
+   */
+  InstanceTarget& registerInstance(InstanceTargetDelegate& delegate);
+
+  /**
+   * Unregisters an instance from this PageTarget.
+   * \param instance The InstanceTarget reference previously returned by
+   * registerInstance.
+   */
+  void unregisterInstance(InstanceTarget& instance);
+
  private:
   std::list<std::weak_ptr<PageTargetSession>> sessions_;
 
   PageTargetDelegate& delegate_;
   PageTargetController controller_{*this};
+  std::optional<InstanceTarget> currentInstance_{std::nullopt};
 
   /**
    * Call the given function for every active session, and clean up any
@@ -151,6 +174,10 @@ class JSINSPECTOR_EXPORT PageTarget {
     return delegate_;
   }
 
+  inline bool hasInstance() const {
+    return currentInstance_.has_value();
+  }
+
   // Necessary to allow PageAgent to access PageTarget's internals in a
   // controlled way (i.e. only PageTargetController gets friend access, while
   // PageAgent itself doesn't).

package/ReactCommon/jsinspector-modern/React-jsinspector.podspec

@@ -20,6 +20,10 @@ folly_config = get_folly_config()
 folly_compiler_flags = folly_config[:compiler_flags]
 folly_version = folly_config[:version]
 
+use_frameworks = ENV['USE_FRAMEWORKS'] != nil
+
+header_dir = 'jsinspector-modern'
+module_name = "jsinspector_modern"
 Pod::Spec.new do |s|
   s.name                   = "React-jsinspector"
   s.version                = version
@@ -35,7 +39,14 @@ Pod::Spec.new do |s|
   s.pod_target_xcconfig    = {
                                "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/..\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fmt/include\"",
                                "CLANG_CXX_LANGUAGE_STANDARD" => "c++20"
-                             }
+  }.merge!(use_frameworks ? {
+    "PUBLIC_HEADERS_FOLDER_PATH" => "#{module_name}.framework/Headers/#{header_dir}"
+  } : {})
+
+  if use_frameworks
+    s.module_name = module_name
+  end
+
   s.dependency "glog"
   s.dependency "RCT-Folly", folly_version
   s.dependency "React-nativeconfig"

package/ReactCommon/jsinspector-modern/ReactCdp.h

@@ -7,4 +7,5 @@
 
 #pragma once
 
+#include <jsinspector-modern/InstanceTarget.h>
 #include <jsinspector-modern/PageTarget.h>

package/ReactCommon/jsinspector-modern/tests/InspectorMocks.h

@@ -121,4 +121,6 @@ class MockPageTargetDelegate : public PageTargetDelegate {
   MOCK_METHOD(void, onReload, (const PageReloadRequest& request), (override));
 };
 
+class MockInstanceTargetDelegate : public InstanceTargetDelegate {};
+
 } // namespace facebook::react::jsinspector_modern

package/ReactCommon/jsinspector-modern/tests/PageTargetTest.cpp

@@ -25,30 +25,29 @@ namespace facebook::react::jsinspector_modern {
 
 namespace {
 
-/**
- * Simplified test harness focused on sending messages to and from a PageTarget.
- */
-class PageTargetProtocolTest : public Test {
- public:
-  PageTargetProtocolTest() {
+class PageTargetTest : public Test {
+ protected:
+  void connect() {
+    ASSERT_FALSE(toPage_) << "Can only connect once in a PageTargetTest.";
     toPage_ = page_.connect(
         remoteConnections_.make_unique(),
-        {.integrationName = "PageTargetProtocolTest"});
+        {.integrationName = "PageTargetTest"});
 
-    // In protocol tests, we'll always get an onDisconnect call when we tear
+    // We'll always get an onDisconnect call when we tear
     // down the test. Expect it in order to satisfy the strict mock.
     EXPECT_CALL(*remoteConnections_[0], onDisconnect());
   }
 
- protected:
   MockPageTargetDelegate pageTargetDelegate_;
 
   MockRemoteConnection& fromPage() {
+    assert(toPage_);
     return *remoteConnections_[0];
   }
 
- private:
   PageTarget page_{pageTargetDelegate_};
+
+ private:
   UniquePtrFactory<StrictMock<MockRemoteConnection>> remoteConnections_;
 
  protected:
@@ -56,6 +55,20 @@ class PageTargetProtocolTest : public Test {
   std::unique_ptr<ILocalConnection> toPage_;
 };
 
+/**
+ * Simplified test harness focused on sending messages to and from a PageTarget.
+ */
+class PageTargetProtocolTest : public PageTargetTest {
+ public:
+  PageTargetProtocolTest() {
+    connect();
+  }
+
+ private:
+  // Protocol tests shouldn't manually call connect()
+  using PageTargetTest::connect;
+};
+
 } // namespace
 
 TEST_F(PageTargetProtocolTest, UnrecognizedMethod) {
@@ -169,4 +182,145 @@ TEST_F(PageTargetProtocolTest, PageReloadMethod) {
                          })");
 }
 
+TEST_F(PageTargetProtocolTest, RegisterUnregisterInstanceWithoutEvents) {
+  MockInstanceTargetDelegate instanceTargetDelegate;
+
+  auto& instanceTarget = page_.registerInstance(instanceTargetDelegate);
+
+  page_.unregisterInstance(instanceTarget);
+}
+
+TEST_F(PageTargetTest, ConnectToAlreadyRegisteredInstanceWithoutEvents) {
+  MockInstanceTargetDelegate instanceTargetDelegate;
+
+  auto& instanceTarget = page_.registerInstance(instanceTargetDelegate);
+
+  connect();
+
+  page_.unregisterInstance(instanceTarget);
+}
+
+TEST_F(PageTargetProtocolTest, RegisterUnregisterInstanceWithEvents) {
+  InSequence s;
+
+  EXPECT_CALL(fromPage(), onMessage(JsonEq(R"({
+                                               "id": 1,
+                                               "result": {}
+                                             })")));
+  toPage_->sendMessage(R"({
+                           "id": 1,
+                           "method": "Runtime.enable"
+                         })");
+
+  MockInstanceTargetDelegate instanceTargetDelegate;
+
+  EXPECT_CALL(fromPage(), onMessage(JsonEq(R"({
+                                               "method": "Runtime.executionContextCreated",
+                                               "params": {
+                                                 "context": {
+                                                   "id": 1,
+                                                   "origin": "",
+                                                   "name": "React Native"
+                                                 }
+                                               }
+                                             })")));
+  auto& instanceTarget = page_.registerInstance(instanceTargetDelegate);
+
+  EXPECT_CALL(fromPage(), onMessage(JsonEq(R"({
+                                               "method": "Runtime.executionContextDestroyed",
+                                               "params": {
+                                                 "executionContextId": 1
+                                               }
+                                             })")));
+  EXPECT_CALL(fromPage(), onMessage(JsonEq(R"({
+                                               "method": "Runtime.executionContextsCleared"
+                                             })")));
+  page_.unregisterInstance(instanceTarget);
+}
+
+TEST_F(PageTargetTest, ConnectToAlreadyRegisteredInstanceWithEvents) {
+  MockInstanceTargetDelegate instanceTargetDelegate;
+  auto& instanceTarget = page_.registerInstance(instanceTargetDelegate);
+
+  connect();
+
+  InSequence s;
+
+  EXPECT_CALL(fromPage(), onMessage(JsonEq(R"({
+                                               "id": 1,
+                                               "result": {}
+                                             })")));
+  EXPECT_CALL(fromPage(), onMessage(JsonEq(R"({
+                                               "method": "Runtime.executionContextCreated",
+                                               "params": {
+                                                 "context": {
+                                                   "id": 1,
+                                                   "origin": "",
+                                                   "name": "React Native"
+                                                 }
+                                               }
+                                             })")));
+
+  toPage_->sendMessage(R"({
+                           "id": 1,
+                           "method": "Runtime.enable"
+                         })");
+
+  EXPECT_CALL(fromPage(), onMessage(JsonEq(R"({
+                                               "method": "Runtime.executionContextDestroyed",
+                                               "params": {
+                                                 "executionContextId": 1
+                                               }
+                                             })")));
+  EXPECT_CALL(fromPage(), onMessage(JsonEq(R"({
+                                               "method": "Runtime.executionContextsCleared"
+                                             })")));
+  page_.unregisterInstance(instanceTarget);
+}
+
+TEST_F(PageTargetProtocolTest, RespondToHeapUsageMethodWhileInstanceExists) {
+  // NOTE: This test will be deleted once we add some real CDP method
+  // implementations to InstanceAgent.
+
+  EXPECT_CALL(
+      fromPage(),
+      onMessage(JsonParsed(AllOf(
+          AtJsonPtr("/error/code", Eq(-32601)), AtJsonPtr("/id", Eq(1))))))
+      .RetiresOnSaturation();
+
+  toPage_->sendMessage(R"({
+                           "id": 1,
+                           "method": "Runtime.getHeapUsage"
+                         })");
+
+  MockInstanceTargetDelegate instanceTargetDelegate;
+  auto& instanceTarget = page_.registerInstance(instanceTargetDelegate);
+
+  EXPECT_CALL(fromPage(), onMessage(JsonEq(R"({
+                                               "id": 2,
+                                               "result": {
+                                                 "usedSize": 0,
+                                                 "totalSize": 0
+                                               }
+                                             })")));
+
+  toPage_->sendMessage(R"({
+                           "id": 2,
+                           "method": "Runtime.getHeapUsage"
+                         })");
+
+  page_.unregisterInstance(instanceTarget);
+
+  EXPECT_CALL(
+      fromPage(),
+      onMessage(JsonParsed(AllOf(
+          AtJsonPtr("/error/code", Eq(-32601)), AtJsonPtr("/id", Eq(3))))))
+      .RetiresOnSaturation();
+
+  toPage_->sendMessage(R"({
+                           "id": 3,
+                           "method": "Runtime.getHeapUsage"
+                         })");
+}
+
 } // namespace facebook::react::jsinspector_modern

package/ReactCommon/react/featureflags/ReactNativeFeatureFlags.cpp

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<eb9bb346a84321197849de2dd8bf7dc3>>
+ * @generated SignedSource<<809c23db6d36e18d448554900e462aa0>>
  */
 
 /**
@@ -37,6 +37,10 @@ bool ReactNativeFeatureFlags::batchRenderingUpdatesInEventLoop() {
   return getAccessor().batchRenderingUpdatesInEventLoop();
 }
 
+bool ReactNativeFeatureFlags::enableSpannableBuildingUnification() {
+  return getAccessor().enableSpannableBuildingUnification();
+}
+
 void ReactNativeFeatureFlags::override(
     std::unique_ptr<ReactNativeFeatureFlagsProvider> provider) {
   getAccessor().override(std::move(provider));

package/ReactCommon/react/featureflags/ReactNativeFeatureFlags.h

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<be203871f94ca134f75b803b7d79a5ab>>
+ * @generated SignedSource<<ea6c88fb2c3fcaa35b5886b8f8ceb769>>
  */
 
 /**
@@ -52,6 +52,11 @@ class ReactNativeFeatureFlags {
    */
   static bool batchRenderingUpdatesInEventLoop();
 
+  /**
+   * Uses new, deduplicated logic for constructing Android Spannables from text fragments
+   */
+  static bool enableSpannableBuildingUnification();
+
   /**
    * Overrides the feature flags with the ones provided by the given provider
    * (generally one that extends `ReactNativeFeatureFlagsDefaults`).

package/ReactCommon/react/featureflags/ReactNativeFeatureFlagsAccessor.cpp

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<5df50987338c0541436b11cd5433013c>>
+ * @generated SignedSource<<15858c6ab96e90350aa5f29eb108b051>>
  */
 
 /**
@@ -96,6 +96,23 @@ bool ReactNativeFeatureFlagsAccessor::batchRenderingUpdatesInEventLoop() {
   return batchRenderingUpdatesInEventLoop_.value();
 }
 
+bool ReactNativeFeatureFlagsAccessor::enableSpannableBuildingUnification() {
+  if (!enableSpannableBuildingUnification_.has_value()) {
+    // Mark the flag as accessed.
+    static const char* flagName = "enableSpannableBuildingUnification";
+    if (std::find(
+            accessedFeatureFlags_.begin(),
+            accessedFeatureFlags_.end(),
+            flagName) == accessedFeatureFlags_.end()) {
+      accessedFeatureFlags_.push_back(flagName);
+    }
+
+    enableSpannableBuildingUnification_.emplace(currentProvider_->enableSpannableBuildingUnification());
+  }
+
+  return enableSpannableBuildingUnification_.value();
+}
+
 void ReactNativeFeatureFlagsAccessor::override(
     std::unique_ptr<ReactNativeFeatureFlagsProvider> provider) {
   if (!accessedFeatureFlags_.empty()) {

package/ReactCommon/react/featureflags/ReactNativeFeatureFlagsAccessor.h

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<11335a9c0d793a3a5a0dfdb01cd43efd>>
+ * @generated SignedSource<<938f1f3ad6aa3343beb3ad7707a49a87>>
  */
 
 /**
@@ -34,6 +34,7 @@ class ReactNativeFeatureFlagsAccessor {
   bool useModernRuntimeScheduler();
   bool enableMicrotasks();
   bool batchRenderingUpdatesInEventLoop();
+  bool enableSpannableBuildingUnification();
 
   void override(std::unique_ptr<ReactNativeFeatureFlagsProvider> provider);
 
@@ -45,6 +46,7 @@ class ReactNativeFeatureFlagsAccessor {
   std::optional<bool> useModernRuntimeScheduler_;
   std::optional<bool> enableMicrotasks_;
   std::optional<bool> batchRenderingUpdatesInEventLoop_;
+  std::optional<bool> enableSpannableBuildingUnification_;
 };
 
 } // namespace facebook::react

package/ReactCommon/react/featureflags/ReactNativeFeatureFlagsDefaults.h

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<b354cb54b822e2dfa3e093d39fb4da4e>>
+ * @generated SignedSource<<18dc9a1aa23d156bc94e426ee1864359>>
  */
 
 /**
@@ -42,6 +42,10 @@ class ReactNativeFeatureFlagsDefaults : public ReactNativeFeatureFlagsProvider {
   bool batchRenderingUpdatesInEventLoop() override {
     return false;
   }
+
+  bool enableSpannableBuildingUnification() override {
+    return false;
+  }
 };
 
 } // namespace facebook::react

package/ReactCommon/react/featureflags/ReactNativeFeatureFlagsProvider.h

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<6bf1fc0d7b32a36041c2371fe191792b>>
+ * @generated SignedSource<<2828ad8eb7ea0a0ea9cb0240eadedeb8>>
  */
 
 /**
@@ -29,6 +29,7 @@ class ReactNativeFeatureFlagsProvider {
   virtual bool useModernRuntimeScheduler() = 0;
   virtual bool enableMicrotasks() = 0;
   virtual bool batchRenderingUpdatesInEventLoop() = 0;
+  virtual bool enableSpannableBuildingUnification() = 0;
 };
 
 } // namespace facebook::react

package/ReactCommon/react/featureflags/tests/ReactNativeFeatureFlagsTest.cpp

@@ -28,6 +28,10 @@ class ReactNativeFeatureFlagsTest : public testing::Test {
   void SetUp() override {
     overrideAccessCount = 0;
   }
+
+  void TearDown() override {
+    ReactNativeFeatureFlags::dangerouslyReset();
+  }
 };
 
 TEST_F(ReactNativeFeatureFlagsTest, providesDefaults) {

package/ReactCommon/react/nativemodule/core/platform/ios/React-NativeModulesApple.podspec

@@ -52,6 +52,7 @@ Pod::Spec.new do |s|
     s.dependency "React-cxxreact"
     s.dependency "React-jsi"
     s.dependency "React-runtimeexecutor"
+    add_dependency(s, "React-jsinspector", :framework_name => 'jsinspector_modern')
 
     if using_hermes
       s.dependency "hermes-engine"

package/ReactCommon/react/nativemodule/featureflags/NativeReactNativeFeatureFlags.cpp

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<01b940f6716765f9359c42180db497c0>>
+ * @generated SignedSource<<de38e5abc0430aedc0fe94f0c73fee3d>>
  */
 
 /**
@@ -55,4 +55,9 @@ bool NativeReactNativeFeatureFlags::batchRenderingUpdatesInEventLoop(
   return ReactNativeFeatureFlags::batchRenderingUpdatesInEventLoop();
 }
 
+bool NativeReactNativeFeatureFlags::enableSpannableBuildingUnification(
+    jsi::Runtime& /*runtime*/) {
+  return ReactNativeFeatureFlags::enableSpannableBuildingUnification();
+}
+
 } // namespace facebook::react

package/ReactCommon/react/nativemodule/featureflags/NativeReactNativeFeatureFlags.h

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<200fe2cf84a044164c60f6dd3c5569dd>>
+ * @generated SignedSource<<b6444bb426632dfb672312df3384127f>>
  */
 
 /**
@@ -37,6 +37,8 @@ class NativeReactNativeFeatureFlags
   bool enableMicrotasks(jsi::Runtime& runtime);
 
   bool batchRenderingUpdatesInEventLoop(jsi::Runtime& runtime);
+
+  bool enableSpannableBuildingUnification(jsi::Runtime& runtime);
 };
 
 } // namespace facebook::react

package/ReactCommon/react/renderer/attributedstring/primitives.h

@@ -120,89 +120,3 @@ enum class HyphenationFrequency {
 };
 
 } // namespace facebook::react
-
-namespace std {
-template <>
-struct hash<facebook::react::FontVariant> {
-  size_t operator()(const facebook::react::FontVariant& v) const {
-    return hash<int>()(static_cast<int>(v));
-  }
-};
-
-template <>
-struct hash<facebook::react::TextAlignment> {
-  size_t operator()(const facebook::react::TextAlignment& v) const {
-    return hash<int>()(static_cast<int>(v));
-  }
-};
-
-template <>
-struct hash<facebook::react::FontStyle> {
-  size_t operator()(const facebook::react::FontStyle& v) const {
-    return hash<int>()(static_cast<int>(v));
-  }
-};
-
-template <>
-struct hash<facebook::react::TextDecorationLineType> {
-  size_t operator()(const facebook::react::TextDecorationLineType& v) const {
-    return hash<int>()(static_cast<int>(v));
-  }
-};
-
-template <>
-struct hash<facebook::react::WritingDirection> {
-  size_t operator()(const facebook::react::WritingDirection& v) const {
-    return hash<int>()(static_cast<int>(v));
-  }
-};
-
-template <>
-struct hash<facebook::react::TextDecorationStyle> {
-  size_t operator()(const facebook::react::TextDecorationStyle& v) const {
-    return hash<int>()(static_cast<int>(v));
-  }
-};
-
-template <>
-struct hash<facebook::react::FontWeight> {
-  size_t operator()(const facebook::react::FontWeight& v) const {
-    return hash<int>()(static_cast<int>(v));
-  }
-};
-
-template <>
-struct hash<facebook::react::DynamicTypeRamp> {
-  size_t operator()(const facebook::react::DynamicTypeRamp& v) const {
-    return hash<int>()(static_cast<int>(v));
-  }
-};
-
-template <>
-struct hash<facebook::react::EllipsizeMode> {
-  size_t operator()(const facebook::react::EllipsizeMode& v) const {
-    return hash<int>()(static_cast<int>(v));
-  }
-};
-
-template <>
-struct hash<facebook::react::TextBreakStrategy> {
-  size_t operator()(const facebook::react::TextBreakStrategy& v) const {
-    return hash<int>()(static_cast<int>(v));
-  }
-};
-
-template <>
-struct hash<facebook::react::TextTransform> {
-  size_t operator()(const facebook::react::TextTransform& v) const {
-    return hash<int>()(static_cast<int>(v));
-  }
-};
-
-template <>
-struct hash<facebook::react::HyphenationFrequency> {
-  size_t operator()(const facebook::react::HyphenationFrequency& v) const {
-    return hash<int>()(static_cast<int>(v));
-  }
-};
-} // namespace std

package/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp

@@ -30,7 +30,10 @@ ParagraphShadowNode::ParagraphShadowNode(
     const ShadowNode& sourceShadowNode,
     const ShadowNodeFragment& fragment)
     : ConcreteViewShadowNode(sourceShadowNode, fragment) {
-  if (!fragment.children && !fragment.props) {
+  auto& sourceParagraphShadowNode =
+      traitCast<ParagraphShadowNode const&>(sourceShadowNode);
+  if (!fragment.children && !fragment.props &&
+      sourceParagraphShadowNode.getIsLayoutClean()) {
     // This ParagraphShadowNode was cloned but did not change
     // in a way that affects its layout. Let's mark it clean
     // to stop Yoga from traversing it.

package/ReactCommon/react/renderer/components/view/AccessibilityPrimitives.h

@@ -248,19 +248,3 @@ enum class Role {
 };
 
 } // namespace facebook::react
-
-namespace std {
-template <>
-struct hash<facebook::react::AccessibilityRole> {
-  size_t operator()(const facebook::react::AccessibilityRole& v) const {
-    return hash<int>()(static_cast<int>(v));
-  }
-};
-
-template <>
-struct hash<facebook::react::Role> {
-  size_t operator()(const facebook::react::Role& v) const {
-    return hash<int>()(static_cast<int>(v));
-  }
-};
-} // namespace std