@leafer-ui/event 2.1.6 → 2.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/event",
-  "version": "2.1.6",
+  "version": "2.1.8",
   "description": "@leafer-ui/event",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,9 +22,9 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "2.1.6"
+    "@leafer/core": "2.1.8"
   },
   "devDependencies": {
-    "@leafer/interface": "2.1.6"
+    "@leafer/interface": "2.1.8"
   }
 }

package/src/DragBoundsHelper.ts

@@ -71,8 +71,8 @@ export const DragBoundsHelper = {
         tempDragBounds.set(dragBounds)
         tempContent.set(content).scaleOf(origin, scale.x, scale.y)
 
-        const originLeftScale = (origin.x - content.x) / content.width, originRightScale = 1 - originLeftScale
-        const originTopScale = (origin.y - content.y) / content.height, originBottomScale = 1 - originTopScale
+        const originLeftScale = float((origin.x - content.x) / content.width), originRightScale = float(1 - originLeftScale)
+        const originTopScale = float((origin.y - content.y) / content.height), originBottomScale = float(1 - originTopScale)
 
         let correctScaleX = 1, correctScaleY = 1, aScale: number, bScale: number, aSize: number, bSize: number
 
@@ -90,7 +90,13 @@ export const DragBoundsHelper = {
         } else { // outer 模式
 
             if (scale.x < 0) {
-                if (float(minX(content) - minX(dragBounds)) <= 0 || float(maxX(dragBounds) - maxX(content)) <= 0) tempContent.scaleOf(origin, correctScaleX = 1 / scale.x, 1) // 到达边界时阻止镜像
+                if (float(minX(content) - minX(dragBounds), 2) <= 0 || float(maxX(dragBounds) - maxX(content), 2) <= 0) {
+                    tempContent.scaleOf(origin, correctScaleX = 1 / scale.x, 1) // 到达边界时阻止镜像
+                    if (tempContent.width > 1) {
+                        correctScaleX *= 1 / tempContent.width
+                        tempContent.width = 1
+                    }
+                }
                 tempContent.unsign()
             }
 
@@ -124,7 +130,13 @@ export const DragBoundsHelper = {
         } else { // outer 模式
 
             if (scale.y < 0) {
-                if (float(minY(content) - minY(dragBounds)) <= 0 || float(maxY(dragBounds) - maxY(content)) <= 0) tempContent.scaleOf(origin, 1, correctScaleY = 1 / scale.y) // 到达边界时阻止镜像
+                if (float(minY(content) - minY(dragBounds), 2) <= 0 || float(maxY(dragBounds) - maxY(content), 2) <= 0) {
+                    tempContent.scaleOf(origin, 1, correctScaleY = 1 / scale.y) // 到达边界时阻止镜像
+                    if (tempContent.height > 1) {
+                        correctScaleY *= 1 / tempContent.height
+                        tempContent.height = 1
+                    }
+                }
                 tempContent.unsign()
             }
 

package/src/DragEvent.ts

@@ -22,6 +22,8 @@ export class DragEvent extends PointerEvent implements IDragEvent {
     static ENTER = 'drag.enter'
     static LEAVE = 'drag.leave'
 
+    static ANIMATE = 'drag.animate'
+
     readonly moveX: number
     readonly moveY: number
     readonly totalX: number

package/src/UIEvent.ts

@@ -57,9 +57,9 @@ export class UIEvent extends Event implements IUIEvent {
     }
 
     // 兼容代码，未来可移除
-    public getInner(relative?: ILeaf): IPointData { return this.getInnerPoint(relative) }
-    public getLocal(relative?: ILeaf): IPointData { return this.getLocalPoint(relative) }
-    public getPage(): IPointData { return this.getPagePoint() }
+    protected getInner(relative?: ILeaf): IPointData { return this.getInnerPoint(relative) }
+    protected getLocal(relative?: ILeaf): IPointData { return this.getLocalPoint(relative) }
+    protected getPage(): IPointData { return this.getPagePoint() }
     // ---
 
     static changeName(oldName: string, newName: string): void {

package/types/index.d.ts

@@ -25,9 +25,9 @@ declare class UIEvent extends Event implements IUIEvent {
     getInnerPoint(relative?: ILeaf): IPointData;
     getLocalPoint(relative?: ILeaf): IPointData;
     getPagePoint(): IPointData;
-    getInner(relative?: ILeaf): IPointData;
-    getLocal(relative?: ILeaf): IPointData;
-    getPage(): IPointData;
+    protected getInner(relative?: ILeaf): IPointData;
+    protected getLocal(relative?: ILeaf): IPointData;
+    protected getPage(): IPointData;
     static changeName(oldName: string, newName: string): void;
 }
 
@@ -74,6 +74,7 @@ declare class DragEvent extends PointerEvent implements IDragEvent {
     static OUT: string;
     static ENTER: string;
     static LEAVE: string;
+    static ANIMATE: string;
     readonly moveX: number;
     readonly moveY: number;
     readonly totalX: number;