@react-native-ohos/react-native-svg 15.12.1-rc.1 → 15.12.1-rc.10

package/harmony/svg/src/main/cpp/SvgNode.h

@@ -28,6 +28,7 @@
 #include <type_traits>
 #include "SvgBaseAttribute.h"
 #include "SvgContext.h"
+#include "SvgForeignProps.h"
 #include "properties/Decoration.h"
 #include "properties/Dimension.h"
 #include "properties/Size.h"
@@ -36,6 +37,7 @@
 #include "utils/StringUtils.h"
 #include "utils/SvgAttributesParser.h"
 #include <glog/logging.h>
+#include <multimedia/image_framework/image/pixelmap_native.h>
 #include <native_drawing/drawing_canvas.h>
 #include <native_drawing/drawing_rect.h>
 #include "utils/DynamicUtils.h"
@@ -174,18 +176,32 @@ public:
 
         // Handle stroke properties - support both generic and text-specific structures
         if constexpr (requires { props->stroke; }) {
-            if (!props->stroke.isNull() && props->stroke.count("type") > 0 && props->stroke.count("payload") > 0) {
+            if (!props->stroke.isNull() && props->stroke.count("type") > 0) {
                 int strokeType = props->stroke["type"].asInt();
                 if (strokeType == INHERIT_TYPE) {
-                    Color color = Color(static_cast<uint32_t>(props->stroke["payload"].asInt()));
-                    color.SetUseCurrentColor(true);
-                    attributes_.strokeState.SetColor(color, true);
-                } else {
-                    uint32_t colorValue = static_cast<uint32_t>(props->stroke["payload"].asInt());
-                    if (facebook::react::isColorMeaningful(facebook::react::SharedColor(colorValue))) {
-                        attributes_.strokeState.SetColor(Color(colorValue), set.count("stroke"));
+                    if (props->stroke.count("payload") > 0) {
+                        Color color = Color(static_cast<uint32_t>(props->stroke["payload"].asInt()));
+                        color.SetUseCurrentColor(true);
+                        attributes_.strokeState.SetColor(color, true);
                     } else {
-                        attributes_.strokeState.SetColor(Color::TRANSPARENT, set.count("stroke"));
+                        if (props->color) {
+                            Color color = Color(*props->color);
+                            color.SetUseCurrentColor(true);
+                            attributes_.strokeState.SetColor(color, true);
+                        } else {
+                            Color color = Color::TRANSPARENT;
+                            color.SetUseCurrentColor(true);
+                            attributes_.strokeState.SetColor(color, true);
+                        }
+                    }
+                } else {
+                    if (props->stroke.count("payload") > 0) {
+                        uint32_t colorValue = static_cast<uint32_t>(props->stroke["payload"].asInt());
+                        if (facebook::react::isColorMeaningful(facebook::react::SharedColor(colorValue))) {
+                            attributes_.strokeState.SetColor(Color(colorValue), set.count("stroke"));
+                        } else {
+                            attributes_.strokeState.SetColor(Color::TRANSPARENT, set.count("stroke"));
+                        }
                     }
                 }
             } else if (!props->stroke.isNull() && props->stroke.count("payload") > 0) {
@@ -256,10 +272,14 @@ public:
         attributes_.Inherit(parent);
         // svg color -> current color
         if (attributes_.strokeState.GetColor().IsUseCurrentColor()) {
-            attributes_.strokeState.SetColor(context_->GetSvgColor(), true);
+            if(context_) {
+                attributes_.strokeState.SetColor(context_->GetSvgColor(), true);
+            }
         }
         if (attributes_.fillState.GetColor().IsUseCurrentColor()) {
-            attributes_.fillState.SetColor(context_->GetSvgColor(), true);
+            if(context_) {
+                attributes_.fillState.SetColor(context_->GetSvgColor(), true);
+            }
         }
     }
 
@@ -275,6 +295,11 @@ public:
     double getCanvasHeight();
     double getCanvasDiagonal();
 
+    void SetForeignObject(ForeignProps foreignProps) {
+        _foreignPropsArray.emplace_back(foreignProps);
+    }
+    
+
 protected:
     // override as need by derived class
     // called by function AppendChild
@@ -286,7 +311,7 @@ protected:
     virtual void OnDrawTraversed(OH_Drawing_Canvas *canvas);
     void OnClipPath(OH_Drawing_Canvas *canvas);
     void OnMask(OH_Drawing_Canvas *canvas);
-    void OnTransform(OH_Drawing_Canvas *canvas);
+    void OnTransform(OH_Drawing_Canvas *canvas, std::vector<double> transform);
 
     const Rect &GetRootViewBox() const;
 
@@ -296,7 +321,10 @@ protected:
     std::optional<Gradient> GetGradient(const std::string &href);
 
     std::shared_ptr<PatternAttr> GetPatternAttr(const std::string &href);
-
+    void DrawForeignPixelMap(OH_Drawing_Canvas *canvas,ForeignProps _foreignProps);
+    void DrawForeignMask(OH_Drawing_Canvas *canvas, const std::string &id);
+    void DrawForeignClip(OH_Drawing_Canvas *canvas, const std::string &id, int clipRule);
+    
     void InitNoneFlag() {
         hrefFill_ = false;
         hrefRender_ = false;
@@ -341,6 +369,8 @@ protected:
       Provide enough digits for the 128-bit IEEE quad (36 significant digits).
   */
     const double M_SQRT1_2l = 0.707106781186547524400844362104849039;
+
+    std::vector<ForeignProps> _foreignPropsArray;
 };
 
 } // namespace svg

package/harmony/svg/src/main/cpp/componentInstances/RNSVGFeBlendComponentInstance.cpp

@@ -1,40 +1,40 @@
-/*
- * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
- * Use of this source code is governed by a MIT license that can be
- * found in the LICENSE file.
- */
-
-#include "RNSVGFeBlendComponentInstance.h"
-#include "utils/DynamicUtils.h"
-#include <glog/logging.h>
-
-namespace facebook::react {
-    // Forward declaration for toString function
-    static inline std::string toString(const RNSVGFeBlendMode &value);
-}
-
-namespace rnoh {
-namespace svg {
-
-RNSVGFeBlendComponentInstance::RNSVGFeBlendComponentInstance(Context context)
-    : RNSVGBaseComponentInstance(std::move(context)) {}
-
-void RNSVGFeBlendComponentInstance::onPropsChanged(SharedConcreteProps const &props) {
-    if (props) {
-        x_ = DynamicUtils::DynamicToString(props->x);
-        y_ = DynamicUtils::DynamicToString(props->y);
-        width_ = DynamicUtils::DynamicToString(props->width);
-        height_ = DynamicUtils::DynamicToString(props->height);
-        in_ = props->in1;
-        in2_ = props->in2;
-        mode_ = facebook::react::toString(props->mode);
-        result_ = props->result;
-    }
-}
-
-void RNSVGFeBlendComponentInstance::UpdateElementProps() {}
-
-void RNSVGFeBlendComponentInstance::extractAttributes() {}
-
-} // namespace svg
-} // namespace rnoh
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+
+#include "RNSVGFeBlendComponentInstance.h"
+#include "utils/DynamicUtils.h"
+#include <glog/logging.h>
+
+namespace facebook::react {
+    // Forward declaration for toString function
+    static inline std::string toString(const RNSVGFeBlendMode &value);
+}
+
+namespace rnoh {
+namespace svg {
+
+RNSVGFeBlendComponentInstance::RNSVGFeBlendComponentInstance(Context context)
+    : RNSVGBaseComponentInstance(std::move(context)) {}
+
+void RNSVGFeBlendComponentInstance::onPropsChanged(SharedConcreteProps const &props) {
+    if (props) {
+        x_ = DynamicUtils::DynamicToString(props->x);
+        y_ = DynamicUtils::DynamicToString(props->y);
+        width_ = DynamicUtils::DynamicToString(props->width);
+        height_ = DynamicUtils::DynamicToString(props->height);
+        in_ = props->in1;
+        in2_ = props->in2;
+        mode_ = facebook::react::toString(props->mode);
+        result_ = props->result;
+    }
+}
+
+void RNSVGFeBlendComponentInstance::UpdateElementProps() {}
+
+void RNSVGFeBlendComponentInstance::extractAttributes() {}
+
+} // namespace svg
+} // namespace rnoh

package/harmony/svg/src/main/cpp/componentInstances/RNSVGFeBlendComponentInstance.h

@@ -1,48 +1,48 @@
-/*
- * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
- * Use of this source code is governed by a MIT license that can be
- * found in the LICENSE file.
- */
-
-#pragma once
-
-#include "RNSVGBaseComponentInstance.h"
-#include <react/renderer/components/react_native_svg/ShadowNodes.h>
-
-
-namespace rnoh {
-namespace svg {
-
-class RNSVGFeBlendComponentInstance : public RNSVGBaseComponentInstance<facebook::react::RNSVGFeBlendShadowNode> {
-public:
-    using SharedConcreteProps = std::shared_ptr<const facebook::react::RNSVGFeBlendProps>;
-
-    RNSVGFeBlendComponentInstance(Context context);
-
-    void onPropsChanged(SharedConcreteProps const &props) override;
-    void UpdateElementProps() override;
-
-    std::string getIn() const { return in_; }
-    std::string getIn2() const { return in2_; }
-    std::string getMode() const { return mode_; }
-    std::string getResult() const { return result_; }
-    std::string getX() const { return x_; }
-    std::string getY() const { return y_; }
-    std::string getWidth() const { return width_; }
-    std::string getHeight() const { return height_; }
-
-private:
-    std::string x_ = "0";
-    std::string y_ = "0";
-    std::string width_ = "0";
-    std::string height_ = "0";
-    std::string in_ = "SourceGraphic";
-    std::string in2_ = "";
-    std::string mode_ = "normal";
-    std::string result_ = "";
-    
-    void extractAttributes();
-};
-
-} // namespace svg
-} // namespace rnoh
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+
+#pragma once
+
+#include "RNSVGBaseComponentInstance.h"
+#include <react/renderer/components/react_native_svg/ShadowNodes.h>
+
+
+namespace rnoh {
+namespace svg {
+
+class RNSVGFeBlendComponentInstance : public RNSVGBaseComponentInstance<facebook::react::RNSVGFeBlendShadowNode> {
+public:
+    using SharedConcreteProps = std::shared_ptr<const facebook::react::RNSVGFeBlendProps>;
+
+    RNSVGFeBlendComponentInstance(Context context);
+
+    void onPropsChanged(SharedConcreteProps const &props) override;
+    void UpdateElementProps() override;
+
+    std::string getIn() const { return in_; }
+    std::string getIn2() const { return in2_; }
+    std::string getMode() const { return mode_; }
+    std::string getResult() const { return result_; }
+    std::string getX() const { return x_; }
+    std::string getY() const { return y_; }
+    std::string getWidth() const { return width_; }
+    std::string getHeight() const { return height_; }
+
+private:
+    std::string x_ = "0";
+    std::string y_ = "0";
+    std::string width_ = "0";
+    std::string height_ = "0";
+    std::string in_ = "SourceGraphic";
+    std::string in2_ = "";
+    std::string mode_ = "normal";
+    std::string result_ = "";
+    
+    void extractAttributes();
+};
+
+} // namespace svg
+} // namespace rnoh

package/harmony/svg/src/main/cpp/componentInstances/RNSVGFeColorMatrixComponentInstance.cpp

@@ -1,33 +1,33 @@
-/*
- * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
- * Use of this source code is governed by a MIT license that can be
- * found in the LICENSE file.
- */
-
-#include "RNSVGFeColorMatrixComponentInstance.h"
-#include "utils/DynamicUtils.h"
-#include <glog/logging.h>
-
-namespace rnoh {
-namespace svg {
-
-RNSVGFeColorMatrixComponentInstance::RNSVGFeColorMatrixComponentInstance(Context context)
-    : RNSVGBaseComponentInstance(std::move(context)) {}
-
-void RNSVGFeColorMatrixComponentInstance::onPropsChanged(SharedConcreteProps const &props) {
-    if (props) {
-        type_ = facebook::react::toString(props->type);
-        in_ = props->in1;
-        values_ = std::vector<float>(props->values.begin(), props->values.end());
-        x_ = DynamicUtils::DynamicToString(props->x);
-        y_ = DynamicUtils::DynamicToString(props->y);
-        width_ = DynamicUtils::DynamicToString(props->width);
-        height_ = DynamicUtils::DynamicToString(props->height);
-        result_ = props->result;
-    }
-}
-
-void RNSVGFeColorMatrixComponentInstance::UpdateElementProps() {}
-
-} // namespace svg
-} // namespace rnoh
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+
+#include "RNSVGFeColorMatrixComponentInstance.h"
+#include "utils/DynamicUtils.h"
+#include <glog/logging.h>
+
+namespace rnoh {
+namespace svg {
+
+RNSVGFeColorMatrixComponentInstance::RNSVGFeColorMatrixComponentInstance(Context context)
+    : RNSVGBaseComponentInstance(std::move(context)) {}
+
+void RNSVGFeColorMatrixComponentInstance::onPropsChanged(SharedConcreteProps const &props) {
+    if (props) {
+        type_ = facebook::react::toString(props->type);
+        in_ = props->in1;
+        values_ = std::vector<float>(props->values.begin(), props->values.end());
+        x_ = DynamicUtils::DynamicToString(props->x);
+        y_ = DynamicUtils::DynamicToString(props->y);
+        width_ = DynamicUtils::DynamicToString(props->width);
+        height_ = DynamicUtils::DynamicToString(props->height);
+        result_ = props->result;
+    }
+}
+
+void RNSVGFeColorMatrixComponentInstance::UpdateElementProps() {}
+
+} // namespace svg
+} // namespace rnoh

package/harmony/svg/src/main/cpp/componentInstances/RNSVGFeColorMatrixComponentInstance.h

@@ -1,48 +1,48 @@
-/*
- * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
- * Use of this source code is governed by a MIT license that can be
- * found in the LICENSE file.
- */
-
-#pragma once
-
-#include "RNSVGBaseComponentInstance.h"
-#include <react/renderer/components/react_native_svg/ShadowNodes.h>
-
-
-namespace rnoh {
-namespace svg {
-
-class RNSVGFeColorMatrixComponentInstance : public RNSVGBaseComponentInstance<facebook::react::RNSVGFeColorMatrixShadowNode> {
-public:
-    using SharedConcreteProps = std::shared_ptr<const facebook::react::RNSVGFeColorMatrixProps>;
-
-    RNSVGFeColorMatrixComponentInstance(Context context);
-
-    void onPropsChanged(SharedConcreteProps const &props) override;
-    void UpdateElementProps() override;
-    
-    std::string getX() const { return x_; }
-    std::string getY() const { return y_; }
-    std::string getWidth() const { return width_; }
-    std::string getHeight() const { return height_; }
-    std::string getResult() const { return result_; }
-    std::string getType() const { return type_; }
-    std::string getIn() const { return in_; }
-    std::vector<float> getValues() const { return values_; }
-
-private:
-    std::string x_ = "0";
-    std::string y_ = "0";
-    std::string width_ = "0";
-    std::string height_ = "0";
-    std::string result_ = "";
-    std::string type_ = "saturate";
-    std::string in_ = "SourceGraphic";
-    std::vector<float> values_ = {1.0f};
-    
-    void extractAttributes();
-};
-
-} // namespace svg
-} // namespace rnoh
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+
+#pragma once
+
+#include "RNSVGBaseComponentInstance.h"
+#include <react/renderer/components/react_native_svg/ShadowNodes.h>
+
+
+namespace rnoh {
+namespace svg {
+
+class RNSVGFeColorMatrixComponentInstance : public RNSVGBaseComponentInstance<facebook::react::RNSVGFeColorMatrixShadowNode> {
+public:
+    using SharedConcreteProps = std::shared_ptr<const facebook::react::RNSVGFeColorMatrixProps>;
+
+    RNSVGFeColorMatrixComponentInstance(Context context);
+
+    void onPropsChanged(SharedConcreteProps const &props) override;
+    void UpdateElementProps() override;
+    
+    std::string getX() const { return x_; }
+    std::string getY() const { return y_; }
+    std::string getWidth() const { return width_; }
+    std::string getHeight() const { return height_; }
+    std::string getResult() const { return result_; }
+    std::string getType() const { return type_; }
+    std::string getIn() const { return in_; }
+    std::vector<float> getValues() const { return values_; }
+
+private:
+    std::string x_ = "0";
+    std::string y_ = "0";
+    std::string width_ = "0";
+    std::string height_ = "0";
+    std::string result_ = "";
+    std::string type_ = "saturate";
+    std::string in_ = "SourceGraphic";
+    std::vector<float> values_ = {1.0f};
+    
+    void extractAttributes();
+};
+
+} // namespace svg
+} // namespace rnoh

package/harmony/svg/src/main/cpp/componentInstances/RNSVGFeCompositeComponentInstance.cpp

@@ -1,39 +1,39 @@
-/*
- * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
- * Use of this source code is governed by a MIT license that can be
- * found in the LICENSE file.
- */
-
-#include "RNSVGFeCompositeComponentInstance.h"
-#include "utils/DynamicUtils.h"
-#include <glog/logging.h>
-
-namespace rnoh {
-namespace svg {
-
-RNSVGFeCompositeComponentInstance::RNSVGFeCompositeComponentInstance(Context context)
-    : RNSVGBaseComponentInstance(std::move(context)) {}
-
-void RNSVGFeCompositeComponentInstance::onPropsChanged(SharedConcreteProps const &props) {
-    if (props) {
-        x_ = DynamicUtils::DynamicToString(props->x);
-        y_ = DynamicUtils::DynamicToString(props->y);
-        width_ = DynamicUtils::DynamicToString(props->width);
-        height_ = DynamicUtils::DynamicToString(props->height);
-        in_ = props->in1;
-        in2_ = props->in2;
-        operator_ = facebook::react::toString(props->operator1);
-        result_ = props->result;
-        k1_ = std::to_string(props->k1);
-        k2_ = std::to_string(props->k2);
-        k3_ = std::to_string(props->k3);
-        k4_ = std::to_string(props->k4);
-    }
-}
-
-void RNSVGFeCompositeComponentInstance::UpdateElementProps() {}
-
-void RNSVGFeCompositeComponentInstance::extractAttributes() {}
-
-} // namespace svg
-} // namespace rnoh
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+
+#include "RNSVGFeCompositeComponentInstance.h"
+#include "utils/DynamicUtils.h"
+#include <glog/logging.h>
+
+namespace rnoh {
+namespace svg {
+
+RNSVGFeCompositeComponentInstance::RNSVGFeCompositeComponentInstance(Context context)
+    : RNSVGBaseComponentInstance(std::move(context)) {}
+
+void RNSVGFeCompositeComponentInstance::onPropsChanged(SharedConcreteProps const &props) {
+    if (props) {
+        x_ = DynamicUtils::DynamicToString(props->x);
+        y_ = DynamicUtils::DynamicToString(props->y);
+        width_ = DynamicUtils::DynamicToString(props->width);
+        height_ = DynamicUtils::DynamicToString(props->height);
+        in_ = props->in1;
+        in2_ = props->in2;
+        operator_ = facebook::react::toString(props->operator1);
+        result_ = props->result;
+        k1_ = std::to_string(props->k1);
+        k2_ = std::to_string(props->k2);
+        k3_ = std::to_string(props->k3);
+        k4_ = std::to_string(props->k4);
+    }
+}
+
+void RNSVGFeCompositeComponentInstance::UpdateElementProps() {}
+
+void RNSVGFeCompositeComponentInstance::extractAttributes() {}
+
+} // namespace svg
+} // namespace rnoh

package/harmony/svg/src/main/cpp/componentInstances/RNSVGFeCompositeComponentInstance.h

@@ -1,55 +1,55 @@
-/*
- * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
- * Use of this source code is governed by a MIT license that can be
- * found in the LICENSE file.
- */
-
-#pragma once
-
-#include "RNSVGBaseComponentInstance.h"
-#include <react/renderer/components/react_native_svg/ShadowNodes.h>
-
-
-namespace rnoh {
-namespace svg {
-
-class RNSVGFeCompositeComponentInstance : public RNSVGBaseComponentInstance<facebook::react::RNSVGFeCompositeShadowNode> {
-public:
-    using SharedConcreteProps = std::shared_ptr<const facebook::react::RNSVGFeCompositeProps>;
-
-    RNSVGFeCompositeComponentInstance(Context context);
-
-    void onPropsChanged(SharedConcreteProps const &props) override;
-    void UpdateElementProps() override;
-    
-    std::string getIn() const { return in_; }
-    std::string getIn2() const { return in2_; }
-    std::string getOperator() const { return operator_; }
-    std::string getResult() const { return result_; }
-    std::string getK1() const { return k1_; }
-    std::string getK2() const { return k2_; }
-    std::string getK3() const { return k3_; }
-    std::string getK4() const { return k4_; }
-    std::string getX() const { return x_; }
-    std::string getY() const { return y_; }
-    std::string getWidth() const { return width_; }
-    std::string getHeight() const { return height_; }
-
-private:
-    std::string x_ = "0";
-    std::string y_ = "0";
-    std::string width_ = "0";
-    std::string height_ = "0";
-    std::string in_ = "SourceGraphic";
-    std::string in2_ = "";
-    std::string operator_ = "over";
-    std::string result_ = "";
-    std::string k1_ = "0";
-    std::string k2_ = "0";
-    std::string k3_ = "0";
-    std::string k4_ = "0";
-    void extractAttributes();
-};
-
-} // namespace svg
-} // namespace rnoh
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+
+#pragma once
+
+#include "RNSVGBaseComponentInstance.h"
+#include <react/renderer/components/react_native_svg/ShadowNodes.h>
+
+
+namespace rnoh {
+namespace svg {
+
+class RNSVGFeCompositeComponentInstance : public RNSVGBaseComponentInstance<facebook::react::RNSVGFeCompositeShadowNode> {
+public:
+    using SharedConcreteProps = std::shared_ptr<const facebook::react::RNSVGFeCompositeProps>;
+
+    RNSVGFeCompositeComponentInstance(Context context);
+
+    void onPropsChanged(SharedConcreteProps const &props) override;
+    void UpdateElementProps() override;
+    
+    std::string getIn() const { return in_; }
+    std::string getIn2() const { return in2_; }
+    std::string getOperator() const { return operator_; }
+    std::string getResult() const { return result_; }
+    std::string getK1() const { return k1_; }
+    std::string getK2() const { return k2_; }
+    std::string getK3() const { return k3_; }
+    std::string getK4() const { return k4_; }
+    std::string getX() const { return x_; }
+    std::string getY() const { return y_; }
+    std::string getWidth() const { return width_; }
+    std::string getHeight() const { return height_; }
+
+private:
+    std::string x_ = "0";
+    std::string y_ = "0";
+    std::string width_ = "0";
+    std::string height_ = "0";
+    std::string in_ = "SourceGraphic";
+    std::string in2_ = "";
+    std::string operator_ = "over";
+    std::string result_ = "";
+    std::string k1_ = "0";
+    std::string k2_ = "0";
+    std::string k3_ = "0";
+    std::string k4_ = "0";
+    void extractAttributes();
+};
+
+} // namespace svg
+} // namespace rnoh