@tldraw/editor 4.3.0-canary.8fb8d4ef1572 → 4.3.0-canary.9433fac41058
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 +443 -120
- package/dist-cjs/index.js +6 -1
- package/dist-cjs/index.js.map +2 -2
- package/dist-cjs/lib/components/ErrorBoundary.js.map +1 -1
- package/dist-cjs/lib/components/GeometryDebuggingView.js +1 -17
- package/dist-cjs/lib/components/GeometryDebuggingView.js.map +2 -2
- package/dist-cjs/lib/components/default-components/DefaultCanvas.js +3 -3
- package/dist-cjs/lib/components/default-components/DefaultCanvas.js.map +2 -2
- package/dist-cjs/lib/constants.js +1 -3
- package/dist-cjs/lib/constants.js.map +2 -2
- package/dist-cjs/lib/editor/Editor.js +292 -274
- package/dist-cjs/lib/editor/Editor.js.map +2 -2
- package/dist-cjs/lib/editor/derivations/notVisibleShapes.js +18 -17
- package/dist-cjs/lib/editor/derivations/notVisibleShapes.js.map +3 -3
- package/dist-cjs/lib/editor/derivations/parentsToChildren.js +12 -3
- package/dist-cjs/lib/editor/derivations/parentsToChildren.js.map +2 -2
- package/dist-cjs/lib/editor/managers/ClickManager/ClickManager.js +1 -1
- package/dist-cjs/lib/editor/managers/ClickManager/ClickManager.js.map +2 -2
- package/dist-cjs/lib/editor/managers/EdgeScrollManager/EdgeScrollManager.js +5 -6
- package/dist-cjs/lib/editor/managers/EdgeScrollManager/EdgeScrollManager.js.map +2 -2
- package/dist-cjs/lib/editor/managers/InputsManager/InputsManager.js +591 -0
- package/dist-cjs/lib/editor/managers/InputsManager/InputsManager.js.map +7 -0
- package/dist-cjs/lib/editor/managers/SnapManager/SnapManager.js +1 -1
- package/dist-cjs/lib/editor/managers/SnapManager/SnapManager.js.map +2 -2
- package/dist-cjs/lib/editor/managers/TickManager/TickManager.js +1 -22
- package/dist-cjs/lib/editor/managers/TickManager/TickManager.js.map +2 -2
- package/dist-cjs/lib/editor/shapes/ShapeUtil.js +31 -23
- package/dist-cjs/lib/editor/shapes/ShapeUtil.js.map +2 -2
- package/dist-cjs/lib/editor/shapes/group/DashedOutlineBox.js +1 -1
- package/dist-cjs/lib/editor/shapes/group/DashedOutlineBox.js.map +2 -2
- package/dist-cjs/lib/editor/tools/BaseBoxShapeTool/children/Pointing.js +3 -3
- package/dist-cjs/lib/editor/tools/BaseBoxShapeTool/children/Pointing.js.map +2 -2
- package/dist-cjs/lib/editor/types/emit-types.js.map +1 -1
- package/dist-cjs/lib/exports/parseCss.js +1 -1
- package/dist-cjs/lib/exports/parseCss.js.map +2 -2
- package/dist-cjs/lib/globals/environment.js +45 -9
- package/dist-cjs/lib/globals/environment.js.map +2 -2
- package/dist-cjs/lib/globals/menus.js +1 -1
- package/dist-cjs/lib/globals/menus.js.map +2 -2
- package/dist-cjs/lib/hooks/useCoarsePointer.js +14 -29
- package/dist-cjs/lib/hooks/useCoarsePointer.js.map +2 -2
- package/dist-cjs/lib/hooks/useEvent.js +1 -1
- package/dist-cjs/lib/hooks/useEvent.js.map +2 -2
- package/dist-cjs/lib/hooks/useFixSafariDoubleTapZoomPencilEvents.js.map +2 -2
- package/dist-cjs/lib/hooks/useGestureEvents.js +1 -1
- package/dist-cjs/lib/hooks/useGestureEvents.js.map +2 -2
- package/dist-cjs/lib/hooks/usePassThroughMouseOverEvents.js.map +2 -2
- package/dist-cjs/lib/hooks/usePassThroughWheelEvents.js.map +2 -2
- package/dist-cjs/lib/hooks/useScreenBounds.js.map +2 -2
- package/dist-cjs/lib/hooks/useStateAttribute.js +4 -1
- package/dist-cjs/lib/hooks/useStateAttribute.js.map +2 -2
- package/dist-cjs/lib/hooks/useTransform.js.map +1 -1
- package/dist-cjs/lib/hooks/useZoomCss.js +4 -8
- package/dist-cjs/lib/hooks/useZoomCss.js.map +2 -2
- package/dist-cjs/lib/options.js +6 -1
- package/dist-cjs/lib/options.js.map +2 -2
- package/dist-cjs/lib/primitives/Box.js +3 -0
- package/dist-cjs/lib/primitives/Box.js.map +2 -2
- package/dist-cjs/lib/primitives/geometry/Geometry2d.js +1 -0
- package/dist-cjs/lib/primitives/geometry/Geometry2d.js.map +2 -2
- package/dist-cjs/lib/utils/rotation.js +1 -1
- package/dist-cjs/lib/utils/rotation.js.map +2 -2
- package/dist-cjs/version.js +3 -3
- package/dist-cjs/version.js.map +1 -1
- package/dist-esm/index.d.mts +443 -120
- package/dist-esm/index.mjs +7 -2
- package/dist-esm/index.mjs.map +2 -2
- package/dist-esm/lib/components/ErrorBoundary.mjs.map +1 -1
- package/dist-esm/lib/components/GeometryDebuggingView.mjs +1 -17
- package/dist-esm/lib/components/GeometryDebuggingView.mjs.map +2 -2
- package/dist-esm/lib/components/default-components/DefaultCanvas.mjs +3 -3
- package/dist-esm/lib/components/default-components/DefaultCanvas.mjs.map +2 -2
- package/dist-esm/lib/constants.mjs +1 -3
- package/dist-esm/lib/constants.mjs.map +2 -2
- package/dist-esm/lib/editor/Editor.mjs +293 -277
- package/dist-esm/lib/editor/Editor.mjs.map +2 -2
- package/dist-esm/lib/editor/derivations/notVisibleShapes.mjs +18 -17
- package/dist-esm/lib/editor/derivations/notVisibleShapes.mjs.map +3 -3
- package/dist-esm/lib/editor/derivations/parentsToChildren.mjs +13 -4
- package/dist-esm/lib/editor/derivations/parentsToChildren.mjs.map +2 -2
- package/dist-esm/lib/editor/managers/ClickManager/ClickManager.mjs +1 -1
- package/dist-esm/lib/editor/managers/ClickManager/ClickManager.mjs.map +2 -2
- package/dist-esm/lib/editor/managers/EdgeScrollManager/EdgeScrollManager.mjs +5 -6
- package/dist-esm/lib/editor/managers/EdgeScrollManager/EdgeScrollManager.mjs.map +2 -2
- package/dist-esm/lib/editor/managers/InputsManager/InputsManager.mjs +573 -0
- package/dist-esm/lib/editor/managers/InputsManager/InputsManager.mjs.map +7 -0
- package/dist-esm/lib/editor/managers/SnapManager/SnapManager.mjs +1 -1
- package/dist-esm/lib/editor/managers/SnapManager/SnapManager.mjs.map +2 -2
- package/dist-esm/lib/editor/managers/TickManager/TickManager.mjs +1 -22
- package/dist-esm/lib/editor/managers/TickManager/TickManager.mjs.map +2 -2
- package/dist-esm/lib/editor/shapes/ShapeUtil.mjs +31 -23
- package/dist-esm/lib/editor/shapes/ShapeUtil.mjs.map +2 -2
- package/dist-esm/lib/editor/shapes/group/DashedOutlineBox.mjs +1 -1
- package/dist-esm/lib/editor/shapes/group/DashedOutlineBox.mjs.map +2 -2
- package/dist-esm/lib/editor/tools/BaseBoxShapeTool/children/Pointing.mjs +3 -3
- package/dist-esm/lib/editor/tools/BaseBoxShapeTool/children/Pointing.mjs.map +2 -2
- package/dist-esm/lib/exports/parseCss.mjs +1 -1
- package/dist-esm/lib/exports/parseCss.mjs.map +2 -2
- package/dist-esm/lib/globals/environment.mjs +45 -9
- package/dist-esm/lib/globals/environment.mjs.map +2 -2
- package/dist-esm/lib/globals/menus.mjs +1 -1
- package/dist-esm/lib/globals/menus.mjs.map +2 -2
- package/dist-esm/lib/hooks/useCoarsePointer.mjs +15 -30
- package/dist-esm/lib/hooks/useCoarsePointer.mjs.map +2 -2
- package/dist-esm/lib/hooks/useEvent.mjs +1 -1
- package/dist-esm/lib/hooks/useEvent.mjs.map +2 -2
- package/dist-esm/lib/hooks/useFixSafariDoubleTapZoomPencilEvents.mjs.map +2 -2
- package/dist-esm/lib/hooks/useGestureEvents.mjs +1 -1
- package/dist-esm/lib/hooks/useGestureEvents.mjs.map +2 -2
- package/dist-esm/lib/hooks/usePassThroughMouseOverEvents.mjs.map +2 -2
- package/dist-esm/lib/hooks/usePassThroughWheelEvents.mjs.map +2 -2
- package/dist-esm/lib/hooks/useScreenBounds.mjs.map +2 -2
- package/dist-esm/lib/hooks/useStateAttribute.mjs +4 -1
- package/dist-esm/lib/hooks/useStateAttribute.mjs.map +2 -2
- package/dist-esm/lib/hooks/useTransform.mjs.map +1 -1
- package/dist-esm/lib/hooks/useZoomCss.mjs +4 -8
- package/dist-esm/lib/hooks/useZoomCss.mjs.map +2 -2
- package/dist-esm/lib/options.mjs +6 -1
- package/dist-esm/lib/options.mjs.map +2 -2
- package/dist-esm/lib/primitives/Box.mjs +3 -0
- package/dist-esm/lib/primitives/Box.mjs.map +2 -2
- package/dist-esm/lib/primitives/geometry/Geometry2d.mjs +1 -0
- package/dist-esm/lib/primitives/geometry/Geometry2d.mjs.map +2 -2
- package/dist-esm/lib/utils/rotation.mjs +1 -1
- package/dist-esm/lib/utils/rotation.mjs.map +2 -2
- package/dist-esm/version.mjs +3 -3
- package/dist-esm/version.mjs.map +1 -1
- package/editor.css +14 -12
- package/package.json +18 -16
- package/src/index.ts +4 -1
- package/src/lib/components/ErrorBoundary.tsx +1 -1
- package/src/lib/components/GeometryDebuggingView.tsx +1 -19
- package/src/lib/components/default-components/DefaultCanvas.tsx +4 -3
- package/src/lib/config/TLUserPreferences.test.ts +40 -0
- package/src/lib/constants.ts +0 -2
- package/src/lib/editor/Editor.test.ts +140 -0
- package/src/lib/editor/Editor.ts +378 -320
- package/src/lib/editor/derivations/notVisibleShapes.ts +37 -23
- package/src/lib/editor/derivations/parentsToChildren.ts +18 -7
- package/src/lib/editor/managers/ClickManager/ClickManager.test.ts +17 -31
- package/src/lib/editor/managers/ClickManager/ClickManager.ts +1 -1
- package/src/lib/editor/managers/EdgeScrollManager/EdgeScrollManager.test.ts +129 -79
- package/src/lib/editor/managers/EdgeScrollManager/EdgeScrollManager.ts +10 -6
- package/src/lib/editor/managers/InputsManager/InputsManager.ts +566 -0
- package/src/lib/editor/managers/ScribbleManager/ScribbleManager.test.ts +0 -4
- package/src/lib/editor/managers/SnapManager/SnapManager.test.ts +12 -0
- package/src/lib/editor/managers/SnapManager/SnapManager.ts +1 -1
- package/src/lib/editor/managers/TickManager/TickManager.test.ts +40 -107
- package/src/lib/editor/managers/TickManager/TickManager.ts +2 -32
- package/src/lib/editor/shapes/ShapeUtil.ts +67 -24
- package/src/lib/editor/shapes/group/DashedOutlineBox.tsx +1 -1
- package/src/lib/editor/tools/BaseBoxShapeTool/children/Pointing.ts +3 -3
- package/src/lib/editor/types/emit-types.ts +3 -1
- package/src/lib/exports/parseCss.test.ts +1 -0
- package/src/lib/exports/parseCss.ts +1 -1
- package/src/lib/globals/environment.ts +65 -10
- package/src/lib/globals/menus.ts +1 -1
- package/src/lib/hooks/useCoarsePointer.ts +16 -59
- package/src/lib/hooks/useEvent.tsx +1 -1
- package/src/lib/hooks/useFixSafariDoubleTapZoomPencilEvents.ts +1 -1
- package/src/lib/hooks/useGestureEvents.ts +2 -2
- package/src/lib/hooks/usePassThroughMouseOverEvents.ts +1 -1
- package/src/lib/hooks/usePassThroughWheelEvents.ts +1 -1
- package/src/lib/hooks/useScreenBounds.ts +1 -1
- package/src/lib/hooks/useStateAttribute.ts +4 -1
- package/src/lib/hooks/useTransform.ts +1 -1
- package/src/lib/hooks/useZoomCss.ts +3 -8
- package/src/lib/options.ts +32 -0
- package/src/lib/primitives/Box.ts +9 -0
- package/src/lib/primitives/geometry/Geometry2d.ts +1 -0
- package/src/lib/utils/rotation.ts +1 -1
- package/src/version.ts +3 -3
|
@@ -46,7 +46,7 @@ var __privateIn = (member, obj) => Object(obj) !== obj ? __typeError('Cannot use
|
|
|
46
46
|
var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
|
|
47
47
|
var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
|
|
48
48
|
var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "access private method"), method);
|
|
49
|
-
var __setMetaKeyTimeout_dec, __setCtrlKeyTimeout_dec, __setAltKeyTimeout_dec, __setShiftKeyTimeout_dec, _getIsReadonly_dec, _getIsFocused_dec, _getSharedOpacity_dec, _getSharedStyles_dec, __getSelectionSharedStyles_dec, __getBindingsIndexCache_dec, _getCurrentPageRenderingShapesSorted_dec, _getCurrentPageShapesSorted_dec, _getCurrentPageShapes_dec, _getCurrentPageBounds_dec, _getCulledShapes_dec, _getNotVisibleShapes_dec, __getShapeMaskedPageBoundsCache_dec, __getShapeMaskCache_dec, __getShapeClipPathCache_dec, __getShapePageBoundsCache_dec, __getShapePageTransformCache_dec, __getShapeHandlesCache_dec, __getAllAssetsQuery_dec, _getCurrentPageShapeIdsSorted_dec, _getCurrentPageId_dec, _getPages_dec, __getAllPagesQuery_dec, _getRenderingShapes_dec, _getCollaboratorsOnCurrentPage_dec, _getCollaborators_dec, __getCollaboratorsQuery_dec, _getViewportPageBounds_dec, _getViewportScreenCenter_dec, _getViewportScreenBounds_dec, _getZoomLevel_dec, _getCameraForFollowing_dec, _getViewportPageBoundsForFollowing_dec, _getCamera_dec, __unsafe_getCameraId_dec, _getErasingShapes_dec, _getErasingShapeIds_dec, _getHintingShape_dec, _getHintingShapeIds_dec, _getHoveredShape_dec, _getHoveredShapeId_dec, _getRichTextEditor_dec, _getEditingShape_dec, _getEditingShapeId_dec, _getFocusedGroup_dec, _getFocusedGroupId_dec, _getSelectionRotatedScreenBounds_dec, _getSelectionRotatedPageBounds_dec, _getSelectionRotation_dec, _getSelectionPageBounds_dec, _getOnlySelectedShape_dec, _getOnlySelectedShapeId_dec, _getCurrentPageShapesInReadingOrder_dec, _getSelectedShapes_dec, _getSelectedShapeIds_dec, __getCurrentPageStateId_dec, _getCurrentPageState_dec, __getPageStatesQuery_dec, _getPageStates_dec, _getInstanceState_dec, _getDocumentSettings_dec, _getCurrentToolId_dec, _getCurrentTool_dec, _getPath_dec,
|
|
49
|
+
var __setMetaKeyTimeout_dec, __setCtrlKeyTimeout_dec, __setAltKeyTimeout_dec, __setShiftKeyTimeout_dec, _getIsReadonly_dec, _getIsFocused_dec, _getSharedOpacity_dec, _getSharedStyles_dec, __getSelectionSharedStyles_dec, __getBindingsIndexCache_dec, _getCurrentPageRenderingShapesSorted_dec, _getCurrentPageShapesSorted_dec, _getCurrentPageShapes_dec, _getCurrentPageBounds_dec, _getCulledShapes_dec, _getNotVisibleShapes_dec, __getShapeMaskedPageBoundsCache_dec, __getShapeMaskCache_dec, __getShapeClipPathCache_dec, __getShapePageBoundsCache_dec, __getShapePageTransformCache_dec, __getShapeHandlesCache_dec, __getAllAssetsQuery_dec, _getCurrentPageShapeIdsSorted_dec, _getCurrentPageId_dec, _getPages_dec, __getAllPagesQuery_dec, _getRenderingShapes_dec, _getCollaboratorsOnCurrentPage_dec, _getCollaborators_dec, __getCollaboratorsQuery_dec, _getViewportPageBounds_dec, _getViewportScreenCenter_dec, _getViewportScreenBounds_dec, _getEfficientZoomLevel_dec, __getAboveDebouncedZoomThreshold_dec, _getDebouncedZoomLevel_dec, _getZoomLevel_dec, _getCameraForFollowing_dec, _getViewportPageBoundsForFollowing_dec, _getCamera_dec, __unsafe_getCameraId_dec, _getErasingShapes_dec, _getErasingShapeIds_dec, _getHintingShape_dec, _getHintingShapeIds_dec, _getHoveredShape_dec, _getHoveredShapeId_dec, _getRichTextEditor_dec, _getEditingShape_dec, _getEditingShapeId_dec, _getFocusedGroup_dec, _getFocusedGroupId_dec, _getSelectionRotatedScreenBounds_dec, _getSelectionRotatedPageBounds_dec, _getSelectionRotation_dec, _getSelectionPageBounds_dec, _getOnlySelectedShape_dec, _getOnlySelectedShapeId_dec, _getCurrentPageShapesInReadingOrder_dec, _getSelectedShapes_dec, _getSelectedShapeIds_dec, __getCurrentPageStateId_dec, _getCurrentPageState_dec, __getPageStatesQuery_dec, _getPageStates_dec, _getInstanceState_dec, _getDocumentSettings_dec, _getCurrentToolId_dec, _getCurrentTool_dec, _getPath_dec, _canRedo_dec, _canUndo_dec, _getIsShapeHiddenCache_dec, _a, _init;
|
|
50
50
|
import {
|
|
51
51
|
EMPTY_ARRAY,
|
|
52
52
|
atom,
|
|
@@ -64,7 +64,6 @@ import {
|
|
|
64
64
|
PageRecordType,
|
|
65
65
|
TLDOCUMENT_ID,
|
|
66
66
|
TLINSTANCE_ID,
|
|
67
|
-
TLPOINTER_ID,
|
|
68
67
|
createBindingId,
|
|
69
68
|
createShapeId,
|
|
70
69
|
getShapePropKeysByStyle,
|
|
@@ -116,8 +115,7 @@ import {
|
|
|
116
115
|
LEFT_MOUSE_BUTTON,
|
|
117
116
|
MIDDLE_MOUSE_BUTTON,
|
|
118
117
|
RIGHT_MOUSE_BUTTON,
|
|
119
|
-
STYLUS_ERASER_BUTTON
|
|
120
|
-
ZOOM_TO_FIT_PADDING
|
|
118
|
+
STYLUS_ERASER_BUTTON
|
|
121
119
|
} from "../constants.mjs";
|
|
122
120
|
import { exportToSvg } from "../exports/exportToSvg.mjs";
|
|
123
121
|
import { getSvgAsImage } from "../exports/getSvgAsImage.mjs";
|
|
@@ -140,7 +138,6 @@ import {
|
|
|
140
138
|
parseDeepLinkString
|
|
141
139
|
} from "../utils/deepLinks.mjs";
|
|
142
140
|
import { getIncrementedName } from "../utils/getIncrementedName.mjs";
|
|
143
|
-
import { isAccelKey } from "../utils/keyboard.mjs";
|
|
144
141
|
import { getReorderingShapesChanges } from "../utils/reorderShapes.mjs";
|
|
145
142
|
import { applyRotationToSnapshotShapes, getRotationSnapshot } from "../utils/rotation.mjs";
|
|
146
143
|
import { bindingsIndex } from "./derivations/bindingsIndex.mjs";
|
|
@@ -152,13 +149,14 @@ import { EdgeScrollManager } from "./managers/EdgeScrollManager/EdgeScrollManage
|
|
|
152
149
|
import { FocusManager } from "./managers/FocusManager/FocusManager.mjs";
|
|
153
150
|
import { FontManager } from "./managers/FontManager/FontManager.mjs";
|
|
154
151
|
import { HistoryManager } from "./managers/HistoryManager/HistoryManager.mjs";
|
|
152
|
+
import { InputsManager } from "./managers/InputsManager/InputsManager.mjs";
|
|
155
153
|
import { ScribbleManager } from "./managers/ScribbleManager/ScribbleManager.mjs";
|
|
156
154
|
import { SnapManager } from "./managers/SnapManager/SnapManager.mjs";
|
|
157
155
|
import { TextManager } from "./managers/TextManager/TextManager.mjs";
|
|
158
156
|
import { TickManager } from "./managers/TickManager/TickManager.mjs";
|
|
159
157
|
import { UserPreferencesManager } from "./managers/UserPreferencesManager/UserPreferencesManager.mjs";
|
|
160
158
|
import { RootState } from "./tools/RootState.mjs";
|
|
161
|
-
class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed],
|
|
159
|
+
class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed], _canUndo_dec = [computed], _canRedo_dec = [computed], _getPath_dec = [computed], _getCurrentTool_dec = [computed], _getCurrentToolId_dec = [computed], _getDocumentSettings_dec = [computed], _getInstanceState_dec = [computed], _getPageStates_dec = [computed], __getPageStatesQuery_dec = [computed], _getCurrentPageState_dec = [computed], __getCurrentPageStateId_dec = [computed], _getSelectedShapeIds_dec = [computed], _getSelectedShapes_dec = [computed], _getCurrentPageShapesInReadingOrder_dec = [computed], _getOnlySelectedShapeId_dec = [computed], _getOnlySelectedShape_dec = [computed], _getSelectionPageBounds_dec = [computed], _getSelectionRotation_dec = [computed], _getSelectionRotatedPageBounds_dec = [computed], _getSelectionRotatedScreenBounds_dec = [computed], _getFocusedGroupId_dec = [computed], _getFocusedGroup_dec = [computed], _getEditingShapeId_dec = [computed], _getEditingShape_dec = [computed], _getRichTextEditor_dec = [computed], _getHoveredShapeId_dec = [computed], _getHoveredShape_dec = [computed], _getHintingShapeIds_dec = [computed], _getHintingShape_dec = [computed], _getErasingShapeIds_dec = [computed], _getErasingShapes_dec = [computed], __unsafe_getCameraId_dec = [computed], _getCamera_dec = [computed], _getViewportPageBoundsForFollowing_dec = [computed], _getCameraForFollowing_dec = [computed], _getZoomLevel_dec = [computed], _getDebouncedZoomLevel_dec = [computed], __getAboveDebouncedZoomThreshold_dec = [computed], _getEfficientZoomLevel_dec = [computed], _getViewportScreenBounds_dec = [computed], _getViewportScreenCenter_dec = [computed], _getViewportPageBounds_dec = [computed], __getCollaboratorsQuery_dec = [computed], _getCollaborators_dec = [computed], _getCollaboratorsOnCurrentPage_dec = [computed], _getRenderingShapes_dec = [computed], __getAllPagesQuery_dec = [computed], _getPages_dec = [computed], _getCurrentPageId_dec = [computed], _getCurrentPageShapeIdsSorted_dec = [computed], __getAllAssetsQuery_dec = [computed], __getShapeHandlesCache_dec = [computed], __getShapePageTransformCache_dec = [computed], __getShapePageBoundsCache_dec = [computed], __getShapeClipPathCache_dec = [computed], __getShapeMaskCache_dec = [computed], __getShapeMaskedPageBoundsCache_dec = [computed], _getNotVisibleShapes_dec = [computed], _getCulledShapes_dec = [computed], _getCurrentPageBounds_dec = [computed], _getCurrentPageShapes_dec = [computed], _getCurrentPageShapesSorted_dec = [computed], _getCurrentPageRenderingShapesSorted_dec = [computed], __getBindingsIndexCache_dec = [computed], __getSelectionSharedStyles_dec = [computed], _getSharedStyles_dec = [computed({ isEqual: (a, b) => a.equals(b) })], _getSharedOpacity_dec = [computed], _getIsFocused_dec = [computed], _getIsReadonly_dec = [computed], __setShiftKeyTimeout_dec = [bind], __setAltKeyTimeout_dec = [bind], __setCtrlKeyTimeout_dec = [bind], __setMetaKeyTimeout_dec = [bind], _a) {
|
|
162
160
|
constructor({
|
|
163
161
|
store,
|
|
164
162
|
user,
|
|
@@ -194,7 +192,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
194
192
|
*/
|
|
195
193
|
__publicField(this, "root");
|
|
196
194
|
/**
|
|
197
|
-
* A set of functions to call when the
|
|
195
|
+
* A set of functions to call when the editor is disposed.
|
|
198
196
|
*
|
|
199
197
|
* @public
|
|
200
198
|
*/
|
|
@@ -205,10 +203,19 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
205
203
|
* @public
|
|
206
204
|
*/
|
|
207
205
|
__publicField(this, "isDisposed", false);
|
|
208
|
-
/**
|
|
206
|
+
/**
|
|
207
|
+
* A manager for the editor's tick events.
|
|
208
|
+
*
|
|
209
|
+
* @internal */
|
|
209
210
|
__publicField(this, "_tickManager");
|
|
210
211
|
/**
|
|
211
|
-
* A manager for the
|
|
212
|
+
* A manager for the editor's input state.
|
|
213
|
+
*
|
|
214
|
+
* @public
|
|
215
|
+
*/
|
|
216
|
+
__publicField(this, "inputs");
|
|
217
|
+
/**
|
|
218
|
+
* A manager for the editor's snapping feature.
|
|
212
219
|
*
|
|
213
220
|
* @public
|
|
214
221
|
*/
|
|
@@ -290,7 +297,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
290
297
|
__publicField(this, "bindingUtils");
|
|
291
298
|
/* --------------------- History -------------------- */
|
|
292
299
|
/**
|
|
293
|
-
* A manager for the
|
|
300
|
+
* A manager for the editor's history.
|
|
294
301
|
*
|
|
295
302
|
* @readonly
|
|
296
303
|
*/
|
|
@@ -305,6 +312,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
305
312
|
// Rich text editor
|
|
306
313
|
__publicField(this, "_currentRichTextEditor", atom("rich text editor", null));
|
|
307
314
|
__publicField(this, "_textOptions");
|
|
315
|
+
__publicField(this, "_debouncedZoomLevel", atom("debounced zoom level", 1));
|
|
308
316
|
__publicField(this, "_cameraOptions", atom("camera options", DEFAULT_CAMERA_OPTIONS));
|
|
309
317
|
/** @internal */
|
|
310
318
|
__publicField(this, "_viewportAnimation", null);
|
|
@@ -355,54 +363,6 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
355
363
|
tldraw: null,
|
|
356
364
|
excalidraw: null
|
|
357
365
|
});
|
|
358
|
-
/* --------------------- Events --------------------- */
|
|
359
|
-
/**
|
|
360
|
-
* The app's current input state.
|
|
361
|
-
*
|
|
362
|
-
* @public
|
|
363
|
-
*/
|
|
364
|
-
__publicField(this, "inputs", {
|
|
365
|
-
/** The most recent pointer down's position in the current page space. */
|
|
366
|
-
originPagePoint: new Vec(),
|
|
367
|
-
/** The most recent pointer down's position in screen space. */
|
|
368
|
-
originScreenPoint: new Vec(),
|
|
369
|
-
/** The previous pointer position in the current page space. */
|
|
370
|
-
previousPagePoint: new Vec(),
|
|
371
|
-
/** The previous pointer position in screen space. */
|
|
372
|
-
previousScreenPoint: new Vec(),
|
|
373
|
-
/** The most recent pointer position in the current page space. */
|
|
374
|
-
currentPagePoint: new Vec(),
|
|
375
|
-
/** The most recent pointer position in screen space. */
|
|
376
|
-
currentScreenPoint: new Vec(),
|
|
377
|
-
/** A set containing the currently pressed keys. */
|
|
378
|
-
keys: /* @__PURE__ */ new Set(),
|
|
379
|
-
/** A set containing the currently pressed buttons. */
|
|
380
|
-
buttons: /* @__PURE__ */ new Set(),
|
|
381
|
-
/** Whether the input is from a pe. */
|
|
382
|
-
isPen: false,
|
|
383
|
-
/** Whether the shift key is currently pressed. */
|
|
384
|
-
shiftKey: false,
|
|
385
|
-
/** Whether the meta key is currently pressed. */
|
|
386
|
-
metaKey: false,
|
|
387
|
-
/** Whether the control or command key is currently pressed. */
|
|
388
|
-
ctrlKey: false,
|
|
389
|
-
/** Whether the alt or option key is currently pressed. */
|
|
390
|
-
altKey: false,
|
|
391
|
-
/** Whether the user is dragging. */
|
|
392
|
-
isDragging: false,
|
|
393
|
-
/** Whether the user is pointing. */
|
|
394
|
-
isPointing: false,
|
|
395
|
-
/** Whether the user is pinching. */
|
|
396
|
-
isPinching: false,
|
|
397
|
-
/** Whether the user is editing. */
|
|
398
|
-
isEditing: false,
|
|
399
|
-
/** Whether the user is panning. */
|
|
400
|
-
isPanning: false,
|
|
401
|
-
/** Whether the user is spacebar panning. */
|
|
402
|
-
isSpacebarPanning: false,
|
|
403
|
-
/** Velocity of mouse pointer, in pixels per millisecond */
|
|
404
|
-
pointerVelocity: new Vec()
|
|
405
|
-
});
|
|
406
366
|
/**
|
|
407
367
|
* A manager for recording multiple click events.
|
|
408
368
|
*
|
|
@@ -426,8 +386,6 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
426
386
|
/** @internal */
|
|
427
387
|
__publicField(this, "_restoreToolId", "select");
|
|
428
388
|
/** @internal */
|
|
429
|
-
__publicField(this, "_pinchStart", 1);
|
|
430
|
-
/** @internal */
|
|
431
389
|
__publicField(this, "_didPinch", false);
|
|
432
390
|
/** @internal */
|
|
433
391
|
__publicField(this, "_selectedShapeIdsAtPointerDown", []);
|
|
@@ -463,6 +421,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
463
421
|
this.disposables.add(() => this.textMeasure.dispose());
|
|
464
422
|
this.fonts = new FontManager(this, fontAssetUrls);
|
|
465
423
|
this._tickManager = new TickManager(this);
|
|
424
|
+
this.inputs = new InputsManager(this);
|
|
466
425
|
class NewRoot extends RootState {
|
|
467
426
|
static initial = initialState ?? "";
|
|
468
427
|
}
|
|
@@ -895,6 +854,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
895
854
|
this.disposables.clear();
|
|
896
855
|
this.store.dispose();
|
|
897
856
|
this.isDisposed = true;
|
|
857
|
+
this.emit("dispose");
|
|
898
858
|
}
|
|
899
859
|
getShapeUtil(arg) {
|
|
900
860
|
const type = typeof arg === "string" ? arg : arg.type;
|
|
@@ -928,9 +888,12 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
928
888
|
this.history.undo();
|
|
929
889
|
return this;
|
|
930
890
|
}
|
|
931
|
-
|
|
891
|
+
canUndo() {
|
|
932
892
|
return this.history.getNumUndos() > 0;
|
|
933
893
|
}
|
|
894
|
+
getCanUndo() {
|
|
895
|
+
return this.canUndo();
|
|
896
|
+
}
|
|
934
897
|
/**
|
|
935
898
|
* Redo to the next mark.
|
|
936
899
|
*
|
|
@@ -947,13 +910,16 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
947
910
|
this.history.redo();
|
|
948
911
|
return this;
|
|
949
912
|
}
|
|
913
|
+
canRedo() {
|
|
914
|
+
return this.history.getNumRedos() > 0;
|
|
915
|
+
}
|
|
916
|
+
getCanRedo() {
|
|
917
|
+
return this.canRedo();
|
|
918
|
+
}
|
|
950
919
|
clearHistory() {
|
|
951
920
|
this.history.clear();
|
|
952
921
|
return this;
|
|
953
922
|
}
|
|
954
|
-
getCanRedo() {
|
|
955
|
-
return this.history.getNumRedos() > 0;
|
|
956
|
-
}
|
|
957
923
|
/**
|
|
958
924
|
* Create a new "mark", or stopping point, in the undo redo history. Creating a mark will clear
|
|
959
925
|
* any redos. You typically want to do this just before a user interaction begins or is handled.
|
|
@@ -1108,7 +1074,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
1108
1074
|
}),
|
|
1109
1075
|
selectionCount: this.getSelectedShapes().length,
|
|
1110
1076
|
editingShape: editingShapeId ? this.getShape(editingShapeId) : void 0,
|
|
1111
|
-
inputs: this.inputs,
|
|
1077
|
+
inputs: this.inputs.toJson(),
|
|
1112
1078
|
pageState: this.getCurrentPageState(),
|
|
1113
1079
|
instanceState: this.getInstanceState(),
|
|
1114
1080
|
collaboratorCount: this.getCollaboratorsOnCurrentPage().length
|
|
@@ -1129,7 +1095,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
1129
1095
|
* we're in a transaction that's about to be rolled back due to the same error we're currently
|
|
1130
1096
|
* reporting.
|
|
1131
1097
|
*
|
|
1132
|
-
* Instead, to listen to changes to this value, you need to listen to
|
|
1098
|
+
* Instead, to listen to changes to this value, you need to listen to editor's `crash` event.
|
|
1133
1099
|
*
|
|
1134
1100
|
* @internal
|
|
1135
1101
|
*/
|
|
@@ -1780,6 +1746,28 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
1780
1746
|
const editingShapeId = this.getEditingShapeId();
|
|
1781
1747
|
return editingShapeId ? this.getShape(editingShapeId) : void 0;
|
|
1782
1748
|
}
|
|
1749
|
+
/**
|
|
1750
|
+
* Whether the shape can be edited.
|
|
1751
|
+
*
|
|
1752
|
+
* @param shape - The shape (or shape id) to check if it can be edited.
|
|
1753
|
+
* @param info - The info about the edit start.
|
|
1754
|
+
*
|
|
1755
|
+
* @public
|
|
1756
|
+
* @returns true if the shape can be edited, false otherwise.
|
|
1757
|
+
*/
|
|
1758
|
+
canEditShape(shape, info) {
|
|
1759
|
+
const id = typeof shape === "string" ? shape : shape?.id ?? null;
|
|
1760
|
+
if (!id) return false;
|
|
1761
|
+
if (id === this.getEditingShapeId()) return false;
|
|
1762
|
+
const _shape = this.getShape(id);
|
|
1763
|
+
if (!_shape) return false;
|
|
1764
|
+
const util = this.getShapeUtil(_shape);
|
|
1765
|
+
const _info = info ?? { type: "unknown" };
|
|
1766
|
+
if (!util.canEdit(_shape, _info)) return false;
|
|
1767
|
+
if (this.getIsReadonly() && !util.canEditInReadonly(_shape)) return false;
|
|
1768
|
+
if (this.isShapeOrAncestorLocked(_shape) && !util.canEditWhileLocked(_shape)) return false;
|
|
1769
|
+
return true;
|
|
1770
|
+
}
|
|
1783
1771
|
/**
|
|
1784
1772
|
* Set the current editing shape.
|
|
1785
1773
|
*
|
|
@@ -1795,42 +1783,42 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
1795
1783
|
*/
|
|
1796
1784
|
setEditingShape(shape) {
|
|
1797
1785
|
const id = typeof shape === "string" ? shape : shape?.id ?? null;
|
|
1798
|
-
|
|
1799
|
-
const prevEditingShapeId = this.getEditingShapeId();
|
|
1800
|
-
if (id !== prevEditingShapeId) {
|
|
1801
|
-
if (id) {
|
|
1802
|
-
const shape2 = this.getShape(id);
|
|
1803
|
-
if (shape2 && this.getShapeUtil(shape2).canEdit(shape2)) {
|
|
1804
|
-
this.run(
|
|
1805
|
-
() => {
|
|
1806
|
-
this._updateCurrentPageState({ editingShapeId: id });
|
|
1807
|
-
if (prevEditingShapeId) {
|
|
1808
|
-
const prevEditingShape = this.getShape(prevEditingShapeId);
|
|
1809
|
-
if (prevEditingShape) {
|
|
1810
|
-
this.getShapeUtil(prevEditingShape).onEditEnd?.(prevEditingShape);
|
|
1811
|
-
}
|
|
1812
|
-
}
|
|
1813
|
-
this.getShapeUtil(shape2).onEditStart?.(shape2);
|
|
1814
|
-
},
|
|
1815
|
-
{ history: "ignore" }
|
|
1816
|
-
);
|
|
1817
|
-
return this;
|
|
1818
|
-
}
|
|
1819
|
-
}
|
|
1786
|
+
if (!id) {
|
|
1820
1787
|
this.run(
|
|
1821
1788
|
() => {
|
|
1822
|
-
this.
|
|
1823
|
-
this._currentRichTextEditor.set(null);
|
|
1789
|
+
const prevEditingShapeId = this.getEditingShapeId();
|
|
1824
1790
|
if (prevEditingShapeId) {
|
|
1825
1791
|
const prevEditingShape = this.getShape(prevEditingShapeId);
|
|
1826
1792
|
if (prevEditingShape) {
|
|
1827
1793
|
this.getShapeUtil(prevEditingShape).onEditEnd?.(prevEditingShape);
|
|
1828
1794
|
}
|
|
1829
1795
|
}
|
|
1796
|
+
this._updateCurrentPageState({ editingShapeId: null });
|
|
1797
|
+
this._currentRichTextEditor.set(null);
|
|
1830
1798
|
},
|
|
1831
1799
|
{ history: "ignore" }
|
|
1832
1800
|
);
|
|
1801
|
+
return this;
|
|
1833
1802
|
}
|
|
1803
|
+
if (!this.canEditShape(id)) return this;
|
|
1804
|
+
this.run(
|
|
1805
|
+
() => {
|
|
1806
|
+
const prevEditingShapeId = this.getEditingShapeId();
|
|
1807
|
+
if (prevEditingShapeId) {
|
|
1808
|
+
const prevEditingShape = this.getShape(prevEditingShapeId);
|
|
1809
|
+
if (prevEditingShape) {
|
|
1810
|
+
this.getShapeUtil(prevEditingShape).onEditEnd?.(prevEditingShape);
|
|
1811
|
+
}
|
|
1812
|
+
}
|
|
1813
|
+
this._updateCurrentPageState({ editingShapeId: null });
|
|
1814
|
+
this._currentRichTextEditor.set(null);
|
|
1815
|
+
this.select(id);
|
|
1816
|
+
this._updateCurrentPageState({ editingShapeId: id });
|
|
1817
|
+
const nextEditingShape = this.getShape(id);
|
|
1818
|
+
this.getShapeUtil(nextEditingShape).onEditStart?.(nextEditingShape);
|
|
1819
|
+
},
|
|
1820
|
+
{ history: "ignore" }
|
|
1821
|
+
);
|
|
1834
1822
|
return this;
|
|
1835
1823
|
}
|
|
1836
1824
|
getRichTextEditor() {
|
|
@@ -1963,6 +1951,25 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
1963
1951
|
getCroppingShapeId() {
|
|
1964
1952
|
return this.getCurrentPageState().croppingShapeId;
|
|
1965
1953
|
}
|
|
1954
|
+
/**
|
|
1955
|
+
* Whether the shape can be cropped.
|
|
1956
|
+
*
|
|
1957
|
+
* @param shape - The shape (or shape id) to check if it can be cropped.
|
|
1958
|
+
*
|
|
1959
|
+
* @public
|
|
1960
|
+
* @returns true if the shape can be cropped, false otherwise.
|
|
1961
|
+
*/
|
|
1962
|
+
canCropShape(shape) {
|
|
1963
|
+
if (!shape) return false;
|
|
1964
|
+
const id = typeof shape === "string" ? shape : shape?.id ?? null;
|
|
1965
|
+
if (!id) return false;
|
|
1966
|
+
const _shape = this.getShape(id);
|
|
1967
|
+
if (!_shape) return false;
|
|
1968
|
+
const util = this.getShapeUtil(_shape);
|
|
1969
|
+
if (!util.canCrop(_shape)) return false;
|
|
1970
|
+
if (this.isShapeOrAncestorLocked(_shape)) return false;
|
|
1971
|
+
return true;
|
|
1972
|
+
}
|
|
1966
1973
|
/**
|
|
1967
1974
|
* Set the current cropping shape.
|
|
1968
1975
|
*
|
|
@@ -1984,12 +1991,8 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
1984
1991
|
() => {
|
|
1985
1992
|
if (!id) {
|
|
1986
1993
|
this.updateCurrentPageState({ croppingShapeId: null });
|
|
1987
|
-
} else {
|
|
1988
|
-
|
|
1989
|
-
const util = this.getShapeUtil(shape2);
|
|
1990
|
-
if (shape2 && util.canCrop(shape2)) {
|
|
1991
|
-
this.updateCurrentPageState({ croppingShapeId: id });
|
|
1992
|
-
}
|
|
1994
|
+
} else if (this.canCropShape(id)) {
|
|
1995
|
+
this.updateCurrentPageState({ croppingShapeId: id });
|
|
1993
1996
|
}
|
|
1994
1997
|
},
|
|
1995
1998
|
{ history: "ignore" }
|
|
@@ -2064,6 +2067,22 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
2064
2067
|
getZoomLevel() {
|
|
2065
2068
|
return this.getCamera().z;
|
|
2066
2069
|
}
|
|
2070
|
+
getDebouncedZoomLevel() {
|
|
2071
|
+
if (this.options.debouncedZoom) {
|
|
2072
|
+
if (this.getCameraState() === "idle") {
|
|
2073
|
+
return this.getZoomLevel();
|
|
2074
|
+
} else {
|
|
2075
|
+
return this._debouncedZoomLevel.get();
|
|
2076
|
+
}
|
|
2077
|
+
}
|
|
2078
|
+
return this.getZoomLevel();
|
|
2079
|
+
}
|
|
2080
|
+
_getAboveDebouncedZoomThreshold() {
|
|
2081
|
+
return this.getCurrentPageShapeIds().size > this.options.debouncedZoomThreshold;
|
|
2082
|
+
}
|
|
2083
|
+
getEfficientZoomLevel() {
|
|
2084
|
+
return this._getAboveDebouncedZoomThreshold() ? this.getDebouncedZoomLevel() : this.getZoomLevel();
|
|
2085
|
+
}
|
|
2067
2086
|
/**
|
|
2068
2087
|
* Get the camera's initial or reset zoom level.
|
|
2069
2088
|
*
|
|
@@ -2309,7 +2328,8 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
2309
2328
|
},
|
|
2310
2329
|
{ history: "ignore" }
|
|
2311
2330
|
);
|
|
2312
|
-
const
|
|
2331
|
+
const currentScreenPoint = this.inputs.getCurrentScreenPoint();
|
|
2332
|
+
const currentPagePoint = this.inputs.getCurrentPagePoint();
|
|
2313
2333
|
if (currentScreenPoint.x / z - x !== currentPagePoint.x || currentScreenPoint.y / z - y !== currentPagePoint.y) {
|
|
2314
2334
|
this.updatePointer({
|
|
2315
2335
|
immediate: opts?.immediate,
|
|
@@ -2444,7 +2464,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
2444
2464
|
* ```ts
|
|
2445
2465
|
* editor.zoomIn()
|
|
2446
2466
|
* editor.zoomIn(editor.getViewportScreenCenter(), { animation: { duration: 200 } })
|
|
2447
|
-
* editor.zoomIn(editor.inputs.
|
|
2467
|
+
* editor.zoomIn(editor.inputs.getCurrentScreenPoint(), { animation: { duration: 200 } })
|
|
2448
2468
|
* ```
|
|
2449
2469
|
*
|
|
2450
2470
|
* @param point - The screen point to zoom in on. Defaults to the screen center
|
|
@@ -2485,7 +2505,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
2485
2505
|
* ```ts
|
|
2486
2506
|
* editor.zoomOut()
|
|
2487
2507
|
* editor.zoomOut(editor.getViewportScreenCenter(), { animation: { duration: 120 } })
|
|
2488
|
-
* editor.zoomOut(editor.inputs.
|
|
2508
|
+
* editor.zoomOut(editor.inputs.getCurrentScreenPoint(), { animation: { duration: 120 } })
|
|
2489
2509
|
* ```
|
|
2490
2510
|
*
|
|
2491
2511
|
* @param point - The point to zoom out on. Defaults to the viewport screen center.
|
|
@@ -2537,10 +2557,15 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
2537
2557
|
if (isLocked && !opts?.force) return this;
|
|
2538
2558
|
const selectionPageBounds = this.getSelectionPageBounds();
|
|
2539
2559
|
if (selectionPageBounds) {
|
|
2540
|
-
this.
|
|
2541
|
-
|
|
2542
|
-
|
|
2543
|
-
}
|
|
2560
|
+
const currentZoom = this.getZoomLevel();
|
|
2561
|
+
if (Math.abs(currentZoom - 1) < 0.01) {
|
|
2562
|
+
this.zoomToBounds(selectionPageBounds, opts);
|
|
2563
|
+
} else {
|
|
2564
|
+
this.zoomToBounds(selectionPageBounds, {
|
|
2565
|
+
targetZoom: 1,
|
|
2566
|
+
...opts
|
|
2567
|
+
});
|
|
2568
|
+
}
|
|
2544
2569
|
}
|
|
2545
2570
|
return this;
|
|
2546
2571
|
}
|
|
@@ -2580,7 +2605,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
2580
2605
|
const cameraOptions = this._cameraOptions.__unsafe__getWithoutCapture();
|
|
2581
2606
|
if (cameraOptions.isLocked && !opts?.force) return this;
|
|
2582
2607
|
const viewportScreenBounds = this.getViewportScreenBounds();
|
|
2583
|
-
const inset = opts?.inset ?? Math.min(
|
|
2608
|
+
const inset = opts?.inset ?? Math.min(this.options.zoomToFitPadding, viewportScreenBounds.width * 0.28);
|
|
2584
2609
|
const baseZoom = this.getBaseZoom();
|
|
2585
2610
|
const zoomMin = cameraOptions.zoomSteps[0];
|
|
2586
2611
|
const zoomMax = last(cameraOptions.zoomSteps);
|
|
@@ -2804,18 +2829,20 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
2804
2829
|
}
|
|
2805
2830
|
if (_willSetInitialBounds) {
|
|
2806
2831
|
this.updateInstanceState({ screenBounds: screenBounds.toJson(), insets });
|
|
2832
|
+
this.emit("resize", screenBounds.toJson());
|
|
2807
2833
|
this.setCamera(this.getCamera());
|
|
2808
2834
|
} else {
|
|
2809
2835
|
if (center && !this.getInstanceState().followingUserId) {
|
|
2810
2836
|
const before = this.getViewportPageBounds().center;
|
|
2811
2837
|
this.updateInstanceState({ screenBounds: screenBounds.toJson(), insets });
|
|
2838
|
+
this.emit("resize", screenBounds.toJson());
|
|
2812
2839
|
this.centerOnPoint(before);
|
|
2813
2840
|
} else {
|
|
2814
2841
|
this.updateInstanceState({ screenBounds: screenBounds.toJson(), insets });
|
|
2842
|
+
this.emit("resize", screenBounds.toJson());
|
|
2815
2843
|
this._setCamera(Vec.From({ ...this.getCamera() }));
|
|
2816
2844
|
}
|
|
2817
2845
|
}
|
|
2818
|
-
this._tickCameraState();
|
|
2819
2846
|
return this;
|
|
2820
2847
|
}
|
|
2821
2848
|
getViewportScreenBounds() {
|
|
@@ -3095,6 +3122,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
3095
3122
|
this._cameraStateTimeoutRemaining = this.options.cameraMovingTimeoutMs;
|
|
3096
3123
|
if (this._cameraState.__unsafe__getWithoutCapture() !== "idle") return;
|
|
3097
3124
|
this._cameraState.set("moving");
|
|
3125
|
+
this._debouncedZoomLevel.set(unsafe__withoutCapture(() => this.getCamera().z));
|
|
3098
3126
|
this.on("tick", this._decayCameraStateTimeout);
|
|
3099
3127
|
}
|
|
3100
3128
|
/**
|
|
@@ -5694,8 +5722,8 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
5694
5722
|
isAspectRatioLocked: options.isAspectRatioLocked
|
|
5695
5723
|
});
|
|
5696
5724
|
if (Math.sign(scale.x) * Math.sign(scale.y) < 0) {
|
|
5697
|
-
|
|
5698
|
-
rotation
|
|
5725
|
+
const parentRotation = this.getShapeParentTransform(id).rotation();
|
|
5726
|
+
const rotation = -options.initialShape.rotation - 2 * parentRotation;
|
|
5699
5727
|
this.updateShapes([{ id, type, rotation }]);
|
|
5700
5728
|
}
|
|
5701
5729
|
const preScaleShapePageCenter = Mat.applyToPoint(
|
|
@@ -5708,9 +5736,9 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
5708
5736
|
scale,
|
|
5709
5737
|
options.scaleAxisRotation
|
|
5710
5738
|
);
|
|
5711
|
-
const pageBounds = this.getShapePageBounds(id);
|
|
5712
5739
|
const pageTransform = this.getShapePageTransform(id);
|
|
5713
|
-
const
|
|
5740
|
+
const currentLocalBounds = this.getShapeGeometry(id).bounds;
|
|
5741
|
+
const currentPageCenter = Mat.applyToPoint(pageTransform, currentLocalBounds.center);
|
|
5714
5742
|
const shapePageTransformOrigin = pageTransform.point();
|
|
5715
5743
|
if (!currentPageCenter || !shapePageTransformOrigin) return this;
|
|
5716
5744
|
const pageDelta = Vec.Sub(postScaleShapePageCenter, currentPageCenter);
|
|
@@ -5996,7 +6024,11 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
5996
6024
|
)
|
|
5997
6025
|
);
|
|
5998
6026
|
const sortedShapeIds = shapesToGroup.sort(sortByIndex).map((s) => s.id);
|
|
5999
|
-
const
|
|
6027
|
+
const childBounds = compact(shapesToGroup.map((shape) => this.getShapePageBounds(shape)));
|
|
6028
|
+
const pageBounds = Box.Common(childBounds);
|
|
6029
|
+
if (!pageBounds.isValid()) {
|
|
6030
|
+
throw Error(`Editor.groupShapes: group bounds are invalid (NaN).`);
|
|
6031
|
+
}
|
|
6000
6032
|
const { x, y } = pageBounds.point;
|
|
6001
6033
|
const parentId = this.findCommonAncestor(shapesToGroup) ?? this.getCurrentPageId();
|
|
6002
6034
|
if (this.getCurrentToolId() !== "select") return this;
|
|
@@ -6686,6 +6718,25 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
6686
6718
|
}
|
|
6687
6719
|
}
|
|
6688
6720
|
}
|
|
6721
|
+
if (point) {
|
|
6722
|
+
const shapesById = new Map(shapes.map((shape) => [shape.id, shape]));
|
|
6723
|
+
const rootShapesFromContent = compact(rootShapeIds.map((id) => shapesById.get(id)));
|
|
6724
|
+
if (rootShapesFromContent.length > 0) {
|
|
6725
|
+
const targetParent = this.getShapeAtPoint(point, {
|
|
6726
|
+
hitInside: true,
|
|
6727
|
+
hitFrameInside: true,
|
|
6728
|
+
hitLocked: true,
|
|
6729
|
+
filter: (shape) => {
|
|
6730
|
+
const util = this.getShapeUtil(shape);
|
|
6731
|
+
if (!util.canReceiveNewChildrenOfType) return false;
|
|
6732
|
+
return rootShapesFromContent.every(
|
|
6733
|
+
(rootShape) => util.canReceiveNewChildrenOfType(shape, rootShape.type)
|
|
6734
|
+
);
|
|
6735
|
+
}
|
|
6736
|
+
});
|
|
6737
|
+
pasteParentId = targetParent ? targetParent.id : currentPageId;
|
|
6738
|
+
}
|
|
6739
|
+
}
|
|
6689
6740
|
let isDuplicating = false;
|
|
6690
6741
|
if (!isPageId(pasteParentId)) {
|
|
6691
6742
|
const parent = this.getShape(pasteParentId);
|
|
@@ -6930,60 +6981,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
6930
6981
|
height
|
|
6931
6982
|
};
|
|
6932
6983
|
}
|
|
6933
|
-
|
|
6934
|
-
* Update the input points from a pointer, pinch, or wheel event.
|
|
6935
|
-
*
|
|
6936
|
-
* @param info - The event info.
|
|
6937
|
-
*/
|
|
6938
|
-
_updateInputsFromEvent(info) {
|
|
6939
|
-
const {
|
|
6940
|
-
pointerVelocity,
|
|
6941
|
-
previousScreenPoint,
|
|
6942
|
-
previousPagePoint,
|
|
6943
|
-
currentScreenPoint,
|
|
6944
|
-
currentPagePoint,
|
|
6945
|
-
originScreenPoint,
|
|
6946
|
-
originPagePoint
|
|
6947
|
-
} = this.inputs;
|
|
6948
|
-
const { screenBounds } = this.store.unsafeGetWithoutCapture(TLINSTANCE_ID);
|
|
6949
|
-
const { x: cx, y: cy, z: cz } = unsafe__withoutCapture(() => this.getCamera());
|
|
6950
|
-
const sx = info.point.x - screenBounds.x;
|
|
6951
|
-
const sy = info.point.y - screenBounds.y;
|
|
6952
|
-
const sz = info.point.z ?? 0.5;
|
|
6953
|
-
previousScreenPoint.setTo(currentScreenPoint);
|
|
6954
|
-
previousPagePoint.setTo(currentPagePoint);
|
|
6955
|
-
currentScreenPoint.set(sx, sy);
|
|
6956
|
-
const nx = sx / cz - cx;
|
|
6957
|
-
const ny = sy / cz - cy;
|
|
6958
|
-
if (isFinite(nx) && isFinite(ny)) {
|
|
6959
|
-
currentPagePoint.set(nx, ny, sz);
|
|
6960
|
-
}
|
|
6961
|
-
this.inputs.isPen = info.type === "pointer" && info.isPen;
|
|
6962
|
-
if (info.name === "pointer_down" || this.inputs.isPinching) {
|
|
6963
|
-
pointerVelocity.set(0, 0);
|
|
6964
|
-
originScreenPoint.setTo(currentScreenPoint);
|
|
6965
|
-
originPagePoint.setTo(currentPagePoint);
|
|
6966
|
-
}
|
|
6967
|
-
this.run(
|
|
6968
|
-
() => {
|
|
6969
|
-
this.store.put([
|
|
6970
|
-
{
|
|
6971
|
-
id: TLPOINTER_ID,
|
|
6972
|
-
typeName: "pointer",
|
|
6973
|
-
x: currentPagePoint.x,
|
|
6974
|
-
y: currentPagePoint.y,
|
|
6975
|
-
lastActivityTimestamp: (
|
|
6976
|
-
// If our pointer moved only because we're following some other user, then don't
|
|
6977
|
-
// update our last activity timestamp; otherwise, update it to the current timestamp.
|
|
6978
|
-
(info.type === "pointer" && info.pointerId === INTERNAL_POINTER_IDS.CAMERA_MOVE ? this.store.unsafeGetWithoutCapture(TLPOINTER_ID)?.lastActivityTimestamp ?? this._tickManager.now : this._tickManager.now)
|
|
6979
|
-
),
|
|
6980
|
-
meta: {}
|
|
6981
|
-
}
|
|
6982
|
-
]);
|
|
6983
|
-
},
|
|
6984
|
-
{ history: "ignore" }
|
|
6985
|
-
);
|
|
6986
|
-
}
|
|
6984
|
+
/* --------------------- Events --------------------- */
|
|
6987
6985
|
/**
|
|
6988
6986
|
* Dispatch a cancel event.
|
|
6989
6987
|
*
|
|
@@ -7048,18 +7046,19 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
7048
7046
|
point: options?.point ?? // weird but true: what `inputs` calls screen-space is actually viewport space. so
|
|
7049
7047
|
// we need to convert back into true screen space first. we should fix this...
|
|
7050
7048
|
Vec.Add(
|
|
7051
|
-
this.inputs.
|
|
7049
|
+
this.inputs.getCurrentScreenPoint(),
|
|
7052
7050
|
this.store.unsafeGetWithoutCapture(TLINSTANCE_ID).screenBounds
|
|
7053
7051
|
),
|
|
7054
7052
|
pointerId: options?.pointerId ?? 0,
|
|
7055
7053
|
button: options?.button ?? 0,
|
|
7056
|
-
isPen: options?.isPen ?? this.inputs.
|
|
7057
|
-
shiftKey: options?.shiftKey ?? this.inputs.
|
|
7058
|
-
altKey: options?.altKey ?? this.inputs.
|
|
7059
|
-
ctrlKey: options?.ctrlKey ?? this.inputs.
|
|
7060
|
-
metaKey: options?.metaKey ?? this.inputs.
|
|
7061
|
-
accelKey:
|
|
7054
|
+
isPen: options?.isPen ?? this.inputs.getIsPen(),
|
|
7055
|
+
shiftKey: options?.shiftKey ?? this.inputs.getShiftKey(),
|
|
7056
|
+
altKey: options?.altKey ?? this.inputs.getAltKey(),
|
|
7057
|
+
ctrlKey: options?.ctrlKey ?? this.inputs.getCtrlKey(),
|
|
7058
|
+
metaKey: options?.metaKey ?? this.inputs.getMetaKey(),
|
|
7059
|
+
accelKey: false
|
|
7062
7060
|
};
|
|
7061
|
+
event.accelKey = options?.accelKey ?? this.inputs.getAccelKey();
|
|
7063
7062
|
if (options?.immediate) {
|
|
7064
7063
|
this._flushEventForTick(event);
|
|
7065
7064
|
} else {
|
|
@@ -7375,58 +7374,58 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
7375
7374
|
this._clickManager.cancelDoubleClickTimeout();
|
|
7376
7375
|
}
|
|
7377
7376
|
_setShiftKeyTimeout() {
|
|
7378
|
-
this.inputs.
|
|
7377
|
+
this.inputs.setShiftKey(false);
|
|
7379
7378
|
this.dispatch({
|
|
7380
7379
|
type: "keyboard",
|
|
7381
7380
|
name: "key_up",
|
|
7382
7381
|
key: "Shift",
|
|
7383
|
-
shiftKey: this.inputs.
|
|
7384
|
-
ctrlKey: this.inputs.
|
|
7385
|
-
altKey: this.inputs.
|
|
7386
|
-
metaKey: this.inputs.
|
|
7387
|
-
accelKey:
|
|
7382
|
+
shiftKey: this.inputs.getShiftKey(),
|
|
7383
|
+
ctrlKey: this.inputs.getCtrlKey(),
|
|
7384
|
+
altKey: this.inputs.getAltKey(),
|
|
7385
|
+
metaKey: this.inputs.getMetaKey(),
|
|
7386
|
+
accelKey: this.inputs.getAccelKey(),
|
|
7388
7387
|
code: "ShiftLeft"
|
|
7389
7388
|
});
|
|
7390
7389
|
}
|
|
7391
7390
|
_setAltKeyTimeout() {
|
|
7392
|
-
this.inputs.
|
|
7391
|
+
this.inputs.setAltKey(false);
|
|
7393
7392
|
this.dispatch({
|
|
7394
7393
|
type: "keyboard",
|
|
7395
7394
|
name: "key_up",
|
|
7396
7395
|
key: "Alt",
|
|
7397
|
-
shiftKey: this.inputs.
|
|
7398
|
-
ctrlKey: this.inputs.
|
|
7399
|
-
altKey: this.inputs.
|
|
7400
|
-
metaKey: this.inputs.
|
|
7401
|
-
accelKey:
|
|
7396
|
+
shiftKey: this.inputs.getShiftKey(),
|
|
7397
|
+
ctrlKey: this.inputs.getCtrlKey(),
|
|
7398
|
+
altKey: this.inputs.getAltKey(),
|
|
7399
|
+
metaKey: this.inputs.getMetaKey(),
|
|
7400
|
+
accelKey: this.inputs.getAccelKey(),
|
|
7402
7401
|
code: "AltLeft"
|
|
7403
7402
|
});
|
|
7404
7403
|
}
|
|
7405
7404
|
_setCtrlKeyTimeout() {
|
|
7406
|
-
this.inputs.
|
|
7405
|
+
this.inputs.setCtrlKey(false);
|
|
7407
7406
|
this.dispatch({
|
|
7408
7407
|
type: "keyboard",
|
|
7409
7408
|
name: "key_up",
|
|
7410
7409
|
key: "Ctrl",
|
|
7411
|
-
shiftKey: this.inputs.
|
|
7412
|
-
ctrlKey: this.inputs.
|
|
7413
|
-
altKey: this.inputs.
|
|
7414
|
-
metaKey: this.inputs.
|
|
7415
|
-
accelKey:
|
|
7410
|
+
shiftKey: this.inputs.getShiftKey(),
|
|
7411
|
+
ctrlKey: this.inputs.getCtrlKey(),
|
|
7412
|
+
altKey: this.inputs.getAltKey(),
|
|
7413
|
+
metaKey: this.inputs.getMetaKey(),
|
|
7414
|
+
accelKey: this.inputs.getAccelKey(),
|
|
7416
7415
|
code: "ControlLeft"
|
|
7417
7416
|
});
|
|
7418
7417
|
}
|
|
7419
7418
|
_setMetaKeyTimeout() {
|
|
7420
|
-
this.inputs.
|
|
7419
|
+
this.inputs.setMetaKey(false);
|
|
7421
7420
|
this.dispatch({
|
|
7422
7421
|
type: "keyboard",
|
|
7423
7422
|
name: "key_up",
|
|
7424
7423
|
key: "Meta",
|
|
7425
|
-
shiftKey: this.inputs.
|
|
7426
|
-
ctrlKey: this.inputs.
|
|
7427
|
-
altKey: this.inputs.
|
|
7428
|
-
metaKey: this.inputs.
|
|
7429
|
-
accelKey:
|
|
7424
|
+
shiftKey: this.inputs.getShiftKey(),
|
|
7425
|
+
ctrlKey: this.inputs.getCtrlKey(),
|
|
7426
|
+
altKey: this.inputs.getAltKey(),
|
|
7427
|
+
metaKey: this.inputs.getMetaKey(),
|
|
7428
|
+
accelKey: this.inputs.getAccelKey(),
|
|
7430
7429
|
code: "MetaLeft"
|
|
7431
7430
|
});
|
|
7432
7431
|
}
|
|
@@ -7497,47 +7496,47 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
7497
7496
|
const { type } = info;
|
|
7498
7497
|
if (info.type === "misc") {
|
|
7499
7498
|
if (info.name === "cancel" || info.name === "complete") {
|
|
7500
|
-
this.inputs.
|
|
7501
|
-
if (this.inputs.
|
|
7502
|
-
this.inputs.
|
|
7503
|
-
this.inputs.
|
|
7499
|
+
this.inputs.setIsDragging(false);
|
|
7500
|
+
if (this.inputs.getIsPanning()) {
|
|
7501
|
+
this.inputs.setIsPanning(false);
|
|
7502
|
+
this.inputs.setIsSpacebarPanning(false);
|
|
7504
7503
|
this.setCursor({ type: this._prevCursor, rotation: 0 });
|
|
7505
7504
|
}
|
|
7506
7505
|
}
|
|
7507
7506
|
this.root.handleEvent(info);
|
|
7507
|
+
this.emit("event", info);
|
|
7508
7508
|
return;
|
|
7509
7509
|
}
|
|
7510
7510
|
if (info.shiftKey) {
|
|
7511
7511
|
clearTimeout(this._shiftKeyTimeout);
|
|
7512
7512
|
this._shiftKeyTimeout = -1;
|
|
7513
|
-
inputs.
|
|
7514
|
-
} else if (!info.shiftKey && inputs.
|
|
7513
|
+
inputs.setShiftKey(true);
|
|
7514
|
+
} else if (!info.shiftKey && inputs.getShiftKey() && this._shiftKeyTimeout === -1) {
|
|
7515
7515
|
this._shiftKeyTimeout = this.timers.setTimeout(this._setShiftKeyTimeout, 150);
|
|
7516
7516
|
}
|
|
7517
7517
|
if (info.altKey) {
|
|
7518
7518
|
clearTimeout(this._altKeyTimeout);
|
|
7519
7519
|
this._altKeyTimeout = -1;
|
|
7520
|
-
inputs.
|
|
7521
|
-
} else if (!info.altKey && inputs.
|
|
7520
|
+
inputs.setAltKey(true);
|
|
7521
|
+
} else if (!info.altKey && inputs.getAltKey() && this._altKeyTimeout === -1) {
|
|
7522
7522
|
this._altKeyTimeout = this.timers.setTimeout(this._setAltKeyTimeout, 150);
|
|
7523
7523
|
}
|
|
7524
7524
|
if (info.ctrlKey) {
|
|
7525
7525
|
clearTimeout(this._ctrlKeyTimeout);
|
|
7526
7526
|
this._ctrlKeyTimeout = -1;
|
|
7527
|
-
inputs.
|
|
7528
|
-
} else if (!info.ctrlKey && inputs.
|
|
7527
|
+
inputs.setCtrlKey(true);
|
|
7528
|
+
} else if (!info.ctrlKey && inputs.getCtrlKey() && this._ctrlKeyTimeout === -1) {
|
|
7529
7529
|
this._ctrlKeyTimeout = this.timers.setTimeout(this._setCtrlKeyTimeout, 150);
|
|
7530
7530
|
}
|
|
7531
7531
|
if (info.metaKey) {
|
|
7532
7532
|
clearTimeout(this._metaKeyTimeout);
|
|
7533
7533
|
this._metaKeyTimeout = -1;
|
|
7534
|
-
inputs.
|
|
7535
|
-
} else if (!info.metaKey && inputs.
|
|
7534
|
+
inputs.setMetaKey(true);
|
|
7535
|
+
} else if (!info.metaKey && inputs.getMetaKey() && this._metaKeyTimeout === -1) {
|
|
7536
7536
|
this._metaKeyTimeout = this.timers.setTimeout(this._setMetaKeyTimeout, 150);
|
|
7537
7537
|
}
|
|
7538
|
-
|
|
7539
|
-
|
|
7540
|
-
inputs.isDragging = false;
|
|
7538
|
+
if (!inputs.getIsPointing()) {
|
|
7539
|
+
inputs.setIsDragging(false);
|
|
7541
7540
|
}
|
|
7542
7541
|
const instanceState = this.store.unsafeGetWithoutCapture(TLINSTANCE_ID);
|
|
7543
7542
|
const pageState = this.store.get(this._getCurrentPageStateId());
|
|
@@ -7546,23 +7545,23 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
7546
7545
|
case "pinch": {
|
|
7547
7546
|
if (cameraOptions.isLocked) return;
|
|
7548
7547
|
clearTimeout(this._longPressTimeout);
|
|
7549
|
-
this.
|
|
7548
|
+
this.inputs.updateFromEvent(info);
|
|
7550
7549
|
switch (info.name) {
|
|
7551
7550
|
case "pinch_start": {
|
|
7552
|
-
if (inputs.
|
|
7553
|
-
if (!inputs.
|
|
7554
|
-
this._pinchStart = this.getCamera().z;
|
|
7551
|
+
if (inputs.getIsPinching()) return;
|
|
7552
|
+
if (!inputs.getIsEditing()) {
|
|
7555
7553
|
if (!this._selectedShapeIdsAtPointerDown.length) {
|
|
7556
7554
|
this._selectedShapeIdsAtPointerDown = [...pageState.selectedShapeIds];
|
|
7557
7555
|
}
|
|
7558
7556
|
this._didPinch = true;
|
|
7559
|
-
inputs.
|
|
7557
|
+
inputs.setIsPinching(true);
|
|
7560
7558
|
this.interrupt();
|
|
7561
7559
|
}
|
|
7560
|
+
this.emit("event", info);
|
|
7562
7561
|
return;
|
|
7563
7562
|
}
|
|
7564
7563
|
case "pinch": {
|
|
7565
|
-
if (!inputs.
|
|
7564
|
+
if (!inputs.getIsPinching()) return;
|
|
7566
7565
|
const {
|
|
7567
7566
|
point: { z = 1 },
|
|
7568
7567
|
delta: { x: dx, y: dy }
|
|
@@ -7586,11 +7585,12 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
7586
7585
|
),
|
|
7587
7586
|
{ immediate: true }
|
|
7588
7587
|
);
|
|
7588
|
+
this.emit("event", info);
|
|
7589
7589
|
return;
|
|
7590
7590
|
}
|
|
7591
7591
|
case "pinch_end": {
|
|
7592
|
-
if (!inputs.
|
|
7593
|
-
inputs.
|
|
7592
|
+
if (!inputs.getIsPinching()) return this;
|
|
7593
|
+
inputs.setIsPinching(false);
|
|
7594
7594
|
const { _selectedShapeIdsAtPointerDown: shapesToReselect } = this;
|
|
7595
7595
|
this.setSelectedShapes(this._selectedShapeIdsAtPointerDown);
|
|
7596
7596
|
this._selectedShapeIdsAtPointerDown = [];
|
|
@@ -7604,13 +7604,14 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
7604
7604
|
});
|
|
7605
7605
|
}
|
|
7606
7606
|
}
|
|
7607
|
+
this.emit("event", info);
|
|
7607
7608
|
return;
|
|
7608
7609
|
}
|
|
7609
7610
|
}
|
|
7610
7611
|
}
|
|
7611
7612
|
case "wheel": {
|
|
7612
7613
|
if (cameraOptions.isLocked) return;
|
|
7613
|
-
this.
|
|
7614
|
+
this.inputs.updateFromEvent(info);
|
|
7614
7615
|
const { panSpeed, zoomSpeed } = cameraOptions;
|
|
7615
7616
|
let wheelBehavior = cameraOptions.wheelBehavior;
|
|
7616
7617
|
const inputMode = this.user.getUserPreferences().inputMode;
|
|
@@ -7628,7 +7629,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
7628
7629
|
if (info.ctrlKey) behavior = wheelBehavior === "pan" ? "zoom" : "pan";
|
|
7629
7630
|
switch (behavior) {
|
|
7630
7631
|
case "zoom": {
|
|
7631
|
-
const { x, y } = this.inputs.
|
|
7632
|
+
const { x, y } = this.inputs.getCurrentScreenPoint();
|
|
7632
7633
|
let delta = dz;
|
|
7633
7634
|
if (wheelBehavior === "zoom") {
|
|
7634
7635
|
if (Math.abs(dy) > 10) {
|
|
@@ -7642,6 +7643,8 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
7642
7643
|
immediate: true
|
|
7643
7644
|
});
|
|
7644
7645
|
this.maybeTrackPerformance("Zooming");
|
|
7646
|
+
this.root.handleEvent(info);
|
|
7647
|
+
this.emit("event", info);
|
|
7645
7648
|
return;
|
|
7646
7649
|
}
|
|
7647
7650
|
case "pan": {
|
|
@@ -7649,6 +7652,8 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
7649
7652
|
immediate: true
|
|
7650
7653
|
});
|
|
7651
7654
|
this.maybeTrackPerformance("Panning");
|
|
7655
|
+
this.root.handleEvent(info);
|
|
7656
|
+
this.emit("event", info);
|
|
7652
7657
|
return;
|
|
7653
7658
|
}
|
|
7654
7659
|
}
|
|
@@ -7656,14 +7661,14 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
7656
7661
|
break;
|
|
7657
7662
|
}
|
|
7658
7663
|
case "pointer": {
|
|
7659
|
-
if (inputs.
|
|
7660
|
-
this.
|
|
7664
|
+
if (inputs.getIsPinching()) return;
|
|
7665
|
+
this.inputs.updateFromEvent(info);
|
|
7661
7666
|
const { isPen } = info;
|
|
7662
7667
|
const { isPenMode } = instanceState;
|
|
7663
7668
|
switch (info.name) {
|
|
7664
7669
|
case "pointer_down": {
|
|
7665
7670
|
if (isPenMode && !isPen) return;
|
|
7666
|
-
if (!this.inputs.
|
|
7671
|
+
if (!this.inputs.getIsPanning()) {
|
|
7667
7672
|
this._longPressTimeout = this.timers.setTimeout(() => {
|
|
7668
7673
|
const vsb = this.getViewportScreenBounds();
|
|
7669
7674
|
this.dispatch({
|
|
@@ -7672,7 +7677,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
7672
7677
|
// viewport bounds, and will be again when this event is handled...
|
|
7673
7678
|
// so we need to counter-adjust from the stored value so that the
|
|
7674
7679
|
// new value is set correctly.
|
|
7675
|
-
point: this.inputs.
|
|
7680
|
+
point: this.inputs.getOriginScreenPoint().clone().addXY(vsb.x, vsb.y),
|
|
7676
7681
|
name: "long_press"
|
|
7677
7682
|
});
|
|
7678
7683
|
}, this.options.longPressDurationMs);
|
|
@@ -7680,21 +7685,21 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
7680
7685
|
this._selectedShapeIdsAtPointerDown = this.getSelectedShapeIds();
|
|
7681
7686
|
if (info.button === LEFT_MOUSE_BUTTON) this.capturedPointerId = info.pointerId;
|
|
7682
7687
|
inputs.buttons.add(info.button);
|
|
7683
|
-
inputs.
|
|
7684
|
-
inputs.
|
|
7688
|
+
inputs.setIsPointing(true);
|
|
7689
|
+
inputs.setIsDragging(false);
|
|
7685
7690
|
if (!isPenMode && isPen) this.updateInstanceState({ isPenMode: true });
|
|
7686
7691
|
if (info.button === STYLUS_ERASER_BUTTON) {
|
|
7687
7692
|
this._restoreToolId = this.getCurrentToolId();
|
|
7688
7693
|
this.complete();
|
|
7689
7694
|
this.setCurrentTool("eraser");
|
|
7690
7695
|
} else if (info.button === MIDDLE_MOUSE_BUTTON) {
|
|
7691
|
-
if (!this.inputs.
|
|
7696
|
+
if (!this.inputs.getIsPanning()) {
|
|
7692
7697
|
this._prevCursor = this.getInstanceState().cursor.type;
|
|
7693
7698
|
}
|
|
7694
|
-
this.inputs.
|
|
7699
|
+
this.inputs.setIsPanning(true);
|
|
7695
7700
|
clearTimeout(this._longPressTimeout);
|
|
7696
7701
|
}
|
|
7697
|
-
if (this.inputs.
|
|
7702
|
+
if (this.inputs.getIsPanning()) {
|
|
7698
7703
|
this.stopCameraAnimation();
|
|
7699
7704
|
this.setCursor({ type: "grabbing", rotation: 0 });
|
|
7700
7705
|
return this;
|
|
@@ -7704,8 +7709,9 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
7704
7709
|
case "pointer_move": {
|
|
7705
7710
|
if (!isPen && isPenMode) return;
|
|
7706
7711
|
const { x: cx, y: cy, z: cz } = unsafe__withoutCapture(() => this.getCamera());
|
|
7707
|
-
if (this.inputs.
|
|
7708
|
-
const
|
|
7712
|
+
if (this.inputs.getIsPanning() && this.inputs.getIsPointing()) {
|
|
7713
|
+
const currentScreenPoint = this.inputs.getCurrentScreenPoint();
|
|
7714
|
+
const previousScreenPoint = this.inputs.getPreviousScreenPoint();
|
|
7709
7715
|
const offset = Vec.Sub(currentScreenPoint, previousScreenPoint);
|
|
7710
7716
|
this.setCamera(new Vec(cx + offset.x / cz, cy + offset.y / cz, cz), {
|
|
7711
7717
|
immediate: true
|
|
@@ -7713,15 +7719,15 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
7713
7719
|
this.maybeTrackPerformance("Panning");
|
|
7714
7720
|
return;
|
|
7715
7721
|
}
|
|
7716
|
-
if (inputs.
|
|
7717
|
-
inputs.
|
|
7722
|
+
if (inputs.getIsPointing() && !inputs.getIsDragging() && Vec.Dist2(inputs.getOriginPagePoint(), inputs.getCurrentPagePoint()) * this.getZoomLevel() > (instanceState.isCoarsePointer ? this.options.coarseDragDistanceSquared : this.options.dragDistanceSquared) / cz) {
|
|
7723
|
+
inputs.setIsDragging(true);
|
|
7718
7724
|
clearTimeout(this._longPressTimeout);
|
|
7719
7725
|
}
|
|
7720
7726
|
break;
|
|
7721
7727
|
}
|
|
7722
7728
|
case "pointer_up": {
|
|
7723
|
-
inputs.
|
|
7724
|
-
inputs.
|
|
7729
|
+
inputs.setIsDragging(false);
|
|
7730
|
+
inputs.setIsPointing(false);
|
|
7725
7731
|
clearTimeout(this._longPressTimeout);
|
|
7726
7732
|
inputs.buttons.delete(info.button);
|
|
7727
7733
|
if (instanceState.isPenMode && !isPen) return;
|
|
@@ -7729,12 +7735,12 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
7729
7735
|
this.capturedPointerId = null;
|
|
7730
7736
|
info.button = 0;
|
|
7731
7737
|
}
|
|
7732
|
-
if (inputs.
|
|
7738
|
+
if (inputs.getIsPanning()) {
|
|
7733
7739
|
if (!inputs.keys.has("Space")) {
|
|
7734
|
-
inputs.
|
|
7735
|
-
inputs.
|
|
7740
|
+
inputs.setIsPanning(false);
|
|
7741
|
+
inputs.setIsSpacebarPanning(false);
|
|
7736
7742
|
}
|
|
7737
|
-
const slideDirection = this.inputs.
|
|
7743
|
+
const slideDirection = this.inputs.getPointerVelocity();
|
|
7738
7744
|
const slideSpeed = Math.min(2, slideDirection.len());
|
|
7739
7745
|
switch (info.button) {
|
|
7740
7746
|
case LEFT_MOUSE_BUTTON: {
|
|
@@ -7771,51 +7777,58 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
7771
7777
|
switch (info.name) {
|
|
7772
7778
|
case "key_down": {
|
|
7773
7779
|
inputs.keys.add(info.code);
|
|
7774
|
-
if (
|
|
7775
|
-
if (!
|
|
7776
|
-
this.
|
|
7777
|
-
|
|
7778
|
-
this.inputs.isPanning = true;
|
|
7779
|
-
this.inputs.isSpacebarPanning = true;
|
|
7780
|
-
clearTimeout(this._longPressTimeout);
|
|
7781
|
-
this.setCursor({ type: this.inputs.isPointing ? "grabbing" : "grab", rotation: 0 });
|
|
7782
|
-
}
|
|
7783
|
-
if (this.inputs.isSpacebarPanning) {
|
|
7784
|
-
let offset;
|
|
7785
|
-
switch (info.code) {
|
|
7786
|
-
case "ArrowUp": {
|
|
7787
|
-
offset = new Vec(0, -1);
|
|
7788
|
-
break;
|
|
7780
|
+
if (this.options.spacebarPanning) {
|
|
7781
|
+
if (info.code === "Space" && !info.ctrlKey) {
|
|
7782
|
+
if (!this.inputs.getIsPanning()) {
|
|
7783
|
+
this._prevCursor = instanceState.cursor.type;
|
|
7789
7784
|
}
|
|
7790
|
-
|
|
7791
|
-
|
|
7792
|
-
|
|
7793
|
-
|
|
7794
|
-
|
|
7795
|
-
|
|
7796
|
-
|
|
7785
|
+
this.inputs.setIsPanning(true);
|
|
7786
|
+
this.inputs.setIsSpacebarPanning(true);
|
|
7787
|
+
clearTimeout(this._longPressTimeout);
|
|
7788
|
+
this.setCursor({
|
|
7789
|
+
type: this.inputs.getIsPointing() ? "grabbing" : "grab",
|
|
7790
|
+
rotation: 0
|
|
7791
|
+
});
|
|
7792
|
+
}
|
|
7793
|
+
if (this.inputs.getIsSpacebarPanning()) {
|
|
7794
|
+
let offset;
|
|
7795
|
+
switch (info.code) {
|
|
7796
|
+
case "ArrowUp": {
|
|
7797
|
+
offset = new Vec(0, -1);
|
|
7798
|
+
break;
|
|
7799
|
+
}
|
|
7800
|
+
case "ArrowRight": {
|
|
7801
|
+
offset = new Vec(1, 0);
|
|
7802
|
+
break;
|
|
7803
|
+
}
|
|
7804
|
+
case "ArrowDown": {
|
|
7805
|
+
offset = new Vec(0, 1);
|
|
7806
|
+
break;
|
|
7807
|
+
}
|
|
7808
|
+
case "ArrowLeft": {
|
|
7809
|
+
offset = new Vec(-1, 0);
|
|
7810
|
+
break;
|
|
7811
|
+
}
|
|
7797
7812
|
}
|
|
7798
|
-
|
|
7799
|
-
|
|
7800
|
-
|
|
7813
|
+
if (offset) {
|
|
7814
|
+
const bounds = this.getViewportPageBounds();
|
|
7815
|
+
const next = bounds.clone().translate(offset.mulV({ x: bounds.w, y: bounds.h }));
|
|
7816
|
+
this._animateToViewport(next, { animation: { duration: 320 } });
|
|
7801
7817
|
}
|
|
7802
7818
|
}
|
|
7803
|
-
if (offset) {
|
|
7804
|
-
const bounds = this.getViewportPageBounds();
|
|
7805
|
-
const next = bounds.clone().translate(offset.mulV({ x: bounds.w, y: bounds.h }));
|
|
7806
|
-
this._animateToViewport(next, { animation: { duration: 320 } });
|
|
7807
|
-
}
|
|
7808
7819
|
}
|
|
7809
7820
|
break;
|
|
7810
7821
|
}
|
|
7811
7822
|
case "key_up": {
|
|
7812
7823
|
inputs.keys.delete(info.code);
|
|
7813
|
-
if (
|
|
7814
|
-
if (
|
|
7815
|
-
|
|
7816
|
-
|
|
7817
|
-
|
|
7818
|
-
|
|
7824
|
+
if (this.options.spacebarPanning) {
|
|
7825
|
+
if (info.code === "Space") {
|
|
7826
|
+
if (this.inputs.buttons.has(MIDDLE_MOUSE_BUTTON)) {
|
|
7827
|
+
} else {
|
|
7828
|
+
this.inputs.setIsPanning(false);
|
|
7829
|
+
this.inputs.setIsSpacebarPanning(false);
|
|
7830
|
+
this.setCursor({ type: this._prevCursor, rotation: 0 });
|
|
7831
|
+
}
|
|
7819
7832
|
}
|
|
7820
7833
|
}
|
|
7821
7834
|
break;
|
|
@@ -7868,8 +7881,8 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
|
|
|
7868
7881
|
}
|
|
7869
7882
|
_init = __decoratorStart(_a);
|
|
7870
7883
|
__decorateElement(_init, 1, "getIsShapeHiddenCache", _getIsShapeHiddenCache_dec, Editor);
|
|
7871
|
-
__decorateElement(_init, 1, "
|
|
7872
|
-
__decorateElement(_init, 1, "
|
|
7884
|
+
__decorateElement(_init, 1, "canUndo", _canUndo_dec, Editor);
|
|
7885
|
+
__decorateElement(_init, 1, "canRedo", _canRedo_dec, Editor);
|
|
7873
7886
|
__decorateElement(_init, 1, "getPath", _getPath_dec, Editor);
|
|
7874
7887
|
__decorateElement(_init, 1, "getCurrentTool", _getCurrentTool_dec, Editor);
|
|
7875
7888
|
__decorateElement(_init, 1, "getCurrentToolId", _getCurrentToolId_dec, Editor);
|
|
@@ -7904,6 +7917,9 @@ __decorateElement(_init, 1, "getCamera", _getCamera_dec, Editor);
|
|
|
7904
7917
|
__decorateElement(_init, 1, "getViewportPageBoundsForFollowing", _getViewportPageBoundsForFollowing_dec, Editor);
|
|
7905
7918
|
__decorateElement(_init, 1, "getCameraForFollowing", _getCameraForFollowing_dec, Editor);
|
|
7906
7919
|
__decorateElement(_init, 1, "getZoomLevel", _getZoomLevel_dec, Editor);
|
|
7920
|
+
__decorateElement(_init, 1, "getDebouncedZoomLevel", _getDebouncedZoomLevel_dec, Editor);
|
|
7921
|
+
__decorateElement(_init, 1, "_getAboveDebouncedZoomThreshold", __getAboveDebouncedZoomThreshold_dec, Editor);
|
|
7922
|
+
__decorateElement(_init, 1, "getEfficientZoomLevel", _getEfficientZoomLevel_dec, Editor);
|
|
7907
7923
|
__decorateElement(_init, 1, "getViewportScreenBounds", _getViewportScreenBounds_dec, Editor);
|
|
7908
7924
|
__decorateElement(_init, 1, "getViewportScreenCenter", _getViewportScreenCenter_dec, Editor);
|
|
7909
7925
|
__decorateElement(_init, 1, "getViewportPageBounds", _getViewportPageBounds_dec, Editor);
|