@leafer/interface 1.0.0-alpha.7 → 1.0.0-alpha.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/interface",
-  "version": "1.0.0-alpha.7",
+  "version": "1.0.0-alpha.9",
   "description": "@leafer/interface",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",

package/src/canvas/ICanvas.ts

@@ -1,6 +1,6 @@
 type GlobalCompositeOperation = 'color' | 'color-burn' | 'color-dodge' | 'copy' | 'darken' | 'destination-atop' | 'destination-in' | 'destination-out' | 'destination-over' | 'difference' | 'exclusion' | 'hard-light' | 'hue' | 'lighten' | 'lighter' | 'luminosity' | 'multiply' | 'overlay' | 'saturation' | 'screen' | 'soft-light' | 'source-atop' | 'source-in' | 'source-out' | 'source-over' | 'xor'
 type CanvasDirection = 'inherit' | 'ltr' | 'rtl'
-export type ICanvasFillRule = 'evenodd' | 'nonzero'
+export type IWindingRule = 'evenodd' | 'nonzero'
 // type CanvasFontKerning = 'auto' | 'none' | 'normal'
 // type CanvasFontStretch = 'condensed' | 'expanded' | 'extra-condensed' | 'extra-expanded' | 'normal' | 'semi-condensed' | 'semi-expanded' | 'ultra-condensed' | 'ultra-expanded'
 // type CanvasFontVariantCaps = 'all-petite-caps' | 'all-small-caps' | 'normal' | 'petite-caps' | 'small-caps' | 'titling-caps' | 'unicase'
@@ -35,12 +35,12 @@ interface CanvasDrawImage {
 
 interface CanvasDrawPath {
     beginPath(): void
-    clip(fillRule?: ICanvasFillRule): void
-    clip(path: IPath2D, fillRule?: ICanvasFillRule): void
-    fill(fillRule?: ICanvasFillRule): void
-    fill(path: IPath2D, fillRule?: ICanvasFillRule): void
-    isPointInPath(x: number, y: number, fillRule?: ICanvasFillRule): boolean
-    isPointInPath(path: IPath2D, x: number, y: number, fillRule?: ICanvasFillRule): boolean
+    clip(fillRule?: IWindingRule): void
+    clip(path: IPath2D, fillRule?: IWindingRule): void
+    fill(fillRule?: IWindingRule): void
+    fill(path: IPath2D, fillRule?: IWindingRule): void
+    isPointInPath(x: number, y: number, fillRule?: IWindingRule): boolean
+    isPointInPath(path: IPath2D, x: number, y: number, fillRule?: IWindingRule): boolean
     isPointInStroke(x: number, y: number): boolean
     isPointInStroke(path: IPath2D, x: number, y: number): boolean
     stroke(): void
@@ -137,14 +137,14 @@ interface CanvasRenderingContext2DSettings {
 }
 
 /** The CanvasRenderingContext2D interface, part of the Canvas API, provides the 2D rendering context for the drawing surface of a <canvas> element. It is used for drawing shapes, text, images, and other objects. */
-export interface ICanvasRenderingContext2D extends CanvasCompositing, CanvasDrawImage, CanvasDrawPath, CanvasFillStrokeStyles, CanvasFilters, CanvasImageData, CanvasImageSmoothing, CanvasPath, CanvasPathDrawingStyles, CanvasRect, CanvasShadowStyles, CanvasState, CanvasText, CanvasTextDrawingStyles, CanvasTransform, CanvasUserInterface {
+export interface ICanvasContext2D extends CanvasCompositing, CanvasDrawImage, CanvasDrawPath, CanvasFillStrokeStyles, CanvasFilters, CanvasImageData, CanvasImageSmoothing, CanvasPath, CanvasPathDrawingStyles, CanvasRect, CanvasShadowStyles, CanvasState, CanvasText, CanvasTextDrawingStyles, CanvasTransform, CanvasUserInterface {
     readonly canvas: HTMLCanvasElement
     getContextAttributes(): CanvasRenderingContext2DSettings
 }
 
-declare var ICanvasRenderingContext2D: {
-    prototype: ICanvasRenderingContext2D
-    new(): ICanvasRenderingContext2D
+declare var ICanvasContext2D: {
+    prototype: ICanvasContext2D
+    new(): ICanvasContext2D
 }
 
 interface CanvasShadowStyles {

package/src/canvas/ILeaferCanvas.ts

@@ -1,15 +1,11 @@
 import { IObject } from '../data/IData'
 import { IBounds, IMatrixData, IBoundsData, IAutoBoundsData, IAutoBounds, IScreenSizeData, IMatrixWithBoundsData, IPointData } from '../math/IMath'
-import { ICanvasRenderingContext2D, ICanvasFillRule, IPath2D, ITextMetrics, CanvasGradient, CanvasPattern } from './ICanvas'
+import { ICanvasContext2D, IWindingRule, IPath2D, ITextMetrics, CanvasGradient, CanvasPattern } from './ICanvas'
 import { IResizeEventListener } from '../event/IEvent'
-import { ICanvasDrawPath } from './ICanvasPathDrawer'
+import { IPathDrawer } from '../path/IPathDrawer'
 import { InnerId } from '../event/IEventer'
 import { ICanvasManager } from './ICanvasManager'
 
-export interface ILeaferCanvasContext extends ICanvasRenderingContext2D {
-
-}
-
 export interface ILeaferCanvasConfig extends IAutoBoundsData {
     view?: string | IObject
     fill?: string
@@ -67,9 +63,9 @@ interface ICanvasMethod {
     save(): void
     restore(): void
 
-    fill(path?: IPath2D | ICanvasFillRule, rule?: ICanvasFillRule): void
+    fill(path?: IPath2D | IWindingRule, rule?: IWindingRule): void
     stroke(path?: IPath2D): void
-    clip(path?: IPath2D | ICanvasFillRule, rule?: ICanvasFillRule): void
+    clip(path?: IPath2D | IWindingRule, rule?: IWindingRule): void
 
     fillRect(x: number, y: number, width: number, height: number): void
     strokeRect(x: number, y: number, width: number, height: number): void
@@ -121,7 +117,7 @@ interface ICanvasMethod {
     clear(): void
 }
 
-export interface ILeaferCanvas extends ICanvasAttr, ICanvasMethod, ICanvasDrawPath {
+export interface ILeaferCanvas extends ICanvasAttr, ICanvasMethod, IPathDrawer {
 
     manager: ICanvasManager
 
@@ -137,7 +133,7 @@ export interface ILeaferCanvas extends ICanvasAttr, ICanvasMethod, ICanvasDrawPa
     bounds: IBounds
 
     view: unknown
-    context: ILeaferCanvasContext
+    context: ICanvasContext2D
 
     recycled?: boolean
 

package/src/index.ts

@@ -29,9 +29,9 @@ export { IPlatform } from './platform/IPlatform'
 export { IPlugin } from './plugin/IPlugin'
 
 
-export { ILeaferCanvas, IHitCanvas, ICanvasAttr, ICanvasStrokeOptions, ILeaferCanvasContext, ILeaferCanvasConfig, IHitCanvasConfig } from './canvas/ILeaferCanvas'
-export { ICanvasDrawPath } from './canvas/ICanvasPathDrawer'
-export { ICanvasFillRule as ICanvasFillRule, ICanvasRenderingContext2D, ITextMetrics, IPath2D } from './canvas/ICanvas'
+export { ILeaferCanvas, IHitCanvas, ICanvasAttr, ICanvasStrokeOptions, ILeaferCanvasConfig, IHitCanvasConfig } from './canvas/ILeaferCanvas'
+export { IPathDrawer } from './path/IPathDrawer'
+export { IWindingRule, ICanvasContext2D, ITextMetrics, IPath2D } from './canvas/ICanvas'
 export { CanvasPathCommand, IPathCommandData, MCommandData, HCommandData, VCommandData, LCommandData, CCommandData, SCommandData, QCommandData, TCommandData, ZCommandData, ACommandData, RectCommandData, RoundRectCommandData, EllipseCommandData, ArcCommandData, ArcToCommandData } from './path/IPathCommand'
 
 export { ILeaferImage, ILeaferImageConfig } from './image/ILeaferImage'

package/src/{canvas/ICanvasPathDrawer.ts → path/IPathDrawer.ts}

@@ -1,4 +1,4 @@
-export interface ICanvasDrawPath {
+export interface IPathDrawer {
     beginPath?(): void
 
     moveTo(x: number, y: number): void