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

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.3',
+  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/SvgForeignObjectNode.cpp

@@ -21,6 +21,8 @@
 
 #include "SvgForeignObjectNode.h"
 #include "RNOH/arkui/NativeNodeApi.h"
+#include <deviceinfo.h>
+#include <info/application_target_sdk_version.h>
 namespace rnoh {
 namespace svg {
 SvgForeignObjectNode::SvgForeignObjectNode()
@@ -34,6 +36,7 @@ SvgForeignObjectNode::~SvgForeignObjectNode() {
     if (m_NodeDelegate) {
         m_NodeDelegate = nullptr;
     }
+    _isGeneratedPixelMap = false;
 }
 void SvgForeignObjectNode::insertChild(ArkUINode &child, std::size_t index) { mStackNode.insertChild(child, index); }
 
@@ -48,18 +51,26 @@ void SvgForeignObjectNode::SetSnapPosition(float x, float y) {
 
 void SvgForeignObjectNode::onNodeEvent(ArkUI_NodeEventType eventType, EventArgs &eventArgs) {
     if (eventType == ArkUI_NodeEventType::NODE_EVENT_ON_AREA_CHANGE) {
-        if (m_NodeDelegate) {
+        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);
@@ -67,6 +78,7 @@ OH_PixelmapNative *SvgForeignObjectNode::GetNodePixelMap() {
     if (code == ARKUI_ERROR_CODE_NO_ERROR) {
         return pixelMap;
     }
+#endif
     return nullptr;
 }
 

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

@@ -39,7 +39,9 @@ public:
     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;
@@ -47,6 +49,7 @@ private:
     float _height{0};
     float _positionX{0};
     float _positionY{0};
+    bool _isGeneratedPixelMap{false}; //防止快照生成多次，导致性能影响
 };
 
 } // namespace svg

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

@@ -77,6 +77,7 @@ void SvgNode::InitStyle(const SvgBaseAttribute &attr) {
             }
         }
     }
+    OnInitStyle();
     if (passStyle_) {
         for (auto &node : children_) {
             if (node) {

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

@@ -184,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) {
@@ -266,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);
+            }
         }
     }
 

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

@@ -40,11 +40,11 @@ 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);
     }
 }
 

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

@@ -22,6 +22,7 @@ RNSVGSvgViewComponentInstance::RNSVGSvgViewComponentInstance(Context context)
 
 RNSVGSvgViewComponentInstance::~RNSVGSvgViewComponentInstance() {
     SvgViewManager::getInstance().onDropView(CppComponentInstance::getTag());
+    noSvgComponentIndex = 0;
 }
 
 void RNSVGSvgViewComponentInstance::onFinalizeUpdates() {
@@ -65,7 +66,8 @@ void RNSVGSvgViewComponentInstance::onChildInserted(ComponentInstance::Shared co
         for (ComponentInstance::Shared c : childInstance) {
             if (c->getComponentName().find("SVG") == std::string::npos) {
                 NativeNodeApi::getInstance()->insertChildAt(m_svgArkUINode.getArkUINodeHandle(),
-                                                            c->getLocalRootArkUINode().getArkUINodeHandle(), index);
+                                                            c->getLocalRootArkUINode().getArkUINodeHandle(), noSvgComponentIndex);
+                noSvgComponentIndex++;
             }
             auto groupChildInstance = c->getChildren();
             for (ComponentInstance::Shared c1 : groupChildInstance) {

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

@@ -49,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-ohos/react-native-svg",
-  "version": "15.12.1-rc.3",
+  "version": "15.12.1-rc.5",
   "description": "",
   "react-native": "src/index",
   "main": "lib/commonjs/index",
@@ -8,7 +8,7 @@
   "types": "lib/typescript/index.d.ts",
   "scripts": {
     "prepack": "bob build",
-    "prepublishOnly": "npm run prepack",
+    "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"
@@ -21,7 +21,7 @@
     "react-native-svg": "15.12.0"
   },
   "devDependencies": {
-    "@rnoh/react-native-harmony-cli": "./packages/react-native-oh-react-native-harmony-cli-0.77.18.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",
@@ -29,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",

package/tsconfig.json

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