@react-native-ohos/react-native-svg 15.12.1-rc.2 → 15.12.1-rc.5

package/harmony/svg/BuildProfile.ets

@@ -1,7 +1,7 @@
 /**
  * Use these variables when you tailor your ArkTS code. They must be of the const type.
  */
-export const HAR_VERSION = '15.12.0';
+export const HAR_VERSION = '15.12.1-rc.2';
 export const BUILD_MODE_NAME = 'debug';
 export const DEBUG = true;
 export const TARGET_NAME = 'default';

package/harmony/svg/oh-package.json5

@@ -6,7 +6,7 @@
   name: '@react-native-ohos/react-native-svg',
   type: 'module',
   main: 'index.ets',
-  version: '15.12.1-rc.2',
+  version: '15.12.1-rc.5',
   dependencies: {
     "@rnoh/react-native-openharmony": "file:../../node_modules/@react-native-oh/react-native-harmony/harmony/react_native_openharmony.har"
   },

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

@@ -8,6 +8,7 @@
 
 #include "RNOH/Package.h"
 #include <glog/logging.h>
+#include "componentInstances/RNSVGForeignObjectComponentInstance.h"
 #include "componentInstances/RNSVGSvgViewComponentInstance.h"
 #include "componentInstances/RNSVGCircleComponentInstance.h"
 #include "componentInstances/RNSVGGroupComponentInstance.h"
@@ -51,6 +52,9 @@ public:
         if (ctx.componentName == "RNSVGSvgView") {
             return std::make_shared<RNSVGSvgViewComponentInstance>(std::move(ctx));
         }
+        if (ctx.componentName == "RNSVGForeignObject") {
+           return std::make_shared<RNSVGForeignObjectComponentInstance>(std::move(ctx));
+        }
         if (ctx.componentName == "RNSVGCircle") {
             return std::make_shared<RNSVGCircleComponentInstance>(std::move(ctx));
         }

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

@@ -55,6 +55,9 @@ SvgArkUINode::~SvgArkUINode() {
     userCallback_ = nullptr;
 }
 
+void SvgArkUINode::AddChild(ArkUINode &node) {
+    maybeThrow(NativeNodeApi::getInstance()->addChild(m_nodeHandle, node.getArkUINodeHandle()));
+}
 void SvgArkUINode::OnDraw(ArkUI_NodeCustomEvent *event) {
     auto *drawContext = OH_ArkUI_NodeCustomEvent_GetDrawContextInDraw(event);
     auto *drawingHandle = reinterpret_cast<OH_Drawing_Canvas *>(OH_ArkUI_DrawContext_GetCanvas(drawContext));

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

@@ -6,9 +6,10 @@
 
 #pragma once
 
-#include "SvgNode.h"
-#include "SvgHost.h"
 #include "RNOH/arkui/ArkUINode.h"
+#include "SvgForeignObjectNodeDelegate.h"
+#include "SvgHost.h"
+#include "SvgNode.h"
 #include "arkui/native_node.h"
 
 namespace rnoh {
@@ -26,18 +27,23 @@ private:
     std::weak_ptr<SvgNode> root_;
     ArkUI_NativeNodeAPI_1 *nativeModule_ = nullptr;
     UserCallback *userCallback_ = nullptr;
+    std::weak_ptr<SvgNode> _groupNode;
+    std::vector<ForeignProps> foreignPropsArray;
     void (*eventReceiver)(ArkUI_NodeCustomEvent *event);
-
+ 
 public:
     SvgArkUINode();
     ~SvgArkUINode() override;
 
-    void SetSvgNode(const std::weak_ptr<SvgNode>& node)
-    {
-        root_ = node;
-    }
-    void ResetNodeHandle() {
-        
+    void SetSvgNode(const std::weak_ptr<SvgNode> &node) { root_ = node; }
+    void SetGroupNode(const std::weak_ptr<SvgNode> &node) { _groupNode = node; }
+    void ResetNodeHandle() {}
+    void AddChild(ArkUINode &node);
+    void SetForeignObject(OH_PixelmapNative *pixelMap, float w, float h, float x, float y) {
+        ForeignProps foreignProps = {std::move(pixelMap), w, h, x, y};
+        if (auto groupNode = _groupNode.lock()) {
+            groupNode->SetForeignObject(std::move(foreignProps));
+        }
     }
 };
 

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

@@ -0,0 +1,86 @@
+/*
+ * 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"
+#include <deviceinfo.h>
+#include <info/application_target_sdk_version.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;
+    }
+    _isGeneratedPixelMap = false;
+}
+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 && _isGeneratedPixelMap) {
+            OH_PixelmapNative *pixelMap = GetNodePixelMap();
+            if (!pixelMap) {
+                LOG(ERROR) << "[svgForeignNode] get node snapshot pixelMap is null";
+                return;
+            }
+            _isGeneratedPixelMap = false;
+            m_NodeDelegate->onDrawForeignImage(pixelMap, _width, _height, _positionX, _positionY);
+        }
+    }
+}
+
+OH_PixelmapNative *SvgForeignObjectNode::GetNodePixelMap() {
+    DLOG(INFO) << "[svgForeignNode] OH_CURRENT_API_VERSION:" << OH_CURRENT_API_VERSION
+                << ";ROM SDK:" << OH_GetSdkApiVersion();
+    
+#if OH_CURRENT_API_VERSION >= 15
+    if (OH_GetSdkApiVersion() < 15) {
+        return nullptr;
+    }
+    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;
+    }
+#endif
+    return nullptr;
+}
+
+} // namespace svg
+} // namespace rnoh

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

@@ -0,0 +1,57 @@
+/*
+ * 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; };
+    void SetGeneratedPixelMap(bool isNeed) {
+        _isGeneratedPixelMap = isNeed;
+    }
+private:
+    StackNode mStackNode;
+    SvgForeignObjectNodeDelegate *m_NodeDelegate;
+    float _width{0};
+    float _height{0};
+    float _positionX{0};
+    float _positionY{0};
+    bool _isGeneratedPixelMap{false}; //防止快照生成多次，导致性能影响
+};
+
+} // 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/SvgGroup.cpp

@@ -6,6 +6,7 @@
 
 #include "SvgGroup.h"
 #include "SvgFilter.h"
+#include "drawing/Brush.h"
 
 namespace rnoh {
 namespace svg {
@@ -30,7 +31,13 @@ void SvgGroup::OnInitStyle() {
 }
 
 void SvgGroup::OnDraw(OH_Drawing_Canvas *canvas) {
-    OnDrawTraversed(canvas);
+    if (attributes_.selfOpacity < 1.0) {
+        drawing::Brush layerBrush;
+        uint8_t alpha= static_cast<uint8_t>(attributes_.selfOpacity* 255);
+        layerBrush.SetAlpha(alpha);
+        OH_Drawing_CanvasSaveLayer(canvas, nullptr, layerBrush.get());
+    }
+    SvgNode::OnDraw(canvas);
 }
 
 void SvgGroup::ApplyFilterToChildren(std::shared_ptr<SvgFilter> filter) {

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 {
@@ -75,6 +77,7 @@ void SvgNode::InitStyle(const SvgBaseAttribute &attr) {
             }
         }
     }
+    OnInitStyle();
     if (passStyle_) {
         for (auto &node : children_) {
             if (node) {
@@ -204,6 +207,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 +295,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> {
@@ -174,18 +184,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 +280,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 +303,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 +328,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 +373,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/RNSVGForeignObjectComponentInstance.cpp

@@ -0,0 +1,65 @@
+/*
+ * 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 "RNSVGForeignObjectComponentInstance.h"
+namespace rnoh {
+namespace svg {
+
+RNSVGForeignObjectComponentInstance::RNSVGForeignObjectComponentInstance(Context context)
+    : CppComponentInstance(std::move(context)) {
+    DLOG(INFO) << "RNSVGForeignObjectComponentInstance";
+    NativeNodeApi::getInstance()->registerNodeEvent(mForeignStackNode.getArkUINodeHandle(), NODE_EVENT_ON_AREA_CHANGE,
+                                                    NODE_EVENT_ON_AREA_CHANGE, this);
+    mForeignStackNode.insertChild(node, 0);
+}
+
+
+RNSVGForeignObjectComponentInstance::~RNSVGForeignObjectComponentInstance() {
+    NativeNodeApi::getInstance()->unregisterNodeEvent(mForeignStackNode.getArkUINodeHandle(), NODE_EVENT_ON_AREA_CHANGE);
+}
+
+void RNSVGForeignObjectComponentInstance::onFinalizeUpdates() {
+    ComponentInstance::onFinalizeUpdates();
+    if (m_props) {
+        float pointScaleFactor = getLayoutMetrics().pointScaleFactor;
+        mForeignStackNode.SetSnapPosition(pointScaleFactor * std::stof(DynamicUtils::DynamicToString(m_props->x)),
+                                          pointScaleFactor * std::stof(DynamicUtils::DynamicToString(m_props->y)));
+        mForeignStackNode.SetSnapWidth(pointScaleFactor * std::stof(DynamicUtils::DynamicToString(m_props->width)));
+        mForeignStackNode.SetSnapHeight(pointScaleFactor * std::stof(DynamicUtils::DynamicToString(m_props->height)));
+        mForeignStackNode.SetGeneratedPixelMap(true);
+    }
+}
+
+void RNSVGForeignObjectComponentInstance::onChildInserted(ComponentInstance::Shared const &childComponentInstance,
+                                                          std::size_t index) {
+    CppComponentInstance::onChildInserted(childComponentInstance, index);
+    node.insertChild(childComponentInstance->getLocalRootArkUINode(), index);
+}
+
+void RNSVGForeignObjectComponentInstance::onChildRemoved(ComponentInstance::Shared const &childComponentInstance) {
+    CppComponentInstance::onChildRemoved(childComponentInstance);
+}
+
+SvgForeignObjectNode &RNSVGForeignObjectComponentInstance::getLocalRootArkUINode() { return mForeignStackNode; }
+
+
+} // namespace svg
+}

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

@@ -0,0 +1,50 @@
+/*
+ * 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 RNSVG_FOREIGN_OBJECT_COMPONENT_INSTANCE_H
+#define RNSVG_FOREIGN_OBJECT_COMPONENT_INSTANCE_H
+#include "RNOH/CppComponentInstance.h"
+#include "SvgForeignObjectNode.h"
+#include <react/renderer/components/react_native_svg/ShadowNodes.h>
+#include "RNOH/arkui/ColumnNode.h"
+#include "RNOH/arkui/NativeNodeApi.h"
+#include "utils/DynamicUtils.h"
+namespace rnoh {
+namespace svg {
+class RNSVGForeignObjectComponentInstance : public CppComponentInstance<facebook::react::RNSVGForeignObjectShadowNode> {
+public:
+    RNSVGForeignObjectComponentInstance(Context context);
+    ~RNSVGForeignObjectComponentInstance();
+
+    void onFinalizeUpdates() override;
+    void onChildInserted(ComponentInstance::Shared const &childComponentInstance, std::size_t index) override;
+
+    void onChildRemoved(ComponentInstance::Shared const &childComponentInstance) override;
+
+    SvgForeignObjectNode &getLocalRootArkUINode() override;
+
+private:
+    SvgForeignObjectNode mForeignStackNode;
+    ColumnNode node;
+};
+} // namespace svg
+} // namespace rnoh
+#endif // RNSVG_FOREIGN_OBJECT_COMPONENT_INSTANCE_H

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

@@ -3,7 +3,8 @@
  * Use of this source code is governed by a MIT license that can be
  * found in the LICENSE file.
  */
-
+#ifndef RNSVG_GROUP_COMPONENT_INSTANCE_H
+#define RNSVG_GROUP_COMPONENT_INSTANCE_H
 #pragma once
 
 #include "RNSVGBaseComponentInstance.h"
@@ -15,13 +16,16 @@ namespace svg {
 class RNSVGGroupComponentInstance : public RNSVGBaseComponentInstance<facebook::react::RNSVGGroupShadowNode> {
 public:
     explicit RNSVGGroupComponentInstance(Context context);
-
+    std::shared_ptr<SvgGroup> getNode(){
+        return m_svgGroup;
+    }
 protected:
     void UpdateElementProps() override;
-
+    
 private:
     std::shared_ptr<SvgGroup> m_svgGroup = std::make_shared<SvgGroup>();
 };
 
 } // namespace svg
-} // namespace rnoh
+} // namespace rnoh
+#endif // RNSVG_GROUP_COMPONENT_INSTANCE_H

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

@@ -7,6 +7,7 @@
 #include "RNSVGSvgViewComponentInstance.h"
 #include "utils/DynamicUtils.h"
 #include <glog/logging.h>
+#include "RNSVGGroupComponentInstance.h"
 
 namespace rnoh {
 namespace svg {
@@ -21,6 +22,7 @@ RNSVGSvgViewComponentInstance::RNSVGSvgViewComponentInstance(Context context)
 
 RNSVGSvgViewComponentInstance::~RNSVGSvgViewComponentInstance() {
     SvgViewManager::getInstance().onDropView(CppComponentInstance::getTag());
+    noSvgComponentIndex = 0;
 }
 
 void RNSVGSvgViewComponentInstance::onFinalizeUpdates() {
@@ -45,9 +47,46 @@ void RNSVGSvgViewComponentInstance::onFinalizeUpdates() {
     getLocalRootArkUINode().markDirty();
 }
 
+void RNSVGSvgViewComponentInstance::onDrawForeignImage(OH_PixelmapNative *foreignPixelMap, float width, float height,
+                                                       float x, float y) {
+    if (foreignPixelMap) {
+        DLOG(INFO) << "[svgForeignNode] RNSVGSvgViewComponentInstance OH_PixelmapNative is not null, position:{ x:" << x
+                   << ",y:" << y << "},width:" << width << ";height:" << height;
+        m_svgArkUINode.SetForeignObject(foreignPixelMap, width, height, x, y);
+        m_svgArkUINode.markDirty();
+    } else {
+        DLOG(INFO) << "RNSVGSvgViewComponentInstance OH_PixelmapNative is null";
+    }
+}
 void RNSVGSvgViewComponentInstance::onChildInserted(ComponentInstance::Shared const &childComponentInstance,
                                                     std::size_t index) {
     CppComponentInstance::onChildInserted(childComponentInstance, index);
+    if (childComponentInstance->getComponentName() == "RNSVGGroup") {
+        auto childInstance = childComponentInstance->getChildren();
+        for (ComponentInstance::Shared c : childInstance) {
+            if (c->getComponentName().find("SVG") == std::string::npos) {
+                NativeNodeApi::getInstance()->insertChildAt(m_svgArkUINode.getArkUINodeHandle(),
+                                                            c->getLocalRootArkUINode().getArkUINodeHandle(), noSvgComponentIndex);
+                noSvgComponentIndex++;
+            }
+            auto groupChildInstance = c->getChildren();
+            for (ComponentInstance::Shared c1 : groupChildInstance) {
+                if (c1->getComponentName() == "RNSVGForeignObject") {
+                    auto m_foreignComponentInstance =
+                        std::dynamic_pointer_cast<RNSVGForeignObjectComponentInstance>(c1);
+                    if (m_foreignComponentInstance) {
+                        auto groupInstance =
+                            std::dynamic_pointer_cast<RNSVGGroupComponentInstance>(c1->getParent().lock());
+                        m_svgArkUINode.SetGroupNode(groupInstance->getNode());
+                        m_svgArkUINode.AddChild(m_foreignComponentInstance->getLocalRootArkUINode());
+                        m_foreignComponentInstance->getLocalRootArkUINode().SetForeignNodeDelegate(this);
+                    }
+                }
+            }
+        }
+    }
+
+
     OnChildInsertCommon(std::dynamic_pointer_cast<SvgHost>(childComponentInstance));
 }
 

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

@@ -12,18 +12,26 @@
 #include <react/renderer/components/react_native_svg/ShadowNodes.h>
 #include "SvgViewManager.h"
 #include "SvgSvg.h"
+#include "RNSVGForeignObjectComponentInstance.h"
+
+namespace rnoh {
+namespace svg {
+class RNSVGGroupComponentInstance;
+} // namespace svg
+} // namespace rnoh
+
 
 namespace rnoh {
 namespace svg {
 
 class RNSVGSvgViewComponentInstance : public CppComponentInstance<facebook::react::RNSVGSvgViewShadowNode>,
-                                      public SvgHost {
+                                      public SvgHost , public SvgForeignObjectNodeDelegate {
 public:
     explicit RNSVGSvgViewComponentInstance(Context context);
     ~RNSVGSvgViewComponentInstance();
 
     void onFinalizeUpdates() override;
-
+    void onDrawForeignImage(OH_PixelmapNative *foreignPixelMap,float width,float height,float x,float y) override;
     // get SvgNode from childComponentInstance and set it to root_
     void onChildInserted(ComponentInstance::Shared const &childComponentInstance, std::size_t index) override;
 
@@ -41,6 +49,7 @@ public:
 private:
     SvgArkUINode m_svgArkUINode;
     std::shared_ptr<SvgSvg> m_svgSvg = std::make_shared<SvgSvg>();
+    int noSvgComponentIndex {0}; // 非svg添加的index(适配js侧view包裹会拆解子元素成平级)
 };
 
 } // namespace svg

package/lib/commonjs/css/index.js

@@ -1,55 +1,55 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "LocalSvg", {
-  enumerable: true,
-  get: function () {
-    return _css.LocalSvg;
-  }
-});
-Object.defineProperty(exports, "SvgCss", {
-  enumerable: true,
-  get: function () {
-    return _css.SvgCss;
-  }
-});
-Object.defineProperty(exports, "SvgCssUri", {
-  enumerable: true,
-  get: function () {
-    return _css.SvgCssUri;
-  }
-});
-Object.defineProperty(exports, "SvgWithCss", {
-  enumerable: true,
-  get: function () {
-    return _css.SvgWithCss;
-  }
-});
-Object.defineProperty(exports, "SvgWithCssUri", {
-  enumerable: true,
-  get: function () {
-    return _css.SvgWithCssUri;
-  }
-});
-Object.defineProperty(exports, "WithLocalSvg", {
-  enumerable: true,
-  get: function () {
-    return _css.WithLocalSvg;
-  }
-});
-Object.defineProperty(exports, "inlineStyles", {
-  enumerable: true,
-  get: function () {
-    return _css.inlineStyles;
-  }
-});
-Object.defineProperty(exports, "loadLocalRawResource", {
-  enumerable: true,
-  get: function () {
-    return _css.loadLocalRawResource;
-  }
-});
-var _css = require("react-native-svg/css");
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "LocalSvg", {
+  enumerable: true,
+  get: function () {
+    return _css.LocalSvg;
+  }
+});
+Object.defineProperty(exports, "SvgCss", {
+  enumerable: true,
+  get: function () {
+    return _css.SvgCss;
+  }
+});
+Object.defineProperty(exports, "SvgCssUri", {
+  enumerable: true,
+  get: function () {
+    return _css.SvgCssUri;
+  }
+});
+Object.defineProperty(exports, "SvgWithCss", {
+  enumerable: true,
+  get: function () {
+    return _css.SvgWithCss;
+  }
+});
+Object.defineProperty(exports, "SvgWithCssUri", {
+  enumerable: true,
+  get: function () {
+    return _css.SvgWithCssUri;
+  }
+});
+Object.defineProperty(exports, "WithLocalSvg", {
+  enumerable: true,
+  get: function () {
+    return _css.WithLocalSvg;
+  }
+});
+Object.defineProperty(exports, "inlineStyles", {
+  enumerable: true,
+  get: function () {
+    return _css.inlineStyles;
+  }
+});
+Object.defineProperty(exports, "loadLocalRawResource", {
+  enumerable: true,
+  get: function () {
+    return _css.loadLocalRawResource;
+  }
+});
+var _css = require("react-native-svg/css");
 //# sourceMappingURL=index.js.map

package/lib/commonjs/css/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_css","require"],"sourceRoot":"../../../src","sources":["css/index.tsx"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,IAAA,GAAAC,OAAA","ignoreList":[]}
+{"version":3,"names":["_css","require"],"sourceRoot":"..\\..\\..\\src","sources":["css/index.tsx"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,IAAA,GAAAC,OAAA","ignoreList":[]}

package/lib/commonjs/index.js

@@ -1,26 +1,26 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-var _exportNames = {};
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function () {
-    return _ReactNativeSVG.default;
-  }
-});
-var _ReactNativeSVG = _interopRequireWildcard(require("react-native-svg/src/ReactNativeSVG"));
-Object.keys(_ReactNativeSVG).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _ReactNativeSVG[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _ReactNativeSVG[key];
-    }
-  });
-});
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _exportNames = {};
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function () {
+    return _ReactNativeSVG.default;
+  }
+});
+var _ReactNativeSVG = _interopRequireWildcard(require("react-native-svg/src/ReactNativeSVG"));
+Object.keys(_ReactNativeSVG).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _ReactNativeSVG[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _ReactNativeSVG[key];
+    }
+  });
+});
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 //# sourceMappingURL=index.js.map

package/lib/commonjs/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_ReactNativeSVG","_interopRequireWildcard","require","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","set","getOwnPropertyDescriptor"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;;;;;;;;;;;AAAA,IAAAA,eAAA,GAAAC,uBAAA,CAAAC,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAJ,eAAA,EAAAK,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAN,eAAA,CAAAM,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAd,eAAA,CAAAM,GAAA;IAAA;EAAA;AAAA;AAAoD,SAAAL,wBAAAc,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAhB,uBAAA,YAAAA,CAAAc,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAP,GAAA,CAAAC,CAAA,GAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAR,cAAA,CAAAC,IAAA,CAAAM,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAlB,MAAA,CAAAS,cAAA,KAAAT,MAAA,CAAAyB,wBAAA,CAAAb,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAR,GAAA,IAAAQ,CAAA,CAAAK,GAAA,IAAAN,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA","ignoreList":[]}
+{"version":3,"names":["_ReactNativeSVG","_interopRequireWildcard","require","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","set","getOwnPropertyDescriptor"],"sourceRoot":"..\\..\\src","sources":["index.tsx"],"mappings":";;;;;;;;;;;;AAAA,IAAAA,eAAA,GAAAC,uBAAA,CAAAC,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAJ,eAAA,EAAAK,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAN,eAAA,CAAAM,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAd,eAAA,CAAAM,GAAA;IAAA;EAAA;AAAA;AAAoD,SAAAL,wBAAAc,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAhB,uBAAA,YAAAA,CAAAc,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAP,GAAA,CAAAC,CAAA,GAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAR,cAAA,CAAAC,IAAA,CAAAM,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAlB,MAAA,CAAAS,cAAA,KAAAT,MAAA,CAAAyB,wBAAA,CAAAb,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAR,GAAA,IAAAQ,CAAA,CAAAK,GAAA,IAAAN,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA","ignoreList":[]}

package/lib/module/css/index.js

@@ -1,4 +1,4 @@
-import { SvgCss, SvgCssUri, SvgWithCss, SvgWithCssUri, inlineStyles } from 'react-native-svg/css';
-import { LocalSvg, WithLocalSvg, loadLocalRawResource } from 'react-native-svg/css';
-export { SvgCss, SvgCssUri, SvgWithCss, SvgWithCssUri, inlineStyles, LocalSvg, WithLocalSvg, loadLocalRawResource };
+import { SvgCss, SvgCssUri, SvgWithCss, SvgWithCssUri, inlineStyles } from 'react-native-svg/css';
+import { LocalSvg, WithLocalSvg, loadLocalRawResource } from 'react-native-svg/css';
+export { SvgCss, SvgCssUri, SvgWithCss, SvgWithCssUri, inlineStyles, LocalSvg, WithLocalSvg, loadLocalRawResource };
 //# sourceMappingURL=index.js.map

package/lib/module/css/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["SvgCss","SvgCssUri","SvgWithCss","SvgWithCssUri","inlineStyles","LocalSvg","WithLocalSvg","loadLocalRawResource"],"sourceRoot":"../../../src","sources":["css/index.tsx"],"mappings":"AAAA,SACIA,MAAM,EACNC,SAAS,EACTC,UAAU,EACVC,aAAa,EACbC,YAAY,QACP,sBAAsB;AAE7B,SAASC,QAAQ,EAAEC,YAAY,EAAEC,oBAAoB,QAAQ,sBAAsB;AAEnF,SACEP,MAAM,EACNC,SAAS,EACTC,UAAU,EACVC,aAAa,EACbC,YAAY,EACZC,QAAQ,EACRC,YAAY,EACZC,oBAAoB","ignoreList":[]}
+{"version":3,"names":["SvgCss","SvgCssUri","SvgWithCss","SvgWithCssUri","inlineStyles","LocalSvg","WithLocalSvg","loadLocalRawResource"],"sourceRoot":"..\\..\\..\\src","sources":["css/index.tsx"],"mappings":"AAAA,SACIA,MAAM,EACNC,SAAS,EACTC,UAAU,EACVC,aAAa,EACbC,YAAY,QACP,sBAAsB;AAE7B,SAASC,QAAQ,EAAEC,YAAY,EAAEC,oBAAoB,QAAQ,sBAAsB;AAEnF,SACEP,MAAM,EACNC,SAAS,EACTC,UAAU,EACVC,aAAa,EACbC,YAAY,EACZC,QAAQ,EACRC,YAAY,EACZC,oBAAoB","ignoreList":[]}

package/lib/module/index.js

@@ -1,3 +1,3 @@
-export * from 'react-native-svg/src/ReactNativeSVG';
-export { default } from 'react-native-svg/src/ReactNativeSVG';
+export * from 'react-native-svg/src/ReactNativeSVG';
+export { default } from 'react-native-svg/src/ReactNativeSVG';
 //# sourceMappingURL=index.js.map

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["default"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"AAAA,cAAc,qCAAqC;AAEnD,SAASA,OAAO,QAAQ,qCAAqC","ignoreList":[]}
+{"version":3,"names":["default"],"sourceRoot":"..\\..\\src","sources":["index.tsx"],"mappings":"AAAA,cAAc,qCAAqC;AAEnD,SAASA,OAAO,QAAQ,qCAAqC","ignoreList":[]}

package/lib/typescript/babel.config.d.ts

@@ -0,0 +1,8 @@
+export let presets: string[];
+export let plugins: (string | {
+    alias: {
+        '@react-native-community/push-notification-ios': string;
+    };
+    cwd: string;
+})[][];
+//# sourceMappingURL=babel.config.d.ts.map

package/lib/typescript/babel.config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"babel.config.d.ts","sourceRoot":"","sources":["../../babel.config.js"],"names":[],"mappings":""}

package/lib/typescript/example/babel.config.d.ts

@@ -0,0 +1,3 @@
+export let presets: string[];
+export let plugins: string[];
+//# sourceMappingURL=babel.config.d.ts.map

package/lib/typescript/example/babel.config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"babel.config.d.ts","sourceRoot":"","sources":["../../../example/babel.config.js"],"names":[],"mappings":""}

package/lib/typescript/example/contexts.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+export declare const AppParamsContext: React.Context<undefined>;
+//# sourceMappingURL=contexts.d.ts.map

package/lib/typescript/example/contexts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"contexts.d.ts","sourceRoot":"","sources":["../../../example/contexts.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,eAAO,MAAM,gBAAgB,0BAAiC,CAAC"}

package/lib/typescript/example/harmony/entry/hvigorfile.d.ts

@@ -0,0 +1,2 @@
+export { hapTasks } from '@ohos/hvigor-ohos-plugin';
+//# sourceMappingURL=hvigorfile.d.ts.map

package/lib/typescript/example/harmony/entry/hvigorfile.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hvigorfile.d.ts","sourceRoot":"","sources":["../../../../../example/harmony/entry/hvigorfile.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC"}

package/lib/typescript/example/harmony/hvigorfile.d.ts

@@ -0,0 +1,2 @@
+export { appTasks } from '@ohos/hvigor-ohos-plugin';
+//# sourceMappingURL=hvigorfile.d.ts.map

package/lib/typescript/example/harmony/hvigorfile.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hvigorfile.d.ts","sourceRoot":"","sources":["../../../../example/harmony/hvigorfile.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC"}

package/lib/typescript/example/index.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=index.d.ts.map

package/lib/typescript/example/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../example/index.js"],"names":[],"mappings":""}

package/lib/typescript/example/jest.config.d.ts

@@ -0,0 +1,3 @@
+declare const _exports: any;
+export = _exports;
+//# sourceMappingURL=jest.config.d.ts.map

package/lib/typescript/example/jest.config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"jest.config.d.ts","sourceRoot":"","sources":["../../../example/jest.config.js"],"names":[],"mappings":""}

package/lib/typescript/example/metro.config.d.ts

@@ -0,0 +1,3 @@
+declare const _exports: any;
+export = _exports;
+//# sourceMappingURL=metro.config.d.ts.map

package/lib/typescript/example/metro.config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"metro.config.d.ts","sourceRoot":"","sources":["../../../example/metro.config.js"],"names":[],"mappings":""}

package/lib/typescript/example/react-native.config.d.ts

@@ -0,0 +1,3 @@
+export let project: {};
+export let assets: string[];
+//# sourceMappingURL=react-native.config.d.ts.map

package/lib/typescript/example/react-native.config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"react-native.config.d.ts","sourceRoot":"","sources":["../../../example/react-native.config.js"],"names":[],"mappings":""}

package/lib/typescript/example/scripts/create-build-profile.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=create-build-profile.d.ts.map

package/lib/typescript/example/scripts/create-build-profile.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-build-profile.d.ts","sourceRoot":"","sources":["../../../../example/scripts/create-build-profile.js"],"names":[],"mappings":""}

package/lib/typescript/example/src/index.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+export default function App(): React.JSX.Element;
+//# sourceMappingURL=index.d.ts.map

package/lib/typescript/example/src/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../example/src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,MAAM,CAAC,OAAO,UAAU,GAAG,sBAQ1B"}

package/lib/typescript/src/css/index.d.ts

@@ -0,0 +1,4 @@
+import { SvgCss, SvgCssUri, SvgWithCss, SvgWithCssUri, inlineStyles } from 'react-native-svg/css';
+import { LocalSvg, WithLocalSvg, loadLocalRawResource } from 'react-native-svg/css';
+export { SvgCss, SvgCssUri, SvgWithCss, SvgWithCssUri, inlineStyles, LocalSvg, WithLocalSvg, loadLocalRawResource, };
+//# sourceMappingURL=index.d.ts.map

package/lib/typescript/src/css/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/css/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EACH,MAAM,EACN,SAAS,EACT,UAAU,EACV,aAAa,EACb,YAAY,EACb,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAEpF,OAAO,EACL,MAAM,EACN,SAAS,EACT,UAAU,EACV,aAAa,EACb,YAAY,EACZ,QAAQ,EACR,YAAY,EACZ,oBAAoB,GACrB,CAAC"}

package/lib/typescript/src/index.d.ts

@@ -0,0 +1,3 @@
+export * from 'react-native-svg/src/ReactNativeSVG';
+export { default } from 'react-native-svg/src/ReactNativeSVG';
+//# sourceMappingURL=index.d.ts.map

package/lib/typescript/src/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AAAA,cAAc,qCAAqC,CAAC;AAEpD,OAAO,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC"}

package/package.json

@@ -1,12 +1,14 @@
 {
   "name": "@react-native-ohos/react-native-svg",
-  "version": "15.12.1-rc.2",
+  "version": "15.12.1-rc.5",
   "description": "",
   "react-native": "src/index",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
   "types": "lib/typescript/index.d.ts",
   "scripts": {
+    "prepack": "bob build",
+    "prepublishOnly": "npm run prepack && react-native verify-package-harmony --package-path . --skip-checks oh_package_name_is_derived_from_npm_package_name",
     "update_version": "node ./scripts/update-version.js",
     "deploy": "node ./scripts/deploy.js",
     "codegen-lib": "react-native codegen-lib-harmony --no-safety-check --npm-package-name react-native-svg --cpp-output-path ./harmony/svg/src/main/cpp/generated --ets-output-path ./harmony/svg/src/main/ets/generated --cpp-components-spec-paths ./node_modules/react-native-svg/src/fabric"
@@ -19,7 +21,7 @@
     "react-native-svg": "15.12.0"
   },
   "devDependencies": {
-    "@rnoh/react-native-harmony-cli": "./packages/rnoh-react-native-harmony-cli-0.77.10.tgz",
+    "@ohos/hvigor-ohos-plugin": "^6.20.0",
     "@react-native-community/cli": "15.0.1",
     "@tsconfig/react-native": "^3.0.0",
     "@types/jest": "^29.5.1",
@@ -27,7 +29,7 @@
     "@types/react": "^19.1.7",
     "@types/react-native": "^0.71.6",
     "react-native-builder-bob": "^0.20.4",
-    "typescript": "^5.8.3"
+    "typescript": "^5.2.2"
   },
   "harmony": {
     "alias": "react-native-svg",
@@ -45,8 +47,7 @@
     "output": "lib",
     "targets": [
       "commonjs",
-      "module",
-      "typescript"
+      "module"
     ]
   }
 }

package/tsconfig.json

@@ -3,7 +3,7 @@
     "@tsconfig/react-native/tsconfig.json",
   ],
   "compilerOptions": {
-    "noEmit": false
+    "noEmit": false,
   },
   "exclude": [
     "lib",