@tldraw/editor 3.13.0-canary.bbec36f93805 → 3.13.0-canary.bd7655d74283
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist-cjs/index.d.ts +109 -111
- package/dist-cjs/index.js +7 -22
- package/dist-cjs/index.js.map +2 -2
- package/dist-cjs/lib/components/Shape.js +12 -8
- package/dist-cjs/lib/components/Shape.js.map +2 -2
- package/dist-cjs/lib/components/default-components/DefaultCanvas.js +36 -7
- package/dist-cjs/lib/components/default-components/DefaultCanvas.js.map +2 -2
- package/dist-cjs/lib/components/default-components/DefaultShapeIndicator.js +17 -11
- package/dist-cjs/lib/components/default-components/DefaultShapeIndicator.js.map +2 -2
- package/dist-cjs/lib/editor/Editor.js +40 -15
- package/dist-cjs/lib/editor/Editor.js.map +2 -2
- package/dist-cjs/lib/editor/managers/SnapManager/HandleSnaps.js.map +2 -2
- package/dist-cjs/lib/editor/managers/TextManager.js +10 -0
- package/dist-cjs/lib/editor/managers/TextManager.js.map +2 -2
- package/dist-cjs/lib/editor/shapes/ShapeUtil.js.map +2 -2
- package/dist-cjs/lib/editor/shapes/shared/getPerfectDashProps.js.map +2 -2
- package/dist-cjs/lib/exports/getSvgJsx.js +12 -3
- package/dist-cjs/lib/exports/getSvgJsx.js.map +2 -2
- package/dist-cjs/lib/hooks/useEditorComponents.js +16 -16
- package/dist-cjs/lib/hooks/useEditorComponents.js.map +2 -2
- package/dist-cjs/lib/primitives/Box.js +16 -0
- package/dist-cjs/lib/primitives/Box.js.map +2 -2
- package/dist-cjs/lib/primitives/Mat.js +1 -1
- package/dist-cjs/lib/primitives/Mat.js.map +2 -2
- package/dist-cjs/lib/primitives/Vec.js +20 -0
- package/dist-cjs/lib/primitives/Vec.js.map +2 -2
- package/dist-cjs/lib/primitives/geometry/Arc2d.js +2 -2
- package/dist-cjs/lib/primitives/geometry/Arc2d.js.map +2 -2
- package/dist-cjs/lib/primitives/geometry/Circle2d.js +1 -1
- package/dist-cjs/lib/primitives/geometry/Circle2d.js.map +2 -2
- package/dist-cjs/lib/primitives/geometry/CubicBezier2d.js +1 -1
- package/dist-cjs/lib/primitives/geometry/CubicBezier2d.js.map +2 -2
- package/dist-cjs/lib/primitives/geometry/CubicSpline2d.js.map +2 -2
- package/dist-cjs/lib/primitives/geometry/Edge2d.js +1 -1
- package/dist-cjs/lib/primitives/geometry/Edge2d.js.map +2 -2
- package/dist-cjs/lib/primitives/geometry/Ellipse2d.js.map +2 -2
- package/dist-cjs/lib/primitives/geometry/Geometry2d.js +91 -20
- package/dist-cjs/lib/primitives/geometry/Geometry2d.js.map +2 -2
- package/dist-cjs/lib/primitives/geometry/Group2d.js +55 -2
- package/dist-cjs/lib/primitives/geometry/Group2d.js.map +2 -2
- package/dist-cjs/lib/primitives/geometry/Point2d.js.map +2 -2
- package/dist-cjs/lib/primitives/geometry/Polyline2d.js.map +2 -2
- package/dist-cjs/lib/primitives/geometry/Stadium2d.js.map +2 -2
- package/dist-cjs/lib/utils/areShapesContentEqual.js +25 -0
- package/dist-cjs/lib/utils/areShapesContentEqual.js.map +7 -0
- package/dist-cjs/lib/utils/debug-flags.js +5 -2
- package/dist-cjs/lib/utils/debug-flags.js.map +2 -2
- package/dist-cjs/lib/utils/nearestMultiple.js +34 -0
- package/dist-cjs/lib/utils/nearestMultiple.js.map +7 -0
- package/dist-cjs/version.js +3 -3
- package/dist-cjs/version.js.map +1 -1
- package/dist-esm/index.d.mts +109 -111
- package/dist-esm/index.mjs +9 -41
- package/dist-esm/index.mjs.map +2 -2
- package/dist-esm/lib/components/Shape.mjs +12 -8
- package/dist-esm/lib/components/Shape.mjs.map +2 -2
- package/dist-esm/lib/components/default-components/DefaultCanvas.mjs +36 -7
- package/dist-esm/lib/components/default-components/DefaultCanvas.mjs.map +2 -2
- package/dist-esm/lib/components/default-components/DefaultShapeIndicator.mjs +17 -11
- package/dist-esm/lib/components/default-components/DefaultShapeIndicator.mjs.map +2 -2
- package/dist-esm/lib/editor/Editor.mjs +40 -15
- package/dist-esm/lib/editor/Editor.mjs.map +2 -2
- package/dist-esm/lib/editor/managers/SnapManager/HandleSnaps.mjs.map +2 -2
- package/dist-esm/lib/editor/managers/TextManager.mjs +10 -0
- package/dist-esm/lib/editor/managers/TextManager.mjs.map +2 -2
- package/dist-esm/lib/editor/shapes/ShapeUtil.mjs.map +2 -2
- package/dist-esm/lib/editor/shapes/shared/getPerfectDashProps.mjs.map +2 -2
- package/dist-esm/lib/exports/getSvgJsx.mjs +12 -3
- package/dist-esm/lib/exports/getSvgJsx.mjs.map +2 -2
- package/dist-esm/lib/hooks/useEditorComponents.mjs +16 -18
- package/dist-esm/lib/hooks/useEditorComponents.mjs.map +2 -2
- package/dist-esm/lib/primitives/Box.mjs +16 -0
- package/dist-esm/lib/primitives/Box.mjs.map +2 -2
- package/dist-esm/lib/primitives/Mat.mjs +1 -1
- package/dist-esm/lib/primitives/Mat.mjs.map +2 -2
- package/dist-esm/lib/primitives/Vec.mjs +20 -0
- package/dist-esm/lib/primitives/Vec.mjs.map +2 -2
- package/dist-esm/lib/primitives/geometry/Arc2d.mjs +2 -2
- package/dist-esm/lib/primitives/geometry/Arc2d.mjs.map +2 -2
- package/dist-esm/lib/primitives/geometry/Circle2d.mjs +1 -1
- package/dist-esm/lib/primitives/geometry/Circle2d.mjs.map +2 -2
- package/dist-esm/lib/primitives/geometry/CubicBezier2d.mjs +1 -1
- package/dist-esm/lib/primitives/geometry/CubicBezier2d.mjs.map +2 -2
- package/dist-esm/lib/primitives/geometry/CubicSpline2d.mjs.map +2 -2
- package/dist-esm/lib/primitives/geometry/Edge2d.mjs +1 -1
- package/dist-esm/lib/primitives/geometry/Edge2d.mjs.map +2 -2
- package/dist-esm/lib/primitives/geometry/Ellipse2d.mjs.map +2 -2
- package/dist-esm/lib/primitives/geometry/Geometry2d.mjs +92 -21
- package/dist-esm/lib/primitives/geometry/Geometry2d.mjs.map +2 -2
- package/dist-esm/lib/primitives/geometry/Group2d.mjs +55 -2
- package/dist-esm/lib/primitives/geometry/Group2d.mjs.map +2 -2
- package/dist-esm/lib/primitives/geometry/Point2d.mjs.map +2 -2
- package/dist-esm/lib/primitives/geometry/Polyline2d.mjs.map +2 -2
- package/dist-esm/lib/primitives/geometry/Stadium2d.mjs.map +2 -2
- package/dist-esm/lib/utils/areShapesContentEqual.mjs +5 -0
- package/dist-esm/lib/utils/areShapesContentEqual.mjs.map +7 -0
- package/dist-esm/lib/utils/debug-flags.mjs +5 -2
- package/dist-esm/lib/utils/debug-flags.mjs.map +2 -2
- package/dist-esm/lib/utils/nearestMultiple.mjs +14 -0
- package/dist-esm/lib/utils/nearestMultiple.mjs.map +7 -0
- package/dist-esm/version.mjs +3 -3
- package/dist-esm/version.mjs.map +1 -1
- package/editor.css +34 -4
- package/package.json +7 -7
- package/src/index.ts +16 -31
- package/src/lib/components/Shape.tsx +14 -10
- package/src/lib/components/default-components/DefaultCanvas.tsx +41 -7
- package/src/lib/components/default-components/DefaultShapeIndicator.tsx +17 -8
- package/src/lib/editor/Editor.test.ts +1 -1
- package/src/lib/editor/Editor.ts +40 -15
- package/src/lib/editor/managers/SnapManager/HandleSnaps.ts +0 -1
- package/src/lib/editor/managers/TextManager.ts +12 -0
- package/src/lib/editor/shapes/ShapeUtil.ts +22 -2
- package/src/lib/editor/shapes/shared/getPerfectDashProps.ts +9 -9
- package/src/lib/exports/getSvgJsx.tsx +16 -7
- package/src/lib/hooks/useEditorComponents.tsx +33 -32
- package/src/lib/primitives/Box.ts +20 -0
- package/src/lib/primitives/Mat.ts +5 -4
- package/src/lib/primitives/Vec.ts +23 -0
- package/src/lib/primitives/geometry/Arc2d.ts +5 -5
- package/src/lib/primitives/geometry/Circle2d.ts +4 -4
- package/src/lib/primitives/geometry/CubicBezier2d.ts +4 -4
- package/src/lib/primitives/geometry/CubicSpline2d.ts +3 -3
- package/src/lib/primitives/geometry/Edge2d.ts +3 -3
- package/src/lib/primitives/geometry/Ellipse2d.ts +3 -3
- package/src/lib/primitives/geometry/Geometry2d.test.ts +42 -0
- package/src/lib/primitives/geometry/Geometry2d.ts +123 -35
- package/src/lib/primitives/geometry/Group2d.ts +70 -7
- package/src/lib/primitives/geometry/Point2d.ts +2 -2
- package/src/lib/primitives/geometry/Polyline2d.ts +3 -3
- package/src/lib/primitives/geometry/Stadium2d.ts +3 -3
- package/src/lib/test/currentToolIdMask.test.ts +1 -1
- package/src/lib/test/user.test.ts +1 -1
- package/src/lib/utils/areShapesContentEqual.ts +4 -0
- package/src/lib/utils/debug-flags.ts +7 -2
- package/src/lib/utils/nearestMultiple.ts +13 -0
- package/src/lib/utils/sync/LocalIndexedDb.test.ts +1 -1
- package/src/lib/utils/sync/TLLocalSyncClient.test.ts +1 -1
- package/src/version.ts +3 -3
|
@@ -32,6 +32,7 @@ export interface TLMeasureTextSpanOpts {
|
|
|
32
32
|
fontStyle: string
|
|
33
33
|
lineHeight: number
|
|
34
34
|
textAlign: TLDefaultHorizontalAlignStyle
|
|
35
|
+
otherStyles?: Record<string, string>
|
|
35
36
|
}
|
|
36
37
|
|
|
37
38
|
const spaceCharacterRegex = /\s/
|
|
@@ -86,6 +87,7 @@ export class TextManager {
|
|
|
86
87
|
*/
|
|
87
88
|
maxWidth: null | number
|
|
88
89
|
minWidth?: null | number
|
|
90
|
+
otherStyles?: Record<string, string>
|
|
89
91
|
padding: string
|
|
90
92
|
disableOverflowWrapBreaking?: boolean
|
|
91
93
|
}
|
|
@@ -112,6 +114,11 @@ export class TextManager {
|
|
|
112
114
|
'overflow-wrap',
|
|
113
115
|
opts.disableOverflowWrapBreaking ? 'normal' : 'break-word'
|
|
114
116
|
)
|
|
117
|
+
if (opts.otherStyles) {
|
|
118
|
+
for (const [key, value] of Object.entries(opts.otherStyles)) {
|
|
119
|
+
wrapperElm.style.setProperty(key, value)
|
|
120
|
+
}
|
|
121
|
+
}
|
|
115
122
|
|
|
116
123
|
const scrollWidth = wrapperElm.scrollWidth
|
|
117
124
|
const rect = wrapperElm.getBoundingClientRect()
|
|
@@ -256,6 +263,11 @@ export class TextManager {
|
|
|
256
263
|
elm.style.setProperty('line-height', `${opts.lineHeight * opts.fontSize}px`)
|
|
257
264
|
elm.style.setProperty('text-align', textAlignmentsForLtr[opts.textAlign])
|
|
258
265
|
elm.style.setProperty('font-style', opts.fontStyle)
|
|
266
|
+
if (opts.otherStyles) {
|
|
267
|
+
for (const [key, value] of Object.entries(opts.otherStyles)) {
|
|
268
|
+
elm.style.setProperty(key, value)
|
|
269
|
+
}
|
|
270
|
+
}
|
|
259
271
|
|
|
260
272
|
const shouldTruncateToFirstLine =
|
|
261
273
|
opts.overflow === 'truncate-ellipsis' || opts.overflow === 'truncate-clip'
|
|
@@ -19,6 +19,7 @@ import { TLFontFace } from '../managers/FontManager'
|
|
|
19
19
|
import { BoundsSnapGeometry } from '../managers/SnapManager/BoundsSnaps'
|
|
20
20
|
import { HandleSnapGeometry } from '../managers/SnapManager/HandleSnaps'
|
|
21
21
|
import { SvgExportContext } from '../types/SvgExportContext'
|
|
22
|
+
import { TLClickEventInfo } from '../types/event-types'
|
|
22
23
|
import { TLResizeHandle } from '../types/selection-types'
|
|
23
24
|
|
|
24
25
|
/** @public */
|
|
@@ -671,10 +672,21 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
|
|
|
671
672
|
* A callback called when a shape's edge is double clicked.
|
|
672
673
|
*
|
|
673
674
|
* @param shape - The shape.
|
|
675
|
+
* @param info - Info about the edge.
|
|
674
676
|
* @returns A change to apply to the shape, or void.
|
|
675
677
|
* @public
|
|
676
678
|
*/
|
|
677
|
-
onDoubleClickEdge?(shape: Shape): TLShapePartial<Shape> | void
|
|
679
|
+
onDoubleClickEdge?(shape: Shape, info: TLClickEventInfo): TLShapePartial<Shape> | void
|
|
680
|
+
|
|
681
|
+
/**
|
|
682
|
+
* A callback called when a shape's corner is double clicked.
|
|
683
|
+
*
|
|
684
|
+
* @param shape - The shape.
|
|
685
|
+
* @param info - Info about the corner.
|
|
686
|
+
* @returns A change to apply to the shape, or void.
|
|
687
|
+
* @public
|
|
688
|
+
*/
|
|
689
|
+
onDoubleClickCorner?(shape: Shape, info: TLClickEventInfo): TLShapePartial<Shape> | void
|
|
678
690
|
|
|
679
691
|
/**
|
|
680
692
|
* A callback called when a shape is double clicked.
|
|
@@ -695,7 +707,15 @@ export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
|
|
|
695
707
|
onClick?(shape: Shape): TLShapePartial<Shape> | void
|
|
696
708
|
|
|
697
709
|
/**
|
|
698
|
-
* A callback called when a shape
|
|
710
|
+
* A callback called when a shape starts being edited.
|
|
711
|
+
*
|
|
712
|
+
* @param shape - The shape.
|
|
713
|
+
* @public
|
|
714
|
+
*/
|
|
715
|
+
onEditStart?(shape: Shape): void
|
|
716
|
+
|
|
717
|
+
/**
|
|
718
|
+
* A callback called when a shape finishes being edited.
|
|
699
719
|
*
|
|
700
720
|
* @param shape - The shape.
|
|
701
721
|
* @public
|
|
@@ -4,15 +4,15 @@ import { TLDefaultDashStyle } from '@tldraw/tlschema'
|
|
|
4
4
|
export function getPerfectDashProps(
|
|
5
5
|
totalLength: number,
|
|
6
6
|
strokeWidth: number,
|
|
7
|
-
opts
|
|
8
|
-
style
|
|
9
|
-
snap
|
|
10
|
-
end
|
|
11
|
-
start
|
|
12
|
-
lengthRatio
|
|
13
|
-
closed
|
|
14
|
-
forceSolid
|
|
15
|
-
}
|
|
7
|
+
opts: {
|
|
8
|
+
style?: TLDefaultDashStyle
|
|
9
|
+
snap?: number
|
|
10
|
+
end?: 'skip' | 'outset' | 'none'
|
|
11
|
+
start?: 'skip' | 'outset' | 'none'
|
|
12
|
+
lengthRatio?: number
|
|
13
|
+
closed?: boolean
|
|
14
|
+
forceSolid?: boolean
|
|
15
|
+
} = {}
|
|
16
16
|
): {
|
|
17
17
|
strokeDasharray: string
|
|
18
18
|
strokeDashoffset: string
|
|
@@ -365,6 +365,21 @@ function SvgExport({
|
|
|
365
365
|
onMount()
|
|
366
366
|
}, [onMount, shapeElements])
|
|
367
367
|
|
|
368
|
+
let backgroundColor = background ? theme.background : 'transparent'
|
|
369
|
+
|
|
370
|
+
if (singleFrameShapeId && background) {
|
|
371
|
+
const frameShapeUtil = editor.getShapeUtil('frame') as any as
|
|
372
|
+
| undefined
|
|
373
|
+
| { options: { showColors: boolean } }
|
|
374
|
+
if (frameShapeUtil?.options.showColors) {
|
|
375
|
+
const shape = editor.getShape(singleFrameShapeId)! as TLFrameShape
|
|
376
|
+
const color = theme[shape.props.color]
|
|
377
|
+
backgroundColor = color.frame.fill
|
|
378
|
+
} else {
|
|
379
|
+
backgroundColor = theme.solid
|
|
380
|
+
}
|
|
381
|
+
}
|
|
382
|
+
|
|
368
383
|
return (
|
|
369
384
|
<SvgExportContextProvider editor={editor} context={exportContext}>
|
|
370
385
|
<svg
|
|
@@ -375,13 +390,7 @@ function SvgExport({
|
|
|
375
390
|
viewBox={`${bbox.minX} ${bbox.minY} ${bbox.width} ${bbox.height}`}
|
|
376
391
|
strokeLinecap="round"
|
|
377
392
|
strokeLinejoin="round"
|
|
378
|
-
style={{
|
|
379
|
-
backgroundColor: background
|
|
380
|
-
? singleFrameShapeId
|
|
381
|
-
? theme.solid
|
|
382
|
-
: theme.background
|
|
383
|
-
: 'transparent',
|
|
384
|
-
}}
|
|
393
|
+
style={{ backgroundColor }}
|
|
385
394
|
data-color-mode={isDarkMode ? 'dark' : 'light'}
|
|
386
395
|
className={`tl-container tl-theme__force-sRGB ${isDarkMode ? 'tl-theme__dark' : 'tl-theme__light'}`}
|
|
387
396
|
>
|
|
@@ -19,10 +19,7 @@ import { DefaultHandle, TLHandleProps } from '../components/default-components/D
|
|
|
19
19
|
import { DefaultHandles, TLHandlesProps } from '../components/default-components/DefaultHandles'
|
|
20
20
|
import { DefaultLoadingScreen } from '../components/default-components/DefaultLoadingScreen'
|
|
21
21
|
import { DefaultScribble, TLScribbleProps } from '../components/default-components/DefaultScribble'
|
|
22
|
-
import {
|
|
23
|
-
DefaultSelectionBackground,
|
|
24
|
-
TLSelectionBackgroundProps,
|
|
25
|
-
} from '../components/default-components/DefaultSelectionBackground'
|
|
22
|
+
import { TLSelectionBackgroundProps } from '../components/default-components/DefaultSelectionBackground'
|
|
26
23
|
import {
|
|
27
24
|
DefaultSelectionForeground,
|
|
28
25
|
TLSelectionForegroundProps,
|
|
@@ -51,29 +48,30 @@ import { useShallowObjectIdentity } from './useIdentity'
|
|
|
51
48
|
/** @public */
|
|
52
49
|
export interface TLEditorComponents {
|
|
53
50
|
Background?: ComponentType | null
|
|
54
|
-
SvgDefs?: ComponentType | null
|
|
55
51
|
Brush?: ComponentType<TLBrushProps> | null
|
|
56
|
-
ZoomBrush?: ComponentType<TLBrushProps> | null
|
|
57
|
-
ShapeIndicators?: ComponentType | null
|
|
58
|
-
ShapeIndicator?: ComponentType<TLShapeIndicatorProps> | null
|
|
59
|
-
Cursor?: ComponentType<TLCursorProps> | null
|
|
60
52
|
Canvas?: ComponentType<TLCanvasComponentProps> | null
|
|
61
53
|
CollaboratorBrush?: ComponentType<TLBrushProps> | null
|
|
62
54
|
CollaboratorCursor?: ComponentType<TLCursorProps> | null
|
|
63
55
|
CollaboratorHint?: ComponentType<TLCollaboratorHintProps> | null
|
|
56
|
+
CollaboratorScribble?: ComponentType<TLScribbleProps> | null
|
|
64
57
|
CollaboratorShapeIndicator?: ComponentType<TLShapeIndicatorProps> | null
|
|
58
|
+
Cursor?: ComponentType<TLCursorProps> | null
|
|
65
59
|
Grid?: ComponentType<TLGridProps> | null
|
|
66
|
-
Scribble?: ComponentType<TLScribbleProps> | null
|
|
67
|
-
CollaboratorScribble?: ComponentType<TLScribbleProps> | null
|
|
68
|
-
SnapIndicator?: ComponentType<TLSnapIndicatorProps> | null
|
|
69
|
-
Handles?: ComponentType<TLHandlesProps> | null
|
|
70
60
|
Handle?: ComponentType<TLHandleProps> | null
|
|
71
|
-
|
|
72
|
-
SelectionForeground?: ComponentType<TLSelectionForegroundProps> | null
|
|
73
|
-
SelectionBackground?: ComponentType<TLSelectionBackgroundProps> | null
|
|
74
|
-
OnTheCanvas?: ComponentType | null
|
|
61
|
+
Handles?: ComponentType<TLHandlesProps> | null
|
|
75
62
|
InFrontOfTheCanvas?: ComponentType | null
|
|
76
63
|
LoadingScreen?: ComponentType | null
|
|
64
|
+
OnTheCanvas?: ComponentType | null
|
|
65
|
+
Overlays?: ComponentType | null
|
|
66
|
+
Scribble?: ComponentType<TLScribbleProps> | null
|
|
67
|
+
SelectionBackground?: ComponentType<TLSelectionBackgroundProps> | null
|
|
68
|
+
SelectionForeground?: ComponentType<TLSelectionForegroundProps> | null
|
|
69
|
+
ShapeIndicator?: ComponentType<TLShapeIndicatorProps> | null
|
|
70
|
+
ShapeIndicators?: ComponentType | null
|
|
71
|
+
SnapIndicator?: ComponentType<TLSnapIndicatorProps> | null
|
|
72
|
+
Spinner?: ComponentType | null
|
|
73
|
+
SvgDefs?: ComponentType | null
|
|
74
|
+
ZoomBrush?: ComponentType<TLBrushProps> | null
|
|
77
75
|
|
|
78
76
|
// These will always have defaults
|
|
79
77
|
ErrorFallback?: TLErrorFallbackComponent
|
|
@@ -96,32 +94,35 @@ export function EditorComponentsProvider({
|
|
|
96
94
|
const value = useMemo(
|
|
97
95
|
(): Required<TLEditorComponents> => ({
|
|
98
96
|
Background: DefaultBackground,
|
|
99
|
-
SvgDefs: DefaultSvgDefs,
|
|
100
97
|
Brush: DefaultBrush,
|
|
101
|
-
|
|
98
|
+
Canvas: DefaultCanvas,
|
|
102
99
|
CollaboratorBrush: DefaultBrush,
|
|
103
|
-
Cursor: DefaultCursor,
|
|
104
100
|
CollaboratorCursor: DefaultCursor,
|
|
105
101
|
CollaboratorHint: DefaultCollaboratorHint,
|
|
102
|
+
CollaboratorScribble: DefaultScribble,
|
|
106
103
|
CollaboratorShapeIndicator: DefaultShapeIndicator,
|
|
104
|
+
Cursor: DefaultCursor,
|
|
107
105
|
Grid: DefaultGrid,
|
|
106
|
+
Handle: DefaultHandle,
|
|
107
|
+
Handles: DefaultHandles,
|
|
108
|
+
InFrontOfTheCanvas: null,
|
|
109
|
+
LoadingScreen: DefaultLoadingScreen,
|
|
110
|
+
OnTheCanvas: null,
|
|
111
|
+
Overlays: null,
|
|
108
112
|
Scribble: DefaultScribble,
|
|
113
|
+
SelectionBackground: null,
|
|
114
|
+
SelectionForeground: DefaultSelectionForeground,
|
|
115
|
+
ShapeIndicator: DefaultShapeIndicator,
|
|
116
|
+
ShapeIndicators: DefaultShapeIndicators,
|
|
109
117
|
SnapIndicator: DefaultSnapIndicator,
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
118
|
+
Spinner: DefaultSpinner,
|
|
119
|
+
SvgDefs: DefaultSvgDefs,
|
|
120
|
+
ZoomBrush: DefaultBrush,
|
|
121
|
+
|
|
113
122
|
ErrorFallback: DefaultErrorFallback,
|
|
114
123
|
ShapeErrorFallback: DefaultShapeErrorFallback,
|
|
115
124
|
ShapeIndicatorErrorFallback: DefaultShapeIndicatorErrorFallback,
|
|
116
|
-
|
|
117
|
-
SelectionBackground: DefaultSelectionBackground,
|
|
118
|
-
SelectionForeground: DefaultSelectionForeground,
|
|
119
|
-
ShapeIndicators: DefaultShapeIndicators,
|
|
120
|
-
ShapeIndicator: DefaultShapeIndicator,
|
|
121
|
-
OnTheCanvas: null,
|
|
122
|
-
InFrontOfTheCanvas: null,
|
|
123
|
-
Canvas: DefaultCanvas,
|
|
124
|
-
LoadingScreen: DefaultLoadingScreen,
|
|
125
|
+
|
|
125
126
|
..._overrides,
|
|
126
127
|
}),
|
|
127
128
|
[_overrides]
|
|
@@ -57,6 +57,11 @@ export class Box {
|
|
|
57
57
|
this.x = n
|
|
58
58
|
}
|
|
59
59
|
|
|
60
|
+
// eslint-disable-next-line no-restricted-syntax
|
|
61
|
+
get left() {
|
|
62
|
+
return this.x
|
|
63
|
+
}
|
|
64
|
+
|
|
60
65
|
// eslint-disable-next-line no-restricted-syntax
|
|
61
66
|
get midX() {
|
|
62
67
|
return this.x + this.w / 2
|
|
@@ -67,6 +72,11 @@ export class Box {
|
|
|
67
72
|
return this.x + this.w
|
|
68
73
|
}
|
|
69
74
|
|
|
75
|
+
// eslint-disable-next-line no-restricted-syntax
|
|
76
|
+
get right() {
|
|
77
|
+
return this.x + this.w
|
|
78
|
+
}
|
|
79
|
+
|
|
70
80
|
// eslint-disable-next-line no-restricted-syntax
|
|
71
81
|
get minY() {
|
|
72
82
|
return this.y
|
|
@@ -77,6 +87,11 @@ export class Box {
|
|
|
77
87
|
this.y = n
|
|
78
88
|
}
|
|
79
89
|
|
|
90
|
+
// eslint-disable-next-line no-restricted-syntax
|
|
91
|
+
get top() {
|
|
92
|
+
return this.y
|
|
93
|
+
}
|
|
94
|
+
|
|
80
95
|
// eslint-disable-next-line no-restricted-syntax
|
|
81
96
|
get midY() {
|
|
82
97
|
return this.y + this.h / 2
|
|
@@ -87,6 +102,11 @@ export class Box {
|
|
|
87
102
|
return this.y + this.h
|
|
88
103
|
}
|
|
89
104
|
|
|
105
|
+
// eslint-disable-next-line no-restricted-syntax
|
|
106
|
+
get bottom() {
|
|
107
|
+
return this.y + this.h
|
|
108
|
+
}
|
|
109
|
+
|
|
90
110
|
// eslint-disable-next-line no-restricted-syntax
|
|
91
111
|
get width() {
|
|
92
112
|
return this.w
|
|
@@ -157,12 +157,13 @@ export class Mat {
|
|
|
157
157
|
return Mat.Compose(Mat.Translate(cx, cy!), rotationMatrix, Mat.Translate(-cx, -cy!))
|
|
158
158
|
}
|
|
159
159
|
|
|
160
|
-
static Scale(x: number, y: number):
|
|
161
|
-
static Scale(x: number, y: number, cx: number, cy: number):
|
|
162
|
-
static Scale(x: number, y: number, cx?: number, cy?: number):
|
|
160
|
+
static Scale(x: number, y: number): Mat
|
|
161
|
+
static Scale(x: number, y: number, cx: number, cy: number): Mat
|
|
162
|
+
static Scale(x: number, y: number, cx?: number, cy?: number): Mat {
|
|
163
163
|
const scaleMatrix = new Mat(x, 0, 0, y, 0, 0)
|
|
164
164
|
if (cx === undefined) return scaleMatrix
|
|
165
|
-
|
|
165
|
+
|
|
166
|
+
return Mat.Translate(cx, cy!).multiply(scaleMatrix).translate(-cx, -cy!)
|
|
166
167
|
}
|
|
167
168
|
static Multiply(m1: MatModel, m2: MatModel): MatModel {
|
|
168
169
|
return {
|
|
@@ -319,6 +319,11 @@ export class Vec {
|
|
|
319
319
|
return ((A.y - B.y) ** 2 + (A.x - B.x) ** 2) ** 0.5
|
|
320
320
|
}
|
|
321
321
|
|
|
322
|
+
// Get the Manhattan distance between two points.
|
|
323
|
+
static ManhattanDist(A: VecLike, B: VecLike): number {
|
|
324
|
+
return Math.abs(A.x - B.x) + Math.abs(A.y - B.y)
|
|
325
|
+
}
|
|
326
|
+
|
|
322
327
|
// Get whether a distance between two points is less than a number. This is faster to calulate than using `Vec.Dist(a, b) < n`.
|
|
323
328
|
static DistMin(A: VecLike, B: VecLike, n: number): boolean {
|
|
324
329
|
return (A.x - B.x) * (A.x - B.x) + (A.y - B.y) * (A.y - B.y) < n ** 2
|
|
@@ -465,10 +470,28 @@ export class Vec {
|
|
|
465
470
|
return isNaN(A.x) || isNaN(A.y)
|
|
466
471
|
}
|
|
467
472
|
|
|
473
|
+
/**
|
|
474
|
+
* Get the angle from position A to position B.
|
|
475
|
+
*/
|
|
468
476
|
static Angle(A: VecLike, B: VecLike): number {
|
|
469
477
|
return Math.atan2(B.y - A.y, B.x - A.x)
|
|
470
478
|
}
|
|
471
479
|
|
|
480
|
+
/**
|
|
481
|
+
* Get the angle between vector A and vector B. This will return the smallest angle between the
|
|
482
|
+
* two vectors, between -π and π. The sign indicates direction of angle.
|
|
483
|
+
*/
|
|
484
|
+
static AngleBetween(A: VecLike, B: VecLike): number {
|
|
485
|
+
const p = A.x * B.x + A.y * B.y
|
|
486
|
+
const n = Math.sqrt(
|
|
487
|
+
(Math.pow(A.x, 2) + Math.pow(A.y, 2)) * (Math.pow(B.x, 2) + Math.pow(B.y, 2))
|
|
488
|
+
)
|
|
489
|
+
const sign = A.x * B.y - A.y * B.x < 0 ? -1 : 1
|
|
490
|
+
const angle = sign * Math.acos(p / n)
|
|
491
|
+
|
|
492
|
+
return angle
|
|
493
|
+
}
|
|
494
|
+
|
|
472
495
|
/**
|
|
473
496
|
* Linearly interpolate between two points.
|
|
474
497
|
* @param A - The first point.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Vec } from '../Vec'
|
|
1
|
+
import { Vec, VecLike } from '../Vec'
|
|
2
2
|
import { intersectLineSegmentCircle } from '../intersect'
|
|
3
3
|
import { getArcMeasure, getPointInArcT, getPointOnCircle } from '../utils'
|
|
4
4
|
import { Geometry2d, Geometry2dOptions } from './Geometry2d'
|
|
@@ -44,14 +44,14 @@ export class Arc2d extends Geometry2d {
|
|
|
44
44
|
this._center = center
|
|
45
45
|
}
|
|
46
46
|
|
|
47
|
-
nearestPoint(point:
|
|
47
|
+
nearestPoint(point: VecLike): Vec {
|
|
48
48
|
const { _center, measure, radius, angleEnd, angleStart, start: A, end: B } = this
|
|
49
49
|
const t = getPointInArcT(measure, angleStart, angleEnd, _center.angle(point))
|
|
50
50
|
if (t <= 0) return A
|
|
51
51
|
if (t >= 1) return B
|
|
52
52
|
|
|
53
53
|
// Get the point (P) on the arc, then pick the nearest of A, B, and P
|
|
54
|
-
const P =
|
|
54
|
+
const P = Vec.Sub(point, _center).uni().mul(radius).add(_center)
|
|
55
55
|
|
|
56
56
|
let nearest: Vec | undefined
|
|
57
57
|
let dist = Infinity
|
|
@@ -67,7 +67,7 @@ export class Arc2d extends Geometry2d {
|
|
|
67
67
|
return nearest
|
|
68
68
|
}
|
|
69
69
|
|
|
70
|
-
hitTestLineSegment(A:
|
|
70
|
+
hitTestLineSegment(A: VecLike, B: VecLike): boolean {
|
|
71
71
|
const { _center, radius, measure, angleStart, angleEnd } = this
|
|
72
72
|
const intersection = intersectLineSegmentCircle(A, B, _center, radius)
|
|
73
73
|
if (intersection === null) return false
|
|
@@ -95,6 +95,6 @@ export class Arc2d extends Geometry2d {
|
|
|
95
95
|
}
|
|
96
96
|
|
|
97
97
|
override getLength() {
|
|
98
|
-
return this.measure * this.radius
|
|
98
|
+
return Math.abs(this.measure * this.radius)
|
|
99
99
|
}
|
|
100
100
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Box } from '../Box'
|
|
2
|
-
import { Vec } from '../Vec'
|
|
2
|
+
import { Vec, VecLike } from '../Vec'
|
|
3
3
|
import { intersectLineSegmentCircle } from '../intersect'
|
|
4
4
|
import { PI2, getPointOnCircle } from '../utils'
|
|
5
5
|
import { Geometry2d, Geometry2dOptions } from './Geometry2d'
|
|
@@ -43,13 +43,13 @@ export class Circle2d extends Geometry2d {
|
|
|
43
43
|
return vertices
|
|
44
44
|
}
|
|
45
45
|
|
|
46
|
-
nearestPoint(point:
|
|
46
|
+
nearestPoint(point: VecLike): Vec {
|
|
47
47
|
const { _center, radius } = this
|
|
48
48
|
if (_center.equals(point)) return Vec.AddXY(_center, radius, 0)
|
|
49
|
-
return
|
|
49
|
+
return Vec.Sub(point, _center).uni().mul(radius).add(_center)
|
|
50
50
|
}
|
|
51
51
|
|
|
52
|
-
hitTestLineSegment(A:
|
|
52
|
+
hitTestLineSegment(A: VecLike, B: VecLike, distance = 0): boolean {
|
|
53
53
|
const { _center, radius } = this
|
|
54
54
|
return intersectLineSegmentCircle(A, B, _center, radius + distance) !== null
|
|
55
55
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Vec } from '../Vec'
|
|
2
|
-
import { Geometry2dOptions } from './Geometry2d'
|
|
1
|
+
import { Vec, VecLike } from '../Vec'
|
|
2
|
+
import { Geometry2dFilters, Geometry2dOptions } from './Geometry2d'
|
|
3
3
|
import { Polyline2d } from './Polyline2d'
|
|
4
4
|
|
|
5
5
|
/** @public */
|
|
@@ -52,7 +52,7 @@ export class CubicBezier2d extends Polyline2d {
|
|
|
52
52
|
return CubicBezier2d.GetAtT(this, 0.5)
|
|
53
53
|
}
|
|
54
54
|
|
|
55
|
-
nearestPoint(A:
|
|
55
|
+
nearestPoint(A: VecLike): Vec {
|
|
56
56
|
let nearest: Vec | undefined
|
|
57
57
|
let dist = Infinity
|
|
58
58
|
let d: number
|
|
@@ -89,7 +89,7 @@ export class CubicBezier2d extends Polyline2d {
|
|
|
89
89
|
)
|
|
90
90
|
}
|
|
91
91
|
|
|
92
|
-
override getLength(precision = 32) {
|
|
92
|
+
override getLength(filters?: Geometry2dFilters, precision = 32) {
|
|
93
93
|
let n1: Vec,
|
|
94
94
|
p1 = this.a,
|
|
95
95
|
length = 0
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Vec } from '../Vec'
|
|
1
|
+
import { Vec, VecLike } from '../Vec'
|
|
2
2
|
import { CubicBezier2d } from './CubicBezier2d'
|
|
3
3
|
import { Geometry2d, Geometry2dOptions } from './Geometry2d'
|
|
4
4
|
|
|
@@ -58,7 +58,7 @@ export class CubicSpline2d extends Geometry2d {
|
|
|
58
58
|
return vertices
|
|
59
59
|
}
|
|
60
60
|
|
|
61
|
-
nearestPoint(A:
|
|
61
|
+
nearestPoint(A: VecLike): Vec {
|
|
62
62
|
let nearest: Vec | undefined
|
|
63
63
|
let dist = Infinity
|
|
64
64
|
let d: number
|
|
@@ -75,7 +75,7 @@ export class CubicSpline2d extends Geometry2d {
|
|
|
75
75
|
return nearest
|
|
76
76
|
}
|
|
77
77
|
|
|
78
|
-
hitTestLineSegment(A:
|
|
78
|
+
hitTestLineSegment(A: VecLike, B: VecLike): boolean {
|
|
79
79
|
return this.segments.some((segment) => segment.hitTestLineSegment(A, B))
|
|
80
80
|
}
|
|
81
81
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Vec } from '../Vec'
|
|
2
1
|
import { linesIntersect } from '../intersect'
|
|
2
|
+
import { Vec, VecLike } from '../Vec'
|
|
3
3
|
import { Geometry2d } from './Geometry2d'
|
|
4
4
|
|
|
5
5
|
/** @public */
|
|
@@ -34,7 +34,7 @@ export class Edge2d extends Geometry2d {
|
|
|
34
34
|
return [this.start, this.end]
|
|
35
35
|
}
|
|
36
36
|
|
|
37
|
-
override nearestPoint(point:
|
|
37
|
+
override nearestPoint(point: VecLike): Vec {
|
|
38
38
|
const { start, end, d, u, ul: l } = this
|
|
39
39
|
if (d.len() === 0) return start // start and end are the same
|
|
40
40
|
if (l === 0) return start // no length in the unit vector
|
|
@@ -48,7 +48,7 @@ export class Edge2d extends Geometry2d {
|
|
|
48
48
|
return new Vec(cx, cy)
|
|
49
49
|
}
|
|
50
50
|
|
|
51
|
-
override hitTestLineSegment(A:
|
|
51
|
+
override hitTestLineSegment(A: VecLike, B: VecLike, distance = 0): boolean {
|
|
52
52
|
return (
|
|
53
53
|
linesIntersect(A, B, this.start, this.end) || this.distanceToLineSegment(A, B) <= distance
|
|
54
54
|
)
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Box } from '../Box'
|
|
2
|
-
import { Vec } from '../Vec'
|
|
2
|
+
import { Vec, VecLike } from '../Vec'
|
|
3
3
|
import { PI, PI2, perimeterOfEllipse } from '../utils'
|
|
4
4
|
import { Edge2d } from './Edge2d'
|
|
5
5
|
import { Geometry2d, Geometry2dOptions } from './Geometry2d'
|
|
@@ -73,7 +73,7 @@ export class Ellipse2d extends Geometry2d {
|
|
|
73
73
|
return vertices
|
|
74
74
|
}
|
|
75
75
|
|
|
76
|
-
nearestPoint(A:
|
|
76
|
+
nearestPoint(A: VecLike): Vec {
|
|
77
77
|
let nearest: Vec | undefined
|
|
78
78
|
let dist = Infinity
|
|
79
79
|
let d: number
|
|
@@ -90,7 +90,7 @@ export class Ellipse2d extends Geometry2d {
|
|
|
90
90
|
return nearest
|
|
91
91
|
}
|
|
92
92
|
|
|
93
|
-
hitTestLineSegment(A:
|
|
93
|
+
hitTestLineSegment(A: VecLike, B: VecLike): boolean {
|
|
94
94
|
return this.edges.some((edge) => edge.hitTestLineSegment(A, B))
|
|
95
95
|
}
|
|
96
96
|
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import { Mat } from '../Mat'
|
|
2
|
+
import { Vec, VecLike } from '../Vec'
|
|
3
|
+
import { Geometry2dFilters } from './Geometry2d'
|
|
4
|
+
import { Rectangle2d } from './Rectangle2d'
|
|
5
|
+
|
|
6
|
+
describe('TransformedGeometry2d', () => {
|
|
7
|
+
const rect = new Rectangle2d({ width: 100, height: 50, isFilled: true }).transform(
|
|
8
|
+
Mat.Translate(50, 100).scale(2, 2)
|
|
9
|
+
)
|
|
10
|
+
|
|
11
|
+
test('getVertices', () => {
|
|
12
|
+
expect(rect.getVertices(Geometry2dFilters.INCLUDE_ALL)).toMatchObject([
|
|
13
|
+
{ x: 50, y: 100, z: 1 },
|
|
14
|
+
{ x: 250, y: 100, z: 1 },
|
|
15
|
+
{ x: 250, y: 200, z: 1 },
|
|
16
|
+
{ x: 50, y: 200, z: 1 },
|
|
17
|
+
])
|
|
18
|
+
})
|
|
19
|
+
|
|
20
|
+
test('nearestPoint', () => {
|
|
21
|
+
expectApproxMatch(rect.nearestPoint(new Vec(100, 300)), { x: 100, y: 200 })
|
|
22
|
+
})
|
|
23
|
+
|
|
24
|
+
test('hitTestPoint', () => {
|
|
25
|
+
// basic case - no margin / scaling:
|
|
26
|
+
expect(rect.hitTestPoint(new Vec(0, 0), 0, true)).toBe(false)
|
|
27
|
+
expect(rect.hitTestPoint(new Vec(50, 100), 0, true)).toBe(true)
|
|
28
|
+
expect(rect.hitTestPoint(new Vec(49, 100), 0, true)).toBe(false)
|
|
29
|
+
expect(rect.hitTestPoint(new Vec(100, 150), 0, true)).toBe(true)
|
|
30
|
+
|
|
31
|
+
// with margin:
|
|
32
|
+
// move away 8 px and test with 10px margin:
|
|
33
|
+
expect(rect.hitTestPoint(new Vec(42, 100), 10, true)).toBe(true)
|
|
34
|
+
// move away 12 px and test with 10px margin:
|
|
35
|
+
expect(rect.hitTestPoint(new Vec(38, 100), 10, true)).toBe(false)
|
|
36
|
+
})
|
|
37
|
+
})
|
|
38
|
+
|
|
39
|
+
function expectApproxMatch(a: VecLike, b: VecLike) {
|
|
40
|
+
expect(a.x).toBeCloseTo(b.x, 0.0001)
|
|
41
|
+
expect(a.y).toBeCloseTo(b.y, 0.0001)
|
|
42
|
+
}
|