@atlaskit/editor-plugin-block-controls 13.2.6 → 13.2.7

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 13.2.7
+
+### Patch Changes
+
+- [`d86bd1324d82b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d86bd1324d82b) -
+  Fix table cell selection when moving a table with the keyboard shortcut behind the
+  `platform_editor_fix_table_move_shortcut` experiment.
+- Updated dependencies
+
 ## 13.2.6
 
 ### Patch Changes

package/dist/cjs/blockControlsPlugin.js

@@ -333,10 +333,16 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
           var $from = $expandedAnchor.min($expandedHead);
           var $to = $expandedAnchor.max($expandedHead);
           var expandedNormalisedSel;
-          if ($from.nodeAfter === $to.nodeBefore) {
+          if ((0, _expValEquals.expValEquals)('platform_editor_fix_table_move_shortcut', 'isEnabled', true) && $from.nodeAfter && $from.nodeAfter === $to.nodeBefore) {
+            // Single node
+            (0, _getSelection.selectNode)(tr, $from.pos, $from.nodeAfter.type.name, api);
+            expandedNormalisedSel = tr.selection;
+          } else if ($from.nodeAfter === $to.nodeBefore) {
+            // Single node
             (0, _getSelection.selectNode)(tr, $from.pos, $expandedAnchor.node().type.name, api);
             expandedNormalisedSel = tr.selection;
           } else if (((_$to$nodeBefore = $to.nodeBefore) === null || _$to$nodeBefore === void 0 ? void 0 : _$to$nodeBefore.type.name) === 'mediaSingle' || ((_$from$nodeAfter = $from.nodeAfter) === null || _$from$nodeAfter === void 0 ? void 0 : _$from$nodeAfter.type.name) === 'mediaSingle') {
+            // Media
             expandedNormalisedSel = new _state.TextSelection($expandedAnchor, $expandedHead);
             tr.setSelection(expandedNormalisedSel);
           } else {

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

@@ -178,11 +178,26 @@ var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShor
       var LAYOUT_COL_DEPTH = 3;
       hoistedPos = state.doc.resolve(from).before(LAYOUT_COL_DEPTH);
     }
-    var currentNodePos = !getFocusedHandle(state) && !selection.empty ? hoistedPos !== null && hoistedPos !== void 0 ? hoistedPos : from : getCurrentNodePos(state);
+    var table = (0, _expValEquals.expValEquals)('platform_editor_fix_table_move_shortcut', 'isEnabled', true) && (0, _utils3.isTableSelected)(selection) ? (0, _utils3.findTable)(selection) : undefined;
+    var currentNodePos;
+    if (table) {
+      currentNodePos = table.pos;
+    } else if (!getFocusedHandle(state) && !selection.empty) {
+      currentNodePos = hoistedPos !== null && hoistedPos !== void 0 ? hoistedPos : from;
+    } else {
+      currentNodePos = getCurrentNodePos(state);
+    }
     if (currentNodePos > -1) {
       var _state$doc$nodeAt;
       var $currentNodePos = state.doc.resolve(currentNodePos);
-      var nodeAfterPos = !getFocusedHandle(state) ? Math.max(expandedAnchor, expandedHead) : $currentNodePos.posAtIndex($currentNodePos.index() + 1);
+      var nodeAfterPos;
+      if (table) {
+        nodeAfterPos = table.pos + table.node.nodeSize;
+      } else if (!getFocusedHandle(state)) {
+        nodeAfterPos = Math.max(expandedAnchor, expandedHead);
+      } else {
+        nodeAfterPos = $currentNodePos.posAtIndex($currentNodePos.index() + 1);
+      }
       var isTopLevelNode = $currentNodePos.depth === 0;
       var moveToPos = -1;
       var isLayoutColumnSelected = selection instanceof _state.NodeSelection && selection.node.type.name === 'layoutColumn';

package/dist/es2019/blockControlsPlugin.js

@@ -326,10 +326,16 @@ export const blockControlsPlugin = ({
         const $from = $expandedAnchor.min($expandedHead);
         const $to = $expandedAnchor.max($expandedHead);
         let expandedNormalisedSel;
-        if ($from.nodeAfter === $to.nodeBefore) {
+        if (expValEquals('platform_editor_fix_table_move_shortcut', 'isEnabled', true) && $from.nodeAfter && $from.nodeAfter === $to.nodeBefore) {
+          // Single node
+          selectNode(tr, $from.pos, $from.nodeAfter.type.name, api);
+          expandedNormalisedSel = tr.selection;
+        } else if ($from.nodeAfter === $to.nodeBefore) {
+          // Single node
           selectNode(tr, $from.pos, $expandedAnchor.node().type.name, api);
           expandedNormalisedSel = tr.selection;
         } else if (((_$to$nodeBefore = $to.nodeBefore) === null || _$to$nodeBefore === void 0 ? void 0 : _$to$nodeBefore.type.name) === 'mediaSingle' || ((_$from$nodeAfter = $from.nodeAfter) === null || _$from$nodeAfter === void 0 ? void 0 : _$from$nodeAfter.type.name) === 'mediaSingle') {
+          // Media
           expandedNormalisedSel = new TextSelection($expandedAnchor, $expandedHead);
           tr.setSelection(expandedNormalisedSel);
         } else {

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

@@ -161,7 +161,6 @@ const getFocusedHandle = state => {
 };
 export const moveNodeViaShortcut = (api, direction, formatMessage) => {
   return state => {
-    var _hoistedPos;
     const {
       selection
     } = state;
@@ -176,11 +175,27 @@ export const moveNodeViaShortcut = (api, direction, formatMessage) => {
       const LAYOUT_COL_DEPTH = 3;
       hoistedPos = state.doc.resolve(from).before(LAYOUT_COL_DEPTH);
     }
-    const currentNodePos = !getFocusedHandle(state) && !selection.empty ? (_hoistedPos = hoistedPos) !== null && _hoistedPos !== void 0 ? _hoistedPos : from : getCurrentNodePos(state);
+    const table = expValEquals('platform_editor_fix_table_move_shortcut', 'isEnabled', true) && isTableSelected(selection) ? findTable(selection) : undefined;
+    let currentNodePos;
+    if (table) {
+      currentNodePos = table.pos;
+    } else if (!getFocusedHandle(state) && !selection.empty) {
+      var _hoistedPos;
+      currentNodePos = (_hoistedPos = hoistedPos) !== null && _hoistedPos !== void 0 ? _hoistedPos : from;
+    } else {
+      currentNodePos = getCurrentNodePos(state);
+    }
     if (currentNodePos > -1) {
       var _state$doc$nodeAt;
       const $currentNodePos = state.doc.resolve(currentNodePos);
-      const nodeAfterPos = !getFocusedHandle(state) ? Math.max(expandedAnchor, expandedHead) : $currentNodePos.posAtIndex($currentNodePos.index() + 1);
+      let nodeAfterPos;
+      if (table) {
+        nodeAfterPos = table.pos + table.node.nodeSize;
+      } else if (!getFocusedHandle(state)) {
+        nodeAfterPos = Math.max(expandedAnchor, expandedHead);
+      } else {
+        nodeAfterPos = $currentNodePos.posAtIndex($currentNodePos.index() + 1);
+      }
       const isTopLevelNode = $currentNodePos.depth === 0;
       let moveToPos = -1;
       const isLayoutColumnSelected = selection instanceof NodeSelection && selection.node.type.name === 'layoutColumn';

package/dist/esm/blockControlsPlugin.js

@@ -326,10 +326,16 @@ export var blockControlsPlugin = function blockControlsPlugin(_ref) {
           var $from = $expandedAnchor.min($expandedHead);
           var $to = $expandedAnchor.max($expandedHead);
           var expandedNormalisedSel;
-          if ($from.nodeAfter === $to.nodeBefore) {
+          if (expValEquals('platform_editor_fix_table_move_shortcut', 'isEnabled', true) && $from.nodeAfter && $from.nodeAfter === $to.nodeBefore) {
+            // Single node
+            selectNode(tr, $from.pos, $from.nodeAfter.type.name, api);
+            expandedNormalisedSel = tr.selection;
+          } else if ($from.nodeAfter === $to.nodeBefore) {
+            // Single node
             selectNode(tr, $from.pos, $expandedAnchor.node().type.name, api);
             expandedNormalisedSel = tr.selection;
           } else if (((_$to$nodeBefore = $to.nodeBefore) === null || _$to$nodeBefore === void 0 ? void 0 : _$to$nodeBefore.type.name) === 'mediaSingle' || ((_$from$nodeAfter = $from.nodeAfter) === null || _$from$nodeAfter === void 0 ? void 0 : _$from$nodeAfter.type.name) === 'mediaSingle') {
+            // Media
             expandedNormalisedSel = new TextSelection($expandedAnchor, $expandedHead);
             tr.setSelection(expandedNormalisedSel);
           } else {

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

@@ -172,11 +172,26 @@ export var moveNodeViaShortcut = function moveNodeViaShortcut(api, direction, fo
       var LAYOUT_COL_DEPTH = 3;
       hoistedPos = state.doc.resolve(from).before(LAYOUT_COL_DEPTH);
     }
-    var currentNodePos = !getFocusedHandle(state) && !selection.empty ? hoistedPos !== null && hoistedPos !== void 0 ? hoistedPos : from : getCurrentNodePos(state);
+    var table = expValEquals('platform_editor_fix_table_move_shortcut', 'isEnabled', true) && isTableSelected(selection) ? findTable(selection) : undefined;
+    var currentNodePos;
+    if (table) {
+      currentNodePos = table.pos;
+    } else if (!getFocusedHandle(state) && !selection.empty) {
+      currentNodePos = hoistedPos !== null && hoistedPos !== void 0 ? hoistedPos : from;
+    } else {
+      currentNodePos = getCurrentNodePos(state);
+    }
     if (currentNodePos > -1) {
       var _state$doc$nodeAt;
       var $currentNodePos = state.doc.resolve(currentNodePos);
-      var nodeAfterPos = !getFocusedHandle(state) ? Math.max(expandedAnchor, expandedHead) : $currentNodePos.posAtIndex($currentNodePos.index() + 1);
+      var nodeAfterPos;
+      if (table) {
+        nodeAfterPos = table.pos + table.node.nodeSize;
+      } else if (!getFocusedHandle(state)) {
+        nodeAfterPos = Math.max(expandedAnchor, expandedHead);
+      } else {
+        nodeAfterPos = $currentNodePos.posAtIndex($currentNodePos.index() + 1);
+      }
       var isTopLevelNode = $currentNodePos.depth === 0;
       var moveToPos = -1;
       var isLayoutColumnSelected = selection instanceof NodeSelection && selection.node.type.name === 'layoutColumn';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "13.2.6",
+	"version": "13.2.7",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -48,7 +48,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^4.1.0",
 		"@atlaskit/primitives": "^20.6.0",
 		"@atlaskit/theme": "^26.1.0",
-		"@atlaskit/tmp-editor-statsig": "^125.0.0",
+		"@atlaskit/tmp-editor-statsig": "^125.1.0",
 		"@atlaskit/tokens": "^15.8.0",
 		"@atlaskit/tooltip": "^23.1.0",
 		"@babel/runtime": "^7.0.0",