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

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.10';
-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.12';
+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/oh-package.json5

@@ -6,7 +6,7 @@
   name: '@react-native-ohos/react-native-svg',
   type: 'module',
   main: 'index.ets',
-  version: '15.12.1-rc.10',
+  version: '15.12.1-rc.12',
   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

@@ -30,3 +30,8 @@ if("${OHOS_ARCH}" STREQUAL "arm64-v8a")
 elseif("${OHOS_ARCH}" STREQUAL "x86_64")
     target_link_directories(rnoh_svg PUBLIC ${HMOS_SDK_NATIVE}/sysroot/usr/lib/x86_64-linux-ohos)
 endif()
+
+if(PARALLELIZATION_ENABLE)
+    message("[SVG]:rnoh_svg PARALLELIZATION OPTIMIZATION is enabled!")
+    target_compile_definitions(rnoh_svg PUBLIC PARALLELIZATION_ENABLE)
+endif()

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

@@ -36,6 +36,7 @@
 #include "componentInstances/RNSVGFeCompositeComponentInstance.h"
 #include "componentInstances/RNSVGFeGaussianBlurComponentInstance.h"
 #include "componentInstances/RNSVGFeOffsetComponentInstance.h"
+#include <hilog/log.h>
 
 using namespace rnoh;
 using namespace facebook;
@@ -152,6 +153,15 @@ public:
     ComponentNapiBinderByString createComponentNapiBinderByName() override;
 
     ComponentJSIBinderByString createComponentJSIBinderByName() override;
+
+    #ifdef PARALLELIZATION_ENABLE
+    std::vector<std::string> getComponentCreateInSubThread() override {
+        OH_LOG_Print(LOG_APP, LOG_INFO, 0, "SVGPackage", "enter getComponentCreateInSubThread");
+            return {"RNSVGCircle", "RNSVGGroup", "RNSVGPath", "RNSVGRect", "RNSVGEllipse", "RNSVGLinearGradient", 
+                     "RNSVGLine", "RNSVGDefs", "RNSVGText", "RNSVGTSpan", "RNSVGTextPath", "RNSVGClipPath",
+                     "RNSVGMask", "RNSVGUse", "RNSVGMarker", "RNSVGPattern", "RNSVGSymbol", "RNSVGRadialGradient", "RNSVGImage", "RNSVGSvgView"};
+    }
+    #endif
 };
 
 } // namespace rnoh

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

@@ -10,9 +10,11 @@ namespace rnoh {
 namespace svg {
 void SvgViewManager::setSvgView(int tag, std::weak_ptr<SvgSvg> svg) {
     mTagToSvgViewMap.insert(std::make_pair(tag, svg));
+    std::lock_guard lock(mTagtoSvgViewMapLock);
 }
 
 std::weak_ptr<SvgSvg> SvgViewManager::getSvgViewByTag(int tag) {
+    std::lock_guard lock(mTagtoSvgViewMapLock);
     std::weak_ptr<SvgSvg> svgSvg;
     auto it = mTagToSvgViewMap.find(tag);
     if (it != mTagToSvgViewMap.end()) {
@@ -24,6 +26,7 @@ std::weak_ptr<SvgSvg> SvgViewManager::getSvgViewByTag(int tag) {
 void SvgViewManager::onDropView(int tag) {
     // 将svgview从容器中删除
     mTagToSvgViewMap.erase(tag);
+    std::lock_guard lock(mTagtoSvgViewMapLock);
 }
 
 SvgViewManager::~SvgViewManager() {

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

@@ -9,6 +9,7 @@
 #include <future>
 #include "SvgSvg.h"
 #include <native_drawing/drawing_bitmap.h>
+#include <mutex>
 
 namespace rnoh {
 namespace svg {
@@ -32,6 +33,7 @@ private:
     SvgViewManager &operator=(const SvgViewManager &) = delete;
     ~SvgViewManager();
     std::map<int, std::weak_ptr<SvgSvg>> mTagToSvgViewMap;
+    std::mutex mTagtoSvgViewMapLock;
 };
 } // namespace svg
 } // namespace rnoh

package/harmony/svg/src/main/cpp/downloadUtils/ImageSourceResolver.cpp

@@ -122,10 +122,11 @@ void ImageSourceResolver::imageDownloadFail(std::string uri) {
         auto &listeners = it->second;
         for (auto listener : listeners) {
             auto weaklistener = listener.lock();
-            if (weaklistener) {
-                weaklistener->onImageSourceCacheDownloadFileFail();
-                removeListenerForURI(uri, weaklistener);
+            if (!weaklistener) {
+               continue;
             }
+			weaklistener->onImageSourceCacheDownloadFileFail();
+            removeListenerForURI(uri, weaklistener);
         }
     }
 }

package/harmony/svg/src/main/ets/SvgPackage.ts

@@ -9,24 +9,6 @@ import type { TurboModule, TurboModuleContext } from '@rnoh/react-native-openhar
 import { RNSVGSvgViewModule } from './RNSVGSvgViewModule';
 import { RNSVGRenderableModule } from './RNSVGRenderableModule';
 import { RNSVGImageModule } from './RNSVGImageModule';
-import { hilog } from '@kit.PerformanceAnalysisKit';
-
-class MyLog {
-  static e(logTag: string, content: string) {
-    const maxSize = 1024;
-    if (content.length <= maxSize) {
-      // 长度小于等于限制直接打印
-      hilog.error(0xFF00, logTag, '%{public}s', content);
-    } else {
-      while (content.length > maxSize) {
-        // 循环分段打印
-        let logContent = content.substring(0, maxSize);
-        content = content.replace(logContent, '');
-        hilog.error(0xFF00, logTag, '%{public}s', logContent); // 打印剩余日志
-      }
-    }
-  }
-}
 
 class SvgTurboModulesFactory extends TurboModulesFactory {
 
@@ -52,7 +34,6 @@ class SvgTurboModulesFactory extends TurboModulesFactory {
 
 export class SvgPackage extends RNPackage {
   createTurboModulesFactory(ctx: TurboModuleContext): TurboModulesFactory {
-    MyLog.e('[kuang] SvgPackage createTurboModulesFactory = ', JSON.stringify(ctx));
     return new SvgTurboModulesFactory(ctx);
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-ohos/react-native-svg",
-  "version": "15.12.1-rc.10",
+  "version": "15.12.1-rc.12",
   "description": "",
   "react-native": "src/index",
   "main": "lib/commonjs/index",
@@ -21,7 +21,6 @@
     "react-native-svg": "15.12.0"
   },
   "devDependencies": {
-    "@rnoh/react-native-harmony-cli": "npm:@react-native-oh/react-native-harmony-cli@0.77.18",
     "@react-native-community/cli": "15.0.1",
     "@tsconfig/react-native": "^3.0.0",
     "@types/jest": "^29.5.1",
@@ -47,7 +46,8 @@
     "output": "lib",
     "targets": [
       "commonjs",
-      "module"
+      "module",
+      "typescript"
     ]
   }
 }