@leafer-in/editor 1.12.1 → 1.12.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-in/editor",
-  "version": "1.12.1",
+  "version": "1.12.2",
   "description": "@leafer-in/editor",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -34,10 +34,10 @@
     "leaferjs"
   ],
   "peerDependencies": {
-    "@leafer-ui/draw": "^1.12.1",
-    "@leafer-ui/core": "^1.12.1",
-    "@leafer-in/resize": "^1.12.1",
-    "@leafer-ui/interface": "^1.12.1",
-    "@leafer-in/interface": "^1.12.1"
+    "@leafer-ui/draw": "^1.12.2",
+    "@leafer-ui/core": "^1.12.2",
+    "@leafer-in/resize": "^1.12.2",
+    "@leafer-ui/interface": "^1.12.2",
+    "@leafer-in/interface": "^1.12.2"
   }
 }

package/src/display/EditSelect.ts

@@ -64,8 +64,8 @@ export class EditSelect extends Group implements IEditSelect {
     public update(): void {
         this.hoverStroker.update()
 
-        const { stroke, strokeWidth, selectedStyle } = this.editor.mergedConfig
-        this.targetStroker.update({ stroke, strokeWidth: strokeWidth && Math.max(1, strokeWidth / 2), ...(selectedStyle || {}) })
+        const { stroke, strokeWidth, selectedPathType, selectedStyle } = this.editor.mergedConfig
+        this.targetStroker.update({ stroke, strokeWidth: strokeWidth && Math.max(1, strokeWidth / 2), strokePathType: selectedPathType, ...(selectedStyle || {}) })
     }
 
     // move / down

package/src/display/Stroker.ts

@@ -1,5 +1,5 @@
-import { IUI, ILeaferCanvas, IRenderOptions, IRectInputData, IMatrixWithOptionHalfData } from '@leafer-ui/interface'
-import { Paint, UI, MatrixHelper, getBoundsData, getMatrixData, BoundsHelper, LeafBoundsHelper, isArray, isString } from '@leafer-ui/draw'
+import { IUI, ILeaferCanvas, IRenderOptions, IUIInputData, IMatrixWithOptionHalfData } from '@leafer-ui/interface'
+import { Paint, UI, MatrixHelper, getBoundsData, getMatrixData, BoundsHelper, LeafBoundsHelper, isArray, isString, surfaceType } from '@leafer-ui/draw'
 
 import { IStroker } from '@leafer-in/interface'
 
@@ -20,6 +20,9 @@ export class Stroker extends UI implements IStroker {
 
     public list: IUI[] = []
 
+    @surfaceType('render-path')
+    public strokePathType: 'path' | 'render-path'
+
     constructor() {
         super()
         this.visible = 0
@@ -27,13 +30,13 @@ export class Stroker extends UI implements IStroker {
         this.strokeAlign = 'center'
     }
 
-    public setTarget(target: IUI | IUI[], style?: IRectInputData): void {
+    public setTarget(target: IUI | IUI[], style?: IUIInputData): void {
         if (style) this.set(style)
         this.target = target
         this.update()
     }
 
-    public update(style?: IRectInputData): void {
+    public update(style?: IUIInputData): void {
         const { list } = this
         if (list.length) {
             setListWithFn(bounds, list, worldBounds)
@@ -65,8 +68,13 @@ export class Stroker extends UI implements IStroker {
                     canvas.setWorld(matrix, options.matrix)
                     canvas.beginPath()
 
-                    if (leaf.__.__useArrow) leaf.__drawPath(canvas)
-                    else leaf.__.__pathForRender ? leaf.__drawRenderPath(canvas) : leaf.__drawPathByBox(canvas)
+
+                    if (this.strokePathType === 'path') {
+                        leaf.__drawPath(canvas)
+                    } else {
+                        if (leaf.__.__useArrow) leaf.__drawPath(canvas)
+                        else leaf.__.__pathForRender ? leaf.__drawRenderPath(canvas) : leaf.__drawPathByBox(canvas)
+                    }
 
                     data.strokeWidth = strokeWidth / Math.max(aScaleX, aScaleY)
 

package/src/tool/TransformTool.ts

@@ -57,7 +57,7 @@ export class TransformTool implements ITransformTool { // Editor use
         let { around, lockRatio, flipable, editSize } = mergeConfig, totalMove: IPointData | number
 
         if (e instanceof ZoomEvent) {
-            around = target.getBoxPoint(e)
+            if (!around) around = target.getBoxPoint(e)
             totalMove = e.totalScale
         } else {
             totalMove = e.getInnerTotal(target)

package/types/index.d.ts

@@ -1,5 +1,5 @@
 import * as _leafer_ui_interface from '@leafer-ui/interface';
-import { IBounds, ILeafList, IUI, IFunction, IEventListenerId, ILeaf, IPointerEvent, ILeaferCanvas, IRenderOptions, IGroup, IObject, IGroupInputData, IEditSize, IPointData, IAlign, IAxis, IMatrix, IApp, IEditorDragStartData, IEditorConfig as IEditorConfig$1, ITransformTool, IBoundsData, IBoxInputData, IUIEvent, IKeyEvent, IRect, IRectInputData, IMatrixData, IDragEvent, IAround, IEvent, ILayoutBoundsData } from '@leafer-ui/interface';
+import { IBounds, ILeafList, IUI, IFunction, IEventListenerId, ILeaf, IPointerEvent, ILeaferCanvas, IRenderOptions, IGroup, IObject, IGroupInputData, IEditSize, IPointData, IAlign, IAxis, IMatrix, IApp, IEditorDragStartData, IEditorConfig as IEditorConfig$1, ITransformTool, IBoundsData, IBoxInputData, IUIEvent, IKeyEvent, IRect, IRectInputData, IUIInputData, IMatrixData, IDragEvent, IAround, IEvent, ILayoutBoundsData } from '@leafer-ui/interface';
 import { Group, UI, Direction9, Box, Event } from '@leafer-ui/draw';
 import { PointerEvent, DragEvent, MoveEvent, ZoomEvent, RotateEvent, KeyEvent } from '@leafer-ui/core';
 import { IEditSelect, IEditor, IStroker, ISelectArea, IEditorConfig, IEditPoint, ISimulateElement, IEditBox, IEditTool, IInnerEditor, IEditorScaleEvent, IEditPointType, IEditPointInputData, IEditorEvent, IEditorMoveEvent, IEditorRotateEvent, IEditorSkewEvent, IEditorGroupEvent, IInnerEditorEvent, IInnerEditorMode, IUI as IUI$1, IDragEvent as IDragEvent$1, IPointData as IPointData$1, IPathCommandData, IFromToData, IAround as IAround$1 } from '@leafer-in/interface';
@@ -223,9 +223,10 @@ declare class SelectArea extends Group implements ISelectArea {
 declare class Stroker extends UI implements IStroker {
     target: IUI | IUI[];
     list: IUI[];
+    strokePathType: 'path' | 'render-path';
     constructor();
-    setTarget(target: IUI | IUI[], style?: IRectInputData): void;
-    update(style?: IRectInputData): void;
+    setTarget(target: IUI | IUI[], style?: IUIInputData): void;
+    update(style?: IUIInputData): void;
     __draw(canvas: ILeaferCanvas, options: IRenderOptions): void;
     destroy(): void;
 }