@tldraw/editor 4.3.0-canary.244925359412 → 4.3.0-canary.2643056dfc8d
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 +536 -120
- package/dist-cjs/index.js +8 -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 +4 -5
- 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 +346 -280
- package/dist-cjs/lib/editor/Editor.js.map +2 -2
- package/dist-cjs/lib/editor/derivations/notVisibleShapes.js +16 -23
- 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/SpatialIndexManager/RBushIndex.js +144 -0
- package/dist-cjs/lib/editor/managers/SpatialIndexManager/RBushIndex.js.map +7 -0
- package/dist-cjs/lib/editor/managers/SpatialIndexManager/SpatialIndexManager.js +181 -0
- package/dist-cjs/lib/editor/managers/SpatialIndexManager/SpatialIndexManager.js.map +7 -0
- 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/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 +536 -120
- package/dist-esm/index.mjs +9 -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 +4 -5
- 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 +347 -283
- package/dist-esm/lib/editor/Editor.mjs.map +2 -2
- package/dist-esm/lib/editor/derivations/notVisibleShapes.mjs +16 -23
- 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/SpatialIndexManager/RBushIndex.mjs +114 -0
- package/dist-esm/lib/editor/managers/SpatialIndexManager/RBushIndex.mjs.map +7 -0
- package/dist-esm/lib/editor/managers/SpatialIndexManager/SpatialIndexManager.mjs +161 -0
- package/dist-esm/lib/editor/managers/SpatialIndexManager/SpatialIndexManager.mjs.map +7 -0
- 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/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 +21 -17
- package/src/index.ts +5 -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 -8
- 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 +452 -326
- package/src/lib/editor/derivations/notVisibleShapes.ts +21 -33
- 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/SpatialIndexManager/RBushIndex.ts +144 -0
- package/src/lib/editor/managers/SpatialIndexManager/SpatialIndexManager.ts +215 -0
- 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 +1 -0
- 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/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
|
@@ -104,7 +104,6 @@ var import_assets = require("../utils/assets");
|
|
|
104
104
|
var import_debug_flags = require("../utils/debug-flags");
|
|
105
105
|
var import_deepLinks = require("../utils/deepLinks");
|
|
106
106
|
var import_getIncrementedName = require("../utils/getIncrementedName");
|
|
107
|
-
var import_keyboard = require("../utils/keyboard");
|
|
108
107
|
var import_reorderShapes = require("../utils/reorderShapes");
|
|
109
108
|
var import_rotation = require("../utils/rotation");
|
|
110
109
|
var import_bindingsIndex = require("./derivations/bindingsIndex");
|
|
@@ -116,14 +115,16 @@ var import_EdgeScrollManager = require("./managers/EdgeScrollManager/EdgeScrollM
|
|
|
116
115
|
var import_FocusManager = require("./managers/FocusManager/FocusManager");
|
|
117
116
|
var import_FontManager = require("./managers/FontManager/FontManager");
|
|
118
117
|
var import_HistoryManager = require("./managers/HistoryManager/HistoryManager");
|
|
118
|
+
var import_InputsManager = require("./managers/InputsManager/InputsManager");
|
|
119
119
|
var import_ScribbleManager = require("./managers/ScribbleManager/ScribbleManager");
|
|
120
120
|
var import_SnapManager = require("./managers/SnapManager/SnapManager");
|
|
121
|
+
var import_SpatialIndexManager = require("./managers/SpatialIndexManager/SpatialIndexManager");
|
|
121
122
|
var import_TextManager = require("./managers/TextManager/TextManager");
|
|
122
123
|
var import_TickManager = require("./managers/TickManager/TickManager");
|
|
123
124
|
var import_UserPreferencesManager = require("./managers/UserPreferencesManager/UserPreferencesManager");
|
|
124
125
|
var import_RootState = require("./tools/RootState");
|
|
125
|
-
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,
|
|
126
|
-
class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_dec = [import_state.computed],
|
|
126
|
+
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;
|
|
127
|
+
class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_dec = [import_state.computed], _canUndo_dec = [import_state.computed], _canRedo_dec = [import_state.computed], _getPath_dec = [import_state.computed], _getCurrentTool_dec = [import_state.computed], _getCurrentToolId_dec = [import_state.computed], _getDocumentSettings_dec = [import_state.computed], _getInstanceState_dec = [import_state.computed], _getPageStates_dec = [import_state.computed], __getPageStatesQuery_dec = [import_state.computed], _getCurrentPageState_dec = [import_state.computed], __getCurrentPageStateId_dec = [import_state.computed], _getSelectedShapeIds_dec = [import_state.computed], _getSelectedShapes_dec = [import_state.computed], _getCurrentPageShapesInReadingOrder_dec = [import_state.computed], _getOnlySelectedShapeId_dec = [import_state.computed], _getOnlySelectedShape_dec = [import_state.computed], _getSelectionPageBounds_dec = [import_state.computed], _getSelectionRotation_dec = [import_state.computed], _getSelectionRotatedPageBounds_dec = [import_state.computed], _getSelectionRotatedScreenBounds_dec = [import_state.computed], _getFocusedGroupId_dec = [import_state.computed], _getFocusedGroup_dec = [import_state.computed], _getEditingShapeId_dec = [import_state.computed], _getEditingShape_dec = [import_state.computed], _getRichTextEditor_dec = [import_state.computed], _getHoveredShapeId_dec = [import_state.computed], _getHoveredShape_dec = [import_state.computed], _getHintingShapeIds_dec = [import_state.computed], _getHintingShape_dec = [import_state.computed], _getErasingShapeIds_dec = [import_state.computed], _getErasingShapes_dec = [import_state.computed], __unsafe_getCameraId_dec = [import_state.computed], _getCamera_dec = [import_state.computed], _getViewportPageBoundsForFollowing_dec = [import_state.computed], _getCameraForFollowing_dec = [import_state.computed], _getZoomLevel_dec = [import_state.computed], _getDebouncedZoomLevel_dec = [import_state.computed], __getAboveDebouncedZoomThreshold_dec = [import_state.computed], _getEfficientZoomLevel_dec = [import_state.computed], _getViewportScreenBounds_dec = [import_state.computed], _getViewportScreenCenter_dec = [import_state.computed], _getViewportPageBounds_dec = [import_state.computed], __getCollaboratorsQuery_dec = [import_state.computed], _getCollaborators_dec = [import_state.computed], _getCollaboratorsOnCurrentPage_dec = [import_state.computed], _getRenderingShapes_dec = [import_state.computed], __getAllPagesQuery_dec = [import_state.computed], _getPages_dec = [import_state.computed], _getCurrentPageId_dec = [import_state.computed], _getCurrentPageShapeIdsSorted_dec = [import_state.computed], __getAllAssetsQuery_dec = [import_state.computed], __getShapeHandlesCache_dec = [import_state.computed], __getShapePageTransformCache_dec = [import_state.computed], __getShapePageBoundsCache_dec = [import_state.computed], __getShapeClipPathCache_dec = [import_state.computed], __getShapeMaskCache_dec = [import_state.computed], __getShapeMaskedPageBoundsCache_dec = [import_state.computed], _getNotVisibleShapes_dec = [import_state.computed], _getCulledShapes_dec = [import_state.computed], _getCurrentPageBounds_dec = [import_state.computed], _getCurrentPageShapes_dec = [import_state.computed], _getCurrentPageShapesSorted_dec = [import_state.computed], _getCurrentPageRenderingShapesSorted_dec = [import_state.computed], __getBindingsIndexCache_dec = [import_state.computed], __getSelectionSharedStyles_dec = [import_state.computed], _getSharedStyles_dec = [(0, import_state.computed)({ isEqual: (a, b) => a.equals(b) })], _getSharedOpacity_dec = [import_state.computed], _getIsFocused_dec = [import_state.computed], _getIsReadonly_dec = [import_state.computed], __setShiftKeyTimeout_dec = [import_utils.bind], __setAltKeyTimeout_dec = [import_utils.bind], __setCtrlKeyTimeout_dec = [import_utils.bind], __setMetaKeyTimeout_dec = [import_utils.bind], _a) {
|
|
127
128
|
constructor({
|
|
128
129
|
store,
|
|
129
130
|
user,
|
|
@@ -159,7 +160,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
159
160
|
*/
|
|
160
161
|
__publicField(this, "root");
|
|
161
162
|
/**
|
|
162
|
-
* A set of functions to call when the
|
|
163
|
+
* A set of functions to call when the editor is disposed.
|
|
163
164
|
*
|
|
164
165
|
* @public
|
|
165
166
|
*/
|
|
@@ -170,14 +171,29 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
170
171
|
* @public
|
|
171
172
|
*/
|
|
172
173
|
__publicField(this, "isDisposed", false);
|
|
173
|
-
/**
|
|
174
|
+
/**
|
|
175
|
+
* A manager for the editor's tick events.
|
|
176
|
+
*
|
|
177
|
+
* @internal */
|
|
174
178
|
__publicField(this, "_tickManager");
|
|
175
179
|
/**
|
|
176
|
-
* A manager for the
|
|
180
|
+
* A manager for the editor's input state.
|
|
181
|
+
*
|
|
182
|
+
* @public
|
|
183
|
+
*/
|
|
184
|
+
__publicField(this, "inputs");
|
|
185
|
+
/**
|
|
186
|
+
* A manager for the editor's snapping feature.
|
|
177
187
|
*
|
|
178
188
|
* @public
|
|
179
189
|
*/
|
|
180
190
|
__publicField(this, "snaps");
|
|
191
|
+
/**
|
|
192
|
+
* A manager for spatial indexing, enabling efficient shape location queries.
|
|
193
|
+
*
|
|
194
|
+
* @public
|
|
195
|
+
*/
|
|
196
|
+
__publicField(this, "spatialIndex");
|
|
181
197
|
/**
|
|
182
198
|
* A manager for the any asynchronous events and making sure they're
|
|
183
199
|
* cleaned up upon disposal.
|
|
@@ -255,7 +271,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
255
271
|
__publicField(this, "bindingUtils");
|
|
256
272
|
/* --------------------- History -------------------- */
|
|
257
273
|
/**
|
|
258
|
-
* A manager for the
|
|
274
|
+
* A manager for the editor's history.
|
|
259
275
|
*
|
|
260
276
|
* @readonly
|
|
261
277
|
*/
|
|
@@ -270,6 +286,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
270
286
|
// Rich text editor
|
|
271
287
|
__publicField(this, "_currentRichTextEditor", (0, import_state.atom)("rich text editor", null));
|
|
272
288
|
__publicField(this, "_textOptions");
|
|
289
|
+
__publicField(this, "_debouncedZoomLevel", (0, import_state.atom)("debounced zoom level", 1));
|
|
273
290
|
__publicField(this, "_cameraOptions", (0, import_state.atom)("camera options", import_constants.DEFAULT_CAMERA_OPTIONS));
|
|
274
291
|
/** @internal */
|
|
275
292
|
__publicField(this, "_viewportAnimation", null);
|
|
@@ -293,6 +310,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
293
310
|
/* --------------------- Shapes --------------------- */
|
|
294
311
|
__publicField(this, "_shapeGeometryCaches", {});
|
|
295
312
|
__publicField(this, "_notVisibleShapes", (0, import_notVisibleShapes.notVisibleShapes)(this));
|
|
313
|
+
__publicField(this, "_culledShapesCache", null);
|
|
296
314
|
// Parents and children
|
|
297
315
|
/**
|
|
298
316
|
* A cache of parents to children.
|
|
@@ -320,54 +338,6 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
320
338
|
tldraw: null,
|
|
321
339
|
excalidraw: null
|
|
322
340
|
});
|
|
323
|
-
/* --------------------- Events --------------------- */
|
|
324
|
-
/**
|
|
325
|
-
* The app's current input state.
|
|
326
|
-
*
|
|
327
|
-
* @public
|
|
328
|
-
*/
|
|
329
|
-
__publicField(this, "inputs", {
|
|
330
|
-
/** The most recent pointer down's position in the current page space. */
|
|
331
|
-
originPagePoint: new import_Vec.Vec(),
|
|
332
|
-
/** The most recent pointer down's position in screen space. */
|
|
333
|
-
originScreenPoint: new import_Vec.Vec(),
|
|
334
|
-
/** The previous pointer position in the current page space. */
|
|
335
|
-
previousPagePoint: new import_Vec.Vec(),
|
|
336
|
-
/** The previous pointer position in screen space. */
|
|
337
|
-
previousScreenPoint: new import_Vec.Vec(),
|
|
338
|
-
/** The most recent pointer position in the current page space. */
|
|
339
|
-
currentPagePoint: new import_Vec.Vec(),
|
|
340
|
-
/** The most recent pointer position in screen space. */
|
|
341
|
-
currentScreenPoint: new import_Vec.Vec(),
|
|
342
|
-
/** A set containing the currently pressed keys. */
|
|
343
|
-
keys: /* @__PURE__ */ new Set(),
|
|
344
|
-
/** A set containing the currently pressed buttons. */
|
|
345
|
-
buttons: /* @__PURE__ */ new Set(),
|
|
346
|
-
/** Whether the input is from a pe. */
|
|
347
|
-
isPen: false,
|
|
348
|
-
/** Whether the shift key is currently pressed. */
|
|
349
|
-
shiftKey: false,
|
|
350
|
-
/** Whether the meta key is currently pressed. */
|
|
351
|
-
metaKey: false,
|
|
352
|
-
/** Whether the control or command key is currently pressed. */
|
|
353
|
-
ctrlKey: false,
|
|
354
|
-
/** Whether the alt or option key is currently pressed. */
|
|
355
|
-
altKey: false,
|
|
356
|
-
/** Whether the user is dragging. */
|
|
357
|
-
isDragging: false,
|
|
358
|
-
/** Whether the user is pointing. */
|
|
359
|
-
isPointing: false,
|
|
360
|
-
/** Whether the user is pinching. */
|
|
361
|
-
isPinching: false,
|
|
362
|
-
/** Whether the user is editing. */
|
|
363
|
-
isEditing: false,
|
|
364
|
-
/** Whether the user is panning. */
|
|
365
|
-
isPanning: false,
|
|
366
|
-
/** Whether the user is spacebar panning. */
|
|
367
|
-
isSpacebarPanning: false,
|
|
368
|
-
/** Velocity of mouse pointer, in pixels per millisecond */
|
|
369
|
-
pointerVelocity: new import_Vec.Vec()
|
|
370
|
-
});
|
|
371
341
|
/**
|
|
372
342
|
* A manager for recording multiple click events.
|
|
373
343
|
*
|
|
@@ -391,8 +361,6 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
391
361
|
/** @internal */
|
|
392
362
|
__publicField(this, "_restoreToolId", "select");
|
|
393
363
|
/** @internal */
|
|
394
|
-
__publicField(this, "_pinchStart", 1);
|
|
395
|
-
/** @internal */
|
|
396
364
|
__publicField(this, "_didPinch", false);
|
|
397
365
|
/** @internal */
|
|
398
366
|
__publicField(this, "_selectedShapeIdsAtPointerDown", []);
|
|
@@ -418,6 +386,8 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
418
386
|
}
|
|
419
387
|
});
|
|
420
388
|
this.snaps = new import_SnapManager.SnapManager(this);
|
|
389
|
+
this.spatialIndex = new import_SpatialIndexManager.SpatialIndexManager(this);
|
|
390
|
+
this.disposables.add(() => this.spatialIndex.dispose());
|
|
421
391
|
this.disposables.add(this.timers.dispose);
|
|
422
392
|
this._cameraOptions.set({ ...import_constants.DEFAULT_CAMERA_OPTIONS, ...cameraOptions });
|
|
423
393
|
this._textOptions = (0, import_state.atom)("text options", textOptions ?? null);
|
|
@@ -428,6 +398,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
428
398
|
this.disposables.add(() => this.textMeasure.dispose());
|
|
429
399
|
this.fonts = new import_FontManager.FontManager(this, fontAssetUrls);
|
|
430
400
|
this._tickManager = new import_TickManager.TickManager(this);
|
|
401
|
+
this.inputs = new import_InputsManager.InputsManager(this);
|
|
431
402
|
class NewRoot extends import_RootState.RootState {
|
|
432
403
|
static initial = initialState ?? "";
|
|
433
404
|
}
|
|
@@ -860,6 +831,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
860
831
|
this.disposables.clear();
|
|
861
832
|
this.store.dispose();
|
|
862
833
|
this.isDisposed = true;
|
|
834
|
+
this.emit("dispose");
|
|
863
835
|
}
|
|
864
836
|
getShapeUtil(arg) {
|
|
865
837
|
const type = typeof arg === "string" ? arg : arg.type;
|
|
@@ -893,9 +865,12 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
893
865
|
this.history.undo();
|
|
894
866
|
return this;
|
|
895
867
|
}
|
|
896
|
-
|
|
868
|
+
canUndo() {
|
|
897
869
|
return this.history.getNumUndos() > 0;
|
|
898
870
|
}
|
|
871
|
+
getCanUndo() {
|
|
872
|
+
return this.canUndo();
|
|
873
|
+
}
|
|
899
874
|
/**
|
|
900
875
|
* Redo to the next mark.
|
|
901
876
|
*
|
|
@@ -912,13 +887,16 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
912
887
|
this.history.redo();
|
|
913
888
|
return this;
|
|
914
889
|
}
|
|
890
|
+
canRedo() {
|
|
891
|
+
return this.history.getNumRedos() > 0;
|
|
892
|
+
}
|
|
893
|
+
getCanRedo() {
|
|
894
|
+
return this.canRedo();
|
|
895
|
+
}
|
|
915
896
|
clearHistory() {
|
|
916
897
|
this.history.clear();
|
|
917
898
|
return this;
|
|
918
899
|
}
|
|
919
|
-
getCanRedo() {
|
|
920
|
-
return this.history.getNumRedos() > 0;
|
|
921
|
-
}
|
|
922
900
|
/**
|
|
923
901
|
* Create a new "mark", or stopping point, in the undo redo history. Creating a mark will clear
|
|
924
902
|
* any redos. You typically want to do this just before a user interaction begins or is handled.
|
|
@@ -1073,7 +1051,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
1073
1051
|
}),
|
|
1074
1052
|
selectionCount: this.getSelectedShapes().length,
|
|
1075
1053
|
editingShape: editingShapeId ? this.getShape(editingShapeId) : void 0,
|
|
1076
|
-
inputs: this.inputs,
|
|
1054
|
+
inputs: this.inputs.toJson(),
|
|
1077
1055
|
pageState: this.getCurrentPageState(),
|
|
1078
1056
|
instanceState: this.getInstanceState(),
|
|
1079
1057
|
collaboratorCount: this.getCollaboratorsOnCurrentPage().length
|
|
@@ -1094,7 +1072,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
1094
1072
|
* we're in a transaction that's about to be rolled back due to the same error we're currently
|
|
1095
1073
|
* reporting.
|
|
1096
1074
|
*
|
|
1097
|
-
* Instead, to listen to changes to this value, you need to listen to
|
|
1075
|
+
* Instead, to listen to changes to this value, you need to listen to editor's `crash` event.
|
|
1098
1076
|
*
|
|
1099
1077
|
* @internal
|
|
1100
1078
|
*/
|
|
@@ -1745,6 +1723,28 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
1745
1723
|
const editingShapeId = this.getEditingShapeId();
|
|
1746
1724
|
return editingShapeId ? this.getShape(editingShapeId) : void 0;
|
|
1747
1725
|
}
|
|
1726
|
+
/**
|
|
1727
|
+
* Whether the shape can be edited.
|
|
1728
|
+
*
|
|
1729
|
+
* @param shape - The shape (or shape id) to check if it can be edited.
|
|
1730
|
+
* @param info - The info about the edit start.
|
|
1731
|
+
*
|
|
1732
|
+
* @public
|
|
1733
|
+
* @returns true if the shape can be edited, false otherwise.
|
|
1734
|
+
*/
|
|
1735
|
+
canEditShape(shape, info) {
|
|
1736
|
+
const id = typeof shape === "string" ? shape : shape?.id ?? null;
|
|
1737
|
+
if (!id) return false;
|
|
1738
|
+
if (id === this.getEditingShapeId()) return false;
|
|
1739
|
+
const _shape = this.getShape(id);
|
|
1740
|
+
if (!_shape) return false;
|
|
1741
|
+
const util = this.getShapeUtil(_shape);
|
|
1742
|
+
const _info = info ?? { type: "unknown" };
|
|
1743
|
+
if (!util.canEdit(_shape, _info)) return false;
|
|
1744
|
+
if (this.getIsReadonly() && !util.canEditInReadonly(_shape)) return false;
|
|
1745
|
+
if (this.isShapeOrAncestorLocked(_shape) && !util.canEditWhileLocked(_shape)) return false;
|
|
1746
|
+
return true;
|
|
1747
|
+
}
|
|
1748
1748
|
/**
|
|
1749
1749
|
* Set the current editing shape.
|
|
1750
1750
|
*
|
|
@@ -1760,42 +1760,42 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
1760
1760
|
*/
|
|
1761
1761
|
setEditingShape(shape) {
|
|
1762
1762
|
const id = typeof shape === "string" ? shape : shape?.id ?? null;
|
|
1763
|
-
|
|
1764
|
-
const prevEditingShapeId = this.getEditingShapeId();
|
|
1765
|
-
if (id !== prevEditingShapeId) {
|
|
1766
|
-
if (id) {
|
|
1767
|
-
const shape2 = this.getShape(id);
|
|
1768
|
-
if (shape2 && this.getShapeUtil(shape2).canEdit(shape2)) {
|
|
1769
|
-
this.run(
|
|
1770
|
-
() => {
|
|
1771
|
-
this._updateCurrentPageState({ editingShapeId: id });
|
|
1772
|
-
if (prevEditingShapeId) {
|
|
1773
|
-
const prevEditingShape = this.getShape(prevEditingShapeId);
|
|
1774
|
-
if (prevEditingShape) {
|
|
1775
|
-
this.getShapeUtil(prevEditingShape).onEditEnd?.(prevEditingShape);
|
|
1776
|
-
}
|
|
1777
|
-
}
|
|
1778
|
-
this.getShapeUtil(shape2).onEditStart?.(shape2);
|
|
1779
|
-
},
|
|
1780
|
-
{ history: "ignore" }
|
|
1781
|
-
);
|
|
1782
|
-
return this;
|
|
1783
|
-
}
|
|
1784
|
-
}
|
|
1763
|
+
if (!id) {
|
|
1785
1764
|
this.run(
|
|
1786
1765
|
() => {
|
|
1787
|
-
this.
|
|
1788
|
-
this._currentRichTextEditor.set(null);
|
|
1766
|
+
const prevEditingShapeId = this.getEditingShapeId();
|
|
1789
1767
|
if (prevEditingShapeId) {
|
|
1790
1768
|
const prevEditingShape = this.getShape(prevEditingShapeId);
|
|
1791
1769
|
if (prevEditingShape) {
|
|
1792
1770
|
this.getShapeUtil(prevEditingShape).onEditEnd?.(prevEditingShape);
|
|
1793
1771
|
}
|
|
1794
1772
|
}
|
|
1773
|
+
this._updateCurrentPageState({ editingShapeId: null });
|
|
1774
|
+
this._currentRichTextEditor.set(null);
|
|
1795
1775
|
},
|
|
1796
1776
|
{ history: "ignore" }
|
|
1797
1777
|
);
|
|
1778
|
+
return this;
|
|
1798
1779
|
}
|
|
1780
|
+
if (!this.canEditShape(id)) return this;
|
|
1781
|
+
this.run(
|
|
1782
|
+
() => {
|
|
1783
|
+
const prevEditingShapeId = this.getEditingShapeId();
|
|
1784
|
+
if (prevEditingShapeId) {
|
|
1785
|
+
const prevEditingShape = this.getShape(prevEditingShapeId);
|
|
1786
|
+
if (prevEditingShape) {
|
|
1787
|
+
this.getShapeUtil(prevEditingShape).onEditEnd?.(prevEditingShape);
|
|
1788
|
+
}
|
|
1789
|
+
}
|
|
1790
|
+
this._updateCurrentPageState({ editingShapeId: null });
|
|
1791
|
+
this._currentRichTextEditor.set(null);
|
|
1792
|
+
this.select(id);
|
|
1793
|
+
this._updateCurrentPageState({ editingShapeId: id });
|
|
1794
|
+
const nextEditingShape = this.getShape(id);
|
|
1795
|
+
this.getShapeUtil(nextEditingShape).onEditStart?.(nextEditingShape);
|
|
1796
|
+
},
|
|
1797
|
+
{ history: "ignore" }
|
|
1798
|
+
);
|
|
1799
1799
|
return this;
|
|
1800
1800
|
}
|
|
1801
1801
|
getRichTextEditor() {
|
|
@@ -1928,6 +1928,25 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
1928
1928
|
getCroppingShapeId() {
|
|
1929
1929
|
return this.getCurrentPageState().croppingShapeId;
|
|
1930
1930
|
}
|
|
1931
|
+
/**
|
|
1932
|
+
* Whether the shape can be cropped.
|
|
1933
|
+
*
|
|
1934
|
+
* @param shape - The shape (or shape id) to check if it can be cropped.
|
|
1935
|
+
*
|
|
1936
|
+
* @public
|
|
1937
|
+
* @returns true if the shape can be cropped, false otherwise.
|
|
1938
|
+
*/
|
|
1939
|
+
canCropShape(shape) {
|
|
1940
|
+
if (!shape) return false;
|
|
1941
|
+
const id = typeof shape === "string" ? shape : shape?.id ?? null;
|
|
1942
|
+
if (!id) return false;
|
|
1943
|
+
const _shape = this.getShape(id);
|
|
1944
|
+
if (!_shape) return false;
|
|
1945
|
+
const util = this.getShapeUtil(_shape);
|
|
1946
|
+
if (!util.canCrop(_shape)) return false;
|
|
1947
|
+
if (this.isShapeOrAncestorLocked(_shape)) return false;
|
|
1948
|
+
return true;
|
|
1949
|
+
}
|
|
1931
1950
|
/**
|
|
1932
1951
|
* Set the current cropping shape.
|
|
1933
1952
|
*
|
|
@@ -1949,12 +1968,8 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
1949
1968
|
() => {
|
|
1950
1969
|
if (!id) {
|
|
1951
1970
|
this.updateCurrentPageState({ croppingShapeId: null });
|
|
1952
|
-
} else {
|
|
1953
|
-
|
|
1954
|
-
const util = this.getShapeUtil(shape2);
|
|
1955
|
-
if (shape2 && util.canCrop(shape2)) {
|
|
1956
|
-
this.updateCurrentPageState({ croppingShapeId: id });
|
|
1957
|
-
}
|
|
1971
|
+
} else if (this.canCropShape(id)) {
|
|
1972
|
+
this.updateCurrentPageState({ croppingShapeId: id });
|
|
1958
1973
|
}
|
|
1959
1974
|
},
|
|
1960
1975
|
{ history: "ignore" }
|
|
@@ -2029,6 +2044,22 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
2029
2044
|
getZoomLevel() {
|
|
2030
2045
|
return this.getCamera().z;
|
|
2031
2046
|
}
|
|
2047
|
+
getDebouncedZoomLevel() {
|
|
2048
|
+
if (this.options.debouncedZoom) {
|
|
2049
|
+
if (this.getCameraState() === "idle") {
|
|
2050
|
+
return this.getZoomLevel();
|
|
2051
|
+
} else {
|
|
2052
|
+
return this._debouncedZoomLevel.get();
|
|
2053
|
+
}
|
|
2054
|
+
}
|
|
2055
|
+
return this.getZoomLevel();
|
|
2056
|
+
}
|
|
2057
|
+
_getAboveDebouncedZoomThreshold() {
|
|
2058
|
+
return this.getCurrentPageShapeIds().size > this.options.debouncedZoomThreshold;
|
|
2059
|
+
}
|
|
2060
|
+
getEfficientZoomLevel() {
|
|
2061
|
+
return this._getAboveDebouncedZoomThreshold() ? this.getDebouncedZoomLevel() : this.getZoomLevel();
|
|
2062
|
+
}
|
|
2032
2063
|
/**
|
|
2033
2064
|
* Get the camera's initial or reset zoom level.
|
|
2034
2065
|
*
|
|
@@ -2274,7 +2305,8 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
2274
2305
|
},
|
|
2275
2306
|
{ history: "ignore" }
|
|
2276
2307
|
);
|
|
2277
|
-
const
|
|
2308
|
+
const currentScreenPoint = this.inputs.getCurrentScreenPoint();
|
|
2309
|
+
const currentPagePoint = this.inputs.getCurrentPagePoint();
|
|
2278
2310
|
if (currentScreenPoint.x / z - x !== currentPagePoint.x || currentScreenPoint.y / z - y !== currentPagePoint.y) {
|
|
2279
2311
|
this.updatePointer({
|
|
2280
2312
|
immediate: opts?.immediate,
|
|
@@ -2409,7 +2441,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
2409
2441
|
* ```ts
|
|
2410
2442
|
* editor.zoomIn()
|
|
2411
2443
|
* editor.zoomIn(editor.getViewportScreenCenter(), { animation: { duration: 200 } })
|
|
2412
|
-
* editor.zoomIn(editor.inputs.
|
|
2444
|
+
* editor.zoomIn(editor.inputs.getCurrentScreenPoint(), { animation: { duration: 200 } })
|
|
2413
2445
|
* ```
|
|
2414
2446
|
*
|
|
2415
2447
|
* @param point - The screen point to zoom in on. Defaults to the screen center
|
|
@@ -2450,7 +2482,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
2450
2482
|
* ```ts
|
|
2451
2483
|
* editor.zoomOut()
|
|
2452
2484
|
* editor.zoomOut(editor.getViewportScreenCenter(), { animation: { duration: 120 } })
|
|
2453
|
-
* editor.zoomOut(editor.inputs.
|
|
2485
|
+
* editor.zoomOut(editor.inputs.getCurrentScreenPoint(), { animation: { duration: 120 } })
|
|
2454
2486
|
* ```
|
|
2455
2487
|
*
|
|
2456
2488
|
* @param point - The point to zoom out on. Defaults to the viewport screen center.
|
|
@@ -2502,10 +2534,15 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
2502
2534
|
if (isLocked && !opts?.force) return this;
|
|
2503
2535
|
const selectionPageBounds = this.getSelectionPageBounds();
|
|
2504
2536
|
if (selectionPageBounds) {
|
|
2505
|
-
this.
|
|
2506
|
-
|
|
2507
|
-
|
|
2508
|
-
}
|
|
2537
|
+
const currentZoom = this.getZoomLevel();
|
|
2538
|
+
if (Math.abs(currentZoom - 1) < 0.01) {
|
|
2539
|
+
this.zoomToBounds(selectionPageBounds, opts);
|
|
2540
|
+
} else {
|
|
2541
|
+
this.zoomToBounds(selectionPageBounds, {
|
|
2542
|
+
targetZoom: 1,
|
|
2543
|
+
...opts
|
|
2544
|
+
});
|
|
2545
|
+
}
|
|
2509
2546
|
}
|
|
2510
2547
|
return this;
|
|
2511
2548
|
}
|
|
@@ -2545,7 +2582,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
2545
2582
|
const cameraOptions = this._cameraOptions.__unsafe__getWithoutCapture();
|
|
2546
2583
|
if (cameraOptions.isLocked && !opts?.force) return this;
|
|
2547
2584
|
const viewportScreenBounds = this.getViewportScreenBounds();
|
|
2548
|
-
const inset = opts?.inset ?? Math.min(
|
|
2585
|
+
const inset = opts?.inset ?? Math.min(this.options.zoomToFitPadding, viewportScreenBounds.width * 0.28);
|
|
2549
2586
|
const baseZoom = this.getBaseZoom();
|
|
2550
2587
|
const zoomMin = cameraOptions.zoomSteps[0];
|
|
2551
2588
|
const zoomMax = (0, import_utils.last)(cameraOptions.zoomSteps);
|
|
@@ -2783,7 +2820,6 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
2783
2820
|
this._setCamera(import_Vec.Vec.From({ ...this.getCamera() }));
|
|
2784
2821
|
}
|
|
2785
2822
|
}
|
|
2786
|
-
this._tickCameraState();
|
|
2787
2823
|
return this;
|
|
2788
2824
|
}
|
|
2789
2825
|
getViewportScreenBounds() {
|
|
@@ -3063,6 +3099,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
3063
3099
|
this._cameraStateTimeoutRemaining = this.options.cameraMovingTimeoutMs;
|
|
3064
3100
|
if (this._cameraState.__unsafe__getWithoutCapture() !== "idle") return;
|
|
3065
3101
|
this._cameraState.set("moving");
|
|
3102
|
+
this._debouncedZoomLevel.set((0, import_state.unsafe__withoutCapture)(() => this.getCamera().z));
|
|
3066
3103
|
this.on("tick", this._decayCameraStateTimeout);
|
|
3067
3104
|
}
|
|
3068
3105
|
/**
|
|
@@ -3815,14 +3852,29 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
3815
3852
|
const notVisibleShapes2 = this.getNotVisibleShapes();
|
|
3816
3853
|
const selectedShapeIds = this.getSelectedShapeIds();
|
|
3817
3854
|
const editingId = this.getEditingShapeId();
|
|
3818
|
-
const
|
|
3855
|
+
const nextValue = new Set(notVisibleShapes2);
|
|
3819
3856
|
if (editingId) {
|
|
3820
|
-
|
|
3857
|
+
nextValue.delete(editingId);
|
|
3821
3858
|
}
|
|
3822
3859
|
selectedShapeIds.forEach((id) => {
|
|
3823
|
-
|
|
3860
|
+
nextValue.delete(id);
|
|
3824
3861
|
});
|
|
3825
|
-
|
|
3862
|
+
const prevValue = this._culledShapesCache;
|
|
3863
|
+
if (prevValue) {
|
|
3864
|
+
if (prevValue.size !== nextValue.size) {
|
|
3865
|
+
this._culledShapesCache = nextValue;
|
|
3866
|
+
return nextValue;
|
|
3867
|
+
}
|
|
3868
|
+
for (const id of prevValue) {
|
|
3869
|
+
if (!nextValue.has(id)) {
|
|
3870
|
+
this._culledShapesCache = nextValue;
|
|
3871
|
+
return nextValue;
|
|
3872
|
+
}
|
|
3873
|
+
}
|
|
3874
|
+
return prevValue;
|
|
3875
|
+
}
|
|
3876
|
+
this._culledShapesCache = nextValue;
|
|
3877
|
+
return nextValue;
|
|
3826
3878
|
}
|
|
3827
3879
|
getCurrentPageBounds() {
|
|
3828
3880
|
let commonBounds;
|
|
@@ -3872,7 +3924,10 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
3872
3924
|
let inHollowSmallestAreaHit = null;
|
|
3873
3925
|
let inMarginClosestToEdgeDistance = Infinity;
|
|
3874
3926
|
let inMarginClosestToEdgeHit = null;
|
|
3927
|
+
const searchMargin = Math.max(innerMargin, outerMargin, this.options.hitTestMargin / zoomLevel);
|
|
3928
|
+
const candidateIds = this.spatialIndex.getShapeIdsAtPoint(point, searchMargin);
|
|
3875
3929
|
const shapesToCheck = (opts.renderingOnly ? this.getCurrentPageRenderingShapesSorted() : this.getCurrentPageShapesSorted()).filter((shape) => {
|
|
3930
|
+
if (!candidateIds.has(shape.id) && !this.isShapeOfType(shape, "frame")) return false;
|
|
3876
3931
|
if (shape.isLocked && !hitLocked || this.isShapeHidden(shape) || this.isShapeOfType(shape, "group"))
|
|
3877
3932
|
return false;
|
|
3878
3933
|
const pageMask = this.getShapeMask(shape);
|
|
@@ -3979,7 +4034,31 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
3979
4034
|
* @public
|
|
3980
4035
|
*/
|
|
3981
4036
|
getShapesAtPoint(point, opts = {}) {
|
|
3982
|
-
|
|
4037
|
+
const margin = opts.margin ?? 0;
|
|
4038
|
+
const candidateIds = this.spatialIndex.getShapeIdsAtPoint(point, margin);
|
|
4039
|
+
return this.getCurrentPageShapesSorted().filter((shape) => {
|
|
4040
|
+
if (this.isShapeHidden(shape)) return false;
|
|
4041
|
+
if (!candidateIds.has(shape.id) && !this.isShapeOfType(shape, "frame")) return false;
|
|
4042
|
+
return this.isPointInShape(shape, point, opts);
|
|
4043
|
+
}).reverse();
|
|
4044
|
+
}
|
|
4045
|
+
/**
|
|
4046
|
+
* Get shape IDs within the given bounds.
|
|
4047
|
+
*
|
|
4048
|
+
* Note: Results are unordered. If you need z-order, combine with sorted shapes:
|
|
4049
|
+
* ```ts
|
|
4050
|
+
* const candidates = editor.getShapeIdsInsideBounds(bounds)
|
|
4051
|
+
* const sorted = editor.getCurrentPageShapesSorted().filter(s => candidates.has(s.id))
|
|
4052
|
+
* ```
|
|
4053
|
+
*
|
|
4054
|
+
* @param bounds - The bounds to search within.
|
|
4055
|
+
*
|
|
4056
|
+
* @returns Unordered set of shape IDs within the given bounds.
|
|
4057
|
+
*
|
|
4058
|
+
* @public
|
|
4059
|
+
*/
|
|
4060
|
+
getShapeIdsInsideBounds(bounds) {
|
|
4061
|
+
return this.spatialIndex.getShapeIdsInsideBounds(bounds);
|
|
3983
4062
|
}
|
|
3984
4063
|
/**
|
|
3985
4064
|
* Test whether a point (in the current page space) will will a shape. This method takes into account masks,
|
|
@@ -5662,8 +5741,8 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
5662
5741
|
isAspectRatioLocked: options.isAspectRatioLocked
|
|
5663
5742
|
});
|
|
5664
5743
|
if (Math.sign(scale.x) * Math.sign(scale.y) < 0) {
|
|
5665
|
-
|
|
5666
|
-
rotation
|
|
5744
|
+
const parentRotation = this.getShapeParentTransform(id).rotation();
|
|
5745
|
+
const rotation = -options.initialShape.rotation - 2 * parentRotation;
|
|
5667
5746
|
this.updateShapes([{ id, type, rotation }]);
|
|
5668
5747
|
}
|
|
5669
5748
|
const preScaleShapePageCenter = import_Mat.Mat.applyToPoint(
|
|
@@ -5676,9 +5755,9 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
5676
5755
|
scale,
|
|
5677
5756
|
options.scaleAxisRotation
|
|
5678
5757
|
);
|
|
5679
|
-
const pageBounds = this.getShapePageBounds(id);
|
|
5680
5758
|
const pageTransform = this.getShapePageTransform(id);
|
|
5681
|
-
const
|
|
5759
|
+
const currentLocalBounds = this.getShapeGeometry(id).bounds;
|
|
5760
|
+
const currentPageCenter = import_Mat.Mat.applyToPoint(pageTransform, currentLocalBounds.center);
|
|
5682
5761
|
const shapePageTransformOrigin = pageTransform.point();
|
|
5683
5762
|
if (!currentPageCenter || !shapePageTransformOrigin) return this;
|
|
5684
5763
|
const pageDelta = import_Vec.Vec.Sub(postScaleShapePageCenter, currentPageCenter);
|
|
@@ -5964,7 +6043,11 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
5964
6043
|
)
|
|
5965
6044
|
);
|
|
5966
6045
|
const sortedShapeIds = shapesToGroup.sort(import_utils.sortByIndex).map((s) => s.id);
|
|
5967
|
-
const
|
|
6046
|
+
const childBounds = (0, import_utils.compact)(shapesToGroup.map((shape) => this.getShapePageBounds(shape)));
|
|
6047
|
+
const pageBounds = import_Box.Box.Common(childBounds);
|
|
6048
|
+
if (!pageBounds.isValid()) {
|
|
6049
|
+
throw Error(`Editor.groupShapes: group bounds are invalid (NaN).`);
|
|
6050
|
+
}
|
|
5968
6051
|
const { x, y } = pageBounds.point;
|
|
5969
6052
|
const parentId = this.findCommonAncestor(shapesToGroup) ?? this.getCurrentPageId();
|
|
5970
6053
|
if (this.getCurrentToolId() !== "select") return this;
|
|
@@ -6654,6 +6737,25 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
6654
6737
|
}
|
|
6655
6738
|
}
|
|
6656
6739
|
}
|
|
6740
|
+
if (point) {
|
|
6741
|
+
const shapesById = new Map(shapes.map((shape) => [shape.id, shape]));
|
|
6742
|
+
const rootShapesFromContent = (0, import_utils.compact)(rootShapeIds.map((id) => shapesById.get(id)));
|
|
6743
|
+
if (rootShapesFromContent.length > 0) {
|
|
6744
|
+
const targetParent = this.getShapeAtPoint(point, {
|
|
6745
|
+
hitInside: true,
|
|
6746
|
+
hitFrameInside: true,
|
|
6747
|
+
hitLocked: true,
|
|
6748
|
+
filter: (shape) => {
|
|
6749
|
+
const util = this.getShapeUtil(shape);
|
|
6750
|
+
if (!util.canReceiveNewChildrenOfType) return false;
|
|
6751
|
+
return rootShapesFromContent.every(
|
|
6752
|
+
(rootShape) => util.canReceiveNewChildrenOfType(shape, rootShape.type)
|
|
6753
|
+
);
|
|
6754
|
+
}
|
|
6755
|
+
});
|
|
6756
|
+
pasteParentId = targetParent ? targetParent.id : currentPageId;
|
|
6757
|
+
}
|
|
6758
|
+
}
|
|
6657
6759
|
let isDuplicating = false;
|
|
6658
6760
|
if (!(0, import_tlschema.isPageId)(pasteParentId)) {
|
|
6659
6761
|
const parent = this.getShape(pasteParentId);
|
|
@@ -6898,60 +7000,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
6898
7000
|
height
|
|
6899
7001
|
};
|
|
6900
7002
|
}
|
|
6901
|
-
|
|
6902
|
-
* Update the input points from a pointer, pinch, or wheel event.
|
|
6903
|
-
*
|
|
6904
|
-
* @param info - The event info.
|
|
6905
|
-
*/
|
|
6906
|
-
_updateInputsFromEvent(info) {
|
|
6907
|
-
const {
|
|
6908
|
-
pointerVelocity,
|
|
6909
|
-
previousScreenPoint,
|
|
6910
|
-
previousPagePoint,
|
|
6911
|
-
currentScreenPoint,
|
|
6912
|
-
currentPagePoint,
|
|
6913
|
-
originScreenPoint,
|
|
6914
|
-
originPagePoint
|
|
6915
|
-
} = this.inputs;
|
|
6916
|
-
const { screenBounds } = this.store.unsafeGetWithoutCapture(import_tlschema.TLINSTANCE_ID);
|
|
6917
|
-
const { x: cx, y: cy, z: cz } = (0, import_state.unsafe__withoutCapture)(() => this.getCamera());
|
|
6918
|
-
const sx = info.point.x - screenBounds.x;
|
|
6919
|
-
const sy = info.point.y - screenBounds.y;
|
|
6920
|
-
const sz = info.point.z ?? 0.5;
|
|
6921
|
-
previousScreenPoint.setTo(currentScreenPoint);
|
|
6922
|
-
previousPagePoint.setTo(currentPagePoint);
|
|
6923
|
-
currentScreenPoint.set(sx, sy);
|
|
6924
|
-
const nx = sx / cz - cx;
|
|
6925
|
-
const ny = sy / cz - cy;
|
|
6926
|
-
if (isFinite(nx) && isFinite(ny)) {
|
|
6927
|
-
currentPagePoint.set(nx, ny, sz);
|
|
6928
|
-
}
|
|
6929
|
-
this.inputs.isPen = info.type === "pointer" && info.isPen;
|
|
6930
|
-
if (info.name === "pointer_down" || this.inputs.isPinching) {
|
|
6931
|
-
pointerVelocity.set(0, 0);
|
|
6932
|
-
originScreenPoint.setTo(currentScreenPoint);
|
|
6933
|
-
originPagePoint.setTo(currentPagePoint);
|
|
6934
|
-
}
|
|
6935
|
-
this.run(
|
|
6936
|
-
() => {
|
|
6937
|
-
this.store.put([
|
|
6938
|
-
{
|
|
6939
|
-
id: import_tlschema.TLPOINTER_ID,
|
|
6940
|
-
typeName: "pointer",
|
|
6941
|
-
x: currentPagePoint.x,
|
|
6942
|
-
y: currentPagePoint.y,
|
|
6943
|
-
lastActivityTimestamp: (
|
|
6944
|
-
// If our pointer moved only because we're following some other user, then don't
|
|
6945
|
-
// update our last activity timestamp; otherwise, update it to the current timestamp.
|
|
6946
|
-
info.type === "pointer" && info.pointerId === import_constants.INTERNAL_POINTER_IDS.CAMERA_MOVE ? this.store.unsafeGetWithoutCapture(import_tlschema.TLPOINTER_ID)?.lastActivityTimestamp ?? this._tickManager.now : this._tickManager.now
|
|
6947
|
-
),
|
|
6948
|
-
meta: {}
|
|
6949
|
-
}
|
|
6950
|
-
]);
|
|
6951
|
-
},
|
|
6952
|
-
{ history: "ignore" }
|
|
6953
|
-
);
|
|
6954
|
-
}
|
|
7003
|
+
/* --------------------- Events --------------------- */
|
|
6955
7004
|
/**
|
|
6956
7005
|
* Dispatch a cancel event.
|
|
6957
7006
|
*
|
|
@@ -7016,18 +7065,19 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
7016
7065
|
point: options?.point ?? // weird but true: what `inputs` calls screen-space is actually viewport space. so
|
|
7017
7066
|
// we need to convert back into true screen space first. we should fix this...
|
|
7018
7067
|
import_Vec.Vec.Add(
|
|
7019
|
-
this.inputs.
|
|
7068
|
+
this.inputs.getCurrentScreenPoint(),
|
|
7020
7069
|
this.store.unsafeGetWithoutCapture(import_tlschema.TLINSTANCE_ID).screenBounds
|
|
7021
7070
|
),
|
|
7022
7071
|
pointerId: options?.pointerId ?? 0,
|
|
7023
7072
|
button: options?.button ?? 0,
|
|
7024
|
-
isPen: options?.isPen ?? this.inputs.
|
|
7025
|
-
shiftKey: options?.shiftKey ?? this.inputs.
|
|
7026
|
-
altKey: options?.altKey ?? this.inputs.
|
|
7027
|
-
ctrlKey: options?.ctrlKey ?? this.inputs.
|
|
7028
|
-
metaKey: options?.metaKey ?? this.inputs.
|
|
7029
|
-
accelKey:
|
|
7073
|
+
isPen: options?.isPen ?? this.inputs.getIsPen(),
|
|
7074
|
+
shiftKey: options?.shiftKey ?? this.inputs.getShiftKey(),
|
|
7075
|
+
altKey: options?.altKey ?? this.inputs.getAltKey(),
|
|
7076
|
+
ctrlKey: options?.ctrlKey ?? this.inputs.getCtrlKey(),
|
|
7077
|
+
metaKey: options?.metaKey ?? this.inputs.getMetaKey(),
|
|
7078
|
+
accelKey: false
|
|
7030
7079
|
};
|
|
7080
|
+
event.accelKey = options?.accelKey ?? this.inputs.getAccelKey();
|
|
7031
7081
|
if (options?.immediate) {
|
|
7032
7082
|
this._flushEventForTick(event);
|
|
7033
7083
|
} else {
|
|
@@ -7343,58 +7393,58 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
7343
7393
|
this._clickManager.cancelDoubleClickTimeout();
|
|
7344
7394
|
}
|
|
7345
7395
|
_setShiftKeyTimeout() {
|
|
7346
|
-
this.inputs.
|
|
7396
|
+
this.inputs.setShiftKey(false);
|
|
7347
7397
|
this.dispatch({
|
|
7348
7398
|
type: "keyboard",
|
|
7349
7399
|
name: "key_up",
|
|
7350
7400
|
key: "Shift",
|
|
7351
|
-
shiftKey: this.inputs.
|
|
7352
|
-
ctrlKey: this.inputs.
|
|
7353
|
-
altKey: this.inputs.
|
|
7354
|
-
metaKey: this.inputs.
|
|
7355
|
-
accelKey:
|
|
7401
|
+
shiftKey: this.inputs.getShiftKey(),
|
|
7402
|
+
ctrlKey: this.inputs.getCtrlKey(),
|
|
7403
|
+
altKey: this.inputs.getAltKey(),
|
|
7404
|
+
metaKey: this.inputs.getMetaKey(),
|
|
7405
|
+
accelKey: this.inputs.getAccelKey(),
|
|
7356
7406
|
code: "ShiftLeft"
|
|
7357
7407
|
});
|
|
7358
7408
|
}
|
|
7359
7409
|
_setAltKeyTimeout() {
|
|
7360
|
-
this.inputs.
|
|
7410
|
+
this.inputs.setAltKey(false);
|
|
7361
7411
|
this.dispatch({
|
|
7362
7412
|
type: "keyboard",
|
|
7363
7413
|
name: "key_up",
|
|
7364
7414
|
key: "Alt",
|
|
7365
|
-
shiftKey: this.inputs.
|
|
7366
|
-
ctrlKey: this.inputs.
|
|
7367
|
-
altKey: this.inputs.
|
|
7368
|
-
metaKey: this.inputs.
|
|
7369
|
-
accelKey:
|
|
7415
|
+
shiftKey: this.inputs.getShiftKey(),
|
|
7416
|
+
ctrlKey: this.inputs.getCtrlKey(),
|
|
7417
|
+
altKey: this.inputs.getAltKey(),
|
|
7418
|
+
metaKey: this.inputs.getMetaKey(),
|
|
7419
|
+
accelKey: this.inputs.getAccelKey(),
|
|
7370
7420
|
code: "AltLeft"
|
|
7371
7421
|
});
|
|
7372
7422
|
}
|
|
7373
7423
|
_setCtrlKeyTimeout() {
|
|
7374
|
-
this.inputs.
|
|
7424
|
+
this.inputs.setCtrlKey(false);
|
|
7375
7425
|
this.dispatch({
|
|
7376
7426
|
type: "keyboard",
|
|
7377
7427
|
name: "key_up",
|
|
7378
7428
|
key: "Ctrl",
|
|
7379
|
-
shiftKey: this.inputs.
|
|
7380
|
-
ctrlKey: this.inputs.
|
|
7381
|
-
altKey: this.inputs.
|
|
7382
|
-
metaKey: this.inputs.
|
|
7383
|
-
accelKey:
|
|
7429
|
+
shiftKey: this.inputs.getShiftKey(),
|
|
7430
|
+
ctrlKey: this.inputs.getCtrlKey(),
|
|
7431
|
+
altKey: this.inputs.getAltKey(),
|
|
7432
|
+
metaKey: this.inputs.getMetaKey(),
|
|
7433
|
+
accelKey: this.inputs.getAccelKey(),
|
|
7384
7434
|
code: "ControlLeft"
|
|
7385
7435
|
});
|
|
7386
7436
|
}
|
|
7387
7437
|
_setMetaKeyTimeout() {
|
|
7388
|
-
this.inputs.
|
|
7438
|
+
this.inputs.setMetaKey(false);
|
|
7389
7439
|
this.dispatch({
|
|
7390
7440
|
type: "keyboard",
|
|
7391
7441
|
name: "key_up",
|
|
7392
7442
|
key: "Meta",
|
|
7393
|
-
shiftKey: this.inputs.
|
|
7394
|
-
ctrlKey: this.inputs.
|
|
7395
|
-
altKey: this.inputs.
|
|
7396
|
-
metaKey: this.inputs.
|
|
7397
|
-
accelKey:
|
|
7443
|
+
shiftKey: this.inputs.getShiftKey(),
|
|
7444
|
+
ctrlKey: this.inputs.getCtrlKey(),
|
|
7445
|
+
altKey: this.inputs.getAltKey(),
|
|
7446
|
+
metaKey: this.inputs.getMetaKey(),
|
|
7447
|
+
accelKey: this.inputs.getAccelKey(),
|
|
7398
7448
|
code: "MetaLeft"
|
|
7399
7449
|
});
|
|
7400
7450
|
}
|
|
@@ -7465,48 +7515,47 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
7465
7515
|
const { type } = info;
|
|
7466
7516
|
if (info.type === "misc") {
|
|
7467
7517
|
if (info.name === "cancel" || info.name === "complete") {
|
|
7468
|
-
this.inputs.
|
|
7469
|
-
if (this.inputs.
|
|
7470
|
-
this.inputs.
|
|
7471
|
-
this.inputs.
|
|
7518
|
+
this.inputs.setIsDragging(false);
|
|
7519
|
+
if (this.inputs.getIsPanning()) {
|
|
7520
|
+
this.inputs.setIsPanning(false);
|
|
7521
|
+
this.inputs.setIsSpacebarPanning(false);
|
|
7472
7522
|
this.setCursor({ type: this._prevCursor, rotation: 0 });
|
|
7473
7523
|
}
|
|
7474
7524
|
}
|
|
7475
|
-
this.emit("event", info);
|
|
7476
7525
|
this.root.handleEvent(info);
|
|
7526
|
+
this.emit("event", info);
|
|
7477
7527
|
return;
|
|
7478
7528
|
}
|
|
7479
7529
|
if (info.shiftKey) {
|
|
7480
7530
|
clearTimeout(this._shiftKeyTimeout);
|
|
7481
7531
|
this._shiftKeyTimeout = -1;
|
|
7482
|
-
inputs.
|
|
7483
|
-
} else if (!info.shiftKey && inputs.
|
|
7532
|
+
inputs.setShiftKey(true);
|
|
7533
|
+
} else if (!info.shiftKey && inputs.getShiftKey() && this._shiftKeyTimeout === -1) {
|
|
7484
7534
|
this._shiftKeyTimeout = this.timers.setTimeout(this._setShiftKeyTimeout, 150);
|
|
7485
7535
|
}
|
|
7486
7536
|
if (info.altKey) {
|
|
7487
7537
|
clearTimeout(this._altKeyTimeout);
|
|
7488
7538
|
this._altKeyTimeout = -1;
|
|
7489
|
-
inputs.
|
|
7490
|
-
} else if (!info.altKey && inputs.
|
|
7539
|
+
inputs.setAltKey(true);
|
|
7540
|
+
} else if (!info.altKey && inputs.getAltKey() && this._altKeyTimeout === -1) {
|
|
7491
7541
|
this._altKeyTimeout = this.timers.setTimeout(this._setAltKeyTimeout, 150);
|
|
7492
7542
|
}
|
|
7493
7543
|
if (info.ctrlKey) {
|
|
7494
7544
|
clearTimeout(this._ctrlKeyTimeout);
|
|
7495
7545
|
this._ctrlKeyTimeout = -1;
|
|
7496
|
-
inputs.
|
|
7497
|
-
} else if (!info.ctrlKey && inputs.
|
|
7546
|
+
inputs.setCtrlKey(true);
|
|
7547
|
+
} else if (!info.ctrlKey && inputs.getCtrlKey() && this._ctrlKeyTimeout === -1) {
|
|
7498
7548
|
this._ctrlKeyTimeout = this.timers.setTimeout(this._setCtrlKeyTimeout, 150);
|
|
7499
7549
|
}
|
|
7500
7550
|
if (info.metaKey) {
|
|
7501
7551
|
clearTimeout(this._metaKeyTimeout);
|
|
7502
7552
|
this._metaKeyTimeout = -1;
|
|
7503
|
-
inputs.
|
|
7504
|
-
} else if (!info.metaKey && inputs.
|
|
7553
|
+
inputs.setMetaKey(true);
|
|
7554
|
+
} else if (!info.metaKey && inputs.getMetaKey() && this._metaKeyTimeout === -1) {
|
|
7505
7555
|
this._metaKeyTimeout = this.timers.setTimeout(this._setMetaKeyTimeout, 150);
|
|
7506
7556
|
}
|
|
7507
|
-
|
|
7508
|
-
|
|
7509
|
-
inputs.isDragging = false;
|
|
7557
|
+
if (!inputs.getIsPointing()) {
|
|
7558
|
+
inputs.setIsDragging(false);
|
|
7510
7559
|
}
|
|
7511
7560
|
const instanceState = this.store.unsafeGetWithoutCapture(import_tlschema.TLINSTANCE_ID);
|
|
7512
7561
|
const pageState = this.store.get(this._getCurrentPageStateId());
|
|
@@ -7515,23 +7564,23 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
7515
7564
|
case "pinch": {
|
|
7516
7565
|
if (cameraOptions.isLocked) return;
|
|
7517
7566
|
clearTimeout(this._longPressTimeout);
|
|
7518
|
-
this.
|
|
7567
|
+
this.inputs.updateFromEvent(info);
|
|
7519
7568
|
switch (info.name) {
|
|
7520
7569
|
case "pinch_start": {
|
|
7521
|
-
if (inputs.
|
|
7522
|
-
if (!inputs.
|
|
7523
|
-
this._pinchStart = this.getCamera().z;
|
|
7570
|
+
if (inputs.getIsPinching()) return;
|
|
7571
|
+
if (!inputs.getIsEditing()) {
|
|
7524
7572
|
if (!this._selectedShapeIdsAtPointerDown.length) {
|
|
7525
7573
|
this._selectedShapeIdsAtPointerDown = [...pageState.selectedShapeIds];
|
|
7526
7574
|
}
|
|
7527
7575
|
this._didPinch = true;
|
|
7528
|
-
inputs.
|
|
7576
|
+
inputs.setIsPinching(true);
|
|
7529
7577
|
this.interrupt();
|
|
7530
7578
|
}
|
|
7579
|
+
this.emit("event", info);
|
|
7531
7580
|
return;
|
|
7532
7581
|
}
|
|
7533
7582
|
case "pinch": {
|
|
7534
|
-
if (!inputs.
|
|
7583
|
+
if (!inputs.getIsPinching()) return;
|
|
7535
7584
|
const {
|
|
7536
7585
|
point: { z = 1 },
|
|
7537
7586
|
delta: { x: dx, y: dy }
|
|
@@ -7555,11 +7604,12 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
7555
7604
|
),
|
|
7556
7605
|
{ immediate: true }
|
|
7557
7606
|
);
|
|
7607
|
+
this.emit("event", info);
|
|
7558
7608
|
return;
|
|
7559
7609
|
}
|
|
7560
7610
|
case "pinch_end": {
|
|
7561
|
-
if (!inputs.
|
|
7562
|
-
inputs.
|
|
7611
|
+
if (!inputs.getIsPinching()) return this;
|
|
7612
|
+
inputs.setIsPinching(false);
|
|
7563
7613
|
const { _selectedShapeIdsAtPointerDown: shapesToReselect } = this;
|
|
7564
7614
|
this.setSelectedShapes(this._selectedShapeIdsAtPointerDown);
|
|
7565
7615
|
this._selectedShapeIdsAtPointerDown = [];
|
|
@@ -7573,13 +7623,14 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
7573
7623
|
});
|
|
7574
7624
|
}
|
|
7575
7625
|
}
|
|
7626
|
+
this.emit("event", info);
|
|
7576
7627
|
return;
|
|
7577
7628
|
}
|
|
7578
7629
|
}
|
|
7579
7630
|
}
|
|
7580
7631
|
case "wheel": {
|
|
7581
7632
|
if (cameraOptions.isLocked) return;
|
|
7582
|
-
this.
|
|
7633
|
+
this.inputs.updateFromEvent(info);
|
|
7583
7634
|
const { panSpeed, zoomSpeed } = cameraOptions;
|
|
7584
7635
|
let wheelBehavior = cameraOptions.wheelBehavior;
|
|
7585
7636
|
const inputMode = this.user.getUserPreferences().inputMode;
|
|
@@ -7597,7 +7648,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
7597
7648
|
if (info.ctrlKey) behavior = wheelBehavior === "pan" ? "zoom" : "pan";
|
|
7598
7649
|
switch (behavior) {
|
|
7599
7650
|
case "zoom": {
|
|
7600
|
-
const { x, y } = this.inputs.
|
|
7651
|
+
const { x, y } = this.inputs.getCurrentScreenPoint();
|
|
7601
7652
|
let delta = dz;
|
|
7602
7653
|
if (wheelBehavior === "zoom") {
|
|
7603
7654
|
if (Math.abs(dy) > 10) {
|
|
@@ -7611,6 +7662,8 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
7611
7662
|
immediate: true
|
|
7612
7663
|
});
|
|
7613
7664
|
this.maybeTrackPerformance("Zooming");
|
|
7665
|
+
this.root.handleEvent(info);
|
|
7666
|
+
this.emit("event", info);
|
|
7614
7667
|
return;
|
|
7615
7668
|
}
|
|
7616
7669
|
case "pan": {
|
|
@@ -7618,6 +7671,8 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
7618
7671
|
immediate: true
|
|
7619
7672
|
});
|
|
7620
7673
|
this.maybeTrackPerformance("Panning");
|
|
7674
|
+
this.root.handleEvent(info);
|
|
7675
|
+
this.emit("event", info);
|
|
7621
7676
|
return;
|
|
7622
7677
|
}
|
|
7623
7678
|
}
|
|
@@ -7625,14 +7680,14 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
7625
7680
|
break;
|
|
7626
7681
|
}
|
|
7627
7682
|
case "pointer": {
|
|
7628
|
-
if (inputs.
|
|
7629
|
-
this.
|
|
7683
|
+
if (inputs.getIsPinching()) return;
|
|
7684
|
+
this.inputs.updateFromEvent(info);
|
|
7630
7685
|
const { isPen } = info;
|
|
7631
7686
|
const { isPenMode } = instanceState;
|
|
7632
7687
|
switch (info.name) {
|
|
7633
7688
|
case "pointer_down": {
|
|
7634
7689
|
if (isPenMode && !isPen) return;
|
|
7635
|
-
if (!this.inputs.
|
|
7690
|
+
if (!this.inputs.getIsPanning()) {
|
|
7636
7691
|
this._longPressTimeout = this.timers.setTimeout(() => {
|
|
7637
7692
|
const vsb = this.getViewportScreenBounds();
|
|
7638
7693
|
this.dispatch({
|
|
@@ -7641,7 +7696,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
7641
7696
|
// viewport bounds, and will be again when this event is handled...
|
|
7642
7697
|
// so we need to counter-adjust from the stored value so that the
|
|
7643
7698
|
// new value is set correctly.
|
|
7644
|
-
point: this.inputs.
|
|
7699
|
+
point: this.inputs.getOriginScreenPoint().clone().addXY(vsb.x, vsb.y),
|
|
7645
7700
|
name: "long_press"
|
|
7646
7701
|
});
|
|
7647
7702
|
}, this.options.longPressDurationMs);
|
|
@@ -7649,21 +7704,21 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
7649
7704
|
this._selectedShapeIdsAtPointerDown = this.getSelectedShapeIds();
|
|
7650
7705
|
if (info.button === import_constants.LEFT_MOUSE_BUTTON) this.capturedPointerId = info.pointerId;
|
|
7651
7706
|
inputs.buttons.add(info.button);
|
|
7652
|
-
inputs.
|
|
7653
|
-
inputs.
|
|
7707
|
+
inputs.setIsPointing(true);
|
|
7708
|
+
inputs.setIsDragging(false);
|
|
7654
7709
|
if (!isPenMode && isPen) this.updateInstanceState({ isPenMode: true });
|
|
7655
7710
|
if (info.button === import_constants.STYLUS_ERASER_BUTTON) {
|
|
7656
7711
|
this._restoreToolId = this.getCurrentToolId();
|
|
7657
7712
|
this.complete();
|
|
7658
7713
|
this.setCurrentTool("eraser");
|
|
7659
7714
|
} else if (info.button === import_constants.MIDDLE_MOUSE_BUTTON) {
|
|
7660
|
-
if (!this.inputs.
|
|
7715
|
+
if (!this.inputs.getIsPanning()) {
|
|
7661
7716
|
this._prevCursor = this.getInstanceState().cursor.type;
|
|
7662
7717
|
}
|
|
7663
|
-
this.inputs.
|
|
7718
|
+
this.inputs.setIsPanning(true);
|
|
7664
7719
|
clearTimeout(this._longPressTimeout);
|
|
7665
7720
|
}
|
|
7666
|
-
if (this.inputs.
|
|
7721
|
+
if (this.inputs.getIsPanning()) {
|
|
7667
7722
|
this.stopCameraAnimation();
|
|
7668
7723
|
this.setCursor({ type: "grabbing", rotation: 0 });
|
|
7669
7724
|
return this;
|
|
@@ -7673,8 +7728,9 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
7673
7728
|
case "pointer_move": {
|
|
7674
7729
|
if (!isPen && isPenMode) return;
|
|
7675
7730
|
const { x: cx, y: cy, z: cz } = (0, import_state.unsafe__withoutCapture)(() => this.getCamera());
|
|
7676
|
-
if (this.inputs.
|
|
7677
|
-
const
|
|
7731
|
+
if (this.inputs.getIsPanning() && this.inputs.getIsPointing()) {
|
|
7732
|
+
const currentScreenPoint = this.inputs.getCurrentScreenPoint();
|
|
7733
|
+
const previousScreenPoint = this.inputs.getPreviousScreenPoint();
|
|
7678
7734
|
const offset = import_Vec.Vec.Sub(currentScreenPoint, previousScreenPoint);
|
|
7679
7735
|
this.setCamera(new import_Vec.Vec(cx + offset.x / cz, cy + offset.y / cz, cz), {
|
|
7680
7736
|
immediate: true
|
|
@@ -7682,15 +7738,15 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
7682
7738
|
this.maybeTrackPerformance("Panning");
|
|
7683
7739
|
return;
|
|
7684
7740
|
}
|
|
7685
|
-
if (inputs.
|
|
7686
|
-
inputs.
|
|
7741
|
+
if (inputs.getIsPointing() && !inputs.getIsDragging() && import_Vec.Vec.Dist2(inputs.getOriginPagePoint(), inputs.getCurrentPagePoint()) * this.getZoomLevel() > (instanceState.isCoarsePointer ? this.options.coarseDragDistanceSquared : this.options.dragDistanceSquared) / cz) {
|
|
7742
|
+
inputs.setIsDragging(true);
|
|
7687
7743
|
clearTimeout(this._longPressTimeout);
|
|
7688
7744
|
}
|
|
7689
7745
|
break;
|
|
7690
7746
|
}
|
|
7691
7747
|
case "pointer_up": {
|
|
7692
|
-
inputs.
|
|
7693
|
-
inputs.
|
|
7748
|
+
inputs.setIsDragging(false);
|
|
7749
|
+
inputs.setIsPointing(false);
|
|
7694
7750
|
clearTimeout(this._longPressTimeout);
|
|
7695
7751
|
inputs.buttons.delete(info.button);
|
|
7696
7752
|
if (instanceState.isPenMode && !isPen) return;
|
|
@@ -7698,12 +7754,12 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
7698
7754
|
this.capturedPointerId = null;
|
|
7699
7755
|
info.button = 0;
|
|
7700
7756
|
}
|
|
7701
|
-
if (inputs.
|
|
7757
|
+
if (inputs.getIsPanning()) {
|
|
7702
7758
|
if (!inputs.keys.has("Space")) {
|
|
7703
|
-
inputs.
|
|
7704
|
-
inputs.
|
|
7759
|
+
inputs.setIsPanning(false);
|
|
7760
|
+
inputs.setIsSpacebarPanning(false);
|
|
7705
7761
|
}
|
|
7706
|
-
const slideDirection = this.inputs.
|
|
7762
|
+
const slideDirection = this.inputs.getPointerVelocity();
|
|
7707
7763
|
const slideSpeed = Math.min(2, slideDirection.len());
|
|
7708
7764
|
switch (info.button) {
|
|
7709
7765
|
case import_constants.LEFT_MOUSE_BUTTON: {
|
|
@@ -7740,51 +7796,58 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
7740
7796
|
switch (info.name) {
|
|
7741
7797
|
case "key_down": {
|
|
7742
7798
|
inputs.keys.add(info.code);
|
|
7743
|
-
if (
|
|
7744
|
-
if (!
|
|
7745
|
-
this.
|
|
7746
|
-
|
|
7747
|
-
this.inputs.isPanning = true;
|
|
7748
|
-
this.inputs.isSpacebarPanning = true;
|
|
7749
|
-
clearTimeout(this._longPressTimeout);
|
|
7750
|
-
this.setCursor({ type: this.inputs.isPointing ? "grabbing" : "grab", rotation: 0 });
|
|
7751
|
-
}
|
|
7752
|
-
if (this.inputs.isSpacebarPanning) {
|
|
7753
|
-
let offset;
|
|
7754
|
-
switch (info.code) {
|
|
7755
|
-
case "ArrowUp": {
|
|
7756
|
-
offset = new import_Vec.Vec(0, -1);
|
|
7757
|
-
break;
|
|
7758
|
-
}
|
|
7759
|
-
case "ArrowRight": {
|
|
7760
|
-
offset = new import_Vec.Vec(1, 0);
|
|
7761
|
-
break;
|
|
7799
|
+
if (this.options.spacebarPanning) {
|
|
7800
|
+
if (info.code === "Space" && !info.ctrlKey) {
|
|
7801
|
+
if (!this.inputs.getIsPanning()) {
|
|
7802
|
+
this._prevCursor = instanceState.cursor.type;
|
|
7762
7803
|
}
|
|
7763
|
-
|
|
7764
|
-
|
|
7765
|
-
|
|
7804
|
+
this.inputs.setIsPanning(true);
|
|
7805
|
+
this.inputs.setIsSpacebarPanning(true);
|
|
7806
|
+
clearTimeout(this._longPressTimeout);
|
|
7807
|
+
this.setCursor({
|
|
7808
|
+
type: this.inputs.getIsPointing() ? "grabbing" : "grab",
|
|
7809
|
+
rotation: 0
|
|
7810
|
+
});
|
|
7811
|
+
}
|
|
7812
|
+
if (this.inputs.getIsSpacebarPanning()) {
|
|
7813
|
+
let offset;
|
|
7814
|
+
switch (info.code) {
|
|
7815
|
+
case "ArrowUp": {
|
|
7816
|
+
offset = new import_Vec.Vec(0, -1);
|
|
7817
|
+
break;
|
|
7818
|
+
}
|
|
7819
|
+
case "ArrowRight": {
|
|
7820
|
+
offset = new import_Vec.Vec(1, 0);
|
|
7821
|
+
break;
|
|
7822
|
+
}
|
|
7823
|
+
case "ArrowDown": {
|
|
7824
|
+
offset = new import_Vec.Vec(0, 1);
|
|
7825
|
+
break;
|
|
7826
|
+
}
|
|
7827
|
+
case "ArrowLeft": {
|
|
7828
|
+
offset = new import_Vec.Vec(-1, 0);
|
|
7829
|
+
break;
|
|
7830
|
+
}
|
|
7766
7831
|
}
|
|
7767
|
-
|
|
7768
|
-
|
|
7769
|
-
|
|
7832
|
+
if (offset) {
|
|
7833
|
+
const bounds = this.getViewportPageBounds();
|
|
7834
|
+
const next = bounds.clone().translate(offset.mulV({ x: bounds.w, y: bounds.h }));
|
|
7835
|
+
this._animateToViewport(next, { animation: { duration: 320 } });
|
|
7770
7836
|
}
|
|
7771
7837
|
}
|
|
7772
|
-
if (offset) {
|
|
7773
|
-
const bounds = this.getViewportPageBounds();
|
|
7774
|
-
const next = bounds.clone().translate(offset.mulV({ x: bounds.w, y: bounds.h }));
|
|
7775
|
-
this._animateToViewport(next, { animation: { duration: 320 } });
|
|
7776
|
-
}
|
|
7777
7838
|
}
|
|
7778
7839
|
break;
|
|
7779
7840
|
}
|
|
7780
7841
|
case "key_up": {
|
|
7781
7842
|
inputs.keys.delete(info.code);
|
|
7782
|
-
if (
|
|
7783
|
-
if (
|
|
7784
|
-
|
|
7785
|
-
|
|
7786
|
-
|
|
7787
|
-
|
|
7843
|
+
if (this.options.spacebarPanning) {
|
|
7844
|
+
if (info.code === "Space") {
|
|
7845
|
+
if (this.inputs.buttons.has(import_constants.MIDDLE_MOUSE_BUTTON)) {
|
|
7846
|
+
} else {
|
|
7847
|
+
this.inputs.setIsPanning(false);
|
|
7848
|
+
this.inputs.setIsSpacebarPanning(false);
|
|
7849
|
+
this.setCursor({ type: this._prevCursor, rotation: 0 });
|
|
7850
|
+
}
|
|
7788
7851
|
}
|
|
7789
7852
|
}
|
|
7790
7853
|
break;
|
|
@@ -7837,8 +7900,8 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
|
|
|
7837
7900
|
}
|
|
7838
7901
|
_init = __decoratorStart(_a);
|
|
7839
7902
|
__decorateElement(_init, 1, "getIsShapeHiddenCache", _getIsShapeHiddenCache_dec, Editor);
|
|
7840
|
-
__decorateElement(_init, 1, "
|
|
7841
|
-
__decorateElement(_init, 1, "
|
|
7903
|
+
__decorateElement(_init, 1, "canUndo", _canUndo_dec, Editor);
|
|
7904
|
+
__decorateElement(_init, 1, "canRedo", _canRedo_dec, Editor);
|
|
7842
7905
|
__decorateElement(_init, 1, "getPath", _getPath_dec, Editor);
|
|
7843
7906
|
__decorateElement(_init, 1, "getCurrentTool", _getCurrentTool_dec, Editor);
|
|
7844
7907
|
__decorateElement(_init, 1, "getCurrentToolId", _getCurrentToolId_dec, Editor);
|
|
@@ -7873,6 +7936,9 @@ __decorateElement(_init, 1, "getCamera", _getCamera_dec, Editor);
|
|
|
7873
7936
|
__decorateElement(_init, 1, "getViewportPageBoundsForFollowing", _getViewportPageBoundsForFollowing_dec, Editor);
|
|
7874
7937
|
__decorateElement(_init, 1, "getCameraForFollowing", _getCameraForFollowing_dec, Editor);
|
|
7875
7938
|
__decorateElement(_init, 1, "getZoomLevel", _getZoomLevel_dec, Editor);
|
|
7939
|
+
__decorateElement(_init, 1, "getDebouncedZoomLevel", _getDebouncedZoomLevel_dec, Editor);
|
|
7940
|
+
__decorateElement(_init, 1, "_getAboveDebouncedZoomThreshold", __getAboveDebouncedZoomThreshold_dec, Editor);
|
|
7941
|
+
__decorateElement(_init, 1, "getEfficientZoomLevel", _getEfficientZoomLevel_dec, Editor);
|
|
7876
7942
|
__decorateElement(_init, 1, "getViewportScreenBounds", _getViewportScreenBounds_dec, Editor);
|
|
7877
7943
|
__decorateElement(_init, 1, "getViewportScreenCenter", _getViewportScreenCenter_dec, Editor);
|
|
7878
7944
|
__decorateElement(_init, 1, "getViewportPageBounds", _getViewportPageBounds_dec, Editor);
|