@leafer/path 1.0.0-alpha.21 → 1.0.0-alpha.30

package/src/PathHelper.ts

@@ -1,115 +1,8 @@
-import { IPathDrawer, ITwoPointBoundsData, IPathCommandData } from '@leafer/interface'
-import { TwoPointBoundsHelper } from '@leafer/math'
-
-import { BezierHelper } from './BezierHelper'
-import { PathCommandMap as Command } from './PathCommandMap'
-
-
-const { M, L, C, Q, Z, ellipse: E } = Command
-const { toTwoPointBounds } = BezierHelper
-const { add, addPoint, setPoint } = TwoPointBoundsHelper
-
-const tempPointBounds = {} as ITwoPointBoundsData
+import { IPathCommandData, IPathCreator } from '@leafer/interface'
 
 export const PathHelper = {
-
-    smoothCorner(data: IPathCommandData, _cornerRadius: number, _cornerSmoothing?: number): IPathCommandData {
-        return data
-    },
-
-    toTwoPointBounds(data: IPathCommandData, setPointBounds: ITwoPointBoundsData): void {
-
-        let command: number
-        let i: number = 0, x: number, y: number, x1: number, y1: number, toX: number, toY: number
-
-        const len = data.length
-
-        while (i < len) {
-            command = data[i]
-
-            if (i === 0) {
-                (command === M) ? setPoint(setPointBounds, data[1], data[2]) : setPoint(setPointBounds, 0, 0)
-            }
-
-            switch (command) {
-                case M: //moveto x,y
-                case L: //lineto x,y
-                    x = data[i + 1]
-                    y = data[i + 2]
-                    addPoint(setPointBounds, x, y)
-                    i += 3
-                    break
-                case C: //bezierCurveTo x1,y1,x2,y2,x,y
-                    toX = data[i + 5]
-                    toY = data[i + 6]
-                    toTwoPointBounds(x, y, data[i + 1], data[i + 2], data[i + 3], data[i + 4], toX, toY, tempPointBounds)
-                    add(setPointBounds, tempPointBounds)
-                    x = toX
-                    y = toY
-                    i += 7
-                    break
-                case Q: //quadraticCurveTo x1,y1,x,y
-                    x1 = data[i + 1]
-                    y1 = data[i + 2]
-                    toX = data[i + 3]
-                    toY = data[i + 4]
-                    toTwoPointBounds(x, y, x1, y1, x1, y1, toX, toY, tempPointBounds)
-                    add(setPointBounds, tempPointBounds)
-                    x = toX
-                    y = toY
-                    i += 5
-                    break
-                case Z: //closepath
-                    i += 1
-                    break
-            }
-        }
-
-        //  增加1px的扩展，否则会有问题
-        setPointBounds.minX--
-        setPointBounds.minY--
-        setPointBounds.maxX++
-        setPointBounds.maxY++
-
-    },
-
-    drawData(drawer: IPathDrawer, data: IPathCommandData): void {
-        if (data) {
-            let command: number
-            let i = 0, len = data.length
-
-            while (i < len) {
-                command = data[i]
-                switch (command) {
-                    case M:  //moveto x,y
-                        drawer.moveTo(data[i + 1], data[i + 2])
-                        i += 3
-                        break
-                    case L:  //lineto x,y
-                        drawer.lineTo(data[i + 1], data[i + 2])
-                        i += 3
-                        break
-                    case C:  //bezierCurveTo x1,y1,x2,y2,x,y
-                        drawer.bezierCurveTo(data[i + 1], data[i + 2], data[i + 3], data[i + 4], data[i + 5], data[i + 6])
-                        i += 7
-                        break
-                    case Q:  //quadraticCurveTo x1,y1,x,y
-                        drawer.quadraticCurveTo(data[i + 1], data[i + 2], data[i + 3], data[i + 4])
-                        i += 5
-                        break
-                    case Z:  //closepath
-                        drawer.closePath()
-                        i += 1
-                        break
-
-                    // 非svg标准的canvas绘图命令
-                    case E:
-                        drawer.ellipse(data[i + 1], data[i + 2], data[i + 3], data[i + 4], data[i + 5], data[i + 6], data[i + 7], data[i + 8] as unknown as boolean)
-                        i += 9
-                        break
-                }
-            }
-        }
-    }
-
+    // index.ts rewrite
+    creator: {} as IPathCreator,
+    parse(_pathString: string, _curveMode?: boolean): IPathCommandData { return undefined },
+    convertToCanvasData(_old: IPathCommandData, _curveMode?: boolean): IPathCommandData { return undefined }
 }

package/src/RectHelper.ts

@@ -0,0 +1,22 @@
+import { IPathDrawer } from '@leafer/interface'
+import { MathHelper } from '@leafer/math'
+
+export const RectHelper = {
+
+    drawRoundRect(drawer: IPathDrawer, x: number, y: number, width: number, height: number, cornerRadius: number | number[]): void {
+        let [topLeft, topRight, bottomRight, bottomLeft] = MathHelper.fourNumber(cornerRadius)
+
+        const max = Math.min(width / 2, height / 2)
+        if (topLeft > max) topLeft = max
+        if (topRight > max) topRight = max
+        if (bottomRight > max) bottomRight = max
+        if (bottomLeft > max) bottomLeft = max
+
+        topLeft ? drawer.moveTo(x + topLeft, y) : drawer.moveTo(x, y)
+        topRight ? drawer.arcTo(x + width, y, x + width, y + height, topRight) : drawer.lineTo(x + width, y)
+        bottomRight ? drawer.arcTo(x + width, y + height, x, y + height, bottomRight) : drawer.lineTo(x + width, y + height)
+        bottomLeft ? drawer.arcTo(x, y + height, x, y, bottomLeft) : drawer.lineTo(x, y + height)
+        topLeft ? drawer.arcTo(x, y, x + width, y, topLeft) : drawer.lineTo(x, y)
+    }
+
+}

package/src/index.ts

@@ -1,5 +1,21 @@
-export { PathConvert } from './PathConvert'
 export { PathHelper } from './PathHelper'
+export { PathConvert } from './PathConvert'
 export { PathCreator } from './PathCreator'
+export { PathCommandDataHelper } from './PathCommandDataHelper'
+export { PathDrawer } from './PathDrawer'
+export { PathBounds } from './PathBounds'
+export { PathCorner } from './PathCorner'
 export { BezierHelper } from './BezierHelper'
-export { PathCommandMap, PathCommandNeedConvertMap, NumberPathCommandMap, NumberPathCommandLengthMap } from './PathCommandMap'
+export { EllipseHelper } from './EllipseHelper'
+export { RectHelper } from './RectHelper'
+export { PathCommandMap, NeedConvertToCanvasCommandMap, PathNumberCommandMap, PathNumberCommandLengthMap } from './PathCommandMap'
+
+// rewrite, prevent circular references
+
+import { PathConvert } from './PathConvert'
+import { PathCreator } from './PathCreator'
+import { PathHelper } from './PathHelper'
+
+PathHelper.creator = new PathCreator()
+PathHelper.parse = PathConvert.parse
+PathHelper.convertToCanvasData = PathConvert.toCanvasData