@react-native-ohos/react-native-clippathview 1.2.0 → 1.3.0-beta.1

package/README.md

@@ -4,9 +4,9 @@ This project is based on [react-native-clippathview v1.1.8](https://github.com/O
 
 ## Documentation
 
-[中文](https://gitcode.com/OpenHarmony-RN/usage-docs/blob/master/zh-cn/react-native-clippath-capi.md)
+[中文](https://gitcode.com/CPF-RN/usage-docs/blob/master/zh-cn/react-native-clippath-capi.md)
 
-[English](https://gitcode.com/OpenHarmony-RN/usage-docs/blob/master/en/react-native-clippath-capi.md)
+[English](https://gitcode.com/CPF-RN/usage-docs/blob/master/en/react-native-clippath-capi.md)
 
 
 ## License

package/harmony/clipPath/BuildProfile.ets

@@ -1,6 +1,17 @@
-export default class BuildProfile { 
-	static readonly HAR_VERSION = '1.1.8';
-	static readonly BUILD_MODE_NAME = 'debug';
-	static readonly DEBUG = true;
-	static readonly TARGET_NAME = 'default';
+/**
+ * Use these variables when you tailor your ArkTS code. They must be of the const type.
+ */
+export const HAR_VERSION = '1.3.0-beta.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;
 }

package/harmony/clipPath/index.ets

@@ -12,4 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { ClipPathPackage } from './src/main/ets/ClipPathPackage'
+export default ClipPathPackage;
 export * from './ts'

package/harmony/clipPath/oh-package.json5

@@ -6,7 +6,7 @@
   "name": "@react-native-ohos/react-native-clippathview",
   "description": "Please describe the basic information.",
   "main": "index.ets",
-  "version": "1.2.0",
+  "version": "1.3.0-beta.1",
   "dependencies": {
     "@rnoh/react-native-openharmony": "file:../react_native_openharmony"
   },

package/harmony/clipPath/src/main/cpp/ClipPathProps.h

@@ -4,6 +4,21 @@
 // Node APIs are not fully supported. To solve the compilation error of the interface cannot be found,
 // please include "napi/native_api.h".
 
+/*
+ * Copyright (C) 2022 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.
+ */
+ 
 #pragma once
 #include "ModUtil.h"
 #include <native_drawing/drawing_path.h>

package/harmony/clipPath/src/main/cpp/ClipPathViewNoneNode.cpp

@@ -3,7 +3,20 @@
 //
 // Node APIs are not fully supported. To solve the compilation error of the interface cannot be found,
 // please include "napi/native_api.h".
-
+/*
+ * Copyright (C) 2022 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.
+ */
 #include "ModUtil.h"
 #include "RNOH/arkui/NativeNodeApi.h"
 #include "ClipPathViewNoneNode.h"
@@ -106,6 +119,9 @@ void ClipPathViewNoneNode::setPanStyleMode(OH_Drawing_Canvas *canvas, int type)
 }
 
 void ClipPathViewNoneNode::OnDraw(ArkUI_NodeCustomEvent *event) {
+    if (mD.empty()) {
+        return;
+    }
     auto *drawContext = OH_ArkUI_NodeCustomEvent_GetDrawContextInDraw(event);
     canvas = reinterpret_cast<OH_Drawing_Canvas *>(OH_ArkUI_DrawContext_GetCanvas(drawContext));
     auto width_ = OH_Drawing_CanvasGetWidth(canvas);

package/harmony/clipPath/src/main/cpp/ClipPathViewNoneNode.h

@@ -3,6 +3,20 @@
 //
 // Node APIs are not fully supported. To solve the compilation error of the interface cannot be found,
 // please include "napi/native_api.h".
+/*
+ * Copyright (C) 2022 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.
+ */
 #pragma once
 
 #include "RNOH/arkui/ArkUINode.h"

package/harmony/clipPath/src/main/cpp/ClipPathViewPackage.h

@@ -60,8 +60,10 @@ namespace rnoh {
         }
 
         std::vector<facebook::react::ComponentDescriptorProvider> createComponentDescriptorProviders() override {
-            return {facebook::react::concreteComponentDescriptorProvider<
-                facebook::react::RNCClipPathViewNoneComponentDescriptor>()};
+            return {
+                facebook::react::concreteComponentDescriptorProvider<facebook::react::RNCClipPathViewNoneComponentDescriptor>(),
+                facebook::react::concreteComponentDescriptorProvider<facebook::react::RNCClipPathViewComponentDescriptor>()
+            };
         }
 
         std::unique_ptr<TurboModuleFactoryDelegate> createTurboModuleFactoryDelegate() override {

package/harmony/clipPath/src/main/cpp/pen_style_node.h

@@ -4,6 +4,20 @@
 // Node APIs are not fully supported. To solve the compilation error of the interface cannot be found,
 // please include "napi/native_api.h".
 
+/*
+ * Copyright (C) 2022 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.
+ */
 typedef enum {
     CLIP_PEN_STYLE_FILL = 1 << 0,
     CLIP_PEN_STYLE_STROKE = 1 << 1,

package/harmony/clipPath/src/main/ets/{ClipPathPackage.ts → ClipPathPackage.ets}

@@ -22,7 +22,8 @@
  * SOFTWARE.
  */
 
-import { RNPackage, TurboModulesFactory } from '@rnoh/react-native-openharmony/ts';
+import { TurboModulesFactory } from '@rnoh/react-native-openharmony/ts';
+ import { RNOHPackage } from '@rnoh/react-native-openharmony'
 import type { TurboModule, TurboModuleContext } from '@rnoh/react-native-openharmony/ts';
 import { ClipPathTurboModule } from './ClipPathTurboModule';
 
@@ -39,7 +40,7 @@ class ClipPathTurboModulesFactory extends TurboModulesFactory {
   }
 }
 
-export class ClipPathPackage extends RNPackage {
+export class ClipPathPackage extends RNOHPackage {
   createTurboModulesFactory(ctx: TurboModuleContext): TurboModulesFactory {
     return new ClipPathTurboModulesFactory(ctx);
   }

package/harmony/clipPath/src/main/ets/{ClipPathTurboModule.ts → ClipPathTurboModule.ets}

@@ -22,10 +22,14 @@
  * SOFTWARE.
  */
 
-import { TurboModule } from "@rnoh/react-native-openharmony/ts";
+import { TurboModule, TurboModuleContext } from "@rnoh/react-native-openharmony/ts";
 import display from '@ohos.display';
 
 export class ClipPathTurboModule extends TurboModule {
+  constructor(ctx: TurboModuleContext) {
+    super(ctx);
+  }
+
   getDensity(): number {
     return display.getDefaultDisplaySync().densityPixels;
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@react-native-ohos/react-native-clippathview",
   "title": "React Native ClipPath",
-  "version": "1.2.0",
+  "version": "1.3.0-beta.1",
   "description": "ClipPath Android Web IOS Harmony",
   "main": "index.js",
   "types": "index.d.ts",
@@ -55,6 +55,12 @@
     "svgpath": "^2.3.1"
   },
   "harmony": {
-    "alias": "react-native-clippathview"
+    "alias": "react-native-clippathview",
+    "autolinking": {
+      "etsPackageClassName":"ClipPathPackage",
+      "cppPackageClassName":"ClipPathViewPackage",
+      "cmakeLibraryTargetName": "rnoh_clip_path", 
+      "ohPackageName": "@react-native-ohos/react-native-clippathview"
+    }
   }
 }