@tldraw/editor 4.6.0-canary.cb759a968736 → 4.6.0-canary.cd729e528177
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 +13 -0
- package/dist-cjs/index.js +1 -1
- package/dist-cjs/lib/components/MenuClickCapture.js +93 -47
- package/dist-cjs/lib/components/MenuClickCapture.js.map +2 -2
- package/dist-cjs/lib/editor/Editor.js +40 -1
- package/dist-cjs/lib/editor/Editor.js.map +2 -2
- package/dist-cjs/lib/editor/assets/AssetUtil.js +1 -0
- package/dist-cjs/lib/editor/assets/AssetUtil.js.map +1 -1
- package/dist-cjs/lib/editor/bindings/BindingUtil.js +1 -0
- package/dist-cjs/lib/editor/bindings/BindingUtil.js.map +1 -1
- package/dist-cjs/lib/editor/managers/ClickManager/ClickManager.js +1 -0
- package/dist-cjs/lib/editor/managers/ClickManager/ClickManager.js.map +1 -1
- package/dist-cjs/lib/editor/managers/EdgeScrollManager/EdgeScrollManager.js +1 -0
- package/dist-cjs/lib/editor/managers/EdgeScrollManager/EdgeScrollManager.js.map +1 -1
- package/dist-cjs/lib/editor/managers/FocusManager/FocusManager.js +1 -0
- package/dist-cjs/lib/editor/managers/FocusManager/FocusManager.js.map +1 -1
- package/dist-cjs/lib/editor/managers/FontManager/FontManager.js +2 -0
- package/dist-cjs/lib/editor/managers/FontManager/FontManager.js.map +1 -1
- package/dist-cjs/lib/editor/managers/HistoryManager/HistoryManager.js +2 -0
- package/dist-cjs/lib/editor/managers/HistoryManager/HistoryManager.js.map +1 -1
- package/dist-cjs/lib/editor/managers/InputsManager/InputsManager.js +12 -0
- package/dist-cjs/lib/editor/managers/InputsManager/InputsManager.js.map +2 -2
- package/dist-cjs/lib/editor/managers/ScribbleManager/ScribbleManager.js +1 -0
- package/dist-cjs/lib/editor/managers/ScribbleManager/ScribbleManager.js.map +1 -1
- package/dist-cjs/lib/editor/managers/SnapManager/BoundsSnaps.js +1 -0
- package/dist-cjs/lib/editor/managers/SnapManager/BoundsSnaps.js.map +1 -1
- package/dist-cjs/lib/editor/managers/SnapManager/HandleSnaps.js +1 -0
- package/dist-cjs/lib/editor/managers/SnapManager/HandleSnaps.js.map +1 -1
- package/dist-cjs/lib/editor/managers/SnapManager/SnapManager.js +1 -0
- package/dist-cjs/lib/editor/managers/SnapManager/SnapManager.js.map +1 -1
- package/dist-cjs/lib/editor/managers/SpatialIndexManager/SpatialIndexManager.js +1 -0
- package/dist-cjs/lib/editor/managers/SpatialIndexManager/SpatialIndexManager.js.map +1 -1
- package/dist-cjs/lib/editor/managers/TextManager/TextManager.js +1 -0
- package/dist-cjs/lib/editor/managers/TextManager/TextManager.js.map +1 -1
- package/dist-cjs/lib/editor/managers/ThemeManager/ThemeManager.js +1 -0
- package/dist-cjs/lib/editor/managers/ThemeManager/ThemeManager.js.map +1 -1
- package/dist-cjs/lib/editor/managers/TickManager/TickManager.js +1 -0
- package/dist-cjs/lib/editor/managers/TickManager/TickManager.js.map +1 -1
- package/dist-cjs/lib/editor/managers/UserPreferencesManager/UserPreferencesManager.js +2 -0
- package/dist-cjs/lib/editor/managers/UserPreferencesManager/UserPreferencesManager.js.map +1 -1
- package/dist-cjs/lib/editor/shapes/ShapeUtil.js +1 -0
- package/dist-cjs/lib/editor/shapes/ShapeUtil.js.map +1 -1
- package/dist-cjs/lib/editor/tools/StateNode.js +1 -0
- package/dist-cjs/lib/editor/tools/StateNode.js.map +1 -1
- package/dist-cjs/lib/exports/ExportDelay.js +1 -0
- package/dist-cjs/lib/exports/ExportDelay.js.map +1 -1
- package/dist-cjs/lib/exports/StyleEmbedder.js +1 -0
- package/dist-cjs/lib/exports/StyleEmbedder.js.map +1 -1
- package/dist-cjs/lib/hooks/useCanvasEvents.js +25 -4
- package/dist-cjs/lib/hooks/useCanvasEvents.js.map +2 -2
- package/dist-cjs/lib/options.js +1 -0
- package/dist-cjs/lib/options.js.map +2 -2
- package/dist-cjs/lib/primitives/Vec.js +3 -0
- package/dist-cjs/lib/primitives/Vec.js.map +1 -1
- package/dist-cjs/lib/primitives/geometry/Circle2d.js +1 -0
- package/dist-cjs/lib/primitives/geometry/Circle2d.js.map +1 -1
- package/dist-cjs/lib/primitives/geometry/Ellipse2d.js +1 -0
- package/dist-cjs/lib/primitives/geometry/Ellipse2d.js.map +1 -1
- package/dist-cjs/lib/primitives/geometry/Geometry2d.js +2 -0
- package/dist-cjs/lib/primitives/geometry/Geometry2d.js.map +1 -1
- package/dist-cjs/lib/primitives/geometry/Stadium2d.js +1 -0
- package/dist-cjs/lib/primitives/geometry/Stadium2d.js.map +1 -1
- package/dist-cjs/lib/utils/EditorAtom.js +2 -0
- package/dist-cjs/lib/utils/EditorAtom.js.map +1 -1
- package/dist-cjs/lib/utils/sync/TLLocalSyncClient.js +2 -0
- package/dist-cjs/lib/utils/sync/TLLocalSyncClient.js.map +1 -1
- package/dist-cjs/version.js +3 -3
- package/dist-cjs/version.js.map +1 -1
- package/dist-esm/index.d.mts +13 -0
- package/dist-esm/index.mjs +1 -1
- package/dist-esm/lib/components/MenuClickCapture.mjs +94 -48
- package/dist-esm/lib/components/MenuClickCapture.mjs.map +2 -2
- package/dist-esm/lib/editor/Editor.mjs +41 -2
- package/dist-esm/lib/editor/Editor.mjs.map +2 -2
- package/dist-esm/lib/editor/assets/AssetUtil.mjs +1 -0
- package/dist-esm/lib/editor/assets/AssetUtil.mjs.map +1 -1
- package/dist-esm/lib/editor/bindings/BindingUtil.mjs +1 -0
- package/dist-esm/lib/editor/bindings/BindingUtil.mjs.map +1 -1
- package/dist-esm/lib/editor/managers/ClickManager/ClickManager.mjs +1 -0
- package/dist-esm/lib/editor/managers/ClickManager/ClickManager.mjs.map +1 -1
- package/dist-esm/lib/editor/managers/EdgeScrollManager/EdgeScrollManager.mjs +1 -0
- package/dist-esm/lib/editor/managers/EdgeScrollManager/EdgeScrollManager.mjs.map +1 -1
- package/dist-esm/lib/editor/managers/FocusManager/FocusManager.mjs +1 -0
- package/dist-esm/lib/editor/managers/FocusManager/FocusManager.mjs.map +1 -1
- package/dist-esm/lib/editor/managers/FontManager/FontManager.mjs +2 -0
- package/dist-esm/lib/editor/managers/FontManager/FontManager.mjs.map +1 -1
- package/dist-esm/lib/editor/managers/HistoryManager/HistoryManager.mjs +2 -0
- package/dist-esm/lib/editor/managers/HistoryManager/HistoryManager.mjs.map +1 -1
- package/dist-esm/lib/editor/managers/InputsManager/InputsManager.mjs +12 -0
- package/dist-esm/lib/editor/managers/InputsManager/InputsManager.mjs.map +2 -2
- package/dist-esm/lib/editor/managers/ScribbleManager/ScribbleManager.mjs +1 -0
- package/dist-esm/lib/editor/managers/ScribbleManager/ScribbleManager.mjs.map +1 -1
- package/dist-esm/lib/editor/managers/SnapManager/BoundsSnaps.mjs +1 -0
- package/dist-esm/lib/editor/managers/SnapManager/BoundsSnaps.mjs.map +1 -1
- package/dist-esm/lib/editor/managers/SnapManager/HandleSnaps.mjs +1 -0
- package/dist-esm/lib/editor/managers/SnapManager/HandleSnaps.mjs.map +1 -1
- package/dist-esm/lib/editor/managers/SnapManager/SnapManager.mjs +1 -0
- package/dist-esm/lib/editor/managers/SnapManager/SnapManager.mjs.map +1 -1
- package/dist-esm/lib/editor/managers/SpatialIndexManager/SpatialIndexManager.mjs +1 -0
- package/dist-esm/lib/editor/managers/SpatialIndexManager/SpatialIndexManager.mjs.map +1 -1
- package/dist-esm/lib/editor/managers/TextManager/TextManager.mjs +1 -0
- package/dist-esm/lib/editor/managers/TextManager/TextManager.mjs.map +1 -1
- package/dist-esm/lib/editor/managers/ThemeManager/ThemeManager.mjs +1 -0
- package/dist-esm/lib/editor/managers/ThemeManager/ThemeManager.mjs.map +1 -1
- package/dist-esm/lib/editor/managers/TickManager/TickManager.mjs +1 -0
- package/dist-esm/lib/editor/managers/TickManager/TickManager.mjs.map +1 -1
- package/dist-esm/lib/editor/managers/UserPreferencesManager/UserPreferencesManager.mjs +2 -0
- package/dist-esm/lib/editor/managers/UserPreferencesManager/UserPreferencesManager.mjs.map +1 -1
- package/dist-esm/lib/editor/shapes/ShapeUtil.mjs +1 -0
- package/dist-esm/lib/editor/shapes/ShapeUtil.mjs.map +1 -1
- package/dist-esm/lib/editor/tools/StateNode.mjs +1 -0
- package/dist-esm/lib/editor/tools/StateNode.mjs.map +1 -1
- package/dist-esm/lib/exports/ExportDelay.mjs +1 -0
- package/dist-esm/lib/exports/ExportDelay.mjs.map +1 -1
- package/dist-esm/lib/exports/StyleEmbedder.mjs +1 -0
- package/dist-esm/lib/exports/StyleEmbedder.mjs.map +1 -1
- package/dist-esm/lib/hooks/useCanvasEvents.mjs +25 -4
- package/dist-esm/lib/hooks/useCanvasEvents.mjs.map +2 -2
- package/dist-esm/lib/options.mjs +1 -0
- package/dist-esm/lib/options.mjs.map +2 -2
- package/dist-esm/lib/primitives/Vec.mjs +3 -0
- package/dist-esm/lib/primitives/Vec.mjs.map +1 -1
- package/dist-esm/lib/primitives/geometry/Circle2d.mjs +1 -0
- package/dist-esm/lib/primitives/geometry/Circle2d.mjs.map +1 -1
- package/dist-esm/lib/primitives/geometry/Ellipse2d.mjs +1 -0
- package/dist-esm/lib/primitives/geometry/Ellipse2d.mjs.map +1 -1
- package/dist-esm/lib/primitives/geometry/Geometry2d.mjs +2 -0
- package/dist-esm/lib/primitives/geometry/Geometry2d.mjs.map +1 -1
- package/dist-esm/lib/primitives/geometry/Stadium2d.mjs +1 -0
- package/dist-esm/lib/primitives/geometry/Stadium2d.mjs.map +1 -1
- package/dist-esm/lib/utils/EditorAtom.mjs +2 -0
- package/dist-esm/lib/utils/EditorAtom.mjs.map +1 -1
- package/dist-esm/lib/utils/sync/TLLocalSyncClient.mjs +2 -0
- package/dist-esm/lib/utils/sync/TLLocalSyncClient.mjs.map +1 -1
- package/dist-esm/version.mjs +3 -3
- package/dist-esm/version.mjs.map +1 -1
- package/editor.css +0 -4
- package/package.json +7 -7
- package/src/lib/components/MenuClickCapture.tsx +124 -64
- package/src/lib/editor/Editor.ts +58 -6
- package/src/lib/editor/managers/InputsManager/InputsManager.ts +12 -0
- package/src/lib/hooks/useCanvasEvents.ts +40 -3
- package/src/lib/options.ts +7 -0
- package/src/version.ts +3 -3
package/dist-cjs/index.d.ts
CHANGED
|
@@ -996,6 +996,7 @@ export declare const defaultTldrawOptions: {
|
|
|
996
996
|
readonly onBeforePasteFromClipboard: undefined;
|
|
997
997
|
readonly onClipboardPasteRaw: undefined;
|
|
998
998
|
readonly quickZoomPreservesScreenBounds: true;
|
|
999
|
+
readonly rightClickPanning: true;
|
|
999
1000
|
readonly snapThreshold: 8;
|
|
1000
1001
|
readonly spacebarPanning: true;
|
|
1001
1002
|
readonly temporaryAssetPreviewLifetimeMs: 180000;
|
|
@@ -5067,6 +5068,12 @@ export declare class InputsManager {
|
|
|
5067
5068
|
get isPointing(): boolean;
|
|
5068
5069
|
set isPointing(isPointing: boolean);
|
|
5069
5070
|
/* Excluded from this release type: setIsPointing */
|
|
5071
|
+
private _isRightPointing;
|
|
5072
|
+
/**
|
|
5073
|
+
* Whether the user is right-click pointing (before drag threshold).
|
|
5074
|
+
*/
|
|
5075
|
+
getIsRightPointing(): boolean;
|
|
5076
|
+
/* Excluded from this release type: setIsRightPointing */
|
|
5070
5077
|
private _isPinching;
|
|
5071
5078
|
/**
|
|
5072
5079
|
* Whether the user is pinching.
|
|
@@ -7660,6 +7667,12 @@ export declare interface TldrawOptions {
|
|
|
7660
7667
|
* When false, the spacebar will not pan the camera.
|
|
7661
7668
|
*/
|
|
7662
7669
|
readonly spacebarPanning: boolean;
|
|
7670
|
+
/**
|
|
7671
|
+
* Whether to allow right-click + drag to pan the camera. When true, right-click + drag pans the
|
|
7672
|
+
* camera and a static right-click opens the context menu at the release position. When false,
|
|
7673
|
+
* right-click opens the context menu on press (no drag-to-pan).
|
|
7674
|
+
*/
|
|
7675
|
+
readonly rightClickPanning: boolean;
|
|
7663
7676
|
/**
|
|
7664
7677
|
* The default padding (in pixels) used when zooming to fit content in the viewport.
|
|
7665
7678
|
* This affects methods like `zoomToFit()`, `zoomToSelection()`, and `zoomToBounds()`.
|
package/dist-cjs/index.js
CHANGED
|
@@ -389,7 +389,7 @@ var import_uniq = require("./lib/utils/uniq");
|
|
|
389
389
|
var import_defaultThemes2 = require("./lib/editor/managers/ThemeManager/defaultThemes");
|
|
390
390
|
(0, import_utils.registerTldrawLibraryVersion)(
|
|
391
391
|
"@tldraw/editor",
|
|
392
|
-
"4.6.0-canary.
|
|
392
|
+
"4.6.0-canary.cd729e528177",
|
|
393
393
|
"cjs"
|
|
394
394
|
);
|
|
395
395
|
//# sourceMappingURL=index.js.map
|
|
@@ -24,9 +24,11 @@ module.exports = __toCommonJS(MenuClickCapture_exports);
|
|
|
24
24
|
var import_jsx_runtime = require("react/jsx-runtime");
|
|
25
25
|
var import_state_react = require("@tldraw/state-react");
|
|
26
26
|
var import_react = require("react");
|
|
27
|
+
var import_react_dom = require("react-dom");
|
|
27
28
|
var import_useCanvasEvents = require("../hooks/useCanvasEvents");
|
|
28
29
|
var import_useEditor = require("../hooks/useEditor");
|
|
29
30
|
var import_Vec = require("../primitives/Vec");
|
|
31
|
+
var import_dom = require("../utils/dom");
|
|
30
32
|
var import_getPointerInfo = require("../utils/getPointerInfo");
|
|
31
33
|
function MenuClickCapture() {
|
|
32
34
|
const editor = (0, import_useEditor.useEditor)();
|
|
@@ -37,81 +39,125 @@ function MenuClickCapture() {
|
|
|
37
39
|
const rPointerState = (0, import_react.useRef)({
|
|
38
40
|
isDown: false,
|
|
39
41
|
isDragging: false,
|
|
42
|
+
button: 0,
|
|
40
43
|
start: new import_Vec.Vec()
|
|
41
44
|
});
|
|
45
|
+
const rCancelContextMenuSwallow = (0, import_react.useRef)(null);
|
|
46
|
+
(0, import_react.useEffect)(
|
|
47
|
+
() => () => {
|
|
48
|
+
rCancelContextMenuSwallow.current?.();
|
|
49
|
+
rCancelContextMenuSwallow.current = null;
|
|
50
|
+
},
|
|
51
|
+
[]
|
|
52
|
+
);
|
|
53
|
+
const swallowNextNativeContextMenu = (0, import_react.useCallback)(() => {
|
|
54
|
+
rCancelContextMenuSwallow.current?.();
|
|
55
|
+
const doc = editor.getContainerDocument();
|
|
56
|
+
const onContextMenu = (event) => {
|
|
57
|
+
if (!event.isTrusted) return;
|
|
58
|
+
rCancelContextMenuSwallow.current?.();
|
|
59
|
+
rCancelContextMenuSwallow.current = null;
|
|
60
|
+
event.preventDefault();
|
|
61
|
+
event.stopImmediatePropagation();
|
|
62
|
+
};
|
|
63
|
+
const cancel = () => doc.removeEventListener("contextmenu", onContextMenu, true);
|
|
64
|
+
rCancelContextMenuSwallow.current = cancel;
|
|
65
|
+
doc.addEventListener("contextmenu", onContextMenu, true);
|
|
66
|
+
doc.defaultView?.setTimeout(() => {
|
|
67
|
+
if (rCancelContextMenuSwallow.current === cancel) {
|
|
68
|
+
cancel();
|
|
69
|
+
rCancelContextMenuSwallow.current = null;
|
|
70
|
+
}
|
|
71
|
+
}, 0);
|
|
72
|
+
}, [editor]);
|
|
42
73
|
const handlePointerDown = (0, import_react.useCallback)(
|
|
43
74
|
(e) => {
|
|
44
|
-
if (e.button
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
}
|
|
75
|
+
if (e.button !== 0 && e.button !== 2) return;
|
|
76
|
+
(0, import_react_dom.flushSync)(() => setIsPointing(true));
|
|
77
|
+
(0, import_dom.setPointerCapture)(e.currentTarget, e);
|
|
78
|
+
rPointerState.current = {
|
|
79
|
+
isDown: true,
|
|
80
|
+
isDragging: false,
|
|
81
|
+
button: e.button,
|
|
82
|
+
start: new import_Vec.Vec(e.clientX, e.clientY)
|
|
83
|
+
};
|
|
53
84
|
if (e.button === 2) {
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
85
|
+
if (!editor.options.rightClickPanning) {
|
|
86
|
+
swallowNextNativeContextMenu();
|
|
87
|
+
editor.menus.clearOpenMenus();
|
|
88
|
+
return;
|
|
89
|
+
}
|
|
90
|
+
const canvas = editor.getContainer().querySelector(".tl-canvas") ?? e.currentTarget;
|
|
91
|
+
canvasEvents.onPointerDown?.({ ...e, currentTarget: canvas });
|
|
92
|
+
swallowNextNativeContextMenu();
|
|
93
|
+
return;
|
|
63
94
|
}
|
|
64
95
|
editor.menus.clearOpenMenus();
|
|
65
96
|
},
|
|
66
|
-
[editor]
|
|
97
|
+
[canvasEvents, editor, swallowNextNativeContextMenu]
|
|
67
98
|
);
|
|
68
|
-
const rDidAPointerDownAndDragWhileMenuWasOpen = (0, import_react.useRef)(false);
|
|
69
99
|
const handlePointerMove = (0, import_react.useCallback)(
|
|
70
100
|
(e) => {
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
if (!
|
|
74
|
-
if (
|
|
75
|
-
|
|
76
|
-
import_Vec.Vec.Dist2(rPointerState.current.start, new import_Vec.Vec(e.clientX, e.clientY)) > editor.options.dragDistanceSquared
|
|
77
|
-
) {
|
|
78
|
-
rDidAPointerDownAndDragWhileMenuWasOpen.current = true;
|
|
79
|
-
rPointerState.current = {
|
|
80
|
-
...rPointerState.current,
|
|
81
|
-
isDown: true,
|
|
82
|
-
isDragging: true
|
|
83
|
-
};
|
|
84
|
-
canvasEvents.onPointerDown?.({
|
|
85
|
-
...e,
|
|
86
|
-
clientX: x,
|
|
87
|
-
clientY: y,
|
|
88
|
-
button: 0
|
|
89
|
-
});
|
|
101
|
+
const state = rPointerState.current;
|
|
102
|
+
if (!state.isDown) return;
|
|
103
|
+
if (state.button !== 2 && !state.isDragging) {
|
|
104
|
+
if (import_Vec.Vec.Dist2(state.start, new import_Vec.Vec(e.clientX, e.clientY)) <= editor.options.dragDistanceSquared) {
|
|
105
|
+
return;
|
|
90
106
|
}
|
|
91
|
-
|
|
92
|
-
if (rDidAPointerDownAndDragWhileMenuWasOpen.current) {
|
|
107
|
+
state.isDragging = true;
|
|
93
108
|
editor.dispatch({
|
|
94
109
|
type: "pointer",
|
|
95
110
|
target: "canvas",
|
|
96
|
-
name: "
|
|
97
|
-
...(0, import_getPointerInfo.getPointerInfo)(editor, e)
|
|
111
|
+
name: "pointer_down",
|
|
112
|
+
...(0, import_getPointerInfo.getPointerInfo)(editor, { ...e, clientX: state.start.x, clientY: state.start.y })
|
|
98
113
|
});
|
|
99
114
|
}
|
|
115
|
+
editor.dispatch({
|
|
116
|
+
type: "pointer",
|
|
117
|
+
target: "canvas",
|
|
118
|
+
name: "pointer_move",
|
|
119
|
+
...(0, import_getPointerInfo.getPointerInfo)(editor, e)
|
|
120
|
+
});
|
|
100
121
|
},
|
|
101
|
-
[
|
|
122
|
+
[editor]
|
|
102
123
|
);
|
|
103
124
|
const handlePointerUp = (0, import_react.useCallback)(
|
|
104
125
|
(e) => {
|
|
105
|
-
|
|
126
|
+
const isStaticRightClick = e.button === 2 && !rPointerState.current.isDragging;
|
|
127
|
+
editor.dispatch({
|
|
128
|
+
type: "pointer",
|
|
129
|
+
target: "canvas",
|
|
130
|
+
name: "pointer_up",
|
|
131
|
+
...(0, import_getPointerInfo.getPointerInfo)(editor, e)
|
|
132
|
+
});
|
|
133
|
+
if (isStaticRightClick && editor.options.rightClickPanning) {
|
|
134
|
+
const canvas = editor.getContainer().querySelector(".tl-canvas");
|
|
135
|
+
const trigger = canvas?.parentElement ?? e.currentTarget;
|
|
136
|
+
editor.timers.requestAnimationFrame(() => {
|
|
137
|
+
trigger.dispatchEvent(
|
|
138
|
+
new PointerEvent("contextmenu", {
|
|
139
|
+
bubbles: true,
|
|
140
|
+
clientX: e.clientX,
|
|
141
|
+
clientY: e.clientY,
|
|
142
|
+
button: 2,
|
|
143
|
+
buttons: 0,
|
|
144
|
+
pointerId: e.pointerId,
|
|
145
|
+
pointerType: e.pointerType,
|
|
146
|
+
isPrimary: e.isPrimary
|
|
147
|
+
})
|
|
148
|
+
);
|
|
149
|
+
});
|
|
150
|
+
}
|
|
151
|
+
(0, import_dom.releasePointerCapture)(e.currentTarget, e);
|
|
106
152
|
setIsPointing(false);
|
|
107
153
|
rPointerState.current = {
|
|
108
154
|
isDown: false,
|
|
109
155
|
isDragging: false,
|
|
156
|
+
button: 0,
|
|
110
157
|
start: new import_Vec.Vec(e.clientX, e.clientY)
|
|
111
158
|
};
|
|
112
|
-
rDidAPointerDownAndDragWhileMenuWasOpen.current = false;
|
|
113
159
|
},
|
|
114
|
-
[
|
|
160
|
+
[editor]
|
|
115
161
|
);
|
|
116
162
|
return showElement && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
|
|
117
163
|
"div",
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/lib/components/MenuClickCapture.tsx"],
|
|
4
|
-
"sourcesContent": ["import { useValue } from '@tldraw/state-react'\nimport { PointerEvent, useCallback, useRef, useState } from 'react'\nimport { useCanvasEvents } from '../hooks/useCanvasEvents'\nimport { useEditor } from '../hooks/useEditor'\nimport { Vec } from '../primitives/Vec'\nimport { getPointerInfo } from '../utils/getPointerInfo'\n\n/**\n * When a menu is open, this component prevents the user from interacting with the canvas.\n *\n * @public @react\n */\nexport function MenuClickCapture() {\n\tconst editor = useEditor()\n\n\
|
|
5
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;
|
|
4
|
+
"sourcesContent": ["import { useValue } from '@tldraw/state-react'\nimport { type PointerEvent, useCallback, useEffect, useRef, useState } from 'react'\nimport { flushSync } from 'react-dom'\nimport { useCanvasEvents } from '../hooks/useCanvasEvents'\nimport { useEditor } from '../hooks/useEditor'\nimport { Vec } from '../primitives/Vec'\nimport { releasePointerCapture, setPointerCapture } from '../utils/dom'\nimport { getPointerInfo } from '../utils/getPointerInfo'\n\n/**\n * When a menu is open, this component prevents the user from interacting with the canvas.\n *\n * @public @react\n */\nexport function MenuClickCapture() {\n\tconst editor = useEditor()\n\n\tconst isMenuOpen = useValue('is menu open', () => editor.menus.hasAnyOpenMenus(), [editor])\n\n\t// Keep this component mounted while the pointer is down so pointerup/move still\n\t// land here after a synchronous clearOpenMenus() flips isMenuOpen to false.\n\tconst [isPointing, setIsPointing] = useState(false)\n\tconst showElement = isMenuOpen || isPointing\n\n\tconst canvasEvents = useCanvasEvents()\n\n\tconst rPointerState = useRef({\n\t\tisDown: false,\n\t\tisDragging: false,\n\t\tbutton: 0,\n\t\tstart: new Vec(),\n\t})\n\n\t// Swallow the native contextmenu that follows a right-click pointerdown. Without\n\t// this, Radix's trigger catches the native event and opens a menu at the pointer-\n\t// DOWN position \u2014 then our own synthetic contextmenu (fired on pointerup) opens it\n\t// again at the release position, producing a visible flash.\n\tconst rCancelContextMenuSwallow = useRef<null | (() => void)>(null)\n\tuseEffect(\n\t\t() => () => {\n\t\t\trCancelContextMenuSwallow.current?.()\n\t\t\trCancelContextMenuSwallow.current = null\n\t\t},\n\t\t[]\n\t)\n\tconst swallowNextNativeContextMenu = useCallback(() => {\n\t\trCancelContextMenuSwallow.current?.()\n\t\tconst doc = editor.getContainerDocument()\n\t\tconst onContextMenu = (event: MouseEvent) => {\n\t\t\t// Skip our own synthetic contextmenu \u2014 only swallow the real browser one\n\t\t\tif (!event.isTrusted) return\n\t\t\trCancelContextMenuSwallow.current?.()\n\t\t\trCancelContextMenuSwallow.current = null\n\t\t\tevent.preventDefault()\n\t\t\tevent.stopImmediatePropagation()\n\t\t}\n\t\tconst cancel = () => doc.removeEventListener('contextmenu', onContextMenu, true)\n\t\trCancelContextMenuSwallow.current = cancel\n\t\tdoc.addEventListener('contextmenu', onContextMenu, true)\n\t\t// Drop the listener on the next tick if it never fires (e.g. pointer moved off-screen)\n\t\tdoc.defaultView?.setTimeout(() => {\n\t\t\tif (rCancelContextMenuSwallow.current === cancel) {\n\t\t\t\tcancel()\n\t\t\t\trCancelContextMenuSwallow.current = null\n\t\t\t}\n\t\t}, 0)\n\t}, [editor])\n\n\tconst handlePointerDown = useCallback(\n\t\t(e: PointerEvent) => {\n\t\t\tif (e.button !== 0 && e.button !== 2) return\n\n\t\t\tflushSync(() => setIsPointing(true))\n\t\t\tsetPointerCapture(e.currentTarget, e)\n\t\t\trPointerState.current = {\n\t\t\t\tisDown: true,\n\t\t\t\tisDragging: false,\n\t\t\t\tbutton: e.button,\n\t\t\t\tstart: new Vec(e.clientX, e.clientY),\n\t\t\t}\n\n\t\t\tif (e.button === 2) {\n\t\t\t\tif (!editor.options.rightClickPanning) {\n\t\t\t\t\t// Right-click panning off: close the open menu and swallow the native\n\t\t\t\t\t// contextmenu that would otherwise briefly open a new one (causing a flash).\n\t\t\t\t\tswallowNextNativeContextMenu()\n\t\t\t\t\teditor.menus.clearOpenMenus()\n\t\t\t\t\treturn\n\t\t\t\t}\n\t\t\t\t// Forward right-click pointerdown through the canvas's own handler so\n\t\t\t\t// pointer capture is also set on the canvas (load-bearing: without this\n\t\t\t\t// the context menu briefly flashes closed during consecutive right-clicks).\n\t\t\t\t// We don't clearOpenMenus() \u2014 Radix's DismissableLayer closes the menu\n\t\t\t\t// via outside-click detection, keeping its internal state in sync.\n\t\t\t\tconst canvas =\n\t\t\t\t\teditor.getContainer().querySelector<HTMLDivElement>('.tl-canvas') ?? e.currentTarget\n\t\t\t\tcanvasEvents.onPointerDown?.({ ...e, currentTarget: canvas })\n\t\t\t\tswallowNextNativeContextMenu()\n\t\t\t\treturn\n\t\t\t}\n\n\t\t\teditor.menus.clearOpenMenus()\n\t\t},\n\t\t[canvasEvents, editor, swallowNextNativeContextMenu]\n\t)\n\n\tconst handlePointerMove = useCallback(\n\t\t(e: PointerEvent) => {\n\t\t\tconst state = rPointerState.current\n\t\t\tif (!state.isDown) return\n\n\t\t\t// Left-click: wait for the drag threshold before forwarding anything, then\n\t\t\t// replay pointerdown at the original start so the editor records the\n\t\t\t// correct drag origin. Right-click forwards moves immediately (pointerdown\n\t\t\t// was already dispatched in handlePointerDown).\n\t\t\tif (state.button !== 2 && !state.isDragging) {\n\t\t\t\tif (\n\t\t\t\t\tVec.Dist2(state.start, new Vec(e.clientX, e.clientY)) <=\n\t\t\t\t\teditor.options.dragDistanceSquared\n\t\t\t\t) {\n\t\t\t\t\treturn\n\t\t\t\t}\n\t\t\t\tstate.isDragging = true\n\t\t\t\teditor.dispatch({\n\t\t\t\t\ttype: 'pointer',\n\t\t\t\t\ttarget: 'canvas',\n\t\t\t\t\tname: 'pointer_down',\n\t\t\t\t\t...getPointerInfo(editor, { ...e, clientX: state.start.x, clientY: state.start.y }),\n\t\t\t\t})\n\t\t\t}\n\n\t\t\teditor.dispatch({\n\t\t\t\ttype: 'pointer',\n\t\t\t\ttarget: 'canvas',\n\t\t\t\tname: 'pointer_move',\n\t\t\t\t...getPointerInfo(editor, e),\n\t\t\t})\n\t\t},\n\t\t[editor]\n\t)\n\n\tconst handlePointerUp = useCallback(\n\t\t(e: PointerEvent) => {\n\t\t\tconst isStaticRightClick = e.button === 2 && !rPointerState.current.isDragging\n\n\t\t\teditor.dispatch({\n\t\t\t\ttype: 'pointer',\n\t\t\t\ttarget: 'canvas',\n\t\t\t\tname: 'pointer_up',\n\t\t\t\t...getPointerInfo(editor, e),\n\t\t\t})\n\n\t\t\tif (isStaticRightClick && editor.options.rightClickPanning) {\n\t\t\t\t// Dispatch contextmenu on the canvas's parent (Radix's trigger) so the\n\t\t\t\t// menu opens at the release position. Bypassing the canvas avoids its\n\t\t\t\t// own onContextMenu handler, which preventDefaults non-synthesized events.\n\t\t\t\tconst canvas = editor.getContainer().querySelector<HTMLDivElement>('.tl-canvas')\n\t\t\t\tconst trigger = canvas?.parentElement ?? e.currentTarget\n\t\t\t\teditor.timers.requestAnimationFrame(() => {\n\t\t\t\t\ttrigger.dispatchEvent(\n\t\t\t\t\t\tnew PointerEvent('contextmenu', {\n\t\t\t\t\t\t\tbubbles: true,\n\t\t\t\t\t\t\tclientX: e.clientX,\n\t\t\t\t\t\t\tclientY: e.clientY,\n\t\t\t\t\t\t\tbutton: 2,\n\t\t\t\t\t\t\tbuttons: 0,\n\t\t\t\t\t\t\tpointerId: e.pointerId,\n\t\t\t\t\t\t\tpointerType: e.pointerType,\n\t\t\t\t\t\t\tisPrimary: e.isPrimary,\n\t\t\t\t\t\t})\n\t\t\t\t\t)\n\t\t\t\t})\n\t\t\t}\n\n\t\t\treleasePointerCapture(e.currentTarget, e)\n\t\t\tsetIsPointing(false)\n\t\t\trPointerState.current = {\n\t\t\t\tisDown: false,\n\t\t\t\tisDragging: false,\n\t\t\t\tbutton: 0,\n\t\t\t\tstart: new Vec(e.clientX, e.clientY),\n\t\t\t}\n\t\t},\n\t\t[editor]\n\t)\n\n\treturn (\n\t\tshowElement && (\n\t\t\t<div\n\t\t\t\tclassName=\"tlui-menu-click-capture\"\n\t\t\t\tdata-testid=\"menu-click-capture.content\"\n\t\t\t\t{...canvasEvents}\n\t\t\t\tonPointerDown={handlePointerDown}\n\t\t\t\tonPointerMove={handlePointerMove}\n\t\t\t\tonPointerUp={handlePointerUp}\n\t\t\t\tonContextMenu={(e) => {\n\t\t\t\t\te.preventDefault()\n\t\t\t\t\te.stopPropagation()\n\t\t\t\t}}\n\t\t\t/>\n\t\t)\n\t)\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
|
@@ -8014,6 +8014,10 @@ class Editor extends import_eventemitter3.default {
|
|
|
8014
8014
|
}
|
|
8015
8015
|
this.inputs.setIsPanning(true);
|
|
8016
8016
|
clearTimeout(this._longPressTimeout);
|
|
8017
|
+
} else if (info.button === import_constants.RIGHT_MOUSE_BUTTON && this.options.rightClickPanning) {
|
|
8018
|
+
this.inputs.setIsRightPointing(true);
|
|
8019
|
+
clearTimeout(this._longPressTimeout);
|
|
8020
|
+
return this;
|
|
8017
8021
|
}
|
|
8018
8022
|
if (this.inputs.getIsPanning()) {
|
|
8019
8023
|
this.stopCameraAnimation();
|
|
@@ -8025,6 +8029,22 @@ class Editor extends import_eventemitter3.default {
|
|
|
8025
8029
|
case "pointer_move": {
|
|
8026
8030
|
if (!isPen && isPenMode) return;
|
|
8027
8031
|
const { x: cx, y: cy, z: cz } = (0, import_state.unsafe__withoutCapture)(() => this.getCamera());
|
|
8032
|
+
if (this.inputs.getIsRightPointing() && !this.inputs.getIsPanning()) {
|
|
8033
|
+
const currentScreenPoint = this.inputs.getCurrentScreenPoint();
|
|
8034
|
+
const originScreenPoint = this.inputs.getOriginScreenPoint();
|
|
8035
|
+
if (import_Vec.Vec.Dist2(originScreenPoint, currentScreenPoint) > this.options.dragDistanceSquared) {
|
|
8036
|
+
this._prevCursor = this.getInstanceState().cursor.type;
|
|
8037
|
+
this.inputs.setIsPanning(true);
|
|
8038
|
+
this.setCursor({ type: "grabbing", rotation: 0 });
|
|
8039
|
+
this.stopCameraAnimation();
|
|
8040
|
+
const offset = import_Vec.Vec.Sub(currentScreenPoint, originScreenPoint);
|
|
8041
|
+
this.setCamera(new import_Vec.Vec(cx + offset.x / cz, cy + offset.y / cz, cz), {
|
|
8042
|
+
immediate: true
|
|
8043
|
+
});
|
|
8044
|
+
this.maybeTrackPerformance("Panning");
|
|
8045
|
+
}
|
|
8046
|
+
return;
|
|
8047
|
+
}
|
|
8028
8048
|
if (this.inputs.getIsPanning() && this.inputs.getIsPointing()) {
|
|
8029
8049
|
const currentScreenPoint = this.inputs.getCurrentScreenPoint();
|
|
8030
8050
|
const previousScreenPoint = this.inputs.getPreviousScreenPoint();
|
|
@@ -8048,6 +8068,12 @@ class Editor extends import_eventemitter3.default {
|
|
|
8048
8068
|
clearTimeout(this._longPressTimeout);
|
|
8049
8069
|
inputs.buttons.delete(info.button);
|
|
8050
8070
|
if (instanceState.isPenMode && !isPen) return;
|
|
8071
|
+
if (this.inputs.getIsRightPointing() && !this.inputs.getIsPanning()) {
|
|
8072
|
+
this.inputs.setIsRightPointing(false);
|
|
8073
|
+
this._selectedShapeIdsAtPointerDown = [];
|
|
8074
|
+
break;
|
|
8075
|
+
}
|
|
8076
|
+
this.inputs.setIsRightPointing(false);
|
|
8051
8077
|
if (this.capturedPointerId === info.pointerId) {
|
|
8052
8078
|
this.capturedPointerId = null;
|
|
8053
8079
|
info.button = 0;
|
|
@@ -8065,11 +8091,24 @@ class Editor extends import_eventemitter3.default {
|
|
|
8065
8091
|
break;
|
|
8066
8092
|
}
|
|
8067
8093
|
case import_constants.MIDDLE_MOUSE_BUTTON: {
|
|
8068
|
-
if (this.inputs.keys.has("
|
|
8094
|
+
if (this.inputs.keys.has("Space")) {
|
|
8069
8095
|
this.setCursor({ type: "grab", rotation: 0 });
|
|
8070
8096
|
} else {
|
|
8071
8097
|
this.setCursor({ type: this._prevCursor, rotation: 0 });
|
|
8072
8098
|
}
|
|
8099
|
+
break;
|
|
8100
|
+
}
|
|
8101
|
+
case import_constants.RIGHT_MOUSE_BUTTON: {
|
|
8102
|
+
if (this.inputs.keys.has("Space")) {
|
|
8103
|
+
this.setCursor({ type: "grab", rotation: 0 });
|
|
8104
|
+
} else {
|
|
8105
|
+
this.setCursor({ type: this._prevCursor, rotation: 0 });
|
|
8106
|
+
}
|
|
8107
|
+
if (slideSpeed > 0) {
|
|
8108
|
+
this.slideCamera({ speed: slideSpeed, direction: slideDirection });
|
|
8109
|
+
}
|
|
8110
|
+
this._selectedShapeIdsAtPointerDown = [];
|
|
8111
|
+
return this;
|
|
8073
8112
|
}
|
|
8074
8113
|
}
|
|
8075
8114
|
if (slideSpeed > 0) {
|