@leafer-ui/interface 1.9.2 → 1.9.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/interface",
-  "version": "1.9.2",
+  "version": "1.9.4",
   "description": "@leafer-ui/interface",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,6 +22,6 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/interface": "1.9.2"
+    "@leafer/interface": "1.9.4"
   }
 }

package/src/IScroller.ts

@@ -7,11 +7,13 @@ export interface IScrollConfig {
     theme?: IScrollTheme // 主题
     style?: IBoxInputData // 滚动条样式
     size?: number // 滚动条的size
+    cornerRadius?: number // 默认取size的一半
     endsMargin?: number // 滚动条两端的间距
     sideMargin?: number // 滚动条两侧的间距
     minSize?: number // 最小显示size
     scaleFixed?: IScaleFixed
     scrollType?: 'drag' | 'move' | 'both' // 滚动类型
+    stopDefault?: boolean, // 阻止自身之外的默认滚动
     hideOnActionEnd?: boolean | 'hover' | 'scroll'  // 操作结束时自动隐藏
 }
 
@@ -40,5 +42,5 @@ export interface IScroller extends IGroup {
     dragScrolling: boolean
 
     updateConfig(): void
-    update(check: boolean): void
+    update(check?: boolean): void
 }

package/src/IUI.ts

@@ -343,8 +343,7 @@ export interface IBox extends IBoxAttrData, IGroup {
     __: IBoxData
     scroller?: IScroller
     hasScroller?: boolean
-    __checkScroll(): void
-    __updateScroll(): void
+    __checkScroll(isScrollMode: boolean): void
     __updateRectRenderBounds(): void
     __renderGroup(canvas: ILeaferCanvas, options: IRenderOptions): void
 }

package/src/editor/IEditor.ts

@@ -153,6 +153,9 @@ export interface IEditorConfig extends IObject {
     rotateKey?: IShortcutKeysCheck | IShortcutKeys
 
     beforeSelect?: IEditorBeforeSelect
+    beforeEditOuter?: IEditorBeforeEditOuter
+    beforeEditInner?: IEditorBeforeEditInner
+
     beforeMove?: IEditorBeforeMove
     beforeScale?: IEditorBeforeScale
     beforeRotate?: IEditorBeforeRotate
@@ -168,6 +171,13 @@ export interface IEditorSelectData {
     target: IUI | IUI[]
 }
 
+export interface IEditorEditOuterData {
+    target: IUI
+    name: string
+}
+
+export type IEditorEditInnerData = IEditorEditOuterData
+
 export interface IEditorMoveData extends IPointData, IObject {
     target: IUI
 }
@@ -192,6 +202,14 @@ export interface IEditorBeforeSelect {
     (data: IEditorSelectData): IUI | IUI[] | boolean | void
 }
 
+export interface IEditorBeforeEditOuter {
+    (data: IEditorEditOuterData): string | boolean | void
+}
+
+export interface IEditorBeforeEditInner {
+    (data: IEditorEditInnerData): string | boolean | void
+}
+
 export interface IEditorBeforeMove {
     (data: IEditorMoveData): IPointData | boolean | void
 }

package/src/index.ts

@@ -51,4 +51,4 @@ export { IEffectModule } from './module/IEffect'
 export { IFilterModule, IFilterProcessor, IFilterFunction } from './module/IFilter'
 export { ICachedShape } from './ICachedShape'
 
-export { IEditorBase, IEditorConfig, ITransformTool, IEditBoxBase, IEditPoint, IEditPointInputData, IEditPointType, IEditorDragStartData, IEditToolFunction, IEditorConfigFunction, IEditorBeforeSelect, IEditorBeforeMove, IEditorBeforeScale, IEditorBeforeRotate, IEditorBeforeSkew, IEditorSelectData, IEditorMoveData, IEditorScaleData, IEditorRotationData, IEditorSkewData } from './editor/IEditor'
+export { IEditorBase, IEditorConfig, ITransformTool, IEditBoxBase, IEditPoint, IEditPointInputData, IEditPointType, IEditorDragStartData, IEditToolFunction, IEditorConfigFunction, IEditorBeforeSelect, IEditorBeforeEditOuter, IEditorBeforeEditInner, IEditorBeforeMove, IEditorBeforeScale, IEditorBeforeRotate, IEditorBeforeSkew, IEditorSelectData, IEditorEditOuterData, IEditorEditInnerData, IEditorMoveData, IEditorScaleData, IEditorRotationData, IEditorSkewData } from './editor/IEditor'

package/src/type/IType.ts

@@ -199,6 +199,6 @@ export interface IEffect extends IFilter {
 
 }
 
-export type IOverflow = 'show' | 'hide' | 'scroll' | 'scroll-x' | 'scroll-y'
+export type IOverflow = 'show' | 'hide' | 'scroll' | 'x-scroll' | 'y-scroll'
 
 export type ITextOverflow = 'show' | 'hide' | 'ellipsis' | (string & {})

package/types/index.d.ts

@@ -149,7 +149,7 @@ interface IGrayscaleEffect {
 }
 interface IEffect extends IFilter {
 }
-type IOverflow = 'show' | 'hide' | 'scroll' | 'scroll-x' | 'scroll-y';
+type IOverflow = 'show' | 'hide' | 'scroll' | 'x-scroll' | 'y-scroll';
 type ITextOverflow = 'show' | 'hide' | 'ellipsis' | (string & {});
 
 type ILeafPaintColor = IColorString | CanvasGradient | CanvasPattern;
@@ -519,6 +519,8 @@ interface IEditorConfig extends IObject$1 {
     multipleSelectKey?: IShortcutKeysCheck | IShortcutKeys;
     rotateKey?: IShortcutKeysCheck | IShortcutKeys;
     beforeSelect?: IEditorBeforeSelect;
+    beforeEditOuter?: IEditorBeforeEditOuter;
+    beforeEditInner?: IEditorBeforeEditInner;
     beforeMove?: IEditorBeforeMove;
     beforeScale?: IEditorBeforeScale;
     beforeRotate?: IEditorBeforeRotate;
@@ -530,6 +532,11 @@ interface IEditorConfig extends IObject$1 {
 interface IEditorSelectData {
     target: IUI$1 | IUI$1[];
 }
+interface IEditorEditOuterData {
+    target: IUI$1;
+    name: string;
+}
+type IEditorEditInnerData = IEditorEditOuterData;
 interface IEditorMoveData extends IPointData$1, IObject$1 {
     target: IUI$1;
 }
@@ -549,6 +556,12 @@ interface IEditorSkewData extends ISkewData, IObject$1 {
 interface IEditorBeforeSelect {
     (data: IEditorSelectData): IUI$1 | IUI$1[] | boolean | void;
 }
+interface IEditorBeforeEditOuter {
+    (data: IEditorEditOuterData): string | boolean | void;
+}
+interface IEditorBeforeEditInner {
+    (data: IEditorEditInnerData): string | boolean | void;
+}
 interface IEditorBeforeMove {
     (data: IEditorMoveData): IPointData$1 | boolean | void;
 }
@@ -627,11 +640,13 @@ interface IScrollConfig {
     theme?: IScrollTheme;
     style?: IBoxInputData;
     size?: number;
+    cornerRadius?: number;
     endsMargin?: number;
     sideMargin?: number;
     minSize?: number;
     scaleFixed?: IScaleFixed;
     scrollType?: 'drag' | 'move' | 'both';
+    stopDefault?: boolean;
     hideOnActionEnd?: boolean | 'hover' | 'scroll';
 }
 type IScrollTheme = 'light' | 'dark' | (string & {});
@@ -648,7 +663,7 @@ interface IScroller extends IGroup {
     ratioY: number;
     dragScrolling: boolean;
     updateConfig(): void;
-    update(check: boolean): void;
+    update(check?: boolean): void;
 }
 
 interface ILine extends ILineAttrData, IUI {
@@ -917,8 +932,7 @@ interface IBox extends IBoxAttrData, IGroup {
     __: IBoxData;
     scroller?: IScroller;
     hasScroller?: boolean;
-    __checkScroll(): void;
-    __updateScroll(): void;
+    __checkScroll(isScrollMode: boolean): void;
     __updateRectRenderBounds(): void;
     __renderGroup(canvas: ILeaferCanvas, options: IRenderOptions): void;
 }
@@ -1235,4 +1249,4 @@ interface IFilterFunction {
     (filter: IFilter, ui: IUI, bounds: IMatrixWithBoundsScaleData, currentCanvas: ILeaferCanvas, originCanvas: ILeaferCanvas, shape: ICachedShape): void;
 }
 
-export type { IAnimate, IAnimateKeyframe, IAnimateList, IAnimateType, IAnimation, IApp, IAppConfig, IAppData, IAppForEachFunction, IAppInputData, IArrow, IArrowData, IArrowInputData, IArrowType, IBackgroundBoxStyle, IBlurEffect, IBox, IBoxData, IBoxInputData, ICachedShape, ICanvas, ICanvasData, ICanvasInputData, IColor, IColorConvertModule, IColorStop, IColorString, IComputedKeyframe, ICornerRadiusString, IDashPatternString, IEditBoxBase, IEditPoint, IEditPointInputData, IEditPointType, IEditToolFunction, IEditorBase, IEditorBeforeMove, IEditorBeforeRotate, IEditorBeforeScale, IEditorBeforeSelect, IEditorBeforeSkew, IEditorConfig, IEditorConfigFunction, IEditorDragStartData, IEditorMoveData, IEditorRotationData, IEditorScaleData, IEditorSelectData, IEditorSkewData, IEffect, IEffectAttrData, IEffectComputedData, IEffectInputData, IEffectModule, IEllipse, IEllipseData, IEllipseInputData, IExportModule, IFill, IFilterFunction, IFilterModule, IFilterProcessor, IFindUIMethod, IFlow, IFlowData, IFlowInputData, IFontWeight, IFontWeightNumer, IFontWeightString, IFrame, IFrameData, IFrameInputData, IFrameRenderModule, IGIF, IGIFData, IGIFInputData, IGradientPaint, IGradientType, IGrayscaleEffect, IGroup, IGroupData, IGroupInputData, IGroupRenderModule, IImage, IImageData, IImageFilters, IImageInputData, IImagePaint, IImagePaintMode, IImageRenderModule, IKeyframe, IKeyframeId, IKeyframesAnimation, ILeafFill, ILeafPaint, ILeafPaintColor, ILeafPaintPatternData, ILeafShadowEffect, ILeafStrokePaint, ILeafer, ILeaferData, ILeaferInputData, ILine, ILineData, ILineInputData, IOverflow, IPaint, IPaintAttr, IPaintBase, IPaintGradientModule, IPaintImageModule, IPaintModule, IPaintString, IPaintType, IPath, IPathArrowModule, IPathData, IPathDataArrow, IPathDataArrowMap, IPathDataArrowOffset, IPathInputData, IPen, IPenData, IPenInputData, IPercent, IPolygon, IPolygonData, IPolygonInputData, IRGB, IRGBA, IRect, IRectData, IRectInputData, IRectRenderModule, IRepeat, IRobot, IRobotActionName, IRobotActions, IRobotAnimation, IRobotComputedKeyframe, IRobotData, IRobotInputData, IRobotKeyframe, IScrollConfig, IScrollTheme, IScroller, IShadowEffect, IShadowString, ISolidPaint, IStar, IStarData, IStarInputData, IStateModule, IStateName, IStateStyle, IStates, IStroke, IStrokeAlign, IStrokeAttrData, IStrokeCap, IStrokeComputedData, IStrokeComputedStyle, IStrokeGradientPaint, IStrokeImagePaint, IStrokeInputData, IStrokeJoin, IStrokePaint, IStrokeSolidPaint, IStrokeStyle, IStrokeWidthString, IStyleAnimation, IText, ITextAlign, ITextCase, ITextCharData, ITextConvertModule, ITextData, ITextDecoration, ITextDecorationData, ITextDecorationType, ITextDrawData, ITextInputData, ITextOverflow, ITextRenderModule, ITextRowData, ITextStyleAttrData, ITextStyleComputedData, ITextStyleInputData, ITextWordData, ITextWrap, ITransformTool, ITransitionFunction, ITransitionMap, ITransitionModule, IUI, IUIBaseInputData, IUIBoundsModule, IUIData, IUIHitModule, IUIInputData, IUIJSONData, IUIRenderModule, IUITag, IVectorPath, IVerticalAlign, IVideo, IVideoData, IVideoInputData, IWritingMode };
+export type { IAnimate, IAnimateKeyframe, IAnimateList, IAnimateType, IAnimation, IApp, IAppConfig, IAppData, IAppForEachFunction, IAppInputData, IArrow, IArrowData, IArrowInputData, IArrowType, IBackgroundBoxStyle, IBlurEffect, IBox, IBoxData, IBoxInputData, ICachedShape, ICanvas, ICanvasData, ICanvasInputData, IColor, IColorConvertModule, IColorStop, IColorString, IComputedKeyframe, ICornerRadiusString, IDashPatternString, IEditBoxBase, IEditPoint, IEditPointInputData, IEditPointType, IEditToolFunction, IEditorBase, IEditorBeforeEditInner, IEditorBeforeEditOuter, IEditorBeforeMove, IEditorBeforeRotate, IEditorBeforeScale, IEditorBeforeSelect, IEditorBeforeSkew, IEditorConfig, IEditorConfigFunction, IEditorDragStartData, IEditorEditInnerData, IEditorEditOuterData, IEditorMoveData, IEditorRotationData, IEditorScaleData, IEditorSelectData, IEditorSkewData, IEffect, IEffectAttrData, IEffectComputedData, IEffectInputData, IEffectModule, IEllipse, IEllipseData, IEllipseInputData, IExportModule, IFill, IFilterFunction, IFilterModule, IFilterProcessor, IFindUIMethod, IFlow, IFlowData, IFlowInputData, IFontWeight, IFontWeightNumer, IFontWeightString, IFrame, IFrameData, IFrameInputData, IFrameRenderModule, IGIF, IGIFData, IGIFInputData, IGradientPaint, IGradientType, IGrayscaleEffect, IGroup, IGroupData, IGroupInputData, IGroupRenderModule, IImage, IImageData, IImageFilters, IImageInputData, IImagePaint, IImagePaintMode, IImageRenderModule, IKeyframe, IKeyframeId, IKeyframesAnimation, ILeafFill, ILeafPaint, ILeafPaintColor, ILeafPaintPatternData, ILeafShadowEffect, ILeafStrokePaint, ILeafer, ILeaferData, ILeaferInputData, ILine, ILineData, ILineInputData, IOverflow, IPaint, IPaintAttr, IPaintBase, IPaintGradientModule, IPaintImageModule, IPaintModule, IPaintString, IPaintType, IPath, IPathArrowModule, IPathData, IPathDataArrow, IPathDataArrowMap, IPathDataArrowOffset, IPathInputData, IPen, IPenData, IPenInputData, IPercent, IPolygon, IPolygonData, IPolygonInputData, IRGB, IRGBA, IRect, IRectData, IRectInputData, IRectRenderModule, IRepeat, IRobot, IRobotActionName, IRobotActions, IRobotAnimation, IRobotComputedKeyframe, IRobotData, IRobotInputData, IRobotKeyframe, IScrollConfig, IScrollTheme, IScroller, IShadowEffect, IShadowString, ISolidPaint, IStar, IStarData, IStarInputData, IStateModule, IStateName, IStateStyle, IStates, IStroke, IStrokeAlign, IStrokeAttrData, IStrokeCap, IStrokeComputedData, IStrokeComputedStyle, IStrokeGradientPaint, IStrokeImagePaint, IStrokeInputData, IStrokeJoin, IStrokePaint, IStrokeSolidPaint, IStrokeStyle, IStrokeWidthString, IStyleAnimation, IText, ITextAlign, ITextCase, ITextCharData, ITextConvertModule, ITextData, ITextDecoration, ITextDecorationData, ITextDecorationType, ITextDrawData, ITextInputData, ITextOverflow, ITextRenderModule, ITextRowData, ITextStyleAttrData, ITextStyleComputedData, ITextStyleInputData, ITextWordData, ITextWrap, ITransformTool, ITransitionFunction, ITransitionMap, ITransitionModule, IUI, IUIBaseInputData, IUIBoundsModule, IUIData, IUIHitModule, IUIInputData, IUIJSONData, IUIRenderModule, IUITag, IVectorPath, IVerticalAlign, IVideo, IVideoData, IVideoInputData, IWritingMode };