feat: add onSvgLayout event to ios

Author: kacperzolkiewski

apple/RNSVGNode.h

@@ -62,7 +62,7 @@ extern CGFloat const RNSVG_DEFAULT_FONT_SIZE;
 @property (nonatomic, assign) CGRect fillBounds;
 @property (nonatomic, assign) CGRect strokeBounds;
 @property (nonatomic, assign) CGRect markerBounds;
-@property (nonatomic, copy) RCTDirectEventBlock onLayout;
+@property (nonatomic, copy) RCTDirectEventBlock onSvgLayout;
 
 /**
  * RNSVGSvgView which ownes current RNSVGNode

apple/RNSVGNode.mm

@@ -12,6 +12,11 @@
 #import "RNSVGGlyphContext.h"
 #import "RNSVGGroup.h"
 
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <react/renderer/components/rnsvg/ComponentDescriptors.h>
+using namespace facebook::react;
+#endif // RCT_NEW_ARCH_ENABLED
+
 @interface RNSVGNode ()
 @property (nonatomic, readwrite, weak) RNSVGSvgView *svgView;
 @property (nonatomic, readwrite, weak) RNSVGGroup *textRoot;
@@ -264,16 +269,18 @@ - (void)setClientRect:(CGRect)clientRect
   _clientRect = clientRect;
 #ifdef RCT_NEW_ARCH_ENABLED
   if (_eventEmitter != nullptr) {
-    facebook::react::LayoutMetrics customLayoutMetrics = _layoutMetrics;
-    customLayoutMetrics.frame.size.width = _clientRect.size.width;
-    customLayoutMetrics.frame.size.height = _clientRect.size.height;
-    customLayoutMetrics.frame.origin.x = _clientRect.origin.x;
-    customLayoutMetrics.frame.origin.y = _clientRect.origin.y;
-    _eventEmitter->onLayout(customLayoutMetrics);
+    static_cast<const RNSVGGroupEventEmitter &>(*_eventEmitter)
+      .onSvgLayout(
+        {.layout = {
+            .x = static_cast<int>(_clientRect.origin.x),
+            .y = static_cast<int>(_clientRect.origin.y),
+            .width = static_cast<int>(_clientRect.size.width),
+            .height = static_cast<int>(_clientRect.size.height)
+        }});
   }
 #else
-  if (self.onLayout) {
-    self.onLayout(@{
+  if (self.onSvgLayout) {
+    self.onSvgLayout(@{
       @"layout" : @{
         @"x" : @(_clientRect.origin.x),
         @"y" : @(_clientRect.origin.y),
@@ -660,7 +667,7 @@ - (void)prepareForRecycle
   _fillBounds = CGRectZero;
   _strokeBounds = CGRectZero;
   _markerBounds = CGRectZero;
-  _onLayout = nil;
+  _onSvgLayout = nil;
 
   _svgView = nil;
   _textRoot = nil;

apple/ViewManagers/RNSVGNodeManager.mm

@@ -41,7 +41,7 @@ - (RNSVGPlatformView *)view
 RCT_EXPORT_VIEW_PROPERTY(clipPath, NSString)
 RCT_EXPORT_VIEW_PROPERTY(clipRule, RNSVGCGFCRule)
 RCT_EXPORT_VIEW_PROPERTY(responsible, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(onLayout, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onSvgLayout, RCTDirectEventBlock)
 
 RCT_CUSTOM_SHADOW_PROPERTY(top, id, RNSVGNode) {}
 RCT_CUSTOM_SHADOW_PROPERTY(right, id, RNSVGNode) {}

src/fabric/CircleNativeComponent.ts

@@ -33,10 +33,12 @@ type ColorStruct = Readonly<{
 }>;
 
 type OnSvgLayoutEvent = Readonly<{
-  x: Int32;
-  y: Int32;
-  width: Int32;
-  height: Int32;
+  layout: {
+    x: Int32;
+    y: Int32;
+    width: Int32;
+    height: Int32;
+  };
 }>;
 
 interface SvgRenderableCommonProps {

src/fabric/ClipPathNativeComponent.ts

@@ -33,10 +33,12 @@ type ColorStruct = Readonly<{
 }>;
 
 type OnSvgLayoutEvent = Readonly<{
-  x: Int32;
-  y: Int32;
-  width: Int32;
-  height: Int32;
+  layout: {
+    x: Int32;
+    y: Int32;
+    width: Int32;
+    height: Int32;
+  };
 }>;
 
 interface SvgRenderableCommonProps {

src/fabric/EllipseNativeComponent.ts

@@ -33,10 +33,12 @@ type ColorStruct = Readonly<{
 }>;
 
 type OnSvgLayoutEvent = Readonly<{
-  x: Int32;
-  y: Int32;
-  width: Int32;
-  height: Int32;
+  layout: {
+    x: Int32;
+    y: Int32;
+    width: Int32;
+    height: Int32;
+  };
 }>;
 
 interface SvgRenderableCommonProps {

src/fabric/ForeignObjectNativeComponent.ts

@@ -33,12 +33,13 @@ type ColorStruct = Readonly<{
 }>;
 
 type OnSvgLayoutEvent = Readonly<{
-  x: Int32;
-  y: Int32;
-  width: Int32;
-  height: Int32;
+  layout: {
+    x: Int32;
+    y: Int32;
+    width: Int32;
+    height: Int32;
+  };
 }>;
-
 interface SvgRenderableCommonProps {
   color?: ColorValue;
   fill?: UnsafeMixed<ColorValue | ColorStruct>;

src/fabric/GroupNativeComponent.ts

@@ -33,10 +33,12 @@ type ColorStruct = Readonly<{
 }>;
 
 type OnSvgLayoutEvent = Readonly<{
-  x: Int32;
-  y: Int32;
-  width: Int32;
-  height: Int32;
+  layout: {
+    x: Int32;
+    y: Int32;
+    width: Int32;
+    height: Int32;
+  };
 }>;
 
 interface SvgRenderableCommonProps {

src/fabric/ImageNativeComponent.ts

@@ -45,10 +45,12 @@ type ColorStruct = Readonly<{
 }>;
 
 type OnSvgLayoutEvent = Readonly<{
-  x: Int32;
-  y: Int32;
-  width: Int32;
-  height: Int32;
+  layout: {
+    x: Int32;
+    y: Int32;
+    width: Int32;
+    height: Int32;
+  };
 }>;
 
 interface SvgRenderableCommonProps {

src/fabric/LineNativeComponent.ts

@@ -33,10 +33,12 @@ type ColorStruct = Readonly<{
 }>;
 
 type OnSvgLayoutEvent = Readonly<{
-  x: Int32;
-  y: Int32;
-  width: Int32;
-  height: Int32;
+  layout: {
+    x: Int32;
+    y: Int32;
+    width: Int32;
+    height: Int32;
+  };
 }>;
 
 interface SvgRenderableCommonProps {