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

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

@@ -1,112 +1,112 @@
-/*
- * 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 "SvgNode.h"
-#include "drawing/Brush.h"
-#include "drawing/Pen.h"
-#include <native_drawing/drawing_canvas.h>
-#include <native_drawing/drawing_filter.h>
-
-namespace rnoh {
-namespace svg {
-
-enum class FilterType {
-    BLUR,
-    GAUSSIAN_BLUR,
-    DROP_SHADOW,
-    COLOR_MATRIX,
-    FEOFFSET,
-    FEFLOOD,
-    BLEND,
-    COMPOSITE,
-    MERGE,
-    UNKNOWN
-};
-
-struct FilterEffect {
-    FilterType filterType = FilterType::UNKNOWN;
-    std::vector<float> values;
-    std::string type = "";
-    std::string in = "SourceGraphic";
-    std::string in2 = "";
-    std::string result = "";
-
-    std::string mode = "";
-    std::string operator_ = "";
-    std::string floodColor = "black";
-    float floodOpacity = 1.0f;
-
-    float dx_ = 0.0f;
-    float dy_ = 0.0f;
-    float stdDeviationX_ = 0.0f;
-    float stdDeviationY_ = 0.0f;
-    std::string edgeMode_ = "duplicate";
-    std::string k1 = "";
-    std::string k2 = "";
-    std::string k3 = "";
-    std::string k4 = "";
-
-    FilterEffect() = default;
-    FilterEffect(FilterType t, const std::vector<float>& v) : filterType(t), values(v) {}
-    FilterEffect(FilterType t, const std::vector<float>& v, const std::string& inputSource, const std::string& inputType, const std::string& resultId) 
-        : filterType(t), values(v), in(inputSource), type(inputType), result(resultId) {}
-    FilterEffect(FilterType t, const std::string& inputSource, const std::string& inputSource2, const std::string& blendMode, const std::string& resultId)
-        : filterType(t), in(inputSource), in2(inputSource2), mode(blendMode), result(resultId) {}
-    FilterEffect(FilterType t, const std::string& inputSource, const std::string& color, float opacity, const std::string& resultId)
-        : filterType(t), in(inputSource), floodColor(color), floodOpacity(opacity), result(resultId) {}
-    FilterEffect(FilterType t, const std::string& inputSource, float dx, float dy, const std::string& resultId)
-        : filterType(t), in(inputSource), dx_(dx), dy_(dy), result(resultId) {}
-    FilterEffect(FilterType t, const std::string& inputSource, const std::string& inputSource2, const std::string& op,
-        const std::string& k1_, const std::string& k2_, const std::string& k3_, const std::string& k4_, const std::string& resultId)
-        : filterType(t), in(inputSource), in2(inputSource2), operator_(op), k1(k1_), k2(k2_), k3(k3_), k4(k4_), result(resultId) {}
-    FilterEffect(FilterType t, const std::string& inputSource, float stdDeviationX, float stdDeviationY, const std::string& edgeMode, const std::string& resultId)
-        : filterType(t), in(inputSource), stdDeviationX_(stdDeviationX), stdDeviationY_(stdDeviationY), edgeMode_(edgeMode), result(resultId) {}
-    
-    // DropShadow specific constructor
-    FilterEffect(FilterType t, const std::string& inputSource, float dx, float dy, float stdDeviation, const std::string& color, float opacity)
-        : filterType(t), in(inputSource), dx_(dx), dy_(dy), stdDeviationX_(stdDeviation), floodColor(color), floodOpacity(opacity) {}
-};
-
-class SvgFilter : virtual public SvgNode {
-public:
-    SvgFilter() : SvgNode() {}
-    ~SvgFilter() noexcept override = default;
-    void ApplyToBrush(rnoh::drawing::Brush& brush, const std::string& extra = "");
-    void ApplyToPen(rnoh::drawing::Pen& pen);
-
-    void AddFilterEffect(const FilterEffect& effect);
-    void ClearFilterEffects() {
-        effects_.clear();
-    }
-
-    void Draw(OH_Drawing_Canvas *canvas) override {}
-private:
-    std::vector<FilterEffect> effects_;
-    void ApplySingleEffectToFilter(OH_Drawing_Filter* filter, const FilterEffect& effect,
-        rnoh::drawing::Brush* brush = nullptr, rnoh::drawing::Pen* pen = nullptr, const std::string& extra = "");
-    
-    OH_Drawing_ImageFilter* CreateGaussianBlurFilter(const FilterEffect& effect);
-    OH_Drawing_MaskFilter* CreateBlurFilter(const FilterEffect& effect);
-    OH_Drawing_ColorFilter* CreateColorMatrixFilter(const FilterEffect& effect);
-    OH_Drawing_ShadowLayer* CreateDropShadowFilter(const FilterEffect& effect);
-
-    OH_Drawing_ColorFilter* CreateMatrixFilter(const std::vector<float>& values);
-    OH_Drawing_ColorFilter* CreateSaturateFilter(const std::vector<float>& values);
-    OH_Drawing_ColorFilter* CreateHueRotateFilter(const std::vector<float>& values);
-    OH_Drawing_ColorFilter* CreateLuminanceToAlphaFilter();
-
-    OH_Drawing_ImageFilter* GetInputImageFilter(const std::string& inputName);
-    OH_Drawing_ColorFilter* GetInputColorFilter(const std::string& inputName);
-    OH_Drawing_Filter* GetInputFilter(const std::string& inputName);
-    OH_Drawing_ColorFilter* CombineWithInputColor(OH_Drawing_ColorFilter* newFilter, const std::string& inputName);
-    void RegisterFilterResult(const std::string& resultId, OH_Drawing_ImageFilter* imageFilter = nullptr, 
-                             OH_Drawing_ColorFilter* colorFilter = nullptr, OH_Drawing_MaskFilter* maskFilter = nullptr);
-};
-
-} // 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 "SvgNode.h"
+#include "drawing/Brush.h"
+#include "drawing/Pen.h"
+#include <native_drawing/drawing_canvas.h>
+#include <native_drawing/drawing_filter.h>
+
+namespace rnoh {
+namespace svg {
+
+enum class FilterType {
+    BLUR,
+    GAUSSIAN_BLUR,
+    DROP_SHADOW,
+    COLOR_MATRIX,
+    FEOFFSET,
+    FEFLOOD,
+    BLEND,
+    COMPOSITE,
+    MERGE,
+    UNKNOWN
+};
+
+struct FilterEffect {
+    FilterType filterType = FilterType::UNKNOWN;
+    std::vector<float> values;
+    std::string type = "";
+    std::string in = "SourceGraphic";
+    std::string in2 = "";
+    std::string result = "";
+
+    std::string mode = "";
+    std::string operator_ = "";
+    std::string floodColor = "black";
+    float floodOpacity = 1.0f;
+
+    float dx_ = 0.0f;
+    float dy_ = 0.0f;
+    float stdDeviationX_ = 0.0f;
+    float stdDeviationY_ = 0.0f;
+    std::string edgeMode_ = "duplicate";
+    std::string k1 = "";
+    std::string k2 = "";
+    std::string k3 = "";
+    std::string k4 = "";
+
+    FilterEffect() = default;
+    FilterEffect(FilterType t, const std::vector<float>& v) : filterType(t), values(v) {}
+    FilterEffect(FilterType t, const std::vector<float>& v, const std::string& inputSource, const std::string& inputType, const std::string& resultId) 
+        : filterType(t), values(v), in(inputSource), type(inputType), result(resultId) {}
+    FilterEffect(FilterType t, const std::string& inputSource, const std::string& inputSource2, const std::string& blendMode, const std::string& resultId)
+        : filterType(t), in(inputSource), in2(inputSource2), mode(blendMode), result(resultId) {}
+    FilterEffect(FilterType t, const std::string& inputSource, const std::string& color, float opacity, const std::string& resultId)
+        : filterType(t), in(inputSource), floodColor(color), floodOpacity(opacity), result(resultId) {}
+    FilterEffect(FilterType t, const std::string& inputSource, float dx, float dy, const std::string& resultId)
+        : filterType(t), in(inputSource), dx_(dx), dy_(dy), result(resultId) {}
+    FilterEffect(FilterType t, const std::string& inputSource, const std::string& inputSource2, const std::string& op,
+        const std::string& k1_, const std::string& k2_, const std::string& k3_, const std::string& k4_, const std::string& resultId)
+        : filterType(t), in(inputSource), in2(inputSource2), operator_(op), k1(k1_), k2(k2_), k3(k3_), k4(k4_), result(resultId) {}
+    FilterEffect(FilterType t, const std::string& inputSource, float stdDeviationX, float stdDeviationY, const std::string& edgeMode, const std::string& resultId)
+        : filterType(t), in(inputSource), stdDeviationX_(stdDeviationX), stdDeviationY_(stdDeviationY), edgeMode_(edgeMode), result(resultId) {}
+    
+    // DropShadow specific constructor
+    FilterEffect(FilterType t, const std::string& inputSource, float dx, float dy, float stdDeviation, const std::string& color, float opacity)
+        : filterType(t), in(inputSource), dx_(dx), dy_(dy), stdDeviationX_(stdDeviation), floodColor(color), floodOpacity(opacity) {}
+};
+
+class SvgFilter : virtual public SvgNode {
+public:
+    SvgFilter() : SvgNode() {}
+    ~SvgFilter() noexcept override = default;
+    void ApplyToBrush(rnoh::drawing::Brush& brush, const std::string& extra = "");
+    void ApplyToPen(rnoh::drawing::Pen& pen);
+
+    void AddFilterEffect(const FilterEffect& effect);
+    void ClearFilterEffects() {
+        effects_.clear();
+    }
+
+    void Draw(OH_Drawing_Canvas *canvas) override {}
+private:
+    std::vector<FilterEffect> effects_;
+    void ApplySingleEffectToFilter(OH_Drawing_Filter* filter, const FilterEffect& effect,
+        rnoh::drawing::Brush* brush = nullptr, rnoh::drawing::Pen* pen = nullptr, const std::string& extra = "");
+    
+    OH_Drawing_ImageFilter* CreateGaussianBlurFilter(const FilterEffect& effect);
+    OH_Drawing_MaskFilter* CreateBlurFilter(const FilterEffect& effect);
+    OH_Drawing_ColorFilter* CreateColorMatrixFilter(const FilterEffect& effect);
+    OH_Drawing_ShadowLayer* CreateDropShadowFilter(const FilterEffect& effect);
+
+    OH_Drawing_ColorFilter* CreateMatrixFilter(const std::vector<float>& values);
+    OH_Drawing_ColorFilter* CreateSaturateFilter(const std::vector<float>& values);
+    OH_Drawing_ColorFilter* CreateHueRotateFilter(const std::vector<float>& values);
+    OH_Drawing_ColorFilter* CreateLuminanceToAlphaFilter();
+
+    OH_Drawing_ImageFilter* GetInputImageFilter(const std::string& inputName);
+    OH_Drawing_ColorFilter* GetInputColorFilter(const std::string& inputName);
+    OH_Drawing_Filter* GetInputFilter(const std::string& inputName);
+    OH_Drawing_ColorFilter* CombineWithInputColor(OH_Drawing_ColorFilter* newFilter, const std::string& inputName);
+    void RegisterFilterResult(const std::string& resultId, OH_Drawing_ImageFilter* imageFilter = nullptr, 
+                             OH_Drawing_ColorFilter* colorFilter = nullptr, OH_Drawing_MaskFilter* maskFilter = nullptr);
+};
+
+} // namespace svg
+} // namespace rnoh

package/harmony/svg/src/main/cpp/SvgForeignObjectNode.cpp

@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2025 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.
+ *
+ * This file incorporates from the OpenHarmony project, licensed under
+ * the Apache License, Version 2.0. Specifically:
+ * - [OpenHarmony/arkui_ace_engine] (https://gitee.com/openharmony/arkui_ace_engine)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at:
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+#include "SvgForeignObjectNode.h"
+#include "RNOH/arkui/NativeNodeApi.h"
+namespace rnoh {
+namespace svg {
+SvgForeignObjectNode::SvgForeignObjectNode()
+    : ArkUINode(NativeNodeApi::getInstance()->createNode(ArkUI_NodeType::ARKUI_NODE_STACK)) {
+    mStackNode.setVisibility(ArkUI_Visibility::ARKUI_VISIBILITY_HIDDEN);
+    mStackNode.setClip(true);
+    maybeThrow(NativeNodeApi::getInstance()->addChild(m_nodeHandle, mStackNode.getArkUINodeHandle()));
+}
+
+SvgForeignObjectNode::~SvgForeignObjectNode() {
+    if (m_NodeDelegate) {
+        m_NodeDelegate = nullptr;
+    }
+}
+void SvgForeignObjectNode::insertChild(ArkUINode &child, std::size_t index) { mStackNode.insertChild(child, index); }
+
+void SvgForeignObjectNode::SetSnapHeight(float height) { _height = height; }
+
+void SvgForeignObjectNode::SetSnapWidth(float width) { _width = width; }
+
+void SvgForeignObjectNode::SetSnapPosition(float x, float y) {
+    _positionX = x;
+    _positionY = y;
+}
+
+void SvgForeignObjectNode::onNodeEvent(ArkUI_NodeEventType eventType, EventArgs &eventArgs) {
+    if (eventType == ArkUI_NodeEventType::NODE_EVENT_ON_AREA_CHANGE) {
+        if (m_NodeDelegate) {
+            OH_PixelmapNative *pixelMap = GetNodePixelMap();
+            if (!pixelMap) {
+                LOG(ERROR) << "[svgForeignNode] get node snapshot pixelMap is null";
+                return;
+            }
+            m_NodeDelegate->onDrawForeignImage(pixelMap, _width, _height, _positionX, _positionY);
+        }
+    }
+}
+
+OH_PixelmapNative *SvgForeignObjectNode::GetNodePixelMap() {
+    OH_PixelmapNative *pixelMap;
+    ArkUI_SnapshotOptions *options = OH_ArkUI_CreateSnapshotOptions();
+    OH_ArkUI_SnapshotOptions_SetScale(options, 1);
+    int32_t code = OH_ArkUI_GetNodeSnapshot(mStackNode.getArkUINodeHandle(), options, &pixelMap);
+    if (code == ARKUI_ERROR_CODE_NO_ERROR) {
+        return pixelMap;
+    }
+    return nullptr;
+}
+
+} // namespace svg
+} // namespace rnoh

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

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2025 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.
+ *
+ * This file incorporates from the OpenHarmony project, licensed under
+ * the Apache License, Version 2.0. Specifically:
+ * - [OpenHarmony/arkui_ace_engine] (https://gitee.com/openharmony/arkui_ace_engine)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at:
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef HARMONY_SVGFOREIGNOBJECTNODE_H
+#define HARMONY_SVGFOREIGNOBJECTNODE_H
+#include "RNOH/arkui/ArkUINode.h"
+#include "RNOH/arkui/StackNode.h"
+#include "SvgForeignObjectNodeDelegate.h"
+
+namespace rnoh {
+namespace svg {
+class SvgForeignObjectNode : public ArkUINode {
+public:
+    SvgForeignObjectNode();
+    ~SvgForeignObjectNode() override;
+    void onNodeEvent(ArkUI_NodeEventType eventType, EventArgs &eventArgs) override;
+    StackNode &getSnapNode() { return mStackNode; }
+    void insertChild(ArkUINode &child, std::size_t index);
+    void SetSnapPosition(float x, float y);
+    void SetSnapWidth(float width);
+    void SetSnapHeight(float height);
+    OH_PixelmapNative *GetNodePixelMap();
+    void SetForeignNodeDelegate(SvgForeignObjectNodeDelegate *delegate) { m_NodeDelegate = delegate; };
+
+private:
+    StackNode mStackNode;
+    SvgForeignObjectNodeDelegate *m_NodeDelegate;
+    float _width{0};
+    float _height{0};
+    float _positionX{0};
+    float _positionY{0};
+};
+
+} // namespace svg
+} // namespace rnoh
+#endif // HARMONY_SVGFOREIGNOBJECTNODE_H

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

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2025 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.
+ *
+ * This file incorporates from the OpenHarmony project, licensed under
+ * the Apache License, Version 2.0. Specifically:
+ * - [OpenHarmony/arkui_ace_engine] (https://gitee.com/openharmony/arkui_ace_engine)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at:
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef HARMONY_SVGFOREIGNOBJECTNODEDELEGATE_H
+#define HARMONY_SVGFOREIGNOBJECTNODEDELEGATE_H
+#include <multimedia/image_framework/image/pixelmap_native.h>
+class SvgForeignObjectNodeDelegate {
+public:
+    virtual ~SvgForeignObjectNodeDelegate() = default;
+    virtual void onDrawForeignImage(OH_PixelmapNative *foreignPixelMap,float width,float height,float x,float y){};
+};
+#endif //HARMONY_SVGFOREIGNOBJECTNODEDELEGATE_H

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

@@ -23,11 +23,13 @@
 #include "utils/SvgUtils.h"
 #include "SvgGradient.h"
 #include "SvgPattern.h"
+#include "properties/ViewBox.h"
 #include "SvgFilter.h"
 #include <native_drawing/drawing_matrix.h>
 #include <native_drawing/drawing_path.h>
 #include <regex>
 #include <string>
+#include <native_drawing/drawing_pixel_map.h>
 
 namespace rnoh {
 namespace svg {
@@ -204,6 +206,13 @@ void SvgNode::Draw(OH_Drawing_Canvas *canvas) {
     // on marker
 
     OnDrawTraversed(canvas);
+    
+    if (_foreignPropsArray.size() > 0) {
+        for (ForeignProps _foreignProps : _foreignPropsArray) {
+            DrawForeignPixelMap(canvas, _foreignProps);
+        }
+        _foreignPropsArray.clear();
+    }
     OH_Drawing_CanvasRestoreToCount(canvas, count);
 }
 
@@ -285,5 +294,60 @@ double SvgNode::getCanvasDiagonal() {
     canvasDiagonal_ = sqrt(powX + powY) * M_SQRT1_2l;
     return canvasDiagonal_;
 }
+
+void SvgNode::DrawForeignPixelMap(OH_Drawing_Canvas *canvas, ForeignProps _foreignProps) {
+    if (!_foreignProps.foreignPixelMap) {
+        DLOG(INFO) << "[svgForeignNode] foreignPixelMap is null";
+        return;
+    }
+    DLOG(INFO) << "[svgForeignNode] DrawForeignPixelMap  start , width:" << _foreignProps.width;
+    OH_Pixelmap_ImageInfo *imageInfo;
+    OH_PixelmapImageInfo_Create(&imageInfo);
+
+    OH_PixelmapNative_GetImageInfo(_foreignProps.foreignPixelMap, imageInfo);
+    uint32_t originalWidth = 0, originalHeight = 0;
+    OH_PixelmapImageInfo_GetWidth(imageInfo, &originalWidth);
+    OH_PixelmapImageInfo_GetHeight(imageInfo, &originalHeight);
+    OH_PixelmapImageInfo_Release(imageInfo);
+
+    if (originalWidth == 0 || originalHeight == 0) {
+        DLOG(WARNING) << "[svgForeignNode] Invalid pixelmap size";
+        OH_PixelmapNative_Release(_foreignProps.foreignPixelMap);
+        return;
+    }
+
+    OH_Drawing_PixelMap *ohPixelMap = OH_Drawing_PixelMapGetFromOhPixelMapNative(_foreignProps.foreignPixelMap);
+    if (!ohPixelMap) {
+        DLOG(WARNING) << "[svgForeignNode] Failed to get OH_Drawing_PixelMap";
+        OH_PixelmapNative_Release(_foreignProps.foreignPixelMap);
+        return;
+    }
+
+    OH_Drawing_CanvasSave(canvas);
+
+    OH_Drawing_CanvasTranslate(canvas, _foreignProps.x, _foreignProps.y);
+
+
+    float scaleX = static_cast<float>(_foreignProps.width) / originalWidth;
+    float scaleY = static_cast<float>(_foreignProps.height) / originalHeight;
+    OH_Drawing_CanvasScale(canvas, 1, 1);
+
+    OH_Drawing_Rect *srcRect = OH_Drawing_RectCreate(0, 0, originalWidth, originalHeight);
+    OH_Drawing_Rect *dstRect = OH_Drawing_RectCreate(0, 0, originalWidth, originalHeight);
+    OH_Drawing_SamplingOptions *sampling = OH_Drawing_SamplingOptionsCreate(FILTER_MODE_LINEAR, MIPMAP_MODE_LINEAR);
+    OH_Drawing_CanvasDrawPixelMapRect(canvas, ohPixelMap, srcRect, dstRect, sampling);
+
+
+    OH_Drawing_CanvasRestore(canvas);
+    OH_Drawing_PixelMapDissolve(ohPixelMap);
+    OH_PixelmapNative_Release(_foreignProps.foreignPixelMap);
+    OH_Drawing_RectDestroy(srcRect);
+    OH_Drawing_RectDestroy(dstRect);
+    OH_Drawing_SamplingOptionsDestroy(sampling);
+
+    _foreignProps.foreignPixelMap = nullptr;
+    DLOG(INFO) << "[svgForeignNode] DrawForeignPixelMap end";
+}
+
 } // namespace svg
 } // namespace rnoh

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

@@ -36,6 +36,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"
@@ -43,6 +44,15 @@
 namespace rnoh {
 namespace svg {
 
+struct ForeignProps {
+    OH_PixelmapNative *foreignPixelMap{nullptr};
+    float width;
+    float height;
+    float x;
+    float y;
+};
+
+
 constexpr int INHERIT_TYPE = 2;
 
 class SvgNode : public std::enable_shared_from_this<SvgNode> {
@@ -275,6 +285,10 @@ public:
     double getCanvasHeight();
     double getCanvasDiagonal();
 
+    void SetForeignObject(ForeignProps foreignProps) {
+        _foreignPropsArray.emplace_back(foreignProps);
+    }
+
 protected:
     // override as need by derived class
     // called by function AppendChild
@@ -296,7 +310,7 @@ 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 InitNoneFlag() {
         hrefFill_ = false;
         hrefRender_ = false;
@@ -341,6 +355,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