@atlaskit/editor-plugin-block-controls 27.0.3 → 27.0.5
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/CHANGELOG.md +12 -0
- package/dist/cjs/editor-commands/handle-key-down-with-preserved-selection.js +2 -2
- package/dist/cjs/editor-commands/move-node-with-block-menu.js +5 -5
- package/dist/cjs/editor-commands/move-node.js +23 -22
- package/dist/cjs/editor-commands/move-to-layout.js +11 -11
- package/dist/cjs/pm-plugins/handle-mouse-down.js +2 -2
- package/dist/cjs/pm-plugins/handle-mouse-over.js +2 -2
- package/dist/cjs/pm-plugins/keymap.js +5 -5
- package/dist/cjs/pm-plugins/main.js +20 -20
- package/dist/cjs/pm-plugins/selection-preservation/pm-plugin.js +2 -2
- package/dist/cjs/pm-plugins/sparse-surfaces-view.js +2 -2
- package/dist/cjs/pm-plugins/utils/analytics.js +10 -10
- package/dist/cjs/pm-plugins/utils/drag-handle-positions.js +3 -3
- package/dist/cjs/pm-plugins/utils/expand-and-update-selection.js +4 -3
- package/dist/cjs/pm-plugins/utils/getSelection.js +4 -3
- package/dist/cjs/pm-plugins/utils/selection.js +4 -3
- package/dist/cjs/pm-plugins/utils/update-selection.js +2 -1
- package/dist/cjs/pm-plugins/vanilla-quick-insert.js +4 -4
- package/dist/cjs/ui/block-controls-left-surfaces.js +4 -4
- package/dist/cjs/ui/block-controls-right-surfaces.js +4 -4
- package/dist/cjs/ui/block-controls-surface-drag-handle.js +10 -10
- package/dist/cjs/ui/consts.js +6 -6
- package/dist/cjs/ui/drag-handle.js +74 -73
- package/dist/cjs/ui/drop-target-layout.js +3 -3
- package/dist/cjs/ui/drop-target.js +2 -2
- package/dist/cjs/ui/global-styles.js +32 -31
- package/dist/cjs/ui/inline-drop-target.js +2 -2
- package/dist/cjs/ui/quick-insert-button.js +16 -16
- package/dist/cjs/ui/use-block-controls-surface-drag-source.js +7 -7
- package/dist/cjs/ui/utils/get-node-content-element.js +3 -3
- package/dist/cjs/ui/visibility-container.js +4 -4
- package/dist/es2019/editor-commands/handle-key-down-with-preserved-selection.js +1 -1
- package/dist/es2019/editor-commands/move-node-with-block-menu.js +2 -2
- package/dist/es2019/editor-commands/move-node.js +5 -4
- package/dist/es2019/editor-commands/move-to-layout.js +2 -2
- package/dist/es2019/pm-plugins/handle-mouse-down.js +1 -1
- package/dist/es2019/pm-plugins/handle-mouse-over.js +1 -1
- package/dist/es2019/pm-plugins/keymap.js +1 -1
- package/dist/es2019/pm-plugins/main.js +4 -4
- package/dist/es2019/pm-plugins/selection-preservation/pm-plugin.js +1 -1
- package/dist/es2019/pm-plugins/sparse-surfaces-view.js +1 -1
- package/dist/es2019/pm-plugins/utils/analytics.js +1 -1
- package/dist/es2019/pm-plugins/utils/drag-handle-positions.js +1 -1
- package/dist/es2019/pm-plugins/utils/expand-and-update-selection.js +3 -2
- package/dist/es2019/pm-plugins/utils/getSelection.js +3 -2
- package/dist/es2019/pm-plugins/utils/selection.js +3 -2
- package/dist/es2019/pm-plugins/utils/update-selection.js +2 -1
- package/dist/es2019/pm-plugins/vanilla-quick-insert.js +2 -2
- package/dist/es2019/ui/block-controls-left-surfaces.js +2 -2
- package/dist/es2019/ui/block-controls-right-surfaces.js +2 -2
- package/dist/es2019/ui/block-controls-surface-drag-handle.js +3 -3
- package/dist/es2019/ui/consts.js +2 -2
- package/dist/es2019/ui/drag-handle.js +6 -5
- package/dist/es2019/ui/drop-target-layout.js +1 -1
- package/dist/es2019/ui/drop-target.js +1 -1
- package/dist/es2019/ui/global-styles.js +5 -4
- package/dist/es2019/ui/inline-drop-target.js +1 -1
- package/dist/es2019/ui/quick-insert-button.js +4 -4
- package/dist/es2019/ui/use-block-controls-surface-drag-source.js +1 -1
- package/dist/es2019/ui/utils/get-node-content-element.js +1 -1
- package/dist/es2019/ui/visibility-container.js +2 -2
- package/dist/esm/editor-commands/handle-key-down-with-preserved-selection.js +1 -1
- package/dist/esm/editor-commands/move-node-with-block-menu.js +2 -2
- package/dist/esm/editor-commands/move-node.js +5 -4
- package/dist/esm/editor-commands/move-to-layout.js +2 -2
- package/dist/esm/pm-plugins/handle-mouse-down.js +1 -1
- package/dist/esm/pm-plugins/handle-mouse-over.js +1 -1
- package/dist/esm/pm-plugins/keymap.js +1 -1
- package/dist/esm/pm-plugins/main.js +4 -4
- package/dist/esm/pm-plugins/selection-preservation/pm-plugin.js +1 -1
- package/dist/esm/pm-plugins/sparse-surfaces-view.js +1 -1
- package/dist/esm/pm-plugins/utils/analytics.js +1 -1
- package/dist/esm/pm-plugins/utils/drag-handle-positions.js +1 -1
- package/dist/esm/pm-plugins/utils/expand-and-update-selection.js +3 -2
- package/dist/esm/pm-plugins/utils/getSelection.js +3 -2
- package/dist/esm/pm-plugins/utils/selection.js +3 -2
- package/dist/esm/pm-plugins/utils/update-selection.js +2 -1
- package/dist/esm/pm-plugins/vanilla-quick-insert.js +2 -2
- package/dist/esm/ui/block-controls-left-surfaces.js +2 -2
- package/dist/esm/ui/block-controls-right-surfaces.js +2 -2
- package/dist/esm/ui/block-controls-surface-drag-handle.js +3 -3
- package/dist/esm/ui/consts.js +2 -2
- package/dist/esm/ui/drag-handle.js +6 -5
- package/dist/esm/ui/drop-target-layout.js +1 -1
- package/dist/esm/ui/drop-target.js +1 -1
- package/dist/esm/ui/global-styles.js +5 -4
- package/dist/esm/ui/inline-drop-target.js +1 -1
- package/dist/esm/ui/quick-insert-button.js +4 -4
- package/dist/esm/ui/use-block-controls-surface-drag-source.js +1 -1
- package/dist/esm/ui/utils/get-node-content-element.js +1 -1
- package/dist/esm/ui/visibility-container.js +2 -2
- package/dist/types/blockControlsPluginType.d.ts +19 -17
- package/dist/types/editor-commands/handle-key-down-with-preserved-selection.d.ts +2 -1
- package/dist/types/editor-commands/map-preserved-selection.d.ts +1 -1
- package/dist/types/editor-commands/move-node-with-block-menu.d.ts +3 -2
- package/dist/types/editor-commands/move-node.d.ts +4 -1
- package/dist/types/editor-commands/move-to-layout.d.ts +2 -1
- package/dist/types/editor-commands/show-drag-handle.d.ts +2 -1
- package/dist/types/pm-plugins/decorations-common.d.ts +1 -1
- package/dist/types/pm-plugins/decorations-drag-handle.d.ts +2 -2
- package/dist/types/pm-plugins/decorations-drop-target-active.d.ts +2 -2
- package/dist/types/pm-plugins/decorations-drop-target.d.ts +2 -2
- package/dist/types/pm-plugins/decorations-quick-insert-button.d.ts +2 -2
- package/dist/types/pm-plugins/handle-mouse-down.d.ts +1 -1
- package/dist/types/pm-plugins/handle-mouse-over.d.ts +1 -1
- package/dist/types/pm-plugins/handle-sparse-hover-target.d.ts +1 -1
- package/dist/types/pm-plugins/interaction-tracking/handle-mouse-move.d.ts +1 -1
- package/dist/types/pm-plugins/interaction-tracking/pm-plugin.d.ts +1 -1
- package/dist/types/pm-plugins/keymap.d.ts +1 -1
- package/dist/types/pm-plugins/main.d.ts +2 -2
- package/dist/types/pm-plugins/selection-preservation/editor-commands.d.ts +1 -1
- package/dist/types/pm-plugins/selection-preservation/pm-plugin.d.ts +1 -1
- package/dist/types/pm-plugins/sparse-surfaces-view.d.ts +1 -1
- package/dist/types/pm-plugins/sparse-surfaces.d.ts +1 -1
- package/dist/types/pm-plugins/utils/analytics.d.ts +1 -1
- package/dist/types/pm-plugins/utils/collapsed-heading.d.ts +1 -1
- package/dist/types/pm-plugins/utils/expand-and-update-selection.d.ts +1 -1
- package/dist/types/pm-plugins/utils/getSelection.d.ts +1 -1
- package/dist/types/pm-plugins/utils/selection.d.ts +2 -2
- package/dist/types/pm-plugins/vanilla-quick-insert.d.ts +1 -1
- package/dist/types/ui/block-controls-left-surface.d.ts +1 -1
- package/dist/types/ui/block-controls-left-surfaces.d.ts +1 -1
- package/dist/types/ui/block-controls-right-surface.d.ts +1 -1
- package/dist/types/ui/block-controls-right-surfaces.d.ts +1 -1
- package/dist/types/ui/block-controls-surface-drag-handle-registration.d.ts +1 -1
- package/dist/types/ui/block-controls-surface-drag-handle.d.ts +1 -1
- package/dist/types/ui/drag-handle.d.ts +1 -1
- package/dist/types/ui/drop-target-layout.d.ts +1 -1
- package/dist/types/ui/drop-target.d.ts +1 -1
- package/dist/types/ui/global-styles.d.ts +1 -1
- package/dist/types/ui/quick-insert-button.d.ts +1 -1
- package/dist/types/ui/use-block-controls-surface-drag-source.d.ts +1 -1
- package/dist/types/ui/utils/editor-commands.d.ts +1 -1
- package/dist/types/ui/visibility-container.d.ts +1 -1
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.handleKeyDownWithPreservedSelection = void 0;
|
|
7
|
-
var
|
|
7
|
+
var _utils = require("@atlaskit/editor-common/selection/utils");
|
|
8
8
|
var _editorCommands = require("../pm-plugins/selection-preservation/editor-commands");
|
|
9
9
|
var getKeyboardEventInfo = function getKeyboardEventInfo(event) {
|
|
10
10
|
var key = event.key.toLowerCase();
|
|
@@ -55,7 +55,7 @@ var handleKeyDownWithPreservedSelection = exports.handleKeyDownWithPreservedSele
|
|
|
55
55
|
// Handle delete/backspace key presses with custom logic to ensure preserved selection is used
|
|
56
56
|
if (isDelete) {
|
|
57
57
|
var _api$blockControls;
|
|
58
|
-
tr = (0,
|
|
58
|
+
tr = (0, _utils.deleteSelectedRange)(tr, (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || (_api$blockControls = _api$blockControls.sharedState.currentState()) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.preservedSelection);
|
|
59
59
|
}
|
|
60
60
|
var isBlockMenuOpen = ((_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 || (_api$userIntent = _api$userIntent.sharedState.currentState()) === null || _api$userIntent === void 0 ? void 0 : _api$userIntent.currentUserIntent) === 'blockMenuOpen';
|
|
61
61
|
|
|
@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.moveNodeWithBlockMenu = void 0;
|
|
8
8
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
9
|
-
var
|
|
10
|
-
var
|
|
9
|
+
var _enums = require("@atlaskit/editor-common/analytics/types/enums");
|
|
10
|
+
var _blockControls = require("@atlaskit/editor-common/types/block-controls");
|
|
11
11
|
var _main = require("../pm-plugins/main");
|
|
12
12
|
var _selection = require("../pm-plugins/utils/selection");
|
|
13
13
|
var _moveNode = require("./move-node");
|
|
@@ -43,10 +43,10 @@ var moveNodeWithBlockMenu = exports.moveNodeWithBlockMenu = function moveNodeWit
|
|
|
43
43
|
var depth = tr.doc.resolve(currentNodePos).depth;
|
|
44
44
|
var fromIndex = $from.index(depth);
|
|
45
45
|
var trAfterNodeMove = tr;
|
|
46
|
-
if (direction ===
|
|
46
|
+
if (direction === _blockControls.DIRECTION.UP) {
|
|
47
47
|
if (fromIndex > 0) {
|
|
48
48
|
var moveToPos = $from.posAtIndex(fromIndex - 1, depth);
|
|
49
|
-
trAfterNodeMove = (0, _moveNode.moveNode)(api)(currentNodePos, moveToPos,
|
|
49
|
+
trAfterNodeMove = (0, _moveNode.moveNode)(api)(currentNodePos, moveToPos, _enums.INPUT_METHOD.BLOCK_MENU)({
|
|
50
50
|
tr: tr
|
|
51
51
|
}) || tr;
|
|
52
52
|
}
|
|
@@ -57,7 +57,7 @@ var moveNodeWithBlockMenu = exports.moveNodeWithBlockMenu = function moveNodeWit
|
|
|
57
57
|
var moveToIndex = selectionToIndex + 2;
|
|
58
58
|
if (moveToIndex <= $to.node(depth).childCount) {
|
|
59
59
|
var _moveToPos = $to.posAtIndex(moveToIndex, depth);
|
|
60
|
-
trAfterNodeMove = (0, _moveNode.moveNode)(api)(currentNodePos, _moveToPos,
|
|
60
|
+
trAfterNodeMove = (0, _moveNode.moveNode)(api)(currentNodePos, _moveToPos, _enums.INPUT_METHOD.BLOCK_MENU)({
|
|
61
61
|
tr: tr
|
|
62
62
|
}) || tr;
|
|
63
63
|
}
|
|
@@ -6,12 +6,13 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.moveNodeViaShortcut = exports.moveNode = void 0;
|
|
8
8
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
9
|
-
var
|
|
9
|
+
var _enums = require("@atlaskit/editor-common/analytics/types/enums");
|
|
10
10
|
var _expand = require("@atlaskit/editor-common/expand");
|
|
11
|
-
var
|
|
11
|
+
var _blockControls = require("@atlaskit/editor-common/messages/block-controls");
|
|
12
12
|
var _selection = require("@atlaskit/editor-common/selection");
|
|
13
|
+
var _selection2 = require("@atlaskit/editor-common/selection/gap-cursor/selection");
|
|
13
14
|
var _transforms = require("@atlaskit/editor-common/transforms");
|
|
14
|
-
var
|
|
15
|
+
var _blockControls2 = require("@atlaskit/editor-common/types/block-controls");
|
|
15
16
|
var _utils = require("@atlaskit/editor-common/utils");
|
|
16
17
|
var _nodeTypeUtils = require("@atlaskit/editor-common/utils/node-type-utils");
|
|
17
18
|
var _model = require("@atlaskit/editor-prosemirror/model");
|
|
@@ -24,12 +25,12 @@ var _fg = require("@atlaskit/platform-feature-flags/fg");
|
|
|
24
25
|
var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
|
|
25
26
|
var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
|
|
26
27
|
var _main = require("../pm-plugins/main");
|
|
27
|
-
var
|
|
28
|
+
var _analytics = require("../pm-plugins/utils/analytics");
|
|
28
29
|
var _collapsedHeading = require("../pm-plugins/utils/collapsed-heading");
|
|
29
30
|
var _getNestedNodePosition = require("../pm-plugins/utils/getNestedNodePosition");
|
|
30
31
|
var _getSelection = require("../pm-plugins/utils/getSelection");
|
|
31
32
|
var _removeFromSource = require("../pm-plugins/utils/remove-from-source");
|
|
32
|
-
var
|
|
33
|
+
var _selection3 = require("../pm-plugins/utils/selection");
|
|
33
34
|
var _updateSelection = require("../pm-plugins/utils/update-selection");
|
|
34
35
|
var _validation = require("../pm-plugins/utils/validation");
|
|
35
36
|
var _moveNodeUtils = require("./utils/move-node-utils");
|
|
@@ -146,7 +147,7 @@ var getCurrentNodePos = function getCurrentNodePos(state) {
|
|
|
146
147
|
// to avoid shortcut collision with table drag and drop
|
|
147
148
|
currentNodePos = (_findTable$pos = (_findTable = (0, _utils3.findTable)(selection)) === null || _findTable === void 0 ? void 0 : _findTable.pos) !== null && _findTable$pos !== void 0 ? _findTable$pos : currentNodePos;
|
|
148
149
|
}
|
|
149
|
-
} else if (!(state.selection instanceof
|
|
150
|
+
} else if (!(state.selection instanceof _selection2.GapCursorSelection)) {
|
|
150
151
|
// 2. caret cursor is inside the node
|
|
151
152
|
// 3. the start of the selection is inside the node
|
|
152
153
|
currentNodePos = selection.$from.before(1);
|
|
@@ -203,7 +204,7 @@ var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShor
|
|
|
203
204
|
var isTopLevelNode = $currentNodePos.depth === 0;
|
|
204
205
|
var moveToPos = -1;
|
|
205
206
|
var isLayoutColumnSelected = selection instanceof _state.NodeSelection && selection.node.type.name === 'layoutColumn';
|
|
206
|
-
if (direction ===
|
|
207
|
+
if (direction === _blockControls2.DIRECTION.LEFT) {
|
|
207
208
|
if (isTopLevelNode && (0, _editorExperiment.editorExperiment)('advanced_layouts', true)) {
|
|
208
209
|
var _api$core, _api$core2;
|
|
209
210
|
var nodeBefore = $currentNodePos.nodeBefore;
|
|
@@ -247,7 +248,7 @@ var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShor
|
|
|
247
248
|
var previousNode = grandParent ? grandParent.maybeChild(index - 1) : null;
|
|
248
249
|
moveToPos = $currentNodePos.start() - ((previousNode === null || previousNode === void 0 ? void 0 : previousNode.nodeSize) || 1);
|
|
249
250
|
}
|
|
250
|
-
} else if (direction ===
|
|
251
|
+
} else if (direction === _blockControls2.DIRECTION.RIGHT) {
|
|
251
252
|
if (isTopLevelNode && (0, _editorExperiment.editorExperiment)('advanced_layouts', true)) {
|
|
252
253
|
var _api$core4, _api$core5;
|
|
253
254
|
var endOfDoc = $currentNodePos.end();
|
|
@@ -295,7 +296,7 @@ var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShor
|
|
|
295
296
|
}
|
|
296
297
|
moveToPos = $currentNodePos.after($currentNodePos.depth) + 1;
|
|
297
298
|
}
|
|
298
|
-
} else if (direction ===
|
|
299
|
+
} else if (direction === _blockControls2.DIRECTION.UP) {
|
|
299
300
|
if (isLayoutColumnSelected) {
|
|
300
301
|
moveToPos = $currentNodePos.start() - 1;
|
|
301
302
|
} else {
|
|
@@ -333,7 +334,7 @@ var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShor
|
|
|
333
334
|
api === null || api === void 0 || api.blockControls.commands.setMultiSelectPositions($newAnchor.pos, $newHead.pos)({
|
|
334
335
|
tr: tr
|
|
335
336
|
});
|
|
336
|
-
moveNode(api)(currentNodePos, moveToPos,
|
|
337
|
+
moveNode(api)(currentNodePos, moveToPos, _enums.INPUT_METHOD.SHORTCUT, formatMessage)({
|
|
337
338
|
tr: tr
|
|
338
339
|
});
|
|
339
340
|
tr.scrollIntoView();
|
|
@@ -358,7 +359,7 @@ var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShor
|
|
|
358
359
|
};
|
|
359
360
|
var moveNode = exports.moveNode = function moveNode(api) {
|
|
360
361
|
return function (start, to) {
|
|
361
|
-
var inputMethod = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] :
|
|
362
|
+
var inputMethod = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : _enums.INPUT_METHOD.DRAG_AND_DROP;
|
|
362
363
|
var formatMessage = arguments.length > 3 ? arguments[3] : undefined;
|
|
363
364
|
return function (_ref6) {
|
|
364
365
|
var _api$blockControls$sh, _convertedNodeSlice, _api$accessibilityUti;
|
|
@@ -386,14 +387,14 @@ var moveNode = exports.moveNode = function moveNode(api) {
|
|
|
386
387
|
var expandedRange = $from.blockRange(preservedSelection.$to);
|
|
387
388
|
sliceFrom = expandedRange ? expandedRange.start : preservedSelection.from;
|
|
388
389
|
sliceTo = expandedRange ? expandedRange.end : preservedSelection.to;
|
|
389
|
-
var attributes = (0,
|
|
390
|
+
var attributes = (0, _analytics.getMultiSelectAnalyticsAttributes)(tr, sliceFrom, sliceTo);
|
|
390
391
|
hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
|
|
391
392
|
sourceNodeTypes = attributes.nodeTypes;
|
|
392
393
|
} else {
|
|
393
|
-
var slicePosition = (0,
|
|
394
|
+
var slicePosition = (0, _selection3.getSelectedSlicePosition)(start, tr, api);
|
|
394
395
|
sliceFrom = slicePosition.from;
|
|
395
396
|
sliceTo = slicePosition.to;
|
|
396
|
-
var _attributes = (0,
|
|
397
|
+
var _attributes = (0, _analytics.getMultiSelectAnalyticsAttributes)(tr, sliceFrom, sliceTo);
|
|
397
398
|
hasSelectedMultipleNodes = _attributes.hasSelectedMultipleNodes;
|
|
398
399
|
sourceNodeTypes = _attributes.nodeTypes;
|
|
399
400
|
}
|
|
@@ -464,7 +465,7 @@ var moveNode = exports.moveNode = function moveNode(api) {
|
|
|
464
465
|
tr.insert(mappedTo, convertedNode);
|
|
465
466
|
}
|
|
466
467
|
var sliceSize = sliceTo - sliceFrom;
|
|
467
|
-
if (inputMethod ===
|
|
468
|
+
if (inputMethod === _enums.INPUT_METHOD.DRAG_AND_DROP) {
|
|
468
469
|
tr = (0, _getSelection.setCursorPositionAtMovedNode)(tr, mappedTo, api);
|
|
469
470
|
} else if (preservedSelection) {
|
|
470
471
|
var _currMeta = tr.getMeta(_main.key);
|
|
@@ -484,7 +485,7 @@ var moveNode = exports.moveNode = function moveNode(api) {
|
|
|
484
485
|
}));
|
|
485
486
|
if (
|
|
486
487
|
// when move node via block menu, we need to keep the focus on block menu popup, so don't move focus to editor in this scenario
|
|
487
|
-
inputMethod !==
|
|
488
|
+
inputMethod !== _enums.INPUT_METHOD.BLOCK_MENU) {
|
|
488
489
|
api === null || api === void 0 || api.core.actions.focus();
|
|
489
490
|
}
|
|
490
491
|
var $mappedTo = tr.doc.resolve(mappedTo);
|
|
@@ -506,14 +507,14 @@ var moveNode = exports.moveNode = function moveNode(api) {
|
|
|
506
507
|
}
|
|
507
508
|
}
|
|
508
509
|
if ((0, _editorExperiment.editorExperiment)('advanced_layouts', true)) {
|
|
509
|
-
(0,
|
|
510
|
+
(0, _analytics.attachMoveNodeAnalytics)(tr, inputMethod, $handlePos.depth, sourceNodeTypes, $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.depth, $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.parent.type.name, $handlePos.sameParent($mappedTo), api, hasSelectedMultipleNodes);
|
|
510
511
|
} else {
|
|
511
512
|
var _api$analytics;
|
|
512
513
|
api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.attachAnalyticsEvent({
|
|
513
|
-
eventType:
|
|
514
|
-
action:
|
|
515
|
-
actionSubject:
|
|
516
|
-
actionSubjectId:
|
|
514
|
+
eventType: _enums.EVENT_TYPE.TRACK,
|
|
515
|
+
action: _enums.ACTION.MOVED,
|
|
516
|
+
actionSubject: _enums.ACTION_SUBJECT.ELEMENT,
|
|
517
|
+
actionSubjectId: _enums.ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
|
|
517
518
|
attributes: {
|
|
518
519
|
nodeDepth: $handlePos.depth,
|
|
519
520
|
nodeTypes: sourceNodeTypes,
|
|
@@ -524,7 +525,7 @@ var moveNode = exports.moveNode = function moveNode(api) {
|
|
|
524
525
|
}
|
|
525
526
|
})(tr);
|
|
526
527
|
}
|
|
527
|
-
var movedMessage = to > sliceFrom ?
|
|
528
|
+
var movedMessage = to > sliceFrom ? _blockControls.messages.movedDown : _blockControls.messages.movedup;
|
|
528
529
|
api === null || api === void 0 || (_api$accessibilityUti = api.accessibilityUtils) === null || _api$accessibilityUti === void 0 || _api$accessibilityUti.actions.ariaNotify(formatMessage ? formatMessage(movedMessage) : movedMessage.defaultMessage, {
|
|
529
530
|
priority: 'important'
|
|
530
531
|
});
|
|
@@ -4,13 +4,13 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.moveToLayout = void 0;
|
|
7
|
-
var
|
|
8
|
-
var
|
|
7
|
+
var _enums = require("@atlaskit/editor-common/analytics/types/enums");
|
|
8
|
+
var _error = require("@atlaskit/editor-common/monitoring/error");
|
|
9
9
|
var _model = require("@atlaskit/editor-prosemirror/model");
|
|
10
10
|
var _state = require("@atlaskit/editor-prosemirror/state");
|
|
11
11
|
var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
|
|
12
12
|
var _fg = require("@atlaskit/platform-feature-flags/fg");
|
|
13
|
-
var
|
|
13
|
+
var _analytics = require("../pm-plugins/utils/analytics");
|
|
14
14
|
var _checkFragment = require("../pm-plugins/utils/check-fragment");
|
|
15
15
|
var _collapsedHeading = require("../pm-plugins/utils/collapsed-heading");
|
|
16
16
|
var _consts = require("../pm-plugins/utils/consts");
|
|
@@ -38,7 +38,7 @@ var createNewLayout = function createNewLayout(schema, layoutContents) {
|
|
|
38
38
|
var layoutSectionNode = layoutSection.createChecked(undefined, layoutContent);
|
|
39
39
|
return layoutSectionNode;
|
|
40
40
|
} catch (error) {
|
|
41
|
-
(0,
|
|
41
|
+
(0, _error.logException)(error, {
|
|
42
42
|
location: 'editor-plugin-block-controls/move-to-layout'
|
|
43
43
|
});
|
|
44
44
|
}
|
|
@@ -47,7 +47,7 @@ var createNewLayout = function createNewLayout(schema, layoutContents) {
|
|
|
47
47
|
var moveToExistingLayout = function moveToExistingLayout(toLayout, toLayoutPos, sourceContent, from, to, tr, $originalFrom, $originalTo, api, selectMovedNode) {
|
|
48
48
|
var isSameLayout = (0, _validation.isInSameLayout)($originalFrom, $originalTo);
|
|
49
49
|
var sourceContentEndPos = from + sourceContent.size;
|
|
50
|
-
var attributes = (0,
|
|
50
|
+
var attributes = (0, _analytics.getMultiSelectAnalyticsAttributes)(tr, from, sourceContentEndPos);
|
|
51
51
|
var sourceNodeTypes = attributes.nodeTypes,
|
|
52
52
|
hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
|
|
53
53
|
if (isSameLayout) {
|
|
@@ -58,11 +58,11 @@ var moveToExistingLayout = function moveToExistingLayout(toLayout, toLayoutPos,
|
|
|
58
58
|
if (selectMovedNode) {
|
|
59
59
|
tr.setSelection(new _state.NodeSelection(tr.doc.resolve(mappedTo))).scrollIntoView();
|
|
60
60
|
}
|
|
61
|
-
(0,
|
|
61
|
+
(0, _analytics.attachMoveNodeAnalytics)(tr, _enums.INPUT_METHOD.DRAG_AND_DROP, $originalFrom.depth, sourceNodeTypes, 1, 'layoutSection', true, api, hasSelectedMultipleNodes);
|
|
62
62
|
} else if (toLayout.childCount < (0, _consts.maxLayoutColumnSupported)()) {
|
|
63
63
|
(0, _removeFromSource.removeFromSource)(tr, tr.doc.resolve(from), sourceContentEndPos);
|
|
64
64
|
insertToDestinationNoWidthUpdate(tr, tr.mapping.map(to), sourceContent);
|
|
65
|
-
(0,
|
|
65
|
+
(0, _analytics.attachMoveNodeAnalytics)(tr, _enums.INPUT_METHOD.DRAG_AND_DROP, $originalFrom.depth, sourceNodeTypes, 1, 'layoutSection', false, api, hasSelectedMultipleNodes);
|
|
66
66
|
}
|
|
67
67
|
return tr;
|
|
68
68
|
};
|
|
@@ -86,7 +86,7 @@ var insertToDestinationNoWidthUpdate = function insertToDestinationNoWidthUpdate
|
|
|
86
86
|
width: 0
|
|
87
87
|
}, (0, _checkFragment.isFragmentOfType)(sourceFragment, 'layoutColumn') ? (_sourceFragment$first = sourceFragment.firstChild) === null || _sourceFragment$first === void 0 ? void 0 : _sourceFragment$first.content : sourceFragment);
|
|
88
88
|
} catch (error) {
|
|
89
|
-
(0,
|
|
89
|
+
(0, _error.logException)(error, {
|
|
90
90
|
location: 'editor-plugin-block-controls/move-to-layout'
|
|
91
91
|
});
|
|
92
92
|
}
|
|
@@ -283,7 +283,7 @@ var moveToLayout = exports.moveToLayout = function moveToLayout(api) {
|
|
|
283
283
|
var layoutContents = options !== null && options !== void 0 && options.moveToEnd ? [toNodeWithoutBreakout, fromContentWithoutBreakout] : [fromContentWithoutBreakout, toNodeWithoutBreakout];
|
|
284
284
|
var newLayout = createNewLayout(tr.doc.type.schema, layoutContents);
|
|
285
285
|
if (newLayout) {
|
|
286
|
-
var attributes = (0,
|
|
286
|
+
var attributes = (0, _analytics.getMultiSelectAnalyticsAttributes)(tr, $sourceFrom.pos, sourceTo);
|
|
287
287
|
var sourceNodeTypes = attributes.nodeTypes,
|
|
288
288
|
hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
|
|
289
289
|
tr = (0, _removeFromSource.removeFromSource)(tr, $sourceFrom, sourceTo);
|
|
@@ -295,9 +295,9 @@ var moveToLayout = exports.moveToLayout = function moveToLayout(api) {
|
|
|
295
295
|
})]);
|
|
296
296
|
if ((0, _fg.fg)('platform_editor_column_count_analytics')) {
|
|
297
297
|
// layout created via drag and drop will always be 2 columns
|
|
298
|
-
(0,
|
|
298
|
+
(0, _analytics.fireInsertLayoutAnalytics)(tr, api, sourceNodeTypes, hasSelectedMultipleNodes, 2);
|
|
299
299
|
} else {
|
|
300
|
-
(0,
|
|
300
|
+
(0, _analytics.fireInsertLayoutAnalytics)(tr, api, sourceNodeTypes, hasSelectedMultipleNodes);
|
|
301
301
|
}
|
|
302
302
|
}
|
|
303
303
|
return tr;
|
|
@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.handleMouseDown = void 0;
|
|
7
|
-
var
|
|
7
|
+
var _dragHandle = require("@atlaskit/editor-common/styles/drag-handle");
|
|
8
8
|
var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
|
|
9
9
|
var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
|
|
10
10
|
var handleMouseDown = exports.handleMouseDown = function handleMouseDown(api) {
|
|
@@ -34,7 +34,7 @@ var handleMouseDown = exports.handleMouseDown = function handleMouseDown(api) {
|
|
|
34
34
|
api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.showDragHandleAt(rootPos, '', (_rootNode$type$name3 = rootNode.type.name) !== null && _rootNode$type$name3 !== void 0 ? _rootNode$type$name3 : '', undefined, rootPos, '', (_rootNode$type$name4 = rootNode.type.name) !== null && _rootNode$type$name4 !== void 0 ? _rootNode$type$name4 : ''));
|
|
35
35
|
}
|
|
36
36
|
} else {
|
|
37
|
-
var isDragHandle = event.target.closest(
|
|
37
|
+
var isDragHandle = event.target.closest(_dragHandle.DRAG_HANDLE_SELECTOR) !== null;
|
|
38
38
|
api === null || api === void 0 || api.core.actions.execute(function (_ref) {
|
|
39
39
|
var tr = _ref.tr;
|
|
40
40
|
api === null || api === void 0 || api.blockControls.commands.setSelectedViaDragHandle(isDragHandle)({
|
|
@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
exports.handleMouseOver = void 0;
|
|
8
8
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
9
9
|
var _memoizeOne = _interopRequireDefault(require("memoize-one"));
|
|
10
|
-
var
|
|
10
|
+
var _utils = require("@atlaskit/editor-common/selection/utils");
|
|
11
11
|
var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
|
|
12
12
|
var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
|
|
13
13
|
var _fg = require("@atlaskit/platform-feature-flags/fg");
|
|
@@ -278,7 +278,7 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
|
|
|
278
278
|
var _selectionPreservatio;
|
|
279
279
|
var preservedSelection = (_selectionPreservatio = _pluginKey.selectionPreservationPluginKey.getState(view.state)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection;
|
|
280
280
|
var selection = preservedSelection || view.state.selection;
|
|
281
|
-
var isMultipleSelected = selection && (0,
|
|
281
|
+
var isMultipleSelected = selection && (0, _utils.isMultiBlockSelection)(selection);
|
|
282
282
|
|
|
283
283
|
// Only execute when selection is not a multi-selection, block menu is open, and menu is opened via keyboard
|
|
284
284
|
// as when it is a multi-selection, the showDragHandleAt command interfere with selection
|
|
@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.boundKeydownHandler = void 0;
|
|
7
7
|
var _keymaps = require("@atlaskit/editor-common/keymaps");
|
|
8
|
-
var
|
|
8
|
+
var _blockControls = require("@atlaskit/editor-common/types/block-controls");
|
|
9
9
|
var _keymap = require("@atlaskit/editor-prosemirror/keymap");
|
|
10
10
|
var _moveNode = require("../editor-commands/move-node");
|
|
11
11
|
var _showDragHandle = require("../editor-commands/show-drag-handle");
|
|
@@ -23,19 +23,19 @@ function keymapList(api, formatMessage) {
|
|
|
23
23
|
(0, _keymaps.bindKeymapWithCommand)(
|
|
24
24
|
// Ignored via go/ees005
|
|
25
25
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
26
|
-
_keymaps.dragToMoveUp.common, (0, _moveNode.moveNodeViaShortcut)(api,
|
|
26
|
+
_keymaps.dragToMoveUp.common, (0, _moveNode.moveNodeViaShortcut)(api, _blockControls.DIRECTION.UP, formatMessage), keymapList);
|
|
27
27
|
(0, _keymaps.bindKeymapWithCommand)(
|
|
28
28
|
// Ignored via go/ees005
|
|
29
29
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
30
|
-
_keymaps.dragToMoveDown.common, (0, _moveNode.moveNodeViaShortcut)(api,
|
|
30
|
+
_keymaps.dragToMoveDown.common, (0, _moveNode.moveNodeViaShortcut)(api, _blockControls.DIRECTION.DOWN, formatMessage), keymapList);
|
|
31
31
|
(0, _keymaps.bindKeymapWithCommand)(
|
|
32
32
|
// Ignored via go/ees005
|
|
33
33
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
34
|
-
_keymaps.dragToMoveLeft.common, (0, _moveNode.moveNodeViaShortcut)(api,
|
|
34
|
+
_keymaps.dragToMoveLeft.common, (0, _moveNode.moveNodeViaShortcut)(api, _blockControls.DIRECTION.LEFT, formatMessage), keymapList);
|
|
35
35
|
(0, _keymaps.bindKeymapWithCommand)(
|
|
36
36
|
// Ignored via go/ees005
|
|
37
37
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
38
|
-
_keymaps.dragToMoveRight.common, (0, _moveNode.moveNodeViaShortcut)(api,
|
|
38
|
+
_keymaps.dragToMoveRight.common, (0, _moveNode.moveNodeViaShortcut)(api, _blockControls.DIRECTION.RIGHT, formatMessage), keymapList);
|
|
39
39
|
}
|
|
40
40
|
return keymapList;
|
|
41
41
|
}
|
|
@@ -8,14 +8,14 @@ exports.key = exports.getDecorations = exports.getBlockControlsMeta = exports.cr
|
|
|
8
8
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
9
9
|
var _rafSchd = _interopRequireDefault(require("raf-schd"));
|
|
10
10
|
var _browserApis = require("@atlaskit/browser-apis");
|
|
11
|
-
var
|
|
11
|
+
var _enums = require("@atlaskit/editor-common/analytics/types/enums");
|
|
12
12
|
var _browser = require("@atlaskit/editor-common/browser");
|
|
13
|
-
var
|
|
13
|
+
var _nodeAnchorProvider = require("@atlaskit/editor-common/node-anchor-provider");
|
|
14
14
|
var _performanceMeasures = require("@atlaskit/editor-common/performance-measures");
|
|
15
15
|
var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
|
|
16
|
-
var
|
|
16
|
+
var _dragHandle = require("@atlaskit/editor-common/styles/drag-handle");
|
|
17
17
|
var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
|
|
18
|
-
var
|
|
18
|
+
var _uiToolbar = require("@atlaskit/editor-common/ui-toolbar");
|
|
19
19
|
var _utils = require("@atlaskit/editor-common/utils");
|
|
20
20
|
var _state = require("@atlaskit/editor-prosemirror/state");
|
|
21
21
|
var _view = require("@atlaskit/editor-prosemirror/view");
|
|
@@ -39,7 +39,7 @@ var _handleMouseDown = require("./handle-mouse-down");
|
|
|
39
39
|
var _handleMouseOver = require("./handle-mouse-over");
|
|
40
40
|
var _keymap = require("./keymap");
|
|
41
41
|
var _activeAnchorTracker = require("./utils/active-anchor-tracker");
|
|
42
|
-
var
|
|
42
|
+
var _analytics = require("./utils/analytics");
|
|
43
43
|
var _anchorUtils = require("./utils/anchor-utils");
|
|
44
44
|
var _getSelection = require("./utils/getSelection");
|
|
45
45
|
var _selection = require("./utils/selection");
|
|
@@ -87,9 +87,9 @@ var destroyFn = function destroyFn(api, editorView) {
|
|
|
87
87
|
(0, _performanceMeasures.stopMeasure)(EDITOR_BLOCKS_DRAG_INIT, function (duration, startTime) {
|
|
88
88
|
var _api$analytics;
|
|
89
89
|
api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.fireAnalyticsEvent({
|
|
90
|
-
action:
|
|
91
|
-
actionSubject:
|
|
92
|
-
eventType:
|
|
90
|
+
action: _enums.ACTION.BLOCKS_DRAG_INIT,
|
|
91
|
+
actionSubject: _enums.ACTION_SUBJECT.EDITOR,
|
|
92
|
+
eventType: _enums.EVENT_TYPE.OPERATIONAL,
|
|
93
93
|
attributes: {
|
|
94
94
|
duration: duration,
|
|
95
95
|
startTime: startTime,
|
|
@@ -149,15 +149,15 @@ var destroyFn = function destroyFn(api, editorView) {
|
|
|
149
149
|
if (lastDragCancelled) {
|
|
150
150
|
var _api$analytics2;
|
|
151
151
|
var position = (0, _selection.getSelectedSlicePosition)(start, tr, api);
|
|
152
|
-
var attributes = (0,
|
|
152
|
+
var attributes = (0, _analytics.getMultiSelectAnalyticsAttributes)(tr, position.from, position.to);
|
|
153
153
|
var nodeTypes = attributes.nodeTypes,
|
|
154
154
|
hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
|
|
155
155
|
var resolvedMovingNode = tr.doc.resolve(start);
|
|
156
156
|
(_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || _api$analytics2.actions.attachAnalyticsEvent({
|
|
157
|
-
eventType:
|
|
158
|
-
action:
|
|
159
|
-
actionSubject:
|
|
160
|
-
actionSubjectId:
|
|
157
|
+
eventType: _enums.EVENT_TYPE.UI,
|
|
158
|
+
action: _enums.ACTION.CANCELLED,
|
|
159
|
+
actionSubject: _enums.ACTION_SUBJECT.DRAG,
|
|
160
|
+
actionSubjectId: _enums.ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
|
|
161
161
|
attributes: {
|
|
162
162
|
nodeDepth: resolvedMovingNode.depth,
|
|
163
163
|
nodeTypes: nodeTypes || '',
|
|
@@ -188,10 +188,10 @@ var destroyFn = function destroyFn(api, editorView) {
|
|
|
188
188
|
var _api$analytics3;
|
|
189
189
|
var isCancelled = location.current.dropTargets.length === 0;
|
|
190
190
|
api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 || _api$analytics3.actions.fireAnalyticsEvent({
|
|
191
|
-
action:
|
|
192
|
-
eventType:
|
|
193
|
-
actionSubject:
|
|
194
|
-
actionSubjectId:
|
|
191
|
+
action: _enums.ACTION.ENDED,
|
|
192
|
+
eventType: _enums.EVENT_TYPE.TRACK,
|
|
193
|
+
actionSubject: _enums.ACTION_SUBJECT.DRAG,
|
|
194
|
+
actionSubjectId: _enums.ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
|
|
195
195
|
attributes: {
|
|
196
196
|
dragInitializationDuration: dragInitializationDuration,
|
|
197
197
|
dropProcessingDuration: duration,
|
|
@@ -1179,7 +1179,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
|
|
|
1179
1179
|
// another layer of protection to prevent handling mouseover
|
|
1180
1180
|
// when native anchor with dnd is enabled in limited mode
|
|
1181
1181
|
// in case there are descripancies between getNodeIdProvider limited mode state
|
|
1182
|
-
if ((_getNodeIdProvider = (0,
|
|
1182
|
+
if ((_getNodeIdProvider = (0, _nodeAnchorProvider.getNodeIdProvider)(view)) !== null && _getNodeIdProvider !== void 0 && _getNodeIdProvider.isLimitedMode() && (0, _expValEquals.expValEquals)('platform_editor_native_anchor_with_dnd', 'isEnabled', true)) {
|
|
1183
1183
|
return;
|
|
1184
1184
|
}
|
|
1185
1185
|
(0, _handleMouseOver.handleMouseOver)(view, event, api);
|
|
@@ -1205,7 +1205,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
|
|
|
1205
1205
|
}
|
|
1206
1206
|
}
|
|
1207
1207
|
if ((event.key === 'Enter' || event.key === ' ') && event.target instanceof HTMLElement && (0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1')) {
|
|
1208
|
-
var isDragHandle = event.target.closest(
|
|
1208
|
+
var isDragHandle = event.target.closest(_dragHandle.DRAG_HANDLE_SELECTOR) !== null;
|
|
1209
1209
|
api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.setSelectedViaDragHandle(isDragHandle));
|
|
1210
1210
|
}
|
|
1211
1211
|
if ((event.key === 'ArrowLeft' || event.key === 'ArrowRight' || event.key === 'ArrowDown' || event.key === 'ArrowUp') && (0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1')) {
|
|
@@ -1229,7 +1229,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
|
|
|
1229
1229
|
// Focus moving into the registry surface remains inside the editor experience.
|
|
1230
1230
|
var isChildOfSurface = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_block_control_migration') && event.relatedTarget instanceof HTMLElement && event.relatedTarget.closest(_consts.BLOCK_CONTROLS_SURFACE_SELECTOR) !== null;
|
|
1231
1231
|
var shouldPreserveRemixInlineDropdownFocus = event.relatedTarget instanceof HTMLElement && event.relatedTarget.closest('[data-editor-remix-inline-dropdown-preserve-focus]') !== null;
|
|
1232
|
-
var isChildOfEditor = event.relatedTarget instanceof HTMLElement && event.relatedTarget.closest("#".concat(
|
|
1232
|
+
var isChildOfEditor = event.relatedTarget instanceof HTMLElement && event.relatedTarget.closest("#".concat(_uiToolbar.EDIT_AREA_ID)) !== null;
|
|
1233
1233
|
|
|
1234
1234
|
// don't do anything if the event relatedTarget (the element receiving focus) is a child of the editor
|
|
1235
1235
|
// or if the editor has focus
|
|
@@ -9,7 +9,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
|
|
|
9
9
|
var _bindEventListener = require("bind-event-listener");
|
|
10
10
|
var _browserApis = require("@atlaskit/browser-apis");
|
|
11
11
|
var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
|
|
12
|
-
var
|
|
12
|
+
var _dragHandle = require("@atlaskit/editor-common/styles/drag-handle");
|
|
13
13
|
var _main = require("../main");
|
|
14
14
|
var _selection = require("../utils/selection");
|
|
15
15
|
var _editorCommands = require("./editor-commands");
|
|
@@ -137,7 +137,7 @@ var createSelectionPreservationPlugin = exports.createSelectionPreservationPlugi
|
|
|
137
137
|
if (!preservedSelection) {
|
|
138
138
|
return;
|
|
139
139
|
}
|
|
140
|
-
var clickedDragHandle = !!e.target.closest(
|
|
140
|
+
var clickedDragHandle = !!e.target.closest(_dragHandle.DRAG_HANDLE_SELECTOR);
|
|
141
141
|
|
|
142
142
|
// When mouse down on a drag handle we continue preserving the selection
|
|
143
143
|
if (clickedDragHandle) {
|
|
@@ -8,7 +8,7 @@ exports.createSparseSurfacesView = void 0;
|
|
|
8
8
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
9
9
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
10
10
|
var _surfaceKeys = require("@atlaskit/editor-common/block-controls/surface-keys");
|
|
11
|
-
var
|
|
11
|
+
var _nodeAnchorProvider = require("@atlaskit/editor-common/node-anchor-provider");
|
|
12
12
|
var _surfaceRenderer = require("@atlaskit/editor-ui-control-model/surface-renderer");
|
|
13
13
|
var _decorationsSurfaceAnchor = require("./decorations-surface-anchor");
|
|
14
14
|
var _main = require("./main");
|
|
@@ -73,7 +73,7 @@ var createSparseSurfacesView = exports.createSparseSurfacesView = function creat
|
|
|
73
73
|
if (!visibilityChanged && !haveAnchorPositionsChanged(anchorPositions, previous.anchors) && candidates === previous.candidates && !previous.documentChanged && !previous.invalidation) {
|
|
74
74
|
return;
|
|
75
75
|
}
|
|
76
|
-
var nodeIdProvider = (0,
|
|
76
|
+
var nodeIdProvider = (0, _nodeAnchorProvider.getNodeIdProvider)(view);
|
|
77
77
|
var _createSurfaceAnchorD = (0, _decorationsSurfaceAnchor.createSurfaceAnchorDecorations)(view.state, anchorPositions, function (node, position, previousAnchorName) {
|
|
78
78
|
if (previousAnchorName) {
|
|
79
79
|
nodeIdProvider.setIdForNode(node, previousAnchorName);
|
|
@@ -6,14 +6,14 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.getMultiSelectAnalyticsAttributes = exports.fireInsertLayoutAnalytics = exports.attachMoveNodeAnalytics = void 0;
|
|
8
8
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
9
|
-
var
|
|
9
|
+
var _enums = require("@atlaskit/editor-common/analytics/types/enums");
|
|
10
10
|
var attachMoveNodeAnalytics = exports.attachMoveNodeAnalytics = function attachMoveNodeAnalytics(tr, inputMethod, fromDepth, fromNodeTypes, toDepth, toNodeType, isSameParent, api, hasSelectedMultipleNodes) {
|
|
11
11
|
var _api$analytics;
|
|
12
12
|
return api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 ? void 0 : _api$analytics.attachAnalyticsEvent({
|
|
13
|
-
eventType:
|
|
14
|
-
action:
|
|
15
|
-
actionSubject:
|
|
16
|
-
actionSubjectId:
|
|
13
|
+
eventType: _enums.EVENT_TYPE.TRACK,
|
|
14
|
+
action: _enums.ACTION.MOVED,
|
|
15
|
+
actionSubject: _enums.ACTION_SUBJECT.ELEMENT,
|
|
16
|
+
actionSubjectId: _enums.ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
|
|
17
17
|
attributes: {
|
|
18
18
|
nodeDepth: fromDepth,
|
|
19
19
|
nodeTypes: fromNodeTypes,
|
|
@@ -28,16 +28,16 @@ var attachMoveNodeAnalytics = exports.attachMoveNodeAnalytics = function attachM
|
|
|
28
28
|
var fireInsertLayoutAnalytics = exports.fireInsertLayoutAnalytics = function fireInsertLayoutAnalytics(tr, api, nodeTypes, hasSelectedMultipleNodes, columnCount) {
|
|
29
29
|
var _api$analytics2;
|
|
30
30
|
api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || (_api$analytics2 = _api$analytics2.actions) === null || _api$analytics2 === void 0 || _api$analytics2.attachAnalyticsEvent({
|
|
31
|
-
action:
|
|
32
|
-
actionSubject:
|
|
33
|
-
actionSubjectId:
|
|
31
|
+
action: _enums.ACTION.INSERTED,
|
|
32
|
+
actionSubject: _enums.ACTION_SUBJECT.DOCUMENT,
|
|
33
|
+
actionSubjectId: _enums.ACTION_SUBJECT_ID.LAYOUT,
|
|
34
34
|
attributes: {
|
|
35
|
-
inputMethod:
|
|
35
|
+
inputMethod: _enums.INPUT_METHOD.DRAG_AND_DROP,
|
|
36
36
|
nodeTypes: nodeTypes,
|
|
37
37
|
hasSelectedMultipleNodes: hasSelectedMultipleNodes,
|
|
38
38
|
columnCount: columnCount
|
|
39
39
|
},
|
|
40
|
-
eventType:
|
|
40
|
+
eventType: _enums.EVENT_TYPE.TRACK
|
|
41
41
|
})(tr);
|
|
42
42
|
};
|
|
43
43
|
|
|
@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
exports.shouldMaskNodeControls = exports.shouldBeSticky = exports.getTopPosition = exports.getNodeHeight = exports.getLeftPosition = exports.getControlHeightCSSValue = exports.getControlBottomCSSValue = void 0;
|
|
8
8
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
9
9
|
var _memoizeOne = _interopRequireDefault(require("memoize-one"));
|
|
10
|
-
var
|
|
10
|
+
var _dragHandle = require("@atlaskit/editor-common/styles/drag-handle");
|
|
11
11
|
var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
|
|
12
12
|
var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
|
|
13
13
|
var _consts = require("../../ui/consts");
|
|
@@ -49,14 +49,14 @@ var getLeftPosition = exports.getLeftPosition = function getLeftPosition(dom, ty
|
|
|
49
49
|
return 'auto';
|
|
50
50
|
}
|
|
51
51
|
if (!innerContainer) {
|
|
52
|
-
return type === 'layoutColumn' ? "".concat(dom.offsetLeft + dom.clientWidth / 2 - _consts.DRAG_HANDLE_HEIGHT / 2, "px") : "".concat(dom.offsetLeft - (0, _consts.dragHandleGap)(type, parentType) -
|
|
52
|
+
return type === 'layoutColumn' ? "".concat(dom.offsetLeft + dom.clientWidth / 2 - _consts.DRAG_HANDLE_HEIGHT / 2, "px") : "".concat(dom.offsetLeft - (0, _consts.dragHandleGap)(type, parentType) - _dragHandle.DRAG_HANDLE_WIDTH, "px");
|
|
53
53
|
}
|
|
54
54
|
|
|
55
55
|
// There is a showMacroInteractionDesignUpdates prop in extension node wrapper that can add a relative span under the top level div
|
|
56
56
|
// We need to adjust the left offset position of the drag handle to account for the relative span
|
|
57
57
|
var relativeSpan = macroInteractionUpdates ? dom.querySelector('span.relative') : null;
|
|
58
58
|
var leftAdjustment = relativeSpan ? relativeSpan.offsetLeft : 0;
|
|
59
|
-
return getComputedStyle(innerContainer).transform === 'none' ? "".concat(innerContainer.offsetLeft + leftAdjustment - (0, _consts.dragHandleGap)(type, parentType) -
|
|
59
|
+
return getComputedStyle(innerContainer).transform === 'none' ? "".concat(innerContainer.offsetLeft + leftAdjustment - (0, _consts.dragHandleGap)(type, parentType) - _dragHandle.DRAG_HANDLE_WIDTH, "px") : "".concat(innerContainer.offsetLeft + leftAdjustment - innerContainer.offsetWidth / 2 - (0, _consts.dragHandleGap)(type, parentType) - _dragHandle.DRAG_HANDLE_WIDTH, "px");
|
|
60
60
|
};
|
|
61
61
|
|
|
62
62
|
// anchorRectCache seems to have a 100% cache miss rate
|
|
@@ -6,8 +6,9 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.expandAndUpdateSelection = void 0;
|
|
7
7
|
var _nodeSelection = require("@atlaskit/editor-common/node-selection");
|
|
8
8
|
var _selection = require("@atlaskit/editor-common/selection");
|
|
9
|
+
var _utils = require("@atlaskit/editor-common/selection/utils");
|
|
9
10
|
var _state = require("@atlaskit/editor-prosemirror/state");
|
|
10
|
-
var
|
|
11
|
+
var _selectTableClosestToPos = require("@atlaskit/editor-tables/select-table-closest-to-pos");
|
|
11
12
|
var _fg = require("@atlaskit/platform-feature-flags/fg");
|
|
12
13
|
var _getSelection = require("./getSelection");
|
|
13
14
|
var _selection2 = require("./selection");
|
|
@@ -33,7 +34,7 @@ var getExpandedSelectionRange = function getExpandedSelectionRange(_ref) {
|
|
|
33
34
|
$from: $from,
|
|
34
35
|
$to: $to
|
|
35
36
|
} : (0, _selection2.adjustSelectionBoundsForEdgePositions)($from, $to);
|
|
36
|
-
return (0,
|
|
37
|
+
return (0, _utils.expandToBlockRange)(adjusted.$from, adjusted.$to);
|
|
37
38
|
};
|
|
38
39
|
/**
|
|
39
40
|
* Updates the transaction's selection based on the clicked drag handle position.
|
|
@@ -67,7 +68,7 @@ var expandAndUpdateSelection = exports.expandAndUpdateSelection = function expan
|
|
|
67
68
|
// the platform-level composer — same path as open-remix-modal, no drift.
|
|
68
69
|
(0, _nodeSelection.selectNodeAtPos)(tr, startPos, nodeType);
|
|
69
70
|
} else if (nodeType === 'table') {
|
|
70
|
-
(0,
|
|
71
|
+
(0, _selectTableClosestToPos.selectTableClosestToPos)(tr, tr.doc.resolve(startPos + 1));
|
|
71
72
|
} else {
|
|
72
73
|
// Select the clicked drag handle's node only
|
|
73
74
|
(0, _getSelection.selectNode)(tr, startPos, nodeType, api);
|