@leafer-ui/interaction 1.0.0-rc.26 → 1.0.0-rc.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/interaction",
-  "version": "1.0.0-rc.26",
+  "version": "1.0.0-rc.28",
   "description": "@leafer-ui/interaction",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,12 +22,12 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.0.0-rc.26",
-    "@leafer-ui/draw": "1.0.0-rc.26",
-    "@leafer-ui/event": "1.0.0-rc.26"
+    "@leafer/core": "1.0.0-rc.28",
+    "@leafer-ui/draw": "1.0.0-rc.28",
+    "@leafer-ui/event": "1.0.0-rc.28"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-rc.26",
-    "@leafer-ui/interface": "1.0.0-rc.26"
+    "@leafer/interface": "1.0.0-rc.28",
+    "@leafer-ui/interface": "1.0.0-rc.28"
   }
 }

package/src/Interaction.ts

@@ -421,7 +421,7 @@ export class InteractionBase implements IInteraction {
     }
 
     public updateCursor(data?: IPointerEvent): void {
-        if (this.config.cursor.stop || !this.config.pointer.hover) return
+        if (!this.config.cursor || !this.config.pointer.hover) return
 
         if (!data) {
             this.updateHoverData()

package/src/config.ts

@@ -19,6 +19,6 @@ export const config: IInteractionConfig = {
         swipeDistance: 20,
         preventDefaultMenu: true
     },
-    cursor: {},
+    cursor: true,
     keyEvent: true
 }

package/src/index.ts

@@ -2,28 +2,3 @@ export { InteractionBase } from './Interaction'
 export { InteractionHelper } from './InteractionHelper'
 export { MultiTouchHelper } from './MultiTouchHelper'
 export { Cursor } from './Cursor'
-export { HitCanvasManager } from './HitCanvasManager'
-
-import { IPointData, IRadiusPointData, IWindingRule } from '@leafer/interface'
-import { LeaferCanvasBase, tempBounds } from '@leafer/core'
-
-
-const canvas = LeaferCanvasBase.prototype
-
-canvas.hitFill = function (point: IPointData, fillRule?: IWindingRule): boolean {
-    return fillRule ? this.context.isPointInPath(point.x, point.y, fillRule) : this.context.isPointInPath(point.x, point.y)
-}
-
-canvas.hitStroke = function (point: IPointData, strokeWidth?: number): boolean {
-    this.strokeWidth = strokeWidth
-    return this.context.isPointInStroke(point.x, point.y)
-}
-
-canvas.hitPixel = function (radiusPoint: IRadiusPointData, offset?: IPointData, scale = 1): boolean { // 画布必须有alpha通道
-    let { x, y, radiusX, radiusY } = radiusPoint
-    if (offset) x -= offset.x, y -= offset.y
-    tempBounds.set(x - radiusX, y - radiusY, radiusX * 2, radiusY * 2).scale(scale).ceil()
-    const { data } = this.context.getImageData(tempBounds.x, tempBounds.y, tempBounds.width, tempBounds.height)
-    for (let i = 0, len = data.length; i < len; i += 4) { if (data[i + 3] > 0) return true }
-    return data[3] > 0
-}

package/types/index.d.ts

@@ -1,5 +1,5 @@
-import { IMoveEvent, IZoomEvent, IRotateEvent, ITimer, IDragEvent, IPointerEvent, ILeafList, IPointDataMap, IFunction, ILeaf, IInteraction, IInteractionCanvas, ISelector, IInteractionConfig, ICursorType, IPickBottom, IBounds, IEventListenerId, IBooleanMap, IUIEvent, IKeepTouchData, IKeyEvent, IPickOptions, IClientPointData, IPointData, IEvent, IObject, IDropEvent, ISwipeEvent, IMultiTouchData, ICursorTypeMap, IHitCanvasManager, ILeaferCanvasConfig, IHitCanvas } from '@leafer/interface';
-import { LeafList, CanvasManager } from '@leafer/core';
+import { IMoveEvent, IZoomEvent, IRotateEvent, ITimer, IDragEvent, IPointerEvent, ILeafList, IPointDataMap, IFunction, ILeaf, IInteraction, IInteractionCanvas, ISelector, IInteractionConfig, ICursorType, IPickBottom, IBounds, IEventListenerId, IBooleanMap, IUIEvent, IKeepTouchData, IKeyEvent, IPickOptions, IClientPointData, IPointData, IEvent, IObject, IDropEvent, ISwipeEvent, IMultiTouchData, ICursorTypeMap } from '@leafer/interface';
+import { LeafList } from '@leafer/core';
 
 declare class Transformer {
     protected interaction: InteractionBase;
@@ -167,17 +167,4 @@ declare class Cursor {
     static get(name: string): ICursorType | ICursorType[];
 }
 
-declare class HitCanvasManager extends CanvasManager implements IHitCanvasManager {
-    maxTotal: number;
-    protected pathList: ILeafList;
-    protected pixelList: ILeafList;
-    getPixelType(leaf: ILeaf, config: ILeaferCanvasConfig): IHitCanvas;
-    getPathType(leaf: ILeaf): IHitCanvas;
-    clearImageType(): void;
-    clearPathType(): void;
-    protected __clearLeafList(leafList: ILeafList): void;
-    protected __autoClear(): void;
-    clear(): void;
-}
-
-export { Cursor, HitCanvasManager, InteractionBase, InteractionHelper, MultiTouchHelper };
+export { Cursor, InteractionBase, InteractionHelper, MultiTouchHelper };

package/src/HitCanvasManager.ts

@@ -1,53 +0,0 @@
-import { IHitCanvasManager, ILeaf, IHitCanvas, ILeafList, ILeaferCanvasConfig } from '@leafer/interface'
-import { CanvasManager, LeafList, Creator } from '@leafer/core'
-
-
-export class HitCanvasManager extends CanvasManager implements IHitCanvasManager {
-
-    public maxTotal = 1000 // 最多缓存多少张画布
-
-    protected pathList: ILeafList = new LeafList()
-    protected pixelList: ILeafList = new LeafList()
-
-    public getPixelType(leaf: ILeaf, config: ILeaferCanvasConfig): IHitCanvas {
-        this.__autoClear()
-        this.pixelList.add(leaf)
-        return Creator.hitCanvas(config)
-    }
-
-    public getPathType(leaf: ILeaf): IHitCanvas {
-        this.__autoClear()
-        this.pathList.add(leaf)
-        return Creator.hitCanvas()
-    }
-
-    public clearImageType(): void {
-        this.__clearLeafList(this.pixelList)
-    }
-
-    public clearPathType(): void {
-        this.__clearLeafList(this.pathList)
-    }
-
-    protected __clearLeafList(leafList: ILeafList): void {
-        if (leafList.length) {
-            leafList.forEach(leaf => {
-                if (leaf.__hitCanvas) {
-                    leaf.__hitCanvas.destroy()
-                    leaf.__hitCanvas = null
-                }
-            })
-            leafList.reset()
-        }
-    }
-
-    protected __autoClear(): void {
-        if (this.pathList.length + this.pixelList.length > this.maxTotal) this.clear()
-    }
-
-    public clear(): void {
-        this.clearPathType()
-        this.clearImageType()
-    }
-
-}