@react-native-ohos/react-native-svg 15.12.1-rc.13 → 15.12.1-rc.14

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.13',
+  version: '15.12.1-rc.14',
   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

@@ -18,11 +18,10 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-
+#include <dlfcn.h>
 #include "SvgForeignObjectNode.h"
 #include "RNOH/arkui/NativeNodeApi.h"
-#include <deviceinfo.h>
-#include <info/application_target_sdk_version.h>
+
 namespace rnoh {
 namespace svg {
 SvgForeignObjectNode::SvgForeignObjectNode()
@@ -66,19 +65,31 @@ void SvgForeignObjectNode::onNodeEvent(ArkUI_NodeEventType eventType, EventArgs
 }
 
 OH_PixelmapNative *SvgForeignObjectNode::GetNodePixelMap() {
-#ifdef OH_CURRENT_API_VERSION
-    if (OH_CURRENT_API_VERSION < 15 || OH_GetSdkApiVersion() < 15) {
-        LOG(ERROR) << "[svgForeignNode] current sdk or rom cannot support ForeignObject";
+    high_lib_handle = dlopen("libace_ndk.z.so", RTLD_LAZY);
+    if (high_lib_handle == NULL) {
+        DLOG(INFO) << "[svgForeignNode] libace_ndk.z.so not existed";
+        dlclose(high_lib_handle);
         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;
+    createSnapshotOptionsMethod = (ArkUI_SnapshotOptions*(*)())dlsym(high_lib_handle, "OH_ArkUI_CreateSnapshotOptions");
+    snapshotOptionsSetScaleMethod = (int32_t(*)(ArkUI_SnapshotOptions*, float))dlsym(high_lib_handle, "OH_ArkUI_SnapshotOptions_SetScale");
+    getNodeSnapshotMethod = (int32_t(*)(ArkUI_NodeHandle, ArkUI_SnapshotOptions*, OH_PixelmapNative** ))dlsym(high_lib_handle, "OH_ArkUI_GetNodeSnapshot");
+    
+    bool isCreateSnapshotOptionsMethodExisted = createSnapshotOptionsMethod != NULL;
+    bool isSnapshotOptionsSetScaleMethodExisted = snapshotOptionsSetScaleMethod != NULL;
+    bool isGetNodeSnapshotMethodExisted = getNodeSnapshotMethod != NULL;
+    if (isCreateSnapshotOptionsMethodExisted && isSnapshotOptionsSetScaleMethodExisted && isGetNodeSnapshotMethodExisted) {
+        DLOG(INFO) << "[svgForeignNode] method existed";
+        OH_PixelmapNative *pixelMap;
+        ArkUI_SnapshotOptions *options = createSnapshotOptionsMethod();
+        snapshotOptionsSetScaleMethod(options, 1);
+        int32_t code = getNodeSnapshotMethod(mStackNode.getArkUINodeHandle(), options, &pixelMap);
+        if (code == ARKUI_ERROR_CODE_NO_ERROR) {
+            dlclose(high_lib_handle);
+            return pixelMap;
+        }
     }
-#endif
+    dlclose(high_lib_handle);
     return nullptr;
 }
 

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

@@ -74,6 +74,11 @@ private:
     int _clipRule{0};
     float pointScaleFactor_{0};
     bool _isGeneratedPixelMap{false}; //防止快照生成多次，导致性能影响
+    void *high_lib_handle = NULL;
+    ArkUI_SnapshotOptions* (*createSnapshotOptionsMethod)();
+    int32_t (*snapshotOptionsSetScaleMethod)(ArkUI_SnapshotOptions* snapshotOptions, float scale);
+    int32_t (*getNodeSnapshotMethod)(ArkUI_NodeHandle node, ArkUI_SnapshotOptions* snapshotOptions,
+    OH_PixelmapNative** pixelmap);
 };
 
 } // namespace svg

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-ohos/react-native-svg",
-  "version": "15.12.1-rc.13",
+  "version": "15.12.1-rc.14",
   "description": "",
   "react-native": "src/index",
   "main": "lib/commonjs/index",
@@ -46,8 +46,7 @@
     "output": "lib",
     "targets": [
       "commonjs",
-      "module",
-      "typescript"
+      "module"
     ]
   }
 }

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

@@ -1,8 +0,0 @@
-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

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

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

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

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

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

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

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

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

@@ -1 +0,0 @@
-{"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

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

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

@@ -1 +0,0 @@
-{"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

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

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

@@ -1 +0,0 @@
-{"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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1 +0,0 @@
-{"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

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

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

@@ -1 +0,0 @@
-{"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

@@ -1,3 +0,0 @@
-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

@@ -1 +0,0 @@
-{"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

@@ -1,4 +0,0 @@
-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

@@ -1 +0,0 @@
-{"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

@@ -1,3 +0,0 @@
-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

@@ -1 +0,0 @@
-{"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"}