@leafer-ui/display 2.1.10 → 2.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/display",
-  "version": "2.1.10",
+  "version": "2.2.0",
   "description": "@leafer-ui/display",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,14 +22,14 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "2.1.10",
-    "@leafer-ui/data": "2.1.10",
-    "@leafer-ui/display-module": "2.1.10",
-    "@leafer-ui/decorator": "2.1.10",
-    "@leafer-ui/external": "2.1.10"
+    "@leafer/core": "2.2.0",
+    "@leafer-ui/data": "2.2.0",
+    "@leafer-ui/display-module": "2.2.0",
+    "@leafer-ui/decorator": "2.2.0",
+    "@leafer-ui/external": "2.2.0"
   },
   "devDependencies": {
-    "@leafer/interface": "2.1.10",
-    "@leafer-ui/interface": "2.1.10"
+    "@leafer/interface": "2.2.0",
+    "@leafer-ui/interface": "2.2.0"
   }
 }

package/src/Line.ts

@@ -34,6 +34,8 @@ export class Line<TInputData = ILineInputData> extends UI<TInputData> implements
     @pathType(false)
     declare public closed?: boolean
 
+    public get isPointsMode(): boolean { return this.points && !this.pathInputed }
+
     public get toPoint(): IPointData {
         const { width, rotation } = this.__
         const to: IPointData = getPointData()

package/src/Polygon.ts

@@ -31,6 +31,7 @@ export class Polygon<TInputData = IPolygonInputData> extends UI<TInputData> impl
     @pathType(0)
     public curve?: boolean | number
 
+    public get isPointsMode(): boolean { return this.points && !this.pathInputed }
 
     public __updatePath(): void {
 

package/src/Text.ts

@@ -114,7 +114,7 @@ export class Text<TInputData = ITextInputData> extends UI<TInputData> implements
 
         stintSet(data, '__padding', padding && MathHelper.fourNumber(padding))
         stintSet(data, '__clipText', textOverflow !== 'show' && !data.__autoSize)
-        stintSet(data, '__isCharMode', (width || height || data.__letterSpacing || (textCase !== 'none')) as boolean)
+        stintSet(data, '__isCharMode', (width || height || data.__letterSpacing || data.motionText || (textCase !== 'none')) as boolean)
 
         data.__textDrawData = TextConvert.getDrawData((data.__isPlacehold = data.placeholder && data.text === '') ? data.placeholder : data.text, this.__)
     }
@@ -150,7 +150,7 @@ export class Text<TInputData = ITextInputData> extends UI<TInputData> implements
 
         if (italic) b.width += fontSize * 0.16 // 倾斜会导致文本的bounds增大
 
-        DataHelper.stintSet(this, 'isOverflow', !includes(b, contentBounds))
+        DataHelper.stintSet(this, 'isOverflow', !includes(b, contentBounds) && !data.motionText)
 
         if (this.isOverflow) setList(data.__textBoxBounds = {} as IBoundsData, [b, contentBounds]), layout.renderChanged = true
         else data.__textBoxBounds = b

package/src/UI.ts

@@ -1,7 +1,7 @@
-import { ILeaferCanvas, IRenderOptions, IPathDrawer, IPathCommandData, IHitType, INumber, IBoolean, IString, IPathString, IExportFileType, IPointData, ICursorType, IMaskType, IEraserType, IWindingRule, IPathCreator, IFourNumber, IBoundsData, IFlowType, IGap, IFlowWrap, IAxis, IConstraint, IAutoBoxData, IFlowBoxType, IPointGap, IFlowAlign, IFlowAxisAlign, IFindCondition, IAutoSize, IRangeSize, IAlign, IUnitPointData, IObject, IScaleData, IUnitData, IPathCommandObject, ITransition, IFilter, IScaleFixed, IDragBoundsType, IPathCommandNode } from '@leafer/interface'
+import { ILeaferCanvas, IRenderOptions, IPathDrawer, IPathCommandData, IHitType, INumber, IBoolean, IString, IPathString, IExportFileType, IPointData, ICursorType, IMaskType, IEraserType, IWindingRule, IPathCreator, IFourNumber, IBoundsData, IFlowType, IGap, IFlowWrap, IAxis, IConstraint, IAutoBoxData, IFlowBoxType, IPointGap, IFlowAlign, IFlowAxisAlign, IFindCondition, IAutoSize, IRangeSize, IAlign, IUnitPointData, IObject, IScaleData, IUnitData, IPathCommandObject, ITransition, IFilter, IMotionVertical, IScaleFixed, IDragBoundsType, IPathCommandNode } from '@leafer/interface'
 import { Leaf, PathDrawer, surfaceType, dimType, dataType, positionType, scrollType, boundsType, pathType, scaleType, rotationType, opacityType, visibleType, sortType, maskType, dataProcessor, registerUI, useModule, rewriteAble, UICreator, PathCorner, hitType, strokeType, PathConvert, eraserType, cursorType, autoLayoutType, pen, naturalBoundsType, pathInputType, MathHelper, Plugin, DataHelper, affectRenderBoundsType, isString, isNumber } from '@leafer/core'
 
-import { IUI, IShadowEffect, IBlurEffect, IStrokeAlign, IStrokeJoin, IStrokeCap, IBlendMode, IDashPatternString, IShadowString, IGrayscaleEffect, IUIData, IGroup, IStrokeWidthString, ICornerRadiusString, IUIInputData, IExportOptions, IExportResult, IFill, IStroke, IArrowStyle, IFindUIMethod, ILeafer, IEditorConfig, IEditorConfigFunction, IEditToolFunction, IKeyframe, IAnimation, IAnimate, IStates, IStateName, IAnimateType, IStateStyle, IColorString, IAnimateList, ILeafPaint, ILinker, IPathCommandDataWithRadius } from '@leafer-ui/interface'
+import { IUI, IShadowEffect, IBlurEffect, IStrokeAlign, IStrokeJoin, IStrokeCap, IBlendMode, IDashPatternString, IShadowString, IGrayscaleEffect, IUIData, IGroup, IStrokeWidthString, ICornerRadiusString, IUIInputData, IExportOptions, IExportResult, IFill, IStroke, IArrowStyle, IFindUIMethod, ILeafer, IEditorConfig, IEditorConfigFunction, IEditToolFunction, IKeyframe, IAnimation, IAnimate, IStates, IStateName, IAnimateType, IStateStyle, IColorString, IAnimateList, ILeafPaint, ILinker, IPathCommandDataWithRadius, ILineData } from '@leafer-ui/interface'
 import { effectType, zoomLayerType } from '@leafer-ui/decorator'
 
 import { UIData } from '@leafer-ui/data'
@@ -339,15 +339,19 @@ export class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements I
 
     // @leafer-in/motion-path rewrite
 
-    public motionPath?: boolean | 'text-path'
+    public motionPath?: boolean
 
     public motionPrecision?: INumber
 
 
     public motion?: INumber | IUnitData
 
+    public motionVertical?: IMotionVertical
+
     public motionRotation?: INumber | IBoolean
 
+    public motionText?: boolean
+
 
     // @leafer-in/state rewrite
 
@@ -487,8 +491,9 @@ export class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements I
     }
 
     public __drawPath(canvas: ILeaferCanvas): void {
+        const data = this.__ as ILineData
         canvas.beginPath()
-        this.__drawPathByData(canvas, this.__.path, true)
+        data.__usePointsMode ? PathDrawer.drawPathByPoints(canvas, data.points, data.closed) : this.__drawPathByData(canvas, data.path, true)
     }
 
     public __drawPathByData(drawer: IPathDrawer, data: IPathCommandData, ignoreCornerRadius?: boolean): void {

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { IString, INumber, IBoolean, IMaskType, IEraserType, IScaleFixed, IAlign, IUnitPointData, IFourNumber, IPathCommandData, IPathCommandNode, IPathCommandObject, IPathString, IWindingRule, IFlowType, IGap, IPointGap, IFlowAlign, IFlowAxisAlign, IFlowWrap, IFlowBoxType, IAutoSize, IAutoBoxData, IConstraint, IRangeSize, IAxis, IBoundsData, IDragBoundsType, IHitType, ICursorType, IFilter, ITransition, IUnitData, IObject, IPointData, IPathCreator, IFindCondition, ILeaferCanvas, IPathDrawer, IRenderOptions, IExportFileType, IJSONOptions, IPickOptions, IPickResult, ILeaferMode, IRenderer, IWatcher, ILayouter, ISelector, IInteraction, ICanvasManager, IHitCanvasManager, ILeaferConfig, IAutoBounds, IBounds, IEventListenerId, ITimer, IControl, ILeaferType, IScreenSizeData, IResizeEvent, IValue, ICanvasSizeAttr, IZoomType, IZoomOptions, IClientPointData, ILeaferImage, ICanvasContext2DSettings, ICanvasContext2D } from '@leafer/interface';
+import { IString, INumber, IBoolean, IMaskType, IEraserType, IScaleFixed, IAlign, IUnitPointData, IFourNumber, IPathCommandData, IPathCommandNode, IPathCommandObject, IPathString, IWindingRule, IFlowType, IGap, IPointGap, IFlowAlign, IFlowAxisAlign, IFlowWrap, IFlowBoxType, IAutoSize, IAutoBoxData, IConstraint, IRangeSize, IAxis, IBoundsData, IDragBoundsType, IHitType, ICursorType, IFilter, ITransition, IUnitData, IMotionVertical, IObject, IPointData, IPathCreator, IFindCondition, ILeaferCanvas, IPathDrawer, IRenderOptions, IExportFileType, IJSONOptions, IPickOptions, IPickResult, ILeaferMode, IRenderer, IWatcher, ILayouter, ISelector, IInteraction, ICanvasManager, IHitCanvasManager, ILeaferConfig, IAutoBounds, IBounds, IEventListenerId, ITimer, IControl, ILeaferType, IScreenSizeData, IResizeEvent, IValue, ICanvasSizeAttr, IZoomType, IZoomOptions, IClientPointData, ILeaferImage, ICanvasContext2DSettings, ICanvasContext2D } from '@leafer/interface';
 import { Leaf, LeafList } from '@leafer/core';
 import { IUIInputData, IUI, IUIData, ILeafer, IGroup, ILinker, IBlendMode, IFill, IStroke, IStrokeAlign, IStrokeWidthString, IStrokeCap, IStrokeJoin, IDashPatternString, IArrowStyle, ICornerRadiusString, IShadowEffect, IShadowString, IBlurEffect, IGrayscaleEffect, IAnimation, IStates, IStateName, IStateStyle, IColorString, IEditorConfig, IAnimate, IAnimateList, IFindUIMethod, ILeafPaint, IKeyframe, IAnimateType, IExportOptions, IExportResult, IEditorConfigFunction, IEditToolFunction, IGroupInputData, IGroupData, IUIJSONData, IFindCondition as IFindCondition$1, ILeaferData, IApp, IEditorBase, IFunction, ILeaferInputData, IBoxInputData, IBox, IBoxData, IOverflow, IScrollConfig, IScroller, IFrameInputData, IFrame, IFrameData, IRectInputData, IRect, IRectData, IEllipseInputData, IEllipse, IEllipseData, IPolygonInputData, IPolygon, IPolygonData, IStarInputData, IStar, IStarData, ILineInputData, ILine, ILineData, IImageInputData, IImage, IImageData, ICanvasInputData, ICanvas, ICanvasData, ITextInputData, IText, ITextData, IBackgroundBoxStyle, IHitType as IHitType$1, IFontWeight, ITextCase, ITextDecoration, IWritingMode, ITextAlign, IVerticalAlign, ITextWrap, ITextOverflow, ITextDrawData, IPathInputData, IPath, IPathData, IPenInputData, IPen, IPenData, IPathCommandData as IPathCommandData$1, IPointData as IPointData$1 } from '@leafer-ui/interface';
 
@@ -101,10 +101,12 @@ declare class UI<TInputData = IUIInputData> extends Leaf<TInputData> implements
     animationOut?: IAnimation | IAnimation[];
     transition?: ITransition;
     transitionOut?: ITransition;
-    motionPath?: boolean | 'text-path';
+    motionPath?: boolean;
     motionPrecision?: INumber;
     motion?: INumber | IUnitData;
+    motionVertical?: IMotionVertical;
     motionRotation?: INumber | IBoolean;
+    motionText?: boolean;
     states?: IStates;
     state?: IStateName;
     selected?: IBoolean;
@@ -352,6 +354,7 @@ declare class Polygon<TInputData = IPolygonInputData> extends UI<TInputData> imp
     startAngle?: INumber;
     points?: number[] | IPointData[];
     curve?: boolean | number;
+    get isPointsMode(): boolean;
     __updatePath(): void;
 }
 
@@ -372,6 +375,7 @@ declare class Line<TInputData = ILineInputData> extends UI<TInputData> implement
     points?: number[] | IPointData[];
     curve?: boolean | number;
     closed?: boolean;
+    get isPointsMode(): boolean;
     get toPoint(): IPointData;
     set toPoint(value: IPointData);
     __updatePath(): void;