@atlaskit/editor-plugin-block-controls 7.13.0 → 7.13.2

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.
Files changed (8) hide show
  1. package/CHANGELOG.md +14 -0
  2. package/dist/cjs/editor-commands/move-node-with-block-menu.js +30 -5
  3. package/dist/cjs/editor-commands/move-node.js +5 -1
  4. package/dist/es2019/editor-commands/move-node-with-block-menu.js +31 -6
  5. package/dist/es2019/editor-commands/move-node.js +5 -1
  6. package/dist/esm/editor-commands/move-node-with-block-menu.js +30 -6
  7. package/dist/esm/editor-commands/move-node.js +5 -1
  8. package/package.json +4 -4
package/CHANGELOG.md CHANGED
@@ -1,5 +1,19 @@
1
1
  # @atlaskit/editor-plugin-block-controls
2
2
 
3
+ ## 7.13.2
4
+
5
+ ### Patch Changes
6
+
7
+ - Updated dependencies
8
+
9
+ ## 7.13.1
10
+
11
+ ### Patch Changes
12
+
13
+ - [`fdcaf17b021af`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fdcaf17b021af) -
14
+ Editor-2676: keep block menu open when move up down clicked
15
+ - Updated dependencies
16
+
3
17
  ## 7.13.0
4
18
 
5
19
  ### Minor Changes
package/dist/cjs/editor-commands/move-node-with-block-menu.js CHANGED
@@ -1,14 +1,20 @@
1
1
  "use strict";
2
2
 
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
3
4
  Object.defineProperty(exports, "__esModule", {
4
5
  value: true
5
6
  });
6
7
  exports.moveNodeWithBlockMenu = void 0;
8
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
7
9
  var _analytics = require("@atlaskit/editor-common/analytics");
8
10
  var _types = require("@atlaskit/editor-common/types");
9
11
  var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
12
+ var _main = require("../pm-plugins/main");
13
+ var _selection = require("../pm-plugins/utils/selection");
10
14
  var _moveNode = require("./move-node");
11
15
  var _moveNodeUtils = require("./utils/move-node-utils");
16
+ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
17
+ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
12
18
  var getSelectionToIndex = function getSelectionToIndex(fromIndex, $to, depth) {
13
19
  var toIndex = $to.index(depth);
14
20
  var toIndexAfter = $to.indexAfter(depth);
@@ -40,12 +46,13 @@ var moveNodeWithBlockMenu = exports.moveNodeWithBlockMenu = function moveNodeWit
40
46
  $to = selection.$to;
41
47
  var depth = tr.doc.resolve(currentNodePos).depth;
42
48
  var fromIndex = $from.index(depth);
49
+ var trAfterNodeMove = tr;
43
50
  if (direction === _types.DIRECTION.UP) {
44
51
  if (fromIndex > 0) {
45
52
  var moveToPos = $from.posAtIndex(fromIndex - 1, depth);
46
- return (0, _moveNode.moveNode)(api)(currentNodePos, moveToPos, _analytics.INPUT_METHOD.BLOCK_MENU)({
53
+ trAfterNodeMove = (0, _moveNode.moveNode)(api)(currentNodePos, moveToPos, _analytics.INPUT_METHOD.BLOCK_MENU)({
47
54
  tr: tr
48
- });
55
+ }) || tr;
49
56
  }
50
57
  } else {
51
58
  // selectionToIndex is the index of the last node in the selection
@@ -54,11 +61,29 @@ var moveNodeWithBlockMenu = exports.moveNodeWithBlockMenu = function moveNodeWit
54
61
  var moveToIndex = selectionToIndex + 2;
55
62
  if (moveToIndex <= $to.node(depth).childCount) {
56
63
  var _moveToPos = $to.posAtIndex(moveToIndex, depth);
57
- return (0, _moveNode.moveNode)(api)(currentNodePos, _moveToPos, _analytics.INPUT_METHOD.BLOCK_MENU)({
64
+ trAfterNodeMove = (0, _moveNode.moveNode)(api)(currentNodePos, _moveToPos, _analytics.INPUT_METHOD.BLOCK_MENU)({
58
65
  tr: tr
59
- });
66
+ }) || tr;
60
67
  }
61
68
  }
62
- return tr;
69
+
70
+ // map selection
71
+ var mappedSelection = (0, _selection.mapPreservedSelection)(selection, trAfterNodeMove);
72
+ if (mappedSelection) {
73
+ trAfterNodeMove.setSelection(mappedSelection);
74
+ }
75
+
76
+ //recalculate canMoveUp and canMoveDown
77
+ var _canMoveNodeUpOrDown = (0, _moveNodeUtils.canMoveNodeUpOrDown)(trAfterNodeMove),
78
+ moveUp = _canMoveNodeUpOrDown.moveUp,
79
+ moveDown = _canMoveNodeUpOrDown.moveDown;
80
+ var currentMeta = trAfterNodeMove.getMeta(_main.key);
81
+ var newMeta = _objectSpread(_objectSpread({}, currentMeta), {
82
+ toggleMenu: {
83
+ moveUp: moveUp,
84
+ moveDown: moveDown
85
+ }
86
+ });
87
+ return trAfterNodeMove.setMeta(_main.key, newMeta);
63
88
  };
64
89
  };
package/dist/cjs/editor-commands/move-node.js CHANGED
@@ -444,7 +444,11 @@ var moveNode = exports.moveNode = function moveNode(api) {
444
444
  tr.setMeta(_main.key, _objectSpread(_objectSpread({}, currMeta), {}, {
445
445
  nodeMoved: true
446
446
  }));
447
- api === null || api === void 0 || api.core.actions.focus();
447
+ if (
448
+ // 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
449
+ !(inputMethod === _analytics.INPUT_METHOD.BLOCK_MENU && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true))) {
450
+ api === null || api === void 0 || api.core.actions.focus();
451
+ }
448
452
  var $mappedTo = tr.doc.resolve(mappedTo);
449
453
  var expandAncestor = (0, _utils2.findParentNodeOfTypeClosestToPos)($to, [expand, nestedExpand]);
450
454
  if (expandAncestor) {
package/dist/es2019/editor-commands/move-node-with-block-menu.js CHANGED
@@ -1,8 +1,10 @@
1
1
  import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
2
2
  import { DIRECTION } from '@atlaskit/editor-common/types';
3
3
  import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
4
+ import { key } from '../pm-plugins/main';
5
+ import { mapPreservedSelection } from '../pm-plugins/utils/selection';
4
6
  import { moveNode } from './move-node';
5
- import { getCurrentNodePosFromDragHandleSelection } from './utils/move-node-utils';
7
+ import { canMoveNodeUpOrDown, getCurrentNodePosFromDragHandleSelection } from './utils/move-node-utils';
6
8
  const getSelectionToIndex = (fromIndex, $to, depth) => {
7
9
  const toIndex = $to.index(depth);
8
10
  const toIndexAfter = $to.indexAfter(depth);
@@ -37,12 +39,13 @@ export const moveNodeWithBlockMenu = (api, direction) => {
37
39
  } = selection;
38
40
  const depth = tr.doc.resolve(currentNodePos).depth;
39
41
  const fromIndex = $from.index(depth);
42
+ let trAfterNodeMove = tr;
40
43
  if (direction === DIRECTION.UP) {
41
44
  if (fromIndex > 0) {
42
45
  const moveToPos = $from.posAtIndex(fromIndex - 1, depth);
43
- return moveNode(api)(currentNodePos, moveToPos, INPUT_METHOD.BLOCK_MENU)({
46
+ trAfterNodeMove = moveNode(api)(currentNodePos, moveToPos, INPUT_METHOD.BLOCK_MENU)({
44
47
  tr
45
- });
48
+ }) || tr;
46
49
  }
47
50
  } else {
48
51
  // selectionToIndex is the index of the last node in the selection
@@ -51,11 +54,33 @@ export const moveNodeWithBlockMenu = (api, direction) => {
51
54
  const moveToIndex = selectionToIndex + 2;
52
55
  if (moveToIndex <= $to.node(depth).childCount) {
53
56
  const moveToPos = $to.posAtIndex(moveToIndex, depth);
54
- return moveNode(api)(currentNodePos, moveToPos, INPUT_METHOD.BLOCK_MENU)({
57
+ trAfterNodeMove = moveNode(api)(currentNodePos, moveToPos, INPUT_METHOD.BLOCK_MENU)({
55
58
  tr
56
- });
59
+ }) || tr;
57
60
  }
58
61
  }
59
- return tr;
62
+
63
+ // map selection
64
+ const mappedSelection = mapPreservedSelection(selection, trAfterNodeMove);
65
+ if (mappedSelection) {
66
+ trAfterNodeMove.setSelection(mappedSelection);
67
+ }
68
+
69
+ //recalculate canMoveUp and canMoveDown
70
+ const {
71
+ moveUp,
72
+ moveDown
73
+ } = canMoveNodeUpOrDown(trAfterNodeMove);
74
+ const currentMeta = trAfterNodeMove.getMeta(key);
75
+ const newMeta = {
76
+ ...currentMeta,
77
+ ...{
78
+ toggleMenu: {
79
+ moveUp,
80
+ moveDown
81
+ }
82
+ }
83
+ };
84
+ return trAfterNodeMove.setMeta(key, newMeta);
60
85
  };
61
86
  };
package/dist/es2019/editor-commands/move-node.js CHANGED
@@ -446,7 +446,11 @@ export const moveNode = api => (start, to, inputMethod = INPUT_METHOD.DRAG_AND_D
446
446
  ...currMeta,
447
447
  nodeMoved: true
448
448
  });
449
- api === null || api === void 0 ? void 0 : api.core.actions.focus();
449
+ if (
450
+ // 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
451
+ !(inputMethod === INPUT_METHOD.BLOCK_MENU && expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true))) {
452
+ api === null || api === void 0 ? void 0 : api.core.actions.focus();
453
+ }
450
454
  const $mappedTo = tr.doc.resolve(mappedTo);
451
455
  const expandAncestor = findParentNodeOfTypeClosestToPos($to, [expand, nestedExpand]);
452
456
  if (expandAncestor) {
package/dist/esm/editor-commands/move-node-with-block-menu.js CHANGED
@@ -1,8 +1,13 @@
1
+ import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
+ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
3
+ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
1
4
  import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
2
5
  import { DIRECTION } from '@atlaskit/editor-common/types';
3
6
  import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
7
+ import { key } from '../pm-plugins/main';
8
+ import { mapPreservedSelection } from '../pm-plugins/utils/selection';
4
9
  import { moveNode } from './move-node';
5
- import { getCurrentNodePosFromDragHandleSelection } from './utils/move-node-utils';
10
+ import { canMoveNodeUpOrDown, getCurrentNodePosFromDragHandleSelection } from './utils/move-node-utils';
6
11
  var getSelectionToIndex = function getSelectionToIndex(fromIndex, $to, depth) {
7
12
  var toIndex = $to.index(depth);
8
13
  var toIndexAfter = $to.indexAfter(depth);
@@ -34,12 +39,13 @@ export var moveNodeWithBlockMenu = function moveNodeWithBlockMenu(api, direction
34
39
  $to = selection.$to;
35
40
  var depth = tr.doc.resolve(currentNodePos).depth;
36
41
  var fromIndex = $from.index(depth);
42
+ var trAfterNodeMove = tr;
37
43
  if (direction === DIRECTION.UP) {
38
44
  if (fromIndex > 0) {
39
45
  var moveToPos = $from.posAtIndex(fromIndex - 1, depth);
40
- return moveNode(api)(currentNodePos, moveToPos, INPUT_METHOD.BLOCK_MENU)({
46
+ trAfterNodeMove = moveNode(api)(currentNodePos, moveToPos, INPUT_METHOD.BLOCK_MENU)({
41
47
  tr: tr
42
- });
48
+ }) || tr;
43
49
  }
44
50
  } else {
45
51
  // selectionToIndex is the index of the last node in the selection
@@ -48,11 +54,29 @@ export var moveNodeWithBlockMenu = function moveNodeWithBlockMenu(api, direction
48
54
  var moveToIndex = selectionToIndex + 2;
49
55
  if (moveToIndex <= $to.node(depth).childCount) {
50
56
  var _moveToPos = $to.posAtIndex(moveToIndex, depth);
51
- return moveNode(api)(currentNodePos, _moveToPos, INPUT_METHOD.BLOCK_MENU)({
57
+ trAfterNodeMove = moveNode(api)(currentNodePos, _moveToPos, INPUT_METHOD.BLOCK_MENU)({
52
58
  tr: tr
53
- });
59
+ }) || tr;
54
60
  }
55
61
  }
56
- return tr;
62
+
63
+ // map selection
64
+ var mappedSelection = mapPreservedSelection(selection, trAfterNodeMove);
65
+ if (mappedSelection) {
66
+ trAfterNodeMove.setSelection(mappedSelection);
67
+ }
68
+
69
+ //recalculate canMoveUp and canMoveDown
70
+ var _canMoveNodeUpOrDown = canMoveNodeUpOrDown(trAfterNodeMove),
71
+ moveUp = _canMoveNodeUpOrDown.moveUp,
72
+ moveDown = _canMoveNodeUpOrDown.moveDown;
73
+ var currentMeta = trAfterNodeMove.getMeta(key);
74
+ var newMeta = _objectSpread(_objectSpread({}, currentMeta), {
75
+ toggleMenu: {
76
+ moveUp: moveUp,
77
+ moveDown: moveDown
78
+ }
79
+ });
80
+ return trAfterNodeMove.setMeta(key, newMeta);
57
81
  };
58
82
  };
package/dist/esm/editor-commands/move-node.js CHANGED
@@ -438,7 +438,11 @@ export var moveNode = function moveNode(api) {
438
438
  tr.setMeta(key, _objectSpread(_objectSpread({}, currMeta), {}, {
439
439
  nodeMoved: true
440
440
  }));
441
- api === null || api === void 0 || api.core.actions.focus();
441
+ if (
442
+ // 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
443
+ !(inputMethod === INPUT_METHOD.BLOCK_MENU && expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true))) {
444
+ api === null || api === void 0 || api.core.actions.focus();
445
+ }
442
446
  var $mappedTo = tr.doc.resolve(mappedTo);
443
447
  var expandAncestor = findParentNodeOfTypeClosestToPos($to, [expand, nestedExpand]);
444
448
  if (expandAncestor) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-block-controls",
3
- "version": "7.13.0",
3
+ "version": "7.13.2",
4
4
  "description": "Block controls plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -54,9 +54,9 @@
54
54
  "@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
55
55
  "@atlaskit/primitives": "^16.4.0",
56
56
  "@atlaskit/theme": "^21.0.0",
57
- "@atlaskit/tmp-editor-statsig": "^14.7.0",
57
+ "@atlaskit/tmp-editor-statsig": "^15.0.0",
58
58
  "@atlaskit/tokens": "^8.4.0",
59
- "@atlaskit/tooltip": "^20.10.0",
59
+ "@atlaskit/tooltip": "^20.11.0",
60
60
  "@babel/runtime": "^7.0.0",
61
61
  "@emotion/react": "^11.7.1",
62
62
  "@popperjs/core": "^2.11.8",
@@ -66,7 +66,7 @@
66
66
  "uuid": "^3.1.0"
67
67
  },
68
68
  "peerDependencies": {
69
- "@atlaskit/editor-common": "^110.39.0",
69
+ "@atlaskit/editor-common": "^110.40.0",
70
70
  "react": "^18.2.0",
71
71
  "react-dom": "^18.2.0",
72
72
  "react-intl-next": "npm:react-intl@^5.18.1"