@leafer-ui/interaction-web 1.7.0 → 1.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/interaction-web",
-  "version": "1.7.0",
+  "version": "1.9.0",
   "description": "@leafer-ui/interaction-web",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,10 +22,10 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.7.0",
-    "@leafer-ui/core": "1.7.0"
+    "@leafer/core": "1.9.0",
+    "@leafer-ui/core": "1.9.0"
   },
   "devDependencies": {
-    "@leafer/interface": "1.7.0"
+    "@leafer/interface": "1.9.0"
   }
 }

package/src/Interaction.ts

@@ -1,5 +1,5 @@
 import { IObject, IPointData, ITimer, IKeepTouchData, ICursorType, IClientPointData } from '@leafer/interface'
-import { MathHelper } from '@leafer/core'
+import { MathHelper, isArray, isObject, isString } from '@leafer/core'
 import { InteractionBase, InteractionHelper, Cursor } from '@leafer-ui/core'
 
 import { PointerEventHelper } from './PointerEventHelper'
@@ -338,16 +338,16 @@ export class Interaction extends InteractionBase {
         super.setCursor(cursor)
         const list: ICursorType[] = []
         this.eachCursor(cursor, list)
-        if (typeof list[list.length - 1] === 'object') list.push('default')
-        this.canvas.view.style.cursor = list.map(item => (typeof item === 'object') ? `url(${item.url}) ${item.x || 0} ${item.y || 0}` : item).join(',')
+        if (isObject(list[list.length - 1])) list.push('default')
+        this.canvas.view.style.cursor = list.map(item => (isObject(item)) ? `url(${item.url}) ${item.x || 0} ${item.y || 0}` : item).join(',')
     }
 
     protected eachCursor(cursor: ICursorType | ICursorType[], list: ICursorType[], level = 0): void {
         level++
-        if (cursor instanceof Array) {
+        if (isArray(cursor)) {
             cursor.forEach(item => this.eachCursor(item, list, level))
         } else {
-            const custom = typeof cursor === 'string' && Cursor.get(cursor)
+            const custom = isString(cursor) && Cursor.get(cursor)
             if (custom && level < 2) {
                 this.eachCursor(custom, list, level)
             } else {

package/src/KeyEventHelper.ts

@@ -1,4 +1,4 @@
-import { IKeyEvent } from '@leafer/interface'
+import { IKeyCodes, IKeyEvent } from '@leafer/interface'
 import { InteractionHelper } from '@leafer-ui/core'
 
 
@@ -8,7 +8,7 @@ export const KeyEventHelper = {
         const base = InteractionHelper.getBase(e)
         const data: IKeyEvent = {
             ...base,
-            code: e.code,
+            code: e.code as IKeyCodes,
             key: e.key
         }
         return data