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

package/LICENSE

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) [2015-2016] [Horcrux]
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) [2015-2016] [Horcrux]
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.OpenSource

@@ -1,11 +1,11 @@
-[
-    {
-        "Name": "@react-native-ohos/react-native-svg",
-        "License": "MIT License",
-        "License File": " LICENSE ",
-        "Version Number": "15.12.1",
-        "Owner" : "xiafeng@huawei.com",
-        "Upstream URL": "https://github.com/react-native-oh-library/react-native-harmony-svg",
-        "Description": "SVG library for React Native OpenHarmony."
-    }
+[
+    {
+        "Name": "@react-native-ohos/react-native-svg",
+        "License": "MIT License",
+        "License File": " LICENSE ",
+        "Version Number": "15.12.0",
+        "Owner" : "xiafeng@huawei.com",
+        "Upstream URL": "https://github.com/react-native-oh-library/react-native-harmony-svg",
+        "Description": "SVG library for React Native OpenHarmony."
+    }
 ]

package/README.md

@@ -1,13 +1,13 @@
-# @react-native-ohos/react-native-svg
-
-This project is based on [react-native-svg v15.12.1](https://github.com/software-mansion/react-native-svg/releases/tag/v15.12.1)
-
-## Documentation
-
-- [中文](https://gitee.com/react-native-oh-library/usage-docs/blob/master/zh-cn/react-native-svg-capi.md)
-
-- [English](https://gitee.com/react-native-oh-library/usage-docs/blob/master/en/react-native-svg-capi.md)
-
-## License
-
-This library is licensed under [The MIT License (MIT)](https://github.com/software-mansion/react-native-svg/blob/main/LICENSE)
+# @react-native-ohos/react-native-svg
+
+This project is based on [react-native-svg@15.12.0](https://github.com/software-mansion/react-native-svg/tree/v15.12.0)
+
+## Documentation
+
+- [中文](https://gitee.com/react-native-oh-library/usage-docs/blob/master/zh-cn/react-native-svg-capi.md)
+
+- [English](https://gitee.com/react-native-oh-library/usage-docs/blob/master/en/react-native-svg-capi.md)
+
+## License
+
+This library is licensed under [The MIT License (MIT)](https://github.com/software-mansion/react-native-svg/blob/main/LICENSE)

package/css/package.json

@@ -1,6 +1,6 @@
-{
-    "main": "../lib/commonjs/css/index",
-    "module": "../lib/module/css/index",
-    "react-native": "../src/css/index",
-    "types": "../lib/typescript/css/index"
+{
+    "main": "../lib/commonjs/css/index",
+    "module": "../lib/module/css/index",
+    "react-native": "../src/css/index",
+    "types": "../lib/typescript/css/index"
   }

package/harmony/svg/BuildProfile.ets

@@ -1,17 +1,17 @@
-/**
- * Use these variables when you tailor your ArkTS code. They must be of the const type.
- */
-export const HAR_VERSION = '15.12.1-rc.1';
-export const BUILD_MODE_NAME = 'debug';
-export const DEBUG = true;
-export const TARGET_NAME = 'default';
-
-/**
- * BuildProfile Class is used only for compatibility purposes.
- */
-export default class BuildProfile { 
-	static readonly HAR_VERSION = HAR_VERSION;
-	static readonly BUILD_MODE_NAME = BUILD_MODE_NAME;
-	static readonly DEBUG = DEBUG;
-	static readonly TARGET_NAME = TARGET_NAME;
+/**
+ * Use these variables when you tailor your ArkTS code. They must be of the const type.
+ */
+export const HAR_VERSION = '15.12.1-rc.2';
+export const BUILD_MODE_NAME = 'debug';
+export const DEBUG = true;
+export const TARGET_NAME = 'default';
+
+/**
+ * BuildProfile Class is used only for compatibility purposes.
+ */
+export default class BuildProfile { 
+	static readonly HAR_VERSION = HAR_VERSION;
+	static readonly BUILD_MODE_NAME = BUILD_MODE_NAME;
+	static readonly DEBUG = DEBUG;
+	static readonly TARGET_NAME = TARGET_NAME;
 }

package/harmony/svg/build-profile.json5

@@ -1,9 +1,9 @@
-{
-  "apiType": "stageMode",
-  "targets": [
-    {
-      "name": "default",
-      "runtimeOS": "HarmonyOS"
-    }
-  ]
-}
+{
+  "apiType": "stageMode",
+  "targets": [
+    {
+      "name": "default",
+      "runtimeOS": "HarmonyOS"
+    }
+  ]
+}

package/harmony/svg/hvigorfile.ts

@@ -1,2 +1,2 @@
-// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently.
+// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently.
 export { harTasks } from '@ohos/hvigor-ohos-plugin';

package/harmony/svg/index.ets

@@ -1,7 +1,7 @@
-/*
- * 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.
- */
-
+/*
+ * 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.
+ */
+
 export * from './ts'

package/harmony/svg/oh-package.json5

@@ -1,13 +1,13 @@
-{
-  license: 'MIT',
-  devDependencies: {},
-  author: '',
-  description: "",
-  name: '@react-native-ohos/react-native-svg',
-  type: 'module',
-  main: 'index.ets',
-  version: '15.12.1-rc.1',
-  dependencies: {
-    "@rnoh/react-native-openharmony": "file:../../node_modules/@react-native-oh/react-native-harmony/harmony/react_native_openharmony.har"
-  },
-}
+{
+  license: 'MIT',
+  devDependencies: {},
+  author: '',
+  description: "",
+  name: '@react-native-ohos/react-native-svg',
+  type: 'module',
+  main: 'index.ets',
+  version: '15.12.1-rc.3',
+  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));
+        }
     }
 };