@react-native-ohos/react-native-image-crop-picker 0.40.5-rc.2 → 0.40.5-rc.3

package/harmony/image_crop_picker/oh-package.json5

@@ -3,7 +3,7 @@
   "description": "Please describe the basic information.",
   main: 'index.ets',
   type: 'module',
-  version: '0.40.5-rc.2',
+  version: '0.40.5-rc.3',
   dependencies: {
     "@rnoh/react-native-openharmony": "^0.72.38"
   },

package/harmony/image_crop_picker/src/main/ets/pages/ImageEditInfo.ets

@@ -129,7 +129,6 @@ export struct ImageEditInfo {
   private minSize = PHONE_MIN_CROP // 最小宽高
   private dragObj: DragObj = new DragObj(false);
   private clb: number = 1
-  private canClip: boolean = true
 
   pixelInit(path: string) {
     this.angle = 0;
@@ -173,16 +172,14 @@ export struct ImageEditInfo {
 
     this.maxClipSize = new Rectangle(left, top, right, bottom);
 
-    if (this.initWidth > 0) {
-      left = (screenWidth - this.initWidth) / 2;
-      right = this.initWidth + left;
-    }
-    if (this.initHeight > 0) {
-      top = (screenHeight - this.initHeight) / 2 - 66;
-      bottom = this.initHeight + top;
-    }
-    if(!!this.initWidth && !!this.initHeight){
-      this.canClip = false
+    if (this.initWidth > 0 && this.initHeight > 0) {
+      let flag = imageWidth/this.initWidth < imageHeight/this.initHeight;
+      let _imgWidth = flag ? imgWidth : Math.round(imgHeight * this.initWidth / this.initHeight)
+      let _imgHeight = !flag ? imgHeight : Math.round(imgWidth * this.initHeight / this.initWidth)
+      left = (screenWidth - _imgWidth) / 2;
+      right = _imgWidth + left;
+      top = (screenHeight - _imgHeight) / 2 - 66;
+      bottom = _imgHeight + top;
     }
 
     this.clipSize = new Rectangle(left, top, right, bottom);
@@ -367,17 +364,20 @@ export struct ImageEditInfo {
             let region: image.Region = { x: 0, y: 0, size: { height: cropHeight, width: cropWidth } };
             region.x =
               (this.clipSize.left - this.maxClipSize.left) / this.imgScale * this.clb + (xOff / this.imgScale) - this.imgOffSetX / this.imgScale * this.clb;
-            region.size.width = cropWidth - region.x - (this.maxClipSize.right - this.clipSize.right) / this.imgScale * this.clb
-              - (xOff / this.imgScale) - this.imgOffSetX / this.imgScale * this.clb;
+            region.size.width = Math.round(cropWidth - region.x - (this.maxClipSize.right - this.clipSize.right) / this.imgScale * this.clb
+              - (xOff / this.imgScale) - this.imgOffSetX / this.imgScale * this.clb);
             region.y =
               (this.clipSize.top - this.maxClipSize.top) / this.imgScale * this.clb + (yOff / this.imgScale) - this.imgOffSetY / this.imgScale * this.clb;
-            region.size.height = cropHeight - region.y - (this.maxClipSize.bottom - this.clipSize.bottom) / this.imgScale * this.clb
-              - (yOff / this.imgScale) - this.imgOffSetY / this.imgScale * this.clb;
+            region.size.height = Math.round(cropHeight - region.y - (this.maxClipSize.bottom - this.clipSize.bottom) / this.imgScale * this.clb
+              - (yOff / this.imgScale) - this.imgOffSetY / this.imgScale * this.clb);
             this.icon.crop(region, async (err: BusinessError) => {
               if (err != undefined) {
                 console.error("Failed to crop pixelmap.");
                 return;
               } else {
+                if (this.initWidth > 0 && this.initHeight > 0){
+                  this.icon?.scaleSync( this.initWidth / region.size.width, this.initHeight / region.size.height )
+                }
                 let imgPath = await encode(this, this.icon);
                 AppStorage.setOrCreate('cropImagePath', imgPath)
                 AppStorage.setOrCreate('cropRect', {
@@ -552,7 +552,7 @@ export struct ImageEditInfo {
         return;
       }
       this.imageFlag = false;
-      if (this.freeStyleCropEnabled) {
+      if (!this.freeStyleCropEnabled) {
         return;
       }
       let touch = event.touches[0];
@@ -563,8 +563,6 @@ export struct ImageEditInfo {
       let newPosition = this.clipSize.clone();
 
       let direction = this.dragObj.action;
-
-      if(!this.canClip) return;
       
       if (this.dragObj.multiCrop) {
         this.getMultiCropRect(delX, delY, newPosition, direction, event.pressure);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@react-native-ohos/react-native-image-crop-picker",
-	"version": "0.40.5-rc.2",
+	"version": "0.40.5-rc.3",
 	"description": "Select single or multiple images, with cropping option",
 	"main": "js/index.js",
 	"scripts": {