software-mansion · janicduplessis · Nov 5, 2022 · Dec 9, 2023 · Aug 2, 2024 · Aug 5, 2024
diff --git a/android/src/main/java/com/horcrux/svg/SVGLength.java b/android/src/main/java/com/horcrux/svg/SVGLength.java
@@ -37,7 +37,7 @@ private SVGLength() {
     length = length.trim();
     int stringLength = length.length();
     int percentIndex = stringLength - 1;
-    if (stringLength == 0 || length.equals("normal")) {
+    if (stringLength == 0 || length.equals("normal") || length.equals("auto")) {
       unit = UnitType.UNKNOWN;
       value = 0;
     } else if (length.codePointAt(percentIndex) == '%') {

diff --git a/android/src/main/java/com/horcrux/svg/SvgShadowNode.java b/android/src/main/java/com/horcrux/svg/SvgShadowNode.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2015-present, Horcrux.
+ * All rights reserved.
+ *
+ * This source code is licensed under the MIT-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.horcrux.svg;
+
+import com.facebook.react.uimanager.annotations.ReactProp;
+import com.facebook.react.views.text.ReactBaseTextShadowNode;
+import com.facebook.yoga.YogaMeasureFunction;
+import com.facebook.yoga.YogaMeasureMode;
+import com.facebook.yoga.YogaMeasureOutput;
+import com.facebook.yoga.YogaNode;
+
+public class SvgShadowNode extends ReactBaseTextShadowNode implements YogaMeasureFunction {
+  private float mVbWidth = 0;
+  private float mVbHeight = 0;
+
+  public SvgShadowNode() {
+    setMeasureFunction(this);
+  }
+
+  @ReactProp(name = "vbWidth")
+  public void setVbWidth(float vbWidth) {
+    mVbWidth = vbWidth;
+  }
+
+  @ReactProp(name = "vbHeight")
+  public void setVbHeight(float vbHeight) {
+    mVbHeight = vbHeight;
+  }
+
+  @Override
+  public long measure(
+      YogaNode node,
+      float baseWidth,
+      YogaMeasureMode widthMode,
+      float baseHeight,
+      YogaMeasureMode heightMode) {
+
+    float width = baseWidth;
+    float height = baseHeight;
+    float maxWidth = widthMode == YogaMeasureMode.AT_MOST ? width : Float.MAX_VALUE;
+    float maxHeight = heightMode == YogaMeasureMode.AT_MOST ? height : Float.MAX_VALUE;
+
+    if (mVbWidth != 0 && mVbHeight != 0) {
+      if (widthMode != YogaMeasureMode.EXACTLY) {
+        width = Math.min(mVbWidth / mVbHeight * height, maxWidth);
+      }
+      if (heightMode != YogaMeasureMode.EXACTLY) {
+        height = Math.min(mVbHeight / mVbWidth * width, maxHeight);
+      }
+    }
+
+    return YogaMeasureOutput.make(width, height);
+  }
+}
diff --git a/android/src/main/java/com/horcrux/svg/SvgViewManager.java b/android/src/main/java/com/horcrux/svg/SvgViewManager.java
@@ -79,6 +79,11 @@ public ReactViewGroup createViewInstance(ThemedReactContext reactContext) {
     return new SvgView(reactContext);
   }
 
+  @Override
+  public SvgShadowNode createShadowNodeInstance() {
+    return new SvgShadowNode();
+  }
+
   @Override
   public void updateExtraData(ReactViewGroup root, Object extraData) {
     super.updateExtraData(root, extraData);

diff --git a/android/src/main/jni/rnsvg.h b/android/src/main/jni/rnsvg.h
@@ -3,6 +3,8 @@
 #include <ReactCommon/JavaTurboModule.h>
 #include <ReactCommon/TurboModule.h>
 #include <jsi/jsi.h>
+#include <react/renderer/components/rnsvg/RNSVGComponentDescriptors.h>
+#include <react/renderer/components/rnsvg/RNSVGSvgViewAndroidComponentDescriptor.h>
 #include <react/renderer/components/rnsvg/RNSVGImageComponentDescriptor.h>
 
 namespace facebook {
@@ -29,4 +31,4 @@ JSI_EXPORT
 std::shared_ptr<TurboModule> rnsvg_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params);
 
 } // namespace react
-} // namespace facebook
+} // namespace facebook
diff --git a/apple/Elements/RNSVGClipPath.mm b/apple/Elements/RNSVGClipPath.mm
@@ -11,8 +11,8 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
-#import <react/renderer/components/rnsvg/ComponentDescriptors.h>
 #import <react/renderer/components/view/conversions.h>
+#import <rnsvg/RNSVGComponentDescriptors.h>
 #import "RNSVGFabricConversions.h"
 #endif // RCT_NEW_ARCH_ENABLED
 

diff --git a/apple/Elements/RNSVGDefs.mm b/apple/Elements/RNSVGDefs.mm
@@ -10,8 +10,8 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
-#import <react/renderer/components/rnsvg/ComponentDescriptors.h>
 #import <react/renderer/components/view/conversions.h>
+#import <rnsvg/RNSVGComponentDescriptors.h>
 #import "RNSVGFabricConversions.h"
 #endif // RCT_NEW_ARCH_ENABLED
 

diff --git a/apple/Elements/RNSVGForeignObject.mm b/apple/Elements/RNSVGForeignObject.mm
@@ -13,8 +13,8 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
-#import <react/renderer/components/rnsvg/ComponentDescriptors.h>
 #import <react/renderer/components/view/conversions.h>
+#import <rnsvg/RNSVGComponentDescriptors.h>
 #import "RNSVGFabricConversions.h"
 #endif // RCT_NEW_ARCH_ENABLED
 

diff --git a/apple/Elements/RNSVGGroup.mm b/apple/Elements/RNSVGGroup.mm
@@ -13,8 +13,8 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
-#import <react/renderer/components/rnsvg/ComponentDescriptors.h>
 #import <react/renderer/components/view/conversions.h>
+#import <rnsvg/RNSVGComponentDescriptors.h>
 #import "RNSVGFabricConversions.h"
 #endif // RCT_NEW_ARCH_ENABLED
 

diff --git a/apple/Elements/RNSVGLinearGradient.mm b/apple/Elements/RNSVGLinearGradient.mm
@@ -12,8 +12,8 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
-#import <react/renderer/components/rnsvg/ComponentDescriptors.h>
 #import <react/renderer/components/view/conversions.h>
+#import <rnsvg/RNSVGComponentDescriptors.h>
 #import "RNSVGFabricConversions.h"
 #endif // RCT_NEW_ARCH_ENABLED
 

diff --git a/apple/Elements/RNSVGMarker.mm b/apple/Elements/RNSVGMarker.mm
@@ -14,8 +14,8 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
-#import <react/renderer/components/rnsvg/ComponentDescriptors.h>
 #import <react/renderer/components/view/conversions.h>
+#import <rnsvg/RNSVGComponentDescriptors.h>
 #import "RNSVGFabricConversions.h"
 #endif // RCT_NEW_ARCH_ENABLED
 

diff --git a/apple/Elements/RNSVGMask.mm b/apple/Elements/RNSVGMask.mm
@@ -13,8 +13,8 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
-#import <react/renderer/components/rnsvg/ComponentDescriptors.h>
 #import <react/renderer/components/view/conversions.h>
+#import <rnsvg/RNSVGComponentDescriptors.h>
 #import "RNSVGFabricConversions.h"
 #endif // RCT_NEW_ARCH_ENABLED
 

diff --git a/apple/Elements/RNSVGPath.mm b/apple/Elements/RNSVGPath.mm
@@ -11,8 +11,8 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
-#import <react/renderer/components/rnsvg/ComponentDescriptors.h>
 #import <react/renderer/components/view/conversions.h>
+#import <rnsvg/RNSVGComponentDescriptors.h>
 #import "RNSVGFabricConversions.h"
 #endif // RCT_NEW_ARCH_ENABLED
 

diff --git a/apple/Elements/RNSVGPattern.mm b/apple/Elements/RNSVGPattern.mm
@@ -13,8 +13,8 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
-#import <react/renderer/components/rnsvg/ComponentDescriptors.h>
 #import <react/renderer/components/view/conversions.h>
+#import <rnsvg/RNSVGComponentDescriptors.h>
 #import "RNSVGFabricConversions.h"
 #endif // RCT_NEW_ARCH_ENABLED
 

diff --git a/apple/Elements/RNSVGRadialGradient.mm b/apple/Elements/RNSVGRadialGradient.mm
@@ -10,8 +10,8 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
-#import <react/renderer/components/rnsvg/ComponentDescriptors.h>
 #import <react/renderer/components/view/conversions.h>
+#import <rnsvg/RNSVGComponentDescriptors.h>
 #import "RNSVGFabricConversions.h"
 #endif // RCT_NEW_ARCH_ENABLED
 

diff --git a/apple/Elements/RNSVGSvgView.mm b/apple/Elements/RNSVGSvgView.mm
@@ -14,8 +14,9 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
-#import <react/renderer/components/rnsvg/ComponentDescriptors.h>
 #import <react/renderer/components/view/conversions.h>
+#import <rnsvg/RNSVGComponentDescriptors.h>
+#import <rnsvg/RNSVGSvgViewComponentDescriptor.h>
 #import "RNSVGFabricConversions.h"
 #endif // RCT_NEW_ARCH_ENABLED
 

diff --git a/apple/Elements/RNSVGSymbol.mm b/apple/Elements/RNSVGSymbol.mm
@@ -11,8 +11,8 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
-#import <react/renderer/components/rnsvg/ComponentDescriptors.h>
 #import <react/renderer/components/view/conversions.h>
+#import <rnsvg/RNSVGComponentDescriptors.h>
 #import "RNSVGFabricConversions.h"
 #endif // RCT_NEW_ARCH_ENABLED
 

diff --git a/apple/Elements/RNSVGUse.mm b/apple/Elements/RNSVGUse.mm
@@ -12,8 +12,8 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
-#import <react/renderer/components/rnsvg/ComponentDescriptors.h>
 #import <react/renderer/components/view/conversions.h>
+#import <rnsvg/RNSVGComponentDescriptors.h>
 #import "RNSVGFabricConversions.h"
 #endif // RCT_NEW_ARCH_ENABLED
 

diff --git a/apple/Shapes/RNSVGCircle.mm b/apple/Shapes/RNSVGCircle.mm
@@ -12,8 +12,8 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
-#import <react/renderer/components/rnsvg/ComponentDescriptors.h>
 #import <react/renderer/components/view/conversions.h>
+#import <rnsvg/RNSVGComponentDescriptors.h>
 #import "RNSVGFabricConversions.h"
 #endif // RCT_NEW_ARCH_ENABLED
 

diff --git a/apple/Shapes/RNSVGEllipse.mm b/apple/Shapes/RNSVGEllipse.mm
@@ -12,8 +12,8 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
-#import <react/renderer/components/rnsvg/ComponentDescriptors.h>
 #import <react/renderer/components/view/conversions.h>
+#import <rnsvg/RNSVGComponentDescriptors.h>
 #import "RNSVGFabricConversions.h"
 #endif // RCT_NEW_ARCH_ENABLED
 

diff --git a/apple/Shapes/RNSVGLine.mm b/apple/Shapes/RNSVGLine.mm
@@ -12,8 +12,8 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
-#import <react/renderer/components/rnsvg/ComponentDescriptors.h>
 #import <react/renderer/components/view/conversions.h>
+#import <rnsvg/RNSVGComponentDescriptors.h>
 #import "RNSVGFabricConversions.h"
 #endif // RCT_NEW_ARCH_ENABLED
 

diff --git a/apple/Shapes/RNSVGRect.mm b/apple/Shapes/RNSVGRect.mm
@@ -12,8 +12,8 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
-#import <react/renderer/components/rnsvg/ComponentDescriptors.h>
 #import <react/renderer/components/view/conversions.h>
+#import <rnsvg/RNSVGComponentDescriptors.h>
 #import "RNSVGFabricConversions.h"
 #endif // RCT_NEW_ARCH_ENABLED
 

diff --git a/apple/Text/RNSVGTSpan.mm b/apple/Text/RNSVGTSpan.mm
@@ -20,8 +20,8 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
-#import <react/renderer/components/rnsvg/ComponentDescriptors.h>
 #import <react/renderer/components/view/conversions.h>
+#import <rnsvg/RNSVGComponentDescriptors.h>
 #import "RNSVGFabricConversions.h"
 #endif // RCT_NEW_ARCH_ENABLED
 

diff --git a/apple/Text/RNSVGText.mm b/apple/Text/RNSVGText.mm
@@ -16,8 +16,8 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
-#import <react/renderer/components/rnsvg/ComponentDescriptors.h>
 #import <react/renderer/components/view/conversions.h>
+#import <rnsvg/RNSVGComponentDescriptors.h>
 #import "RNSVGFabricConversions.h"
 #endif // RCT_NEW_ARCH_ENABLED
 

diff --git a/apple/Text/RNSVGTextPath.mm b/apple/Text/RNSVGTextPath.mm
@@ -11,8 +11,8 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
-#import <react/renderer/components/rnsvg/ComponentDescriptors.h>
 #import <react/renderer/components/view/conversions.h>
+#import <rnsvg/RNSVGComponentDescriptors.h>
 #import "RNSVGFabricConversions.h"
 #endif // RCT_NEW_ARCH_ENABLED
 

diff --git a/apple/ViewManagers/RNSVGSvgShadowView.h b/apple/ViewManagers/RNSVGSvgShadowView.h
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) 2015-present, Horcrux.
+ * All rights reserved.
+ *
+ * This source code is licensed under the MIT-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#if !TARGET_OS_OSX // ![macOS]
+#import <UIKit/UIKit.h>
+#else // [macOS]
+#import <React/RCTUIKit.h> // [macOS]
+#endif
+#import <React/RCTShadowView.h>
+
+@class RCTBridge;
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RNSVGSvgShadowView : RCTShadowView
+
+@property (nonatomic, assign) CGFloat vbWidth;
+@property (nonatomic, assign) CGFloat vbHeight;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/apple/ViewManagers/RNSVGSvgShadowView.m b/apple/ViewManagers/RNSVGSvgShadowView.m
@@ -0,0 +1,61 @@
+/**
+ * Copyright (c) 2015-present, Horcrux.
+ * All rights reserved.
+ *
+ * This source code is licensed under the MIT-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RNSVGSvgShadowView.h"
+
+@implementation RNSVGSvgShadowView
+
+- (instancetype)init
+{
+  if (self = [super init]) {
+    YGNodeSetMeasureFunc(self.yogaNode, RNSVGSvgShadowViewMeasure);
+  }
+
+  return self;
+}
+
+static YGSize RNSVGSvgShadowViewMeasure(
+    const struct YGNode *node,
+    float width,
+    YGMeasureMode widthMode,
+    float height,
+    YGMeasureMode heightMode)
+{
+  RNSVGSvgShadowView *shadowView = (__bridge RNSVGSvgShadowView *)YGNodeGetContext(node);
+
+  CGSize size = {width, height};
+  CGSize maximumSize = {
+      widthMode == YGMeasureModeAtMost ? size.width : CGFLOAT_MAX,
+      heightMode == YGMeasureModeAtMost ? size.height : CGFLOAT_MAX,
+  };
+  if (shadowView.vbWidth != 0 && shadowView.vbHeight != 0) {
+    if (widthMode != YGMeasureModeExactly) {
+      size.width = MIN(shadowView.vbWidth / shadowView.vbHeight * size.height, maximumSize.width);
+    }
+    if (heightMode != YGMeasureModeExactly) {
+      size.height = MIN(shadowView.vbHeight / shadowView.vbWidth * size.width, maximumSize.height);
+    }
+  }
+
+  return (YGSize){
+      RCTYogaFloatFromCoreGraphicsFloat(size.width),
+      RCTYogaFloatFromCoreGraphicsFloat(size.height),
+  };
+}
+
+- (BOOL)isYogaLeafNode
+{
+  return YES;
+}
+
+- (void)layoutSubviewsWithContext:(RCTLayoutContext)layoutContext
+{
+  // Do nothing.
+}
+
+@end