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

package/harmony/svg/build/default/cache/default/default@PackageHar/src/main/resources/en_US/element/string.json

@@ -0,0 +1,8 @@
+{
+  "string": [
+    {
+      "name": "page_show",
+      "value": "page from npm package"
+    }
+  ]
+}

package/harmony/svg/build/default/cache/default/default@PackageHar/src/main/resources/zh_CN/element/string.json

@@ -0,0 +1,8 @@
+{
+  "string": [
+    {
+      "name": "page_show",
+      "value": "page from npm package"
+    }
+  ]
+}

package/harmony/svg/build/default/cache/default/default@PackageHar/ts.ts

@@ -0,0 +1,8 @@
+/*
+ * 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 './src/main/ets/SvgPackage'
+export * from './src/main/ets/RNSVGSvgViewModule'

package/harmony/svg/build/default/generated/pm/default/oh-package.json5

@@ -0,0 +1 @@
+{"license":"MIT","devDependencies":{},"author":"","description":"","name":"@react-native-ohos/react-native-svg","type":"module","main":"index.ets","version":"15.12.1-rc.10","dependencies":{"@rnoh/react-native-openharmony":"file:../../node_modules/@react-native-oh/react-native-harmony/harmony/react_native_openharmony.har"}}

package/harmony/svg/build/default/generated/r/default/ResourceTable.h

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * 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 RESOURCE_TABLE_H
+#define RESOURCE_TABLE_H
+
+#include<stdint.h>
+
+namespace OHOS {
+const int32_t STRING_PAGE_SHOW = 0x02000000;
+}
+#endif

package/harmony/svg/build/default/intermediates/loader/default/loader.json

@@ -0,0 +1,26 @@
+{
+  "modulePathMap": {
+    "entry": "D:\\w\\25P1_3\\harmony\\entry",
+    "svg": "D:\\rn_third\\rntpc_react-native-svg\\harmony\\svg"
+  },
+  "compileMode": "esmodule",
+  "projectRootPath": "D:\\rn_third\\rntpc_react-native-svg\\harmony",
+  "nodeModulesPath": "D:\\rn_third\\rntpc_react-native-svg\\harmony\\svg\\build\\default\\intermediates\\loader_out\\default\\node_modules",
+  "byteCodeHarInfo": {},
+  "declarationEntry": [],
+  "moduleName": "svg",
+  "hspNameOhmMap": {},
+  "harNameOhmMap": {},
+  "packageManagerType": "ohpm",
+  "compileEntry": [
+    "D:\\rn_third\\rntpc_react-native-svg\\harmony\\svg\\src\\main\\ets\\RNSVGImageModule.ts",
+    "D:\\rn_third\\rntpc_react-native-svg\\harmony\\svg\\src\\main\\ets\\RNSVGRenderableModule.ts",
+    "D:\\rn_third\\rntpc_react-native-svg\\harmony\\svg\\src\\main\\ets\\RNSVGSvgViewModule.ts",
+    "D:\\rn_third\\rntpc_react-native-svg\\harmony\\svg\\src\\main\\ets\\SvgPackage.ts"
+  ],
+  "otherCompileFiles": [],
+  "dynamicImportLibInfo": {},
+  "routerMap": [],
+  "hspResourcesMap": {},
+  "updateVersionInfo": {}
+}

package/harmony/svg/build/default/intermediates/merge_profile/default/module.json

@@ -0,0 +1,27 @@
+{
+	"app": {
+		"bundleName": "com.example.25P1_3",
+		"debug": true,
+		"versionCode": 1000000,
+		"versionName": "1.0.0",
+		"minAPIVersion": 50000012,
+		"targetAPIVersion": 60001021,
+		"apiReleaseType": "Release",
+		"targetMinorAPIVersion": 0,
+		"targetPatchAPIVersion": 0,
+		"compileSdkVersion": "6.0.1.116",
+		"compileSdkType": "HarmonyOS",
+		"appEnvironments": [],
+		"bundleType": "app",
+		"buildMode": "debug"
+	},
+	"module": {
+		"name": "svg",
+		"type": "har",
+		"deviceTypes": [
+			"default"
+		],
+		"packageName": "@react-native-ohos/react-native-svg",
+		"installationFree": false
+	}
+}

package/harmony/svg/build/default/intermediates/patch/default/base_native_libs.json

@@ -0,0 +1 @@
+{"libs":{},"stripped":{}}

package/harmony/svg/build/default/intermediates/process_profile/default/module.json

@@ -0,0 +1,30 @@
+{
+	"app": {
+		"bundleName": "com.example.25P1_3",
+		"debug": true,
+		"versionCode": 1000000,
+		"versionName": "1.0.0",
+		"minAPIVersion": 50000012,
+		"targetAPIVersion": 60001021,
+		"apiReleaseType": "Release",
+		"targetMinorAPIVersion": 0,
+		"targetPatchAPIVersion": 0,
+		"compileSdkVersion": "6.0.1.116",
+		"compileSdkType": "HarmonyOS",
+		"appEnvironments": [],
+		"bundleType": "app",
+		"buildMode": "debug"
+	},
+	"module": {
+		"name": "svg",
+		"type": "har",
+		"deviceTypes": [
+			"default"
+		],
+		"packageName": "@react-native-ohos/react-native-svg",
+		"installationFree": false,
+		"virtualMachine": "ark12.0.2.0",
+		"compileMode": "esmodule",
+		"dependencies": []
+	}
+}

package/harmony/svg/build/default/intermediates/res/default/ResourceTable.txt

@@ -0,0 +1 @@
+string page_show 0x02000000

package/harmony/svg/build/default/intermediates/res/default/ark_module.json

@@ -0,0 +1 @@
+{"app":{"bundleName":"com.example.25P1_3","debug":true,"versionCode":1000000,"versionName":"1.0.0","minAPIVersion":50000012,"targetAPIVersion":60001021,"apiReleaseType":"Release","targetMinorAPIVersion":0,"targetPatchAPIVersion":0,"compileSdkVersion":"6.0.1.116","compileSdkType":"HarmonyOS","appEnvironments":[],"bundleType":"app","buildMode":"debug"},"module":{"name":"svg","type":"har","deviceTypes":["default"],"packageName":"@react-native-ohos/react-native-svg","installationFree":false,"virtualMachine":"ark12.0.2.0","compileMode":"esmodule","dependencies":[]}}

package/harmony/svg/build/default/intermediates/res/default/ids_map/id_defined.json

@@ -0,0 +1,7 @@
+{
+	"record":	[{
+			"type":	"string",
+			"name":	"page_show",
+			"id":	"0x02000000"
+		}]
+}

package/harmony/svg/build/default/intermediates/res/default/module.json

@@ -0,0 +1,28 @@
+{
+	"app":	{
+		"bundleName":	"com.example.25P1_3",
+		"debug":	true,
+		"versionCode":	1000000,
+		"versionName":	"1.0.0",
+		"minAPIVersion":	50000012,
+		"targetAPIVersion":	60001021,
+		"apiReleaseType":	"Release",
+		"targetMinorAPIVersion":	0,
+		"targetPatchAPIVersion":	0,
+		"compileSdkVersion":	"6.0.1.116",
+		"compileSdkType":	"HarmonyOS",
+		"appEnvironments":	[],
+		"bundleType":	"app",
+		"buildMode":	"debug"
+	},
+	"module":	{
+		"name":	"svg",
+		"type":	"har",
+		"deviceTypes":	["default"],
+		"packageName":	"@react-native-ohos/react-native-svg",
+		"installationFree":	false,
+		"virtualMachine":	"ark12.0.2.0",
+		"compileMode":	"esmodule",
+		"dependencies":	[]
+	}
+}

package/harmony/svg/build/default/intermediates/res/default/opt-compression.json

@@ -0,0 +1 @@
+{"context":{"extensionPath":"D:\\devEcho_Studio\\DevEco Studio\\sdk\\default\\hms\\toolchains\\lib\\libimage_transcoder_shared.dll"},"compression":{"media":{"enable":false},"filters":[]}}

package/harmony/svg/build/default/intermediates/res/default/resConfig.json

@@ -0,0 +1 @@
+{"configPath":"D:\\rn_third\\rntpc_react-native-svg\\harmony\\svg\\build\\default\\intermediates\\process_profile\\default\\module.json","packageName":"com.example.25P1_3","output":"D:\\rn_third\\rntpc_react-native-svg\\harmony\\svg\\build\\default\\intermediates\\res\\default","moduleNames":"svg,entry","ResourceTable":["D:\\rn_third\\rntpc_react-native-svg\\harmony\\svg\\build\\default\\generated\\r\\default\\ResourceTable.h"],"moduleResources":["D:\\rn_third\\rntpc_react-native-svg\\harmony\\svg\\src\\main\\resources"],"dependencies":["D:\\w\\25P1_3\\harmony\\oh_modules\\.ohpm\\@rnoh+react-native-openharmony@4+ohuo6yfmj3imxybqamz3+78szehrybukrhgc7nzee=\\oh_modules\\@rnoh\\react-native-openharmony\\src\\main\\resources"],"iconCheck":false,"compression":"D:\\rn_third\\rntpc_react-native-svg\\harmony\\svg\\build\\default\\intermediates\\res\\default\\opt-compression.json","ids":"D:\\rn_third\\rntpc_react-native-svg\\harmony\\svg\\build\\default\\intermediates\\res\\default\\ids_map","definedIds":"D:\\rn_third\\rntpc_react-native-svg\\harmony\\svg\\build\\default\\intermediates\\res\\default\\ids_map\\id_defined.json","definedSysIds":"D:\\devEcho_Studio\\DevEco Studio\\sdk\\default\\hms\\toolchains\\id_defined.json"}

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.10',
+  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/CMakeLists.txt

@@ -23,7 +23,7 @@ target_link_libraries(rnoh_svg PUBLIC libimage_packer.so)
 target_link_libraries(rnoh_svg PUBLIC librawfile.z.so)
 target_link_libraries(rnoh_svg PUBLIC librcp_c.so)
 target_link_libraries(rnoh_svg PUBLIC libohfileuri.so)
-
+target_link_libraries(rnoh_svg PUBLIC libdeviceinfo_ndk.z.so)
 
 if("${OHOS_ARCH}" STREQUAL "arm64-v8a")
     target_link_directories(rnoh_svg PUBLIC ${HMOS_SDK_NATIVE}/sysroot/usr/lib/aarch64-linux-ohos)

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,11 @@
 
 #pragma once
 
-#include "SvgNode.h"
-#include "SvgHost.h"
 #include "RNOH/arkui/ArkUINode.h"
+#include "SvgForeignObjectNodeDelegate.h"
+#include "SvgForeignProps.h"
+#include "SvgHost.h"
+#include "SvgNode.h"
 #include "arkui/native_node.h"
 
 namespace rnoh {
@@ -26,18 +28,22 @@ 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(ForeignProps foreignProps) {
+        if (auto groupNode = _groupNode.lock()) {
+            groupNode->SetForeignObject(std::move(foreignProps));
+        }
     }
 };