Improve

Author: janicduplessis

common/cpp/react/renderer/components/rnsvg/RNSVGNodeBaseShadowNode.cpp

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "RNSVGNodeBaseShadowNode.h"
+
+#include <react/renderer/core/LayoutConstraints.h>
+#include <react/renderer/core/LayoutContext.h>
+
+namespace facebook {
+namespace react {
+
+RNSVGNodeBaseShadowNode::RNSVGNodeBaseShadowNode(
+    const ShadowNodeFragment &fragment,
+    const ShadowNodeFamily::Shared &family,
+    ShadowNodeTraits traits)
+    : LayoutableShadowNode(fragment, family, traits) {}
+
+RNSVGNodeBaseShadowNode::RNSVGNodeBaseShadowNode(
+    const ShadowNode &sourceShadowNode,
+    const ShadowNodeFragment &fragment)
+    : LayoutableShadowNode(sourceShadowNode, fragment) {}
+
+void RNSVGNodeBaseShadowNode::layoutTree(
+    LayoutContext layoutContext,
+    LayoutConstraints layoutConstraints) {}
+
+void RNSVGNodeBaseShadowNode::layout(LayoutContext layoutContext) {}
+
+void RNSVGNodeBaseShadowNode::cleanLayout() {}
+
+void RNSVGNodeBaseShadowNode::dirtyLayout() {}
+
+bool RNSVGNodeBaseShadowNode::getIsLayoutClean() const {
+  return true;
+}
+
+} // namespace react
+} // namespace facebook

common/cpp/react/renderer/components/rnsvg/RNSVGNodeBaseShadowNode.h

@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <react/renderer/core/LayoutableShadowNode.h>
+
+namespace facebook {
+namespace react {
+
+/**
+ * Base shadow node used as base class for all nodes.
+ *
+ * Currently Fabric on Android requires shadow nodes to be subclasses of
+ * LayoutableShadowNode so that it can instantiate views and setup the view
+ * hierarchy properly. SVG nodes don't need layout so we just implement empty
+ * methods.
+ */
+class RNSVGNodeBaseShadowNode : public LayoutableShadowNode {
+ public:
+  RNSVGNodeBaseShadowNode(
+      const ShadowNodeFragment &fragment,
+      const ShadowNodeFamily::Shared &family,
+      ShadowNodeTraits traits);
+
+  RNSVGNodeBaseShadowNode(
+      const ShadowNode &sourceShadowNode,
+      const ShadowNodeFragment &fragment);
+
+  virtual void layoutTree(
+      LayoutContext layoutContext,
+      LayoutConstraints layoutConstraints);
+  virtual void layout(LayoutContext layoutContext);
+  virtual void cleanLayout();
+  virtual void dirtyLayout();
+  virtual bool getIsLayoutClean() const;
+
+  static ShadowNodeTraits BaseTraits() {
+    auto traits = LayoutableShadowNode::BaseTraits();
+    traits.set(ShadowNodeTraits::Trait::FormsStackingContext);
+    traits.set(ShadowNodeTraits::Trait::FormsView);
+    return traits;
+  }
+};
+
+} // namespace react
+} // namespace facebook

common/cpp/react/renderer/components/rnsvg/RNSVGNodeShadowNode.h

@@ -9,15 +9,23 @@
 
 #include <jsi/jsi.h>
 #include <react/renderer/components/rnsvg/Props.h>
+#include <react/renderer/components/view/ViewEventEmitter.h>
 #include <react/renderer/core/ConcreteShadowNode.h>
 #include <react/renderer/core/ShadowNode.h>
 
-#include "RNSVGNodeShadowNode.h"
+#include "RNSVGNodeBaseShadowNode.h"
 
 namespace facebook {
 namespace react {
 
-JSI_EXPORT extern const char RNSVGCircleComponentName[];
+template <ComponentName concreteComponentName, typename PropsT>
+using RNSVGNodeShadowNode = ConcreteShadowNode<
+    concreteComponentName,
+    RNSVGNodeBaseShadowNode,
+    PropsT,
+    ViewEventEmitter>;
+
+extern const char RNSVGCircleComponentName[];
 
 /*
  * `ShadowNode` for <RNSVGCircle> component.

common/cpp/react/renderer/components/rnsvg/RNSVGShadowNodes.h

@@ -17,24 +17,8 @@ namespace react {
 /*
  * Descriptor for <RNSVGSvgViewAndroid> component.
  */
-class RNSVGSvgViewAndroidComponentDescriptor final
-    : public ConcreteComponentDescriptor<RNSVGSvgViewAndroidShadowNode> {
- public:
-  RNSVGSvgViewAndroidComponentDescriptor(
-      ComponentDescriptorParameters const &parameters)
-      : ConcreteComponentDescriptor(parameters) {}
-
-  void adopt(ShadowNode::Unshared const &shadowNode) const override {
-    ConcreteComponentDescriptor::adopt(shadowNode);
-
-    auto svgViewShadowNode =
-        std::static_pointer_cast<RNSVGSvgViewAndroidShadowNode>(shadowNode);
-
-    // All `RNSVGSvgViewAndroidShadowNode`s must have leaf Yoga nodes with
-    // properly setup measure function.
-    svgViewShadowNode->enableMeasurement();
-  }
-};
+using RNSVGSvgViewAndroidComponentDescriptor =
+    ConcreteComponentDescriptor<RNSVGSvgViewAndroidShadowNode>;
 
 } // namespace react
 } // namespace facebook

common/cpp/react/renderer/components/rnsvg/RNSVGSvgViewAndroidComponentDescriptor.h

@@ -30,6 +30,7 @@ class JSI_EXPORT RNSVGSvgViewAndroidShadowNode final
   static ShadowNodeTraits BaseTraits() {
     auto traits = ConcreteViewShadowNode::BaseTraits();
     traits.set(ShadowNodeTraits::Trait::LeafYogaNode);
+    traits.set(ShadowNodeTraits::Trait::MeasurableYogaNode);
     return traits;
   }
 

common/cpp/react/renderer/components/rnsvg/RNSVGSvgViewAndroidShadowNode.h

@@ -17,24 +17,8 @@ namespace react {
 /*
  * Descriptor for <RNSVGSvgView> component.
  */
-class RNSVGSvgViewComponentDescriptor final
-    : public ConcreteComponentDescriptor<RNSVGSvgViewShadowNode> {
- public:
-  RNSVGSvgViewComponentDescriptor(
-      ComponentDescriptorParameters const &parameters)
-      : ConcreteComponentDescriptor(parameters) {}
-
-  void adopt(ShadowNode::Unshared const &shadowNode) const override {
-    ConcreteComponentDescriptor::adopt(shadowNode);
-
-    auto svgViewShadowNode =
-        std::static_pointer_cast<RNSVGSvgViewShadowNode>(shadowNode);
-
-    // All `RNSVGSvgViewShadowNode`s must have leaf Yoga nodes with
-    // properly setup measure function.
-    svgViewShadowNode->enableMeasurement();
-  }
-};
+using RNSVGSvgViewComponentDescriptor =
+    ConcreteComponentDescriptor<RNSVGSvgViewShadowNode>;
 
 } // namespace react
 } // namespace facebook

common/cpp/react/renderer/components/rnsvg/RNSVGSvgViewComponentDescriptor.h

@@ -7,6 +7,8 @@
 
 #include "RNSVGSvgViewMeasurement.h"
 
+#include <algorithm>
+
 namespace facebook {
 namespace react {
 

common/cpp/react/renderer/components/rnsvg/RNSVGSvgViewMeasurement.cpp

@@ -26,6 +26,13 @@ class JSI_EXPORT RNSVGSvgViewShadowNode final : public ConcreteViewShadowNode<
  public:
   using ConcreteViewShadowNode::ConcreteViewShadowNode;
 
+  static ShadowNodeTraits BaseTraits() {
+    auto traits = ConcreteViewShadowNode::BaseTraits();
+    traits.set(ShadowNodeTraits::Trait::LeafYogaNode);
+    traits.set(ShadowNodeTraits::Trait::MeasurableYogaNode);
+    return traits;
+  }
+
 #pragma mark - LayoutableShadowNode
 
   Size measureContent(