@atlaskit/editor-plugin-block-controls 7.12.1 → 7.13.1

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 7.13.1
+
+### Patch Changes
+
+- [`fdcaf17b021af`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fdcaf17b021af) -
+  Editor-2676: keep block menu open when move up down clicked
+- Updated dependencies
+
+## 7.13.0
+
+### Minor Changes
+
+- [`b3a509f727a0f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b3a509f727a0f) -
+  ED-29696 update CSS anchor selector to enable less anchors
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 7.12.1
 
 ### Patch Changes

package/dist/cjs/editor-commands/move-node-with-block-menu.js

@@ -1,14 +1,20 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.moveNodeWithBlockMenu = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _types = require("@atlaskit/editor-common/types");
 var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
+var _main = require("../pm-plugins/main");
+var _selection = require("../pm-plugins/utils/selection");
 var _moveNode = require("./move-node");
 var _moveNodeUtils = require("./utils/move-node-utils");
+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; }
+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; }
 var getSelectionToIndex = function getSelectionToIndex(fromIndex, $to, depth) {
   var toIndex = $to.index(depth);
   var toIndexAfter = $to.indexAfter(depth);
@@ -40,12 +46,13 @@ var moveNodeWithBlockMenu = exports.moveNodeWithBlockMenu = function moveNodeWit
       $to = selection.$to;
     var depth = tr.doc.resolve(currentNodePos).depth;
     var fromIndex = $from.index(depth);
+    var trAfterNodeMove = tr;
     if (direction === _types.DIRECTION.UP) {
       if (fromIndex > 0) {
         var moveToPos = $from.posAtIndex(fromIndex - 1, depth);
-        return (0, _moveNode.moveNode)(api)(currentNodePos, moveToPos, _analytics.INPUT_METHOD.BLOCK_MENU)({
+        trAfterNodeMove = (0, _moveNode.moveNode)(api)(currentNodePos, moveToPos, _analytics.INPUT_METHOD.BLOCK_MENU)({
           tr: tr
-        });
+        }) || tr;
       }
     } else {
       // selectionToIndex is the index of the last node in the selection
@@ -54,11 +61,29 @@ var moveNodeWithBlockMenu = exports.moveNodeWithBlockMenu = function moveNodeWit
       var moveToIndex = selectionToIndex + 2;
       if (moveToIndex <= $to.node(depth).childCount) {
         var _moveToPos = $to.posAtIndex(moveToIndex, depth);
-        return (0, _moveNode.moveNode)(api)(currentNodePos, _moveToPos, _analytics.INPUT_METHOD.BLOCK_MENU)({
+        trAfterNodeMove = (0, _moveNode.moveNode)(api)(currentNodePos, _moveToPos, _analytics.INPUT_METHOD.BLOCK_MENU)({
           tr: tr
-        });
+        }) || tr;
       }
     }
-    return tr;
+
+    // map selection
+    var mappedSelection = (0, _selection.mapPreservedSelection)(selection, trAfterNodeMove);
+    if (mappedSelection) {
+      trAfterNodeMove.setSelection(mappedSelection);
+    }
+
+    //recalculate canMoveUp and canMoveDown
+    var _canMoveNodeUpOrDown = (0, _moveNodeUtils.canMoveNodeUpOrDown)(trAfterNodeMove),
+      moveUp = _canMoveNodeUpOrDown.moveUp,
+      moveDown = _canMoveNodeUpOrDown.moveDown;
+    var currentMeta = trAfterNodeMove.getMeta(_main.key);
+    var newMeta = _objectSpread(_objectSpread({}, currentMeta), {
+      toggleMenu: {
+        moveUp: moveUp,
+        moveDown: moveDown
+      }
+    });
+    return trAfterNodeMove.setMeta(_main.key, newMeta);
   };
 };

package/dist/cjs/editor-commands/move-node.js

@@ -444,7 +444,11 @@ var moveNode = exports.moveNode = function moveNode(api) {
       tr.setMeta(_main.key, _objectSpread(_objectSpread({}, currMeta), {}, {
         nodeMoved: true
       }));
-      api === null || api === void 0 || api.core.actions.focus();
+      if (
+      // 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
+      !(inputMethod === _analytics.INPUT_METHOD.BLOCK_MENU && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true))) {
+        api === null || api === void 0 || api.core.actions.focus();
+      }
       var $mappedTo = tr.doc.resolve(mappedTo);
       var expandAncestor = (0, _utils2.findParentNodeOfTypeClosestToPos)($to, [expand, nestedExpand]);
       if (expandAncestor) {

package/dist/cjs/pm-plugins/handle-mouse-over.js

@@ -32,7 +32,7 @@ var getNodeSelector = function getNodeSelector(ignoreNodes, ignoreNodeDescendant
   var ignoreNodeDescendantsSelectorList = ignoreNodeDescendants.map(function (node) {
     if (node === 'table') {
       // Special case for table to exclude its direct descendants
-      return ["[data-prosemirror-node-name=\"tableCell\"] > [data-node-anchor]", "[data-prosemirror-node-name=\"tableHeader\"] > [data-node-anchor]"];
+      return ["[data-prosemirror-node-name=\"tableCell\"] > [data-node-anchor]", "[data-prosemirror-node-name=\"tableCell\"] > *:not([data-node-anchor]) > [data-node-anchor]", "[data-prosemirror-node-name=\"tableHeader\"] > [data-node-anchor]", "[data-prosemirror-node-name=\"tableHeader\"] > *:not([data-node-anchor]) > [data-node-anchor]"];
     }
     return "[data-prosemirror-node-name=\"".concat(node, "\"] [data-node-anchor]");
   });

package/dist/cjs/ui/global-styles.js

@@ -407,11 +407,11 @@ var blockCardWithoutLayout = (0, _react.css)({
 });
 var nextAnchorSelector = ['&[data-node-anchor]',
 // adjacent sibling with anchor
-'&:not([data-node-anchor]) [data-node-anchor]',
-// nested anchor inside adjacent sibling
+'&:not([data-node-anchor]) [data-node-anchor]:first-of-type',
+// first nested anchor inside adjacent sibling
 '&.ProseMirror-widget + [data-node-anchor]',
 // adjacent sibling with anchor (when next to a widget like gap cursor)
-'&.ProseMirror-widget + :not([data-node-anchor]) [data-node-anchor]' // nested anchor inside adjacent sibling (when next to a widget like gap cursor)
+'&.ProseMirror-widget + :not([data-node-anchor]) [data-node-anchor]:first-of-type' // first nested anchor inside adjacent sibling (when next to a widget like gap cursor)
 ].join(', ');
 var dragHandlerAnchorStyles = (0, _react.css)({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors

package/dist/es2019/editor-commands/move-node-with-block-menu.js

@@ -1,8 +1,10 @@
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { DIRECTION } from '@atlaskit/editor-common/types';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
+import { key } from '../pm-plugins/main';
+import { mapPreservedSelection } from '../pm-plugins/utils/selection';
 import { moveNode } from './move-node';
-import { getCurrentNodePosFromDragHandleSelection } from './utils/move-node-utils';
+import { canMoveNodeUpOrDown, getCurrentNodePosFromDragHandleSelection } from './utils/move-node-utils';
 const getSelectionToIndex = (fromIndex, $to, depth) => {
   const toIndex = $to.index(depth);
   const toIndexAfter = $to.indexAfter(depth);
@@ -37,12 +39,13 @@ export const moveNodeWithBlockMenu = (api, direction) => {
     } = selection;
     const depth = tr.doc.resolve(currentNodePos).depth;
     const fromIndex = $from.index(depth);
+    let trAfterNodeMove = tr;
     if (direction === DIRECTION.UP) {
       if (fromIndex > 0) {
         const moveToPos = $from.posAtIndex(fromIndex - 1, depth);
-        return moveNode(api)(currentNodePos, moveToPos, INPUT_METHOD.BLOCK_MENU)({
+        trAfterNodeMove = moveNode(api)(currentNodePos, moveToPos, INPUT_METHOD.BLOCK_MENU)({
           tr
-        });
+        }) || tr;
       }
     } else {
       // selectionToIndex is the index of the last node in the selection
@@ -51,11 +54,33 @@ export const moveNodeWithBlockMenu = (api, direction) => {
       const moveToIndex = selectionToIndex + 2;
       if (moveToIndex <= $to.node(depth).childCount) {
         const moveToPos = $to.posAtIndex(moveToIndex, depth);
-        return moveNode(api)(currentNodePos, moveToPos, INPUT_METHOD.BLOCK_MENU)({
+        trAfterNodeMove = moveNode(api)(currentNodePos, moveToPos, INPUT_METHOD.BLOCK_MENU)({
           tr
-        });
+        }) || tr;
       }
     }
-    return tr;
+
+    // map selection
+    const mappedSelection = mapPreservedSelection(selection, trAfterNodeMove);
+    if (mappedSelection) {
+      trAfterNodeMove.setSelection(mappedSelection);
+    }
+
+    //recalculate canMoveUp and canMoveDown
+    const {
+      moveUp,
+      moveDown
+    } = canMoveNodeUpOrDown(trAfterNodeMove);
+    const currentMeta = trAfterNodeMove.getMeta(key);
+    const newMeta = {
+      ...currentMeta,
+      ...{
+        toggleMenu: {
+          moveUp,
+          moveDown
+        }
+      }
+    };
+    return trAfterNodeMove.setMeta(key, newMeta);
   };
 };

package/dist/es2019/editor-commands/move-node.js

@@ -446,7 +446,11 @@ export const moveNode = api => (start, to, inputMethod = INPUT_METHOD.DRAG_AND_D
     ...currMeta,
     nodeMoved: true
   });
-  api === null || api === void 0 ? void 0 : api.core.actions.focus();
+  if (
+  // 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
+  !(inputMethod === INPUT_METHOD.BLOCK_MENU && expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true))) {
+    api === null || api === void 0 ? void 0 : api.core.actions.focus();
+  }
   const $mappedTo = tr.doc.resolve(mappedTo);
   const expandAncestor = findParentNodeOfTypeClosestToPos($to, [expand, nestedExpand]);
   if (expandAncestor) {

package/dist/es2019/pm-plugins/handle-mouse-over.js

@@ -22,7 +22,7 @@ const getNodeSelector = (ignoreNodes, ignoreNodeDescendants) => {
   const ignoreNodeDescendantsSelectorList = ignoreNodeDescendants.map(node => {
     if (node === 'table') {
       // Special case for table to exclude its direct descendants
-      return [`[data-prosemirror-node-name="tableCell"] > [data-node-anchor]`, `[data-prosemirror-node-name="tableHeader"] > [data-node-anchor]`];
+      return [`[data-prosemirror-node-name="tableCell"] > [data-node-anchor]`, `[data-prosemirror-node-name="tableCell"] > *:not([data-node-anchor]) > [data-node-anchor]`, `[data-prosemirror-node-name="tableHeader"] > [data-node-anchor]`, `[data-prosemirror-node-name="tableHeader"] > *:not([data-node-anchor]) > [data-node-anchor]`];
     }
     return `[data-prosemirror-node-name="${node}"] [data-node-anchor]`;
   });

package/dist/es2019/ui/global-styles.js

@@ -485,11 +485,11 @@ const blockCardWithoutLayout = css({
 });
 const nextAnchorSelector = ['&[data-node-anchor]',
 // adjacent sibling with anchor
-'&:not([data-node-anchor]) [data-node-anchor]',
-// nested anchor inside adjacent sibling
+'&:not([data-node-anchor]) [data-node-anchor]:first-of-type',
+// first nested anchor inside adjacent sibling
 '&.ProseMirror-widget + [data-node-anchor]',
 // adjacent sibling with anchor (when next to a widget like gap cursor)
-'&.ProseMirror-widget + :not([data-node-anchor]) [data-node-anchor]' // nested anchor inside adjacent sibling (when next to a widget like gap cursor)
+'&.ProseMirror-widget + :not([data-node-anchor]) [data-node-anchor]:first-of-type' // first nested anchor inside adjacent sibling (when next to a widget like gap cursor)
 ].join(', ');
 const dragHandlerAnchorStyles = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors

package/dist/esm/editor-commands/move-node-with-block-menu.js

@@ -1,8 +1,13 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+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; }
+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; }
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { DIRECTION } from '@atlaskit/editor-common/types';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
+import { key } from '../pm-plugins/main';
+import { mapPreservedSelection } from '../pm-plugins/utils/selection';
 import { moveNode } from './move-node';
-import { getCurrentNodePosFromDragHandleSelection } from './utils/move-node-utils';
+import { canMoveNodeUpOrDown, getCurrentNodePosFromDragHandleSelection } from './utils/move-node-utils';
 var getSelectionToIndex = function getSelectionToIndex(fromIndex, $to, depth) {
   var toIndex = $to.index(depth);
   var toIndexAfter = $to.indexAfter(depth);
@@ -34,12 +39,13 @@ export var moveNodeWithBlockMenu = function moveNodeWithBlockMenu(api, direction
       $to = selection.$to;
     var depth = tr.doc.resolve(currentNodePos).depth;
     var fromIndex = $from.index(depth);
+    var trAfterNodeMove = tr;
     if (direction === DIRECTION.UP) {
       if (fromIndex > 0) {
         var moveToPos = $from.posAtIndex(fromIndex - 1, depth);
-        return moveNode(api)(currentNodePos, moveToPos, INPUT_METHOD.BLOCK_MENU)({
+        trAfterNodeMove = moveNode(api)(currentNodePos, moveToPos, INPUT_METHOD.BLOCK_MENU)({
           tr: tr
-        });
+        }) || tr;
       }
     } else {
       // selectionToIndex is the index of the last node in the selection
@@ -48,11 +54,29 @@ export var moveNodeWithBlockMenu = function moveNodeWithBlockMenu(api, direction
       var moveToIndex = selectionToIndex + 2;
       if (moveToIndex <= $to.node(depth).childCount) {
         var _moveToPos = $to.posAtIndex(moveToIndex, depth);
-        return moveNode(api)(currentNodePos, _moveToPos, INPUT_METHOD.BLOCK_MENU)({
+        trAfterNodeMove = moveNode(api)(currentNodePos, _moveToPos, INPUT_METHOD.BLOCK_MENU)({
           tr: tr
-        });
+        }) || tr;
       }
     }
-    return tr;
+
+    // map selection
+    var mappedSelection = mapPreservedSelection(selection, trAfterNodeMove);
+    if (mappedSelection) {
+      trAfterNodeMove.setSelection(mappedSelection);
+    }
+
+    //recalculate canMoveUp and canMoveDown
+    var _canMoveNodeUpOrDown = canMoveNodeUpOrDown(trAfterNodeMove),
+      moveUp = _canMoveNodeUpOrDown.moveUp,
+      moveDown = _canMoveNodeUpOrDown.moveDown;
+    var currentMeta = trAfterNodeMove.getMeta(key);
+    var newMeta = _objectSpread(_objectSpread({}, currentMeta), {
+      toggleMenu: {
+        moveUp: moveUp,
+        moveDown: moveDown
+      }
+    });
+    return trAfterNodeMove.setMeta(key, newMeta);
   };
 };

package/dist/esm/editor-commands/move-node.js

@@ -438,7 +438,11 @@ export var moveNode = function moveNode(api) {
       tr.setMeta(key, _objectSpread(_objectSpread({}, currMeta), {}, {
         nodeMoved: true
       }));
-      api === null || api === void 0 || api.core.actions.focus();
+      if (
+      // 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
+      !(inputMethod === INPUT_METHOD.BLOCK_MENU && expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true))) {
+        api === null || api === void 0 || api.core.actions.focus();
+      }
       var $mappedTo = tr.doc.resolve(mappedTo);
       var expandAncestor = findParentNodeOfTypeClosestToPos($to, [expand, nestedExpand]);
       if (expandAncestor) {

package/dist/esm/pm-plugins/handle-mouse-over.js

@@ -25,7 +25,7 @@ var getNodeSelector = function getNodeSelector(ignoreNodes, ignoreNodeDescendant
   var ignoreNodeDescendantsSelectorList = ignoreNodeDescendants.map(function (node) {
     if (node === 'table') {
       // Special case for table to exclude its direct descendants
-      return ["[data-prosemirror-node-name=\"tableCell\"] > [data-node-anchor]", "[data-prosemirror-node-name=\"tableHeader\"] > [data-node-anchor]"];
+      return ["[data-prosemirror-node-name=\"tableCell\"] > [data-node-anchor]", "[data-prosemirror-node-name=\"tableCell\"] > *:not([data-node-anchor]) > [data-node-anchor]", "[data-prosemirror-node-name=\"tableHeader\"] > [data-node-anchor]", "[data-prosemirror-node-name=\"tableHeader\"] > *:not([data-node-anchor]) > [data-node-anchor]"];
     }
     return "[data-prosemirror-node-name=\"".concat(node, "\"] [data-node-anchor]");
   });

package/dist/esm/ui/global-styles.js

@@ -400,11 +400,11 @@ var blockCardWithoutLayout = css({
 });
 var nextAnchorSelector = ['&[data-node-anchor]',
 // adjacent sibling with anchor
-'&:not([data-node-anchor]) [data-node-anchor]',
-// nested anchor inside adjacent sibling
+'&:not([data-node-anchor]) [data-node-anchor]:first-of-type',
+// first nested anchor inside adjacent sibling
 '&.ProseMirror-widget + [data-node-anchor]',
 // adjacent sibling with anchor (when next to a widget like gap cursor)
-'&.ProseMirror-widget + :not([data-node-anchor]) [data-node-anchor]' // nested anchor inside adjacent sibling (when next to a widget like gap cursor)
+'&.ProseMirror-widget + :not([data-node-anchor]) [data-node-anchor]:first-of-type' // first nested anchor inside adjacent sibling (when next to a widget like gap cursor)
 ].join(', ');
 var dragHandlerAnchorStyles = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "7.12.1",
+	"version": "7.13.1",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -54,9 +54,9 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
 		"@atlaskit/primitives": "^16.4.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^14.6.0",
+		"@atlaskit/tmp-editor-statsig": "^14.9.0",
 		"@atlaskit/tokens": "^8.4.0",
-		"@atlaskit/tooltip": "^20.10.0",
+		"@atlaskit/tooltip": "^20.11.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"@popperjs/core": "^2.11.8",
@@ -66,7 +66,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.38.0",
+		"@atlaskit/editor-common": "^110.40.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"