@tldraw/editor 5.2.0-canary.52bf73b34fcf → 5.2.0-canary.536aeeea4146
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/README.md +7 -1
- package/dist-cjs/index.d.ts +44 -40
- package/dist-cjs/index.js +4 -4
- package/dist-cjs/index.js.map +2 -2
- package/dist-cjs/lib/components/MenuClickCapture.js +8 -5
- package/dist-cjs/lib/components/MenuClickCapture.js.map +2 -2
- package/dist-cjs/lib/editor/Editor.js +102 -54
- package/dist-cjs/lib/editor/Editor.js.map +3 -3
- package/dist-cjs/lib/editor/managers/CollaboratorsManager/CollaboratorsManager.js +3 -3
- package/dist-cjs/lib/editor/managers/CollaboratorsManager/CollaboratorsManager.js.map +2 -2
- package/dist-cjs/lib/editor/managers/FocusManager/FocusManager.js +1 -2
- package/dist-cjs/lib/editor/managers/FocusManager/FocusManager.js.map +2 -2
- package/dist-cjs/lib/editor/managers/HistoryManager/HistoryManager.js +24 -2
- package/dist-cjs/lib/editor/managers/HistoryManager/HistoryManager.js.map +2 -2
- package/dist-cjs/lib/editor/managers/InputsManager/InputsManager.js +14 -3
- package/dist-cjs/lib/editor/managers/InputsManager/InputsManager.js.map +2 -2
- package/dist-cjs/lib/editor/managers/SpatialIndexManager/SpatialIndexManager.js +4 -2
- package/dist-cjs/lib/editor/managers/SpatialIndexManager/SpatialIndexManager.js.map +2 -2
- package/dist-cjs/lib/editor/managers/TextManager/TextManager.js +7 -3
- package/dist-cjs/lib/editor/managers/TextManager/TextManager.js.map +2 -2
- package/dist-cjs/lib/editor/managers/TickManager/TickManager.js +0 -1
- package/dist-cjs/lib/editor/managers/TickManager/TickManager.js.map +2 -2
- package/dist-cjs/lib/editor/managers/UserPreferencesManager/UserPreferencesManager.js +15 -2
- package/dist-cjs/lib/editor/managers/UserPreferencesManager/UserPreferencesManager.js.map +2 -2
- package/dist-cjs/lib/editor/overlays/strokeShapeIndicators.js +79 -0
- package/dist-cjs/lib/editor/overlays/strokeShapeIndicators.js.map +7 -0
- package/dist-cjs/lib/editor/tools/BaseBoxShapeTool/children/Pointing.js +3 -0
- package/dist-cjs/lib/editor/tools/BaseBoxShapeTool/children/Pointing.js.map +2 -2
- package/dist-cjs/lib/hooks/useCanvasEvents.js +14 -7
- package/dist-cjs/lib/hooks/useCanvasEvents.js.map +2 -2
- package/dist-cjs/lib/hooks/usePresence.js.map +2 -2
- package/dist-cjs/lib/utils/getPointerInfo.js +2 -1
- package/dist-cjs/lib/utils/getPointerInfo.js.map +2 -2
- package/dist-cjs/lib/utils/pointer.js +32 -0
- package/dist-cjs/lib/utils/pointer.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 +44 -40
- package/dist-esm/index.mjs +5 -7
- package/dist-esm/index.mjs.map +2 -2
- package/dist-esm/lib/components/MenuClickCapture.mjs +8 -5
- package/dist-esm/lib/components/MenuClickCapture.mjs.map +2 -2
- package/dist-esm/lib/editor/Editor.mjs +102 -54
- package/dist-esm/lib/editor/Editor.mjs.map +3 -3
- package/dist-esm/lib/editor/managers/CollaboratorsManager/CollaboratorsManager.mjs +3 -3
- package/dist-esm/lib/editor/managers/CollaboratorsManager/CollaboratorsManager.mjs.map +2 -2
- package/dist-esm/lib/editor/managers/FocusManager/FocusManager.mjs +1 -2
- package/dist-esm/lib/editor/managers/FocusManager/FocusManager.mjs.map +2 -2
- package/dist-esm/lib/editor/managers/HistoryManager/HistoryManager.mjs +24 -2
- package/dist-esm/lib/editor/managers/HistoryManager/HistoryManager.mjs.map +2 -2
- package/dist-esm/lib/editor/managers/InputsManager/InputsManager.mjs +14 -3
- package/dist-esm/lib/editor/managers/InputsManager/InputsManager.mjs.map +2 -2
- package/dist-esm/lib/editor/managers/SpatialIndexManager/SpatialIndexManager.mjs +4 -2
- package/dist-esm/lib/editor/managers/SpatialIndexManager/SpatialIndexManager.mjs.map +2 -2
- package/dist-esm/lib/editor/managers/TextManager/TextManager.mjs +7 -3
- package/dist-esm/lib/editor/managers/TextManager/TextManager.mjs.map +2 -2
- package/dist-esm/lib/editor/managers/TickManager/TickManager.mjs +0 -1
- package/dist-esm/lib/editor/managers/TickManager/TickManager.mjs.map +2 -2
- package/dist-esm/lib/editor/managers/UserPreferencesManager/UserPreferencesManager.mjs +15 -2
- package/dist-esm/lib/editor/managers/UserPreferencesManager/UserPreferencesManager.mjs.map +2 -2
- package/dist-esm/lib/editor/overlays/strokeShapeIndicators.mjs +59 -0
- package/dist-esm/lib/editor/overlays/strokeShapeIndicators.mjs.map +7 -0
- package/dist-esm/lib/editor/tools/BaseBoxShapeTool/children/Pointing.mjs +3 -0
- package/dist-esm/lib/editor/tools/BaseBoxShapeTool/children/Pointing.mjs.map +2 -2
- package/dist-esm/lib/hooks/useCanvasEvents.mjs +14 -7
- package/dist-esm/lib/hooks/useCanvasEvents.mjs.map +2 -2
- package/dist-esm/lib/hooks/usePresence.mjs.map +2 -2
- package/dist-esm/lib/utils/getPointerInfo.mjs +2 -1
- package/dist-esm/lib/utils/getPointerInfo.mjs.map +2 -2
- package/dist-esm/lib/utils/pointer.mjs +12 -0
- package/dist-esm/lib/utils/pointer.mjs.map +7 -0
- package/dist-esm/version.mjs +3 -3
- package/dist-esm/version.mjs.map +1 -1
- package/editor.css +5 -3
- package/package.json +11 -8
- package/src/index.ts +2 -5
- package/src/lib/components/MenuClickCapture.tsx +8 -4
- package/src/lib/editor/Editor.ts +135 -67
- package/src/lib/editor/managers/CollaboratorsManager/CollaboratorsManager.test.ts +43 -16
- package/src/lib/editor/managers/CollaboratorsManager/CollaboratorsManager.ts +8 -5
- package/src/lib/editor/managers/FocusManager/FocusManager.test.ts +4 -4
- package/src/lib/editor/managers/FocusManager/FocusManager.ts +1 -2
- package/src/lib/editor/managers/FontManager/FontManager.test.ts +13 -9
- package/src/lib/editor/managers/HistoryManager/HistoryManager.test.ts +32 -0
- package/src/lib/editor/managers/HistoryManager/HistoryManager.ts +34 -4
- package/src/lib/editor/managers/InputsManager/InputsManager.test.ts +61 -0
- package/src/lib/editor/managers/InputsManager/InputsManager.ts +16 -4
- package/src/lib/editor/managers/SpatialIndexManager/SpatialIndexManager.ts +9 -2
- package/src/lib/editor/managers/TextManager/TextManager.test.ts +16 -14
- package/src/lib/editor/managers/TextManager/TextManager.ts +17 -2
- package/src/lib/editor/managers/TickManager/TickManager.test.ts +0 -40
- package/src/lib/editor/managers/TickManager/TickManager.ts +0 -1
- package/src/lib/editor/managers/UserPreferencesManager/UserPreferencesManager.test.ts +12 -2
- package/src/lib/editor/managers/UserPreferencesManager/UserPreferencesManager.ts +27 -2
- package/src/lib/editor/overlays/strokeShapeIndicators.ts +86 -0
- package/src/lib/editor/tools/BaseBoxShapeTool/children/Pointing.ts +4 -0
- package/src/lib/hooks/useCanvasEvents.ts +19 -12
- package/src/lib/hooks/usePresence.ts +2 -2
- package/src/lib/utils/getPointerInfo.ts +2 -1
- package/src/lib/utils/pointer.test.ts +48 -0
- package/src/lib/utils/pointer.ts +18 -0
- package/src/version.ts +3 -3
- package/dist-cjs/lib/editor/overlays/ShapeIndicatorOverlayUtil.js +0 -161
- package/dist-cjs/lib/editor/overlays/ShapeIndicatorOverlayUtil.js.map +0 -7
- package/dist-esm/lib/editor/overlays/ShapeIndicatorOverlayUtil.mjs +0 -141
- package/dist-esm/lib/editor/overlays/ShapeIndicatorOverlayUtil.mjs.map +0 -7
- package/src/lib/editor/overlays/ShapeIndicatorOverlayUtil.ts +0 -216
|
@@ -155,12 +155,12 @@ class Editor extends import_eventemitter3.default {
|
|
|
155
155
|
this._tickManager = new import_TickManager.TickManager(this);
|
|
156
156
|
this.disposables.add(() => this._tickManager.dispose());
|
|
157
157
|
this.disposables.add(() => {
|
|
158
|
-
this.off("tick", this._decayCameraStateTimeout);
|
|
159
158
|
this._setCameraState("idle");
|
|
160
159
|
});
|
|
161
160
|
this.fonts = new import_FontManager.FontManager(this, fontAssetUrls);
|
|
162
161
|
this.disposables.add(() => this.fonts.dispose());
|
|
163
162
|
this.inputs = new import_InputsManager.InputsManager(this);
|
|
163
|
+
this.disposables.add(() => this.inputs.dispose());
|
|
164
164
|
this.performance = new import_PerformanceManager.PerformanceManager(this);
|
|
165
165
|
this.disposables.add(() => this.performance.dispose());
|
|
166
166
|
this.collaborators = new import_CollaboratorsManager.CollaboratorsManager(this);
|
|
@@ -789,6 +789,7 @@ class Editor extends import_eventemitter3.default {
|
|
|
789
789
|
this.store.dispose();
|
|
790
790
|
this.isDisposed = true;
|
|
791
791
|
this.emit("dispose");
|
|
792
|
+
this.removeAllListeners();
|
|
792
793
|
}
|
|
793
794
|
/* ------------------ Themes (shadowing the theme manager) ------------------ */
|
|
794
795
|
/**
|
|
@@ -1058,6 +1059,14 @@ class Editor extends import_eventemitter3.default {
|
|
|
1058
1059
|
getMarkIdMatching(idSubstring) {
|
|
1059
1060
|
return this.history.getMarkIdMatching(idSubstring);
|
|
1060
1061
|
}
|
|
1062
|
+
/**
|
|
1063
|
+
* Whether the editor is currently replaying history (i.e. an undo or redo is being applied).
|
|
1064
|
+
*
|
|
1065
|
+
* @internal
|
|
1066
|
+
*/
|
|
1067
|
+
isReplayingHistory() {
|
|
1068
|
+
return this.history.isReplaying();
|
|
1069
|
+
}
|
|
1061
1070
|
/**
|
|
1062
1071
|
* Coalesces all changes since the given mark into a single change, removing any intermediate marks.
|
|
1063
1072
|
*
|
|
@@ -2152,7 +2161,7 @@ class Editor extends import_eventemitter3.default {
|
|
|
2152
2161
|
return baseCamera;
|
|
2153
2162
|
}
|
|
2154
2163
|
_getFollowingPresence(targetUserId) {
|
|
2155
|
-
const visited = [this.user.
|
|
2164
|
+
const visited = [this.user.getRecordId()];
|
|
2156
2165
|
const collaborators = this.getCollaborators();
|
|
2157
2166
|
let leaderPresence = null;
|
|
2158
2167
|
while (targetUserId && !visited.includes(targetUserId)) {
|
|
@@ -2340,6 +2349,11 @@ class Editor extends import_eventemitter3.default {
|
|
|
2340
2349
|
getConstrainedCamera(point, opts) {
|
|
2341
2350
|
const currentCamera = this.getCamera();
|
|
2342
2351
|
let { x, y, z = currentCamera.z } = point;
|
|
2352
|
+
const preserveFocalPoint = (current, requested, rz, z2) => {
|
|
2353
|
+
const cz = currentCamera.z;
|
|
2354
|
+
if (rz === cz) return current;
|
|
2355
|
+
return current + (requested - current) * (1 / z2 - 1 / cz) / (1 / rz - 1 / cz);
|
|
2356
|
+
};
|
|
2343
2357
|
if (!opts?.force) {
|
|
2344
2358
|
const cameraOptions = this.getCameraOptions();
|
|
2345
2359
|
const zoomMin = cameraOptions.zoomSteps[0];
|
|
@@ -2359,14 +2373,10 @@ class Editor extends import_eventemitter3.default {
|
|
|
2359
2373
|
z = this.getInitialZoom();
|
|
2360
2374
|
}
|
|
2361
2375
|
if (z < minZ || z > maxZ) {
|
|
2362
|
-
const
|
|
2363
|
-
const cxA = -cx + vsb.w / cz / 2;
|
|
2364
|
-
const cyA = -cy + vsb.h / cz / 2;
|
|
2376
|
+
const rz = z;
|
|
2365
2377
|
z = (0, import_utils2.clamp)(z, minZ, maxZ);
|
|
2366
|
-
|
|
2367
|
-
|
|
2368
|
-
x = cx + cxB - cxA;
|
|
2369
|
-
y = cy + cyB - cyA;
|
|
2378
|
+
x = preserveFocalPoint(currentCamera.x, x, rz, z);
|
|
2379
|
+
y = preserveFocalPoint(currentCamera.y, y, rz, z);
|
|
2370
2380
|
}
|
|
2371
2381
|
const minX = px / z - bounds.x;
|
|
2372
2382
|
const minY = py / z - bounds.y;
|
|
@@ -2435,10 +2445,10 @@ class Editor extends import_eventemitter3.default {
|
|
|
2435
2445
|
}
|
|
2436
2446
|
} else {
|
|
2437
2447
|
if (z > zoomMax || z < zoomMin) {
|
|
2438
|
-
const
|
|
2448
|
+
const rz = z;
|
|
2439
2449
|
z = (0, import_utils2.clamp)(z, zoomMin, zoomMax);
|
|
2440
|
-
x =
|
|
2441
|
-
y =
|
|
2450
|
+
x = preserveFocalPoint(currentCamera.x, x, rz, z);
|
|
2451
|
+
y = preserveFocalPoint(currentCamera.y, y, rz, z);
|
|
2442
2452
|
}
|
|
2443
2453
|
}
|
|
2444
2454
|
}
|
|
@@ -2861,14 +2871,25 @@ class Editor extends import_eventemitter3.default {
|
|
|
2861
2871
|
this.off("stop-camera-animation", cancel);
|
|
2862
2872
|
};
|
|
2863
2873
|
this.once("stop-camera-animation", cancel);
|
|
2874
|
+
const dirZ = direction.z ?? 0;
|
|
2864
2875
|
const moveCamera = (elapsed) => {
|
|
2865
2876
|
const { x: cx, y: cy, z: cz } = this.getCamera();
|
|
2866
|
-
const
|
|
2877
|
+
const dx = direction.x * (currentSpeed * elapsed) / cz;
|
|
2878
|
+
const dy = direction.y * (currentSpeed * elapsed) / cz;
|
|
2879
|
+
let newCx = cx + dx;
|
|
2880
|
+
let newCy = cy + dy;
|
|
2881
|
+
let newCz = cz;
|
|
2882
|
+
if (dirZ !== 0) {
|
|
2883
|
+
newCz = cz * (1 + dirZ * currentSpeed * elapsed);
|
|
2884
|
+
const center = this.getViewportScreenCenter();
|
|
2885
|
+
newCx += center.x / newCz - center.x / cz;
|
|
2886
|
+
newCy += center.y / newCz - center.y / cz;
|
|
2887
|
+
}
|
|
2867
2888
|
currentSpeed *= 1 - friction;
|
|
2868
2889
|
if (currentSpeed < speedThreshold) {
|
|
2869
2890
|
cancel();
|
|
2870
2891
|
} else {
|
|
2871
|
-
this._setCamera(new import_Vec.Vec(
|
|
2892
|
+
this._setCamera(new import_Vec.Vec(newCx, newCy, newCz));
|
|
2872
2893
|
}
|
|
2873
2894
|
};
|
|
2874
2895
|
this.on("tick", moveCamera);
|
|
@@ -3188,7 +3209,7 @@ class Editor extends import_eventemitter3.default {
|
|
|
3188
3209
|
*/
|
|
3189
3210
|
startFollowingUser(userId) {
|
|
3190
3211
|
this.stopFollowingUser();
|
|
3191
|
-
const thisUserId = this.user.
|
|
3212
|
+
const thisUserId = this.user.getExternalId();
|
|
3192
3213
|
if (!thisUserId) {
|
|
3193
3214
|
console.warn("You should set the userId for the current instance before following a user");
|
|
3194
3215
|
}
|
|
@@ -5892,24 +5913,40 @@ class Editor extends import_eventemitter3.default {
|
|
|
5892
5913
|
* @public
|
|
5893
5914
|
*/
|
|
5894
5915
|
resizeShape(shape, scale, opts = {}) {
|
|
5916
|
+
const partial = this.getResizeShapePartial(shape, scale, opts);
|
|
5917
|
+
if (partial) this.updateShapes([partial]);
|
|
5918
|
+
return this;
|
|
5919
|
+
}
|
|
5920
|
+
/**
|
|
5921
|
+
* Get the update for a resized shape without committing it to the store. Interactions that
|
|
5922
|
+
* resize many shapes at once use this to collect all of the updates and commit them in a
|
|
5923
|
+
* single batch. Returns null when there is nothing to update.
|
|
5924
|
+
*
|
|
5925
|
+
* Shapes that are rotated out of alignment with the scale axis cannot be resized with a
|
|
5926
|
+
* single update; those shapes are resized immediately (as `resizeShape` would do) and null
|
|
5927
|
+
* is returned.
|
|
5928
|
+
*
|
|
5929
|
+
* @internal
|
|
5930
|
+
*/
|
|
5931
|
+
getResizeShapePartial(shape, scale, opts = {}) {
|
|
5895
5932
|
const id = typeof shape === "string" ? shape : shape.id;
|
|
5896
|
-
if (this.getIsReadonly()) return
|
|
5933
|
+
if (this.getIsReadonly()) return null;
|
|
5897
5934
|
if (!Number.isFinite(scale.x)) scale = new import_Vec.Vec(1, scale.y);
|
|
5898
5935
|
if (!Number.isFinite(scale.y)) scale = new import_Vec.Vec(scale.x, 1);
|
|
5899
5936
|
const initialShape = opts.initialShape ?? this.getShape(id);
|
|
5900
|
-
if (!initialShape) return
|
|
5937
|
+
if (!initialShape) return null;
|
|
5901
5938
|
const scaleOrigin = opts.scaleOrigin ?? this.getShapePageBounds(id)?.center;
|
|
5902
|
-
if (!scaleOrigin) return
|
|
5939
|
+
if (!scaleOrigin) return null;
|
|
5903
5940
|
const pageTransform = opts.initialPageTransform ? import_Mat.Mat.Cast(opts.initialPageTransform) : this.getShapePageTransform(id);
|
|
5904
|
-
if (!pageTransform) return
|
|
5941
|
+
if (!pageTransform) return null;
|
|
5905
5942
|
const pageRotation = pageTransform.rotation();
|
|
5906
|
-
if (pageRotation == null) return
|
|
5943
|
+
if (pageRotation == null) return null;
|
|
5907
5944
|
const scaleAxisRotation = opts.scaleAxisRotation ?? pageRotation;
|
|
5908
5945
|
const initialBounds = opts.initialBounds ?? this.getShapeGeometry(id).bounds;
|
|
5909
|
-
if (!initialBounds) return
|
|
5946
|
+
if (!initialBounds) return null;
|
|
5910
5947
|
const isAspectRatioLocked = opts.isAspectRatioLocked ?? this.getShapeUtil(initialShape).isAspectRatioLocked(initialShape);
|
|
5911
5948
|
if (!(0, import_utils2.areAnglesCompatible)(pageRotation, scaleAxisRotation)) {
|
|
5912
|
-
|
|
5949
|
+
this._resizeUnalignedShape(id, scale, {
|
|
5913
5950
|
...opts,
|
|
5914
5951
|
initialBounds,
|
|
5915
5952
|
scaleOrigin,
|
|
@@ -5918,6 +5955,7 @@ class Editor extends import_eventemitter3.default {
|
|
|
5918
5955
|
isAspectRatioLocked,
|
|
5919
5956
|
initialShape
|
|
5920
5957
|
});
|
|
5958
|
+
return null;
|
|
5921
5959
|
}
|
|
5922
5960
|
const util = this.getShapeUtil(initialShape);
|
|
5923
5961
|
if (isAspectRatioLocked) {
|
|
@@ -5927,7 +5965,7 @@ class Editor extends import_eventemitter3.default {
|
|
|
5927
5965
|
scale = new import_Vec.Vec(Math.sign(scale.x) * Math.abs(scale.y), scale.y);
|
|
5928
5966
|
}
|
|
5929
5967
|
}
|
|
5930
|
-
let
|
|
5968
|
+
let workingShape = null;
|
|
5931
5969
|
if (util.onResize && util.canResize(initialShape)) {
|
|
5932
5970
|
const newPagePoint = this._scalePagePoint(
|
|
5933
5971
|
import_Mat.Mat.applyToPoint(pageTransform, new import_Vec.Vec(0, 0)),
|
|
@@ -5945,7 +5983,7 @@ class Editor extends import_eventemitter3.default {
|
|
|
5945
5983
|
myScale.y = areWidthAndHeightAlignedWithCorrectAxis ? scale.y : scale.x;
|
|
5946
5984
|
const initialPagePoint = import_Mat.Mat.applyToPoint(pageTransform, new import_Vec.Vec());
|
|
5947
5985
|
const { x, y } = this.getPointInParentSpace(initialShape.id, initialPagePoint);
|
|
5948
|
-
|
|
5986
|
+
workingShape = initialShape;
|
|
5949
5987
|
if (!opts.skipStartAndEndCallbacks) {
|
|
5950
5988
|
workingShape = applyPartialToRecordWithProps(
|
|
5951
5989
|
initialShape,
|
|
@@ -5965,9 +6003,6 @@ class Editor extends import_eventemitter3.default {
|
|
|
5965
6003
|
initialShape
|
|
5966
6004
|
}
|
|
5967
6005
|
);
|
|
5968
|
-
if (resizedShape) {
|
|
5969
|
-
didResize = true;
|
|
5970
|
-
}
|
|
5971
6006
|
workingShape = applyPartialToRecordWithProps(workingShape, {
|
|
5972
6007
|
id,
|
|
5973
6008
|
type: initialShape.type,
|
|
@@ -5981,32 +6016,36 @@ class Editor extends import_eventemitter3.default {
|
|
|
5981
6016
|
util.onResizeEnd?.(initialShape, workingShape) ?? void 0
|
|
5982
6017
|
);
|
|
5983
6018
|
}
|
|
5984
|
-
|
|
6019
|
+
if (resizedShape) {
|
|
6020
|
+
return workingShape;
|
|
6021
|
+
}
|
|
5985
6022
|
}
|
|
5986
|
-
|
|
5987
|
-
|
|
5988
|
-
|
|
5989
|
-
|
|
5990
|
-
|
|
5991
|
-
|
|
5992
|
-
|
|
5993
|
-
|
|
5994
|
-
|
|
5995
|
-
|
|
5996
|
-
|
|
5997
|
-
|
|
5998
|
-
|
|
5999
|
-
|
|
6000
|
-
|
|
6001
|
-
|
|
6002
|
-
|
|
6003
|
-
|
|
6004
|
-
|
|
6005
|
-
y: initialShape.y + delta.y
|
|
6006
|
-
}
|
|
6007
|
-
]);
|
|
6023
|
+
const initialPageCenter = import_Mat.Mat.applyToPoint(pageTransform, initialBounds.center);
|
|
6024
|
+
const newPageCenter = this._scalePagePoint(
|
|
6025
|
+
initialPageCenter,
|
|
6026
|
+
scaleOrigin,
|
|
6027
|
+
scale,
|
|
6028
|
+
scaleAxisRotation
|
|
6029
|
+
);
|
|
6030
|
+
const initialPageCenterInParentSpace = this.getPointInParentSpace(
|
|
6031
|
+
initialShape.id,
|
|
6032
|
+
initialPageCenter
|
|
6033
|
+
);
|
|
6034
|
+
const newPageCenterInParentSpace = this.getPointInParentSpace(initialShape.id, newPageCenter);
|
|
6035
|
+
const delta = import_Vec.Vec.Sub(newPageCenterInParentSpace, initialPageCenterInParentSpace);
|
|
6036
|
+
if (workingShape) {
|
|
6037
|
+
return {
|
|
6038
|
+
...workingShape,
|
|
6039
|
+
x: initialShape.x + delta.x,
|
|
6040
|
+
y: initialShape.y + delta.y
|
|
6041
|
+
};
|
|
6008
6042
|
}
|
|
6009
|
-
return
|
|
6043
|
+
return {
|
|
6044
|
+
id,
|
|
6045
|
+
type: initialShape.type,
|
|
6046
|
+
x: initialShape.x + delta.x,
|
|
6047
|
+
y: initialShape.y + delta.y
|
|
6048
|
+
};
|
|
6010
6049
|
}
|
|
6011
6050
|
/** @internal */
|
|
6012
6051
|
_scalePagePoint(point, scaleOrigin, scale, scaleAxisRotation) {
|
|
@@ -8125,7 +8164,10 @@ class Editor extends import_eventemitter3.default {
|
|
|
8125
8164
|
inputs.buttons.add(info.button);
|
|
8126
8165
|
inputs.setIsPointing(true);
|
|
8127
8166
|
inputs.setIsDragging(false);
|
|
8128
|
-
if (!isPenMode && isPen)
|
|
8167
|
+
if (!isPenMode && isPen) {
|
|
8168
|
+
this.updateInstanceState({ isPenMode: true });
|
|
8169
|
+
this.interrupt();
|
|
8170
|
+
}
|
|
8129
8171
|
if (info.button === import_constants.STYLUS_ERASER_BUTTON) {
|
|
8130
8172
|
this._restoreToolId = this.getCurrentToolId();
|
|
8131
8173
|
this.complete();
|
|
@@ -8228,7 +8270,10 @@ class Editor extends import_eventemitter3.default {
|
|
|
8228
8270
|
this.setCursor({ type: this._prevCursor, rotation: 0 });
|
|
8229
8271
|
}
|
|
8230
8272
|
if (slideSpeed > 0) {
|
|
8231
|
-
this.slideCamera({
|
|
8273
|
+
this.slideCamera({
|
|
8274
|
+
speed: slideSpeed,
|
|
8275
|
+
direction: { x: slideDirection.x, y: slideDirection.y, z: 0 }
|
|
8276
|
+
});
|
|
8232
8277
|
}
|
|
8233
8278
|
this._selectedShapeIdsAtPointerDown = [];
|
|
8234
8279
|
this._didCaptureSelectionAtPointerDown = false;
|
|
@@ -8236,7 +8281,10 @@ class Editor extends import_eventemitter3.default {
|
|
|
8236
8281
|
}
|
|
8237
8282
|
}
|
|
8238
8283
|
if (slideSpeed > 0) {
|
|
8239
|
-
this.slideCamera({
|
|
8284
|
+
this.slideCamera({
|
|
8285
|
+
speed: slideSpeed,
|
|
8286
|
+
direction: { x: slideDirection.x, y: slideDirection.y, z: 0 }
|
|
8287
|
+
});
|
|
8240
8288
|
}
|
|
8241
8289
|
} else {
|
|
8242
8290
|
if (info.button === import_constants.STYLUS_ERASER_BUTTON) {
|