@react-native-ohos/react-native-clippathview 1.1.9-rc.2 → 1.2.0

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

@@ -55,17 +55,17 @@ private:
     static void close(OH_Drawing_Path *cPath_);
     static void arcToBezier(float cx, float cy, float rx, float ry, float sa, float ea, bool clockwise, float rad,
                             OH_Drawing_Path *cPath_);
-    static void SetPenDown();
+    static void setPenDown();
     static double _round(double val);
-    static void SkipSpaces();
-    static bool IsCmd(char c);
+    static void skip_spaces();
+    static bool is_cmd(char c);
     static bool is_number_start(char c);
     static bool is_absolute(char c);
     static bool parse_flag();
     static float parse_list_number();
     static float parse_number();
     static void parse_list_separator();
-    static void SkipDigits();
+    static void skip_digits();
 };
 } // namespace rnoh
 #endif // HARMONY_SVGPATHPARSER_H

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

@@ -4,7 +4,7 @@
  * 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
+ *     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,
@@ -14,7 +14,7 @@
  */
 
 #include "SVGViewBox.h"
-#include <cmath>
+#include <math.h>
 #include <native_drawing/drawing_matrix.h>
 #include <native_drawing/drawing_rect.h>
 #include <native_drawing/drawing_types.h>
@@ -23,8 +23,8 @@
 #include <glog/logging.h>
 
 void rnoh::SVGViewBox::transform(OH_Drawing_Rect *vbRect, OH_Drawing_Rect *eRect, std::string align, int meetOrSlice,
-                                 float density, OH_Drawing_Matrix *result)
-{
+                                 float density, OH_Drawing_Matrix *result) {
+
     double vbX = OH_Drawing_RectGetLeft(vbRect) * density;
     double vbY = OH_Drawing_RectGetTop(vbRect) * density;
     double vbX2 = OH_Drawing_RectGetRight(vbRect) * density;
@@ -49,7 +49,6 @@ void rnoh::SVGViewBox::transform(OH_Drawing_Rect *vbRect, OH_Drawing_Rect *eRect
     // Initialize translate-y to e-y - (vb-y * scale-y).
     double translateX = eX - (vbX * scaleX);
     double translateY = eY - (vbY * scaleY);
-    double point2 = 2.0;
 
     // If align is 'none'
     if (meetOrSlice == MOS_NONE) {
@@ -57,8 +56,9 @@ void rnoh::SVGViewBox::transform(OH_Drawing_Rect *vbRect, OH_Drawing_Rect *eRect
         // Assign scale-x and scale-y to scale.
         double scale = scaleX = scaleY = fmin(scaleX, scaleY);
 
-        translateX += (eWidth - vbWidth * scaleX) / point2;
-        translateY += (eHeight - vbHeight * scaleY) / point2;
+        translateX += (eWidth - vbWidth * scaleX) / 2.0;
+        translateY += (eHeight - vbHeight * scaleY) / 2.0;
+
     } else {
         // If align is not 'none' and meetOrSlice is 'meet', set the larger of scale-x and scale-y to the smaller.
         // Otherwise, if align is not 'none' and meetOrSlice is 'slice', set the smaller of scale-x and scale-y to the
@@ -71,7 +71,7 @@ void rnoh::SVGViewBox::transform(OH_Drawing_Rect *vbRect, OH_Drawing_Rect *eRect
 
         // If align contains 'xMid', add (e-width - vb-width * scale-x) / 2 to translate-x.
         if (align.find("xMid") != std::string::npos) {
-            translateX += (eWidth - vbWidth * scaleX) / point2;
+            translateX += (eWidth - vbWidth * scaleX) / 2.0;
         }
         // If align contains 'xMax', add (e-width - vb-width * scale-x) to translate-x.
         if (align.find("xMax") != std::string::npos) {
@@ -80,7 +80,7 @@ void rnoh::SVGViewBox::transform(OH_Drawing_Rect *vbRect, OH_Drawing_Rect *eRect
 
         // If align contains 'yMid', add (e-height - vb-height * scale-y) / 2 to translate-y.
         if (align.find("YMid") != std::string::npos) {
-            translateY += (eHeight - vbHeight * scaleY) / point2;
+            translateY += (eHeight - vbHeight * scaleY) / 2.0;
         }
 
         // If align contains 'yMax', add (e-height - vb-height * scale-y) to translate-y.

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

@@ -13,12 +13,10 @@
  * limitations under the License.
  */
 
-#include "ShadowNodes.h"
-
 namespace facebook {
 namespace react {
 
-const char RNCClipPathViewComponentName[] = "RNCClipPathView";
-const char RNCClipPathViewNoneComponentName[] = "RNCClipPathViewNone";
+extern const char RNCClipPathViewComponentName[] = "RNCClipPathView";
+extern const char RNCClipPathViewNoneComponentName[] = "RNCClipPathViewNone";
 } // namespace react
 } // namespace facebook

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

@@ -1,26 +1,10 @@
-/*
- * 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.
- */
+//
+// Created on 2024/7/4.
+//
 // Node APIs are not fully supported. To solve the compilation error of the interface cannot be found,
 // please include "napi/native_api.h".
 
-#ifndef PEN_STYLE_NODE_H
-#define PEN_STYLE_NODE_H
-
 typedef enum {
     CLIP_PEN_STYLE_FILL = 1 << 0,
     CLIP_PEN_STYLE_STROKE = 1 << 1,
-} Clip_PenStyleType;
-
-#endif
+} Clip_PenStyleType;

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

@@ -25,7 +25,6 @@
 import { RNPackage, TurboModulesFactory } from '@rnoh/react-native-openharmony/ts';
 import type { TurboModule, TurboModuleContext } from '@rnoh/react-native-openharmony/ts';
 import { ClipPathTurboModule } from './ClipPathTurboModule';
-import { RNOHPackage } from "@rnoh/react-native-openharmony";
 
 class ClipPathTurboModulesFactory extends TurboModulesFactory {
   createTurboModule(name: string): TurboModule | null {
@@ -40,7 +39,7 @@ class ClipPathTurboModulesFactory extends TurboModulesFactory {
   }
 }
 
-export class ClipPathPackage extends RNOHPackage {
+export class ClipPathPackage extends RNPackage {
   createTurboModulesFactory(ctx: TurboModuleContext): TurboModulesFactory {
     return new ClipPathTurboModulesFactory(ctx);
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@react-native-ohos/react-native-clippathview",
   "title": "React Native ClipPath",
-  "version": "1.1.9-rc.2",
+  "version": "1.2.0",
   "description": "ClipPath Android Web IOS Harmony",
   "main": "index.js",
   "types": "index.d.ts",
@@ -18,7 +18,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://gitcode.com/openharmony-sig/rntpc_react-native-clippath.git",
+    "url": "git+https://gitcode.com/openharmony-sig/rntpc_react-native-clippath.git",
     "baseUrl": "https://gitcode.com/openharmony-sig/rntpc_react-native-clippath"
   },
   "keywords": [
@@ -35,9 +35,9 @@
     "GPU",
     "Hardware accelerated"
   ],
-  "author": {
-    "name": "Juan J LF",
-    "email": "justinjlf21@gmail.com"
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/",
+    "access": "public"
   },
   "license": "MIT",
   "licenseFilename": "LICENSE",
@@ -55,12 +55,6 @@
     "svgpath": "^2.3.1"
   },
   "harmony": {
-    "alias": "react-native-clippathview",
-    "autolinking": {
-      "etsPackageClassName":"ClipPathPackage",
-      "cppPackageClassName":"ClipPathViewPackage",
-      "cmakeLibraryTargetName": "rnoh_clip_path", 
-      "ohPackageName": "@react-native-ohos/react-native-clippathview"
-    }
+    "alias": "react-native-clippathview"
   }
 }

package/react-native-clippath.podspec

@@ -0,0 +1,30 @@
+# react-native-clippath.podspec
+
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+
+Pod::Spec.new do |s|
+  s.name         = "react-native-clippath"
+  s.version      = package["version"]
+  s.summary      = package["description"]
+  s.description  = <<-DESC
+                   ClipPath IOS
+                   DESC
+  s.homepage     = "https://github.com/Only-IceSoul/react-native-clippath"
+  # brief license entry:
+  s.license      = "MIT"
+  # optional - use expanded license entry instead:
+  # s.license    = { :type => "MIT", :file => "LICENSE" }
+  s.authors      = { "Your Name" => "yourname@email.com" }
+  s.platforms    = { :ios => "10.0" }
+  s.source       = { :git => "https://github.com/Only-IceSoul/react-native-clippath.git", :tag => "#{s.version}" }
+
+  s.source_files = "ios/**/*.{h,c,cc,cpp,m,mm,swift}"
+  s.requires_arc = true
+
+  s.dependency "React"
+  # ...
+  # s.dependency "..."
+end
+