@atlaskit/editor-plugin-selection 2.1.0 → 2.1.2

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-selection
 
+## 2.1.2
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.1.1
+
+### Patch Changes
+
+- [#124883](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/124883)
+  [`cdc857701ad32`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/cdc857701ad32) -
+  [ux] EDF-2571 Updated `selectNodeWithModA` function to account for nested tables.
+- Updated dependencies
+
 ## 2.1.0
 
 ### Minor Changes

package/dist/cjs/pm-plugins/commands.js

@@ -7,11 +7,12 @@ exports.setSelectionRelativeToNode = exports.setSelectionInsideAtNodeEnd = expor
 var _selection = require("@atlaskit/editor-common/selection");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _utils2 = require("@atlaskit/editor-tables/utils");
+var _utils2 = require("@atlaskit/editor-prosemirror/utils");
+var _utils3 = require("@atlaskit/editor-tables/utils");
 var _types = require("../types");
 var _actions = require("./actions");
 var _pluginFactory = require("./plugin-factory");
-var _utils3 = require("./utils");
+var _utils4 = require("./utils");
 /* eslint-disable import/no-extraneous-dependencies */
 
 var selectNearNode = exports.selectNearNode = function selectNearNode(selectionRelativeToNode, selection) {
@@ -65,12 +66,12 @@ var arrowRightFromGapCursor = function arrowRightFromGapCursor(selection) {
       $to = selection.$to,
       side = selection.side;
     if (side === _selection.Side.LEFT) {
-      var selectableNode = (0, _utils3.findSelectableContainerAfter)($to, state.doc);
+      var selectableNode = (0, _utils4.findSelectableContainerAfter)($to, state.doc);
       if (selectableNode) {
         return setSelectionRelativeToNode(_selection.RelativeSelectionPos.Start, _state.NodeSelection.create(state.doc, selectableNode.pos))(state, dispatch);
       }
-    } else if (side === _selection.Side.RIGHT && (0, _utils3.isSelectionAtEndOfParentNode)($from, selection)) {
-      var _selectableNode = (0, _utils3.findSelectableContainerParent)(selection);
+    } else if (side === _selection.Side.RIGHT && (0, _utils4.isSelectionAtEndOfParentNode)($from, selection)) {
+      var _selectableNode = (0, _utils4.findSelectableContainerParent)(selection);
       if (_selectableNode) {
         return setSelectionRelativeToNode(_selection.RelativeSelectionPos.End, _state.NodeSelection.create(state.doc, _selectableNode.pos))(state, dispatch);
       }
@@ -85,15 +86,15 @@ var arrowLeftFromGapCursor = function arrowLeftFromGapCursor(selection) {
     var _getPluginState = (0, _pluginFactory.getPluginState)(state),
       selectionRelativeToNode = _getPluginState.selectionRelativeToNode;
     if (side === _selection.Side.RIGHT) {
-      var selectableNode = (0, _utils3.findSelectableContainerBefore)($from, state.doc);
+      var selectableNode = (0, _utils4.findSelectableContainerBefore)($from, state.doc);
       if (selectableNode) {
         return setSelectionRelativeToNode(_selection.RelativeSelectionPos.End, _state.NodeSelection.create(state.doc, selectableNode.pos))(state, dispatch);
       }
-    } else if (side === _selection.Side.LEFT && (0, _utils3.isSelectionAtStartOfParentNode)($from, selection)) {
+    } else if (side === _selection.Side.LEFT && (0, _utils4.isSelectionAtStartOfParentNode)($from, selection)) {
       if (selectionRelativeToNode === _selection.RelativeSelectionPos.Before) {
         var $parent = state.doc.resolve(selection.$from.before(selection.$from.depth));
         if ($parent) {
-          var _selectableNode2 = (0, _utils3.findSelectableContainerBefore)($parent, state.doc);
+          var _selectableNode2 = (0, _utils4.findSelectableContainerBefore)($parent, state.doc);
           if (_selectableNode2 && (0, _selection.isIgnored)(_selectableNode2.node)) {
             // selection is inside node without gap cursor preceeded by another node without gap cursor - set node selection for previous node
             return setSelectionRelativeToNode(_selection.RelativeSelectionPos.End, _state.NodeSelection.create(state.doc, _selectableNode2.pos))(state, dispatch);
@@ -103,7 +104,7 @@ var arrowLeftFromGapCursor = function arrowLeftFromGapCursor(selection) {
         // from responding to arrow left key
         setSelectionRelativeToNode()(state, dispatch);
       } else {
-        var _selectableNode3 = (0, _utils3.findSelectableContainerParent)(selection);
+        var _selectableNode3 = (0, _utils4.findSelectableContainerParent)(selection);
         if (_selectableNode3) {
           return setSelectionRelativeToNode(_selection.RelativeSelectionPos.Start, _state.NodeSelection.create(state.doc, _selectableNode3.pos))(state, dispatch);
         }
@@ -120,7 +121,7 @@ var arrowRightFromNode = function arrowRightFromNode(selection) {
     var _getPluginState2 = (0, _pluginFactory.getPluginState)(state),
       selectionRelativeToNode = _getPluginState2.selectionRelativeToNode;
     if (node.isAtom) {
-      if ((0, _utils3.isSelectionAtEndOfParentNode)($to, selection) && (node.isInline || (0, _selection.isIgnored)(node))) {
+      if ((0, _utils4.isSelectionAtEndOfParentNode)($to, selection) && (node.isInline || (0, _selection.isIgnored)(node))) {
         // selection is for inline node or atom node which is ignored by gap-cursor and that is the last child of its parent node - set text selection after it
         return findAndSetTextSelection(_selection.RelativeSelectionPos.End, state.doc.resolve(from + 1), _types.SelectionDirection.After)(state, dispatch);
       }
@@ -129,7 +130,7 @@ var arrowRightFromNode = function arrowRightFromNode(selection) {
       // selection is for container node - set selection inside it at the start
       return setSelectionInsideAtNodeStart(_selection.RelativeSelectionPos.Inside, node, from)(state, dispatch);
     } else if ((0, _selection.isIgnored)(node) && (!selectionRelativeToNode || selectionRelativeToNode === _selection.RelativeSelectionPos.End)) {
-      var selectableNode = (0, _utils3.findSelectableContainerAfter)($to, state.doc);
+      var selectableNode = (0, _utils4.findSelectableContainerAfter)($to, state.doc);
       if (selectableNode && (0, _selection.isIgnored)(selectableNode.node)) {
         // selection is for node without gap cursor followed by another node without gap cursor - set node selection for next node
         return setSelectionRelativeToNode(_selection.RelativeSelectionPos.Start, _state.NodeSelection.create(state.doc, selectableNode.pos))(state, dispatch);
@@ -147,7 +148,7 @@ var arrowLeftFromNode = function arrowLeftFromNode(selection) {
     var _getPluginState3 = (0, _pluginFactory.getPluginState)(state),
       selectionRelativeToNode = _getPluginState3.selectionRelativeToNode;
     if (node.isAtom) {
-      if ((0, _utils3.isSelectionAtStartOfParentNode)($from, selection) && (node.isInline || (0, _selection.isIgnored)(node))) {
+      if ((0, _utils4.isSelectionAtStartOfParentNode)($from, selection) && (node.isInline || (0, _selection.isIgnored)(node))) {
         // selection is for inline node or atom node which is ignored by gap-cursor and that is the first child of its parent node - set text selection before it
         return findAndSetTextSelection(_selection.RelativeSelectionPos.Start, state.doc.resolve(from), _types.SelectionDirection.Before)(state, dispatch);
       }
@@ -161,7 +162,7 @@ var arrowLeftFromNode = function arrowLeftFromNode(selection) {
       return setSelectionInsideAtNodeStart(_selection.RelativeSelectionPos.Before, node, from)(state, dispatch);
     } else if ((0, _selection.isIgnored)(node) && selectionRelativeToNode === _selection.RelativeSelectionPos.Start) {
       // selection is for node without gap cursor preceeded by another node without gap cursor - set node selection for previous node
-      var selectableNode = (0, _utils3.findSelectableContainerBefore)($from, state.doc);
+      var selectableNode = (0, _utils4.findSelectableContainerBefore)($from, state.doc);
       if (selectableNode && (0, _selection.isIgnored)(selectableNode.node)) {
         return setSelectionRelativeToNode(_selection.RelativeSelectionPos.End, _state.NodeSelection.create(state.doc, selectableNode.pos))(state, dispatch);
       }
@@ -171,8 +172,8 @@ var arrowLeftFromNode = function arrowLeftFromNode(selection) {
 };
 var arrowRightFromText = function arrowRightFromText(selection) {
   return function (state, dispatch) {
-    if ((0, _utils3.isSelectionAtEndOfParentNode)(selection.$to, selection)) {
-      var selectableNode = (0, _utils3.findSelectableContainerParent)(selection);
+    if ((0, _utils4.isSelectionAtEndOfParentNode)(selection.$to, selection)) {
+      var selectableNode = (0, _utils4.findSelectableContainerParent)(selection);
       if (selectableNode) {
         return setSelectionRelativeToNode(_selection.RelativeSelectionPos.End, _state.NodeSelection.create(state.doc, selectableNode.pos))(state, dispatch);
       }
@@ -185,7 +186,7 @@ var arrowLeftFromText = function arrowLeftFromText(selection) {
     var _getPluginState4 = (0, _pluginFactory.getPluginState)(state),
       selectionRelativeToNode = _getPluginState4.selectionRelativeToNode;
     if (selectionRelativeToNode === _selection.RelativeSelectionPos.Before) {
-      var selectableNode = (0, _utils3.findSelectableContainerBefore)(selection.$from, state.doc);
+      var selectableNode = (0, _utils4.findSelectableContainerBefore)(selection.$from, state.doc);
       if (selectableNode && (0, _selection.isIgnored)(selectableNode.node)) {
         // selection is inside node without gap cursor preceeded by another node without gap cursor - set node selection for previous node
         return setSelectionRelativeToNode(_selection.RelativeSelectionPos.End, _state.NodeSelection.create(state.doc, selectableNode.pos))(state, dispatch);
@@ -193,8 +194,8 @@ var arrowLeftFromText = function arrowLeftFromText(selection) {
       // we don't return this as we want to reset the relative pos, but not block other plugins
       // from responding to arrow left key
       setSelectionRelativeToNode(undefined)(state, dispatch);
-    } else if ((0, _utils3.isSelectionAtStartOfParentNode)(selection.$from, selection)) {
-      var _selectableNode4 = (0, _utils3.findSelectableContainerParent)(selection);
+    } else if ((0, _utils4.isSelectionAtStartOfParentNode)(selection.$from, selection)) {
+      var _selectableNode4 = (0, _utils4.findSelectableContainerParent)(selection);
       if (_selectableNode4) {
         return setSelectionRelativeToNode(_selection.RelativeSelectionPos.Start, _state.NodeSelection.create(state.doc, _selectableNode4.pos))(state, dispatch);
       }
@@ -216,7 +217,7 @@ var setSelectionInsideAtNodeStart = function setSelectionInsideAtNodeStart(selec
     if ((0, _utils.isNodeEmpty)(node)) {
       return findAndSetTextSelection(selectionRelativeToNode, state.doc.resolve(pos), _types.SelectionDirection.After)(state, dispatch);
     }
-    var selectableNode = (0, _utils3.findFirstChildNodeToSelect)(node);
+    var selectableNode = (0, _utils4.findFirstChildNodeToSelect)(node);
     if (selectableNode) {
       var childNode = selectableNode.node,
         childPos = selectableNode.pos;
@@ -228,7 +229,7 @@ var setSelectionInsideAtNodeStart = function setSelectionInsideAtNodeStart(selec
         return findAndSetTextSelection(selectionRelativeToNode, state.doc.resolve(selectionPos + 1), _types.SelectionDirection.Before)(state, dispatch);
       } else if (!(0, _selection.isIgnored)(node)) {
         return setSelectionRelativeToNode(selectionRelativeToNode, new _selection.GapCursorSelection(state.doc.resolve(selectionPos), _selection.Side.LEFT))(state, dispatch);
-      } else if ((0, _utils3.isSelectableContainerNode)(node)) {
+      } else if ((0, _utils4.isSelectableContainerNode)(node)) {
         return setSelectionRelativeToNode(selectionRelativeToNode, _state.NodeSelection.create(state.doc, selectionPos))(state, dispatch);
       }
     }
@@ -240,7 +241,7 @@ var setSelectionInsideAtNodeEnd = exports.setSelectionInsideAtNodeEnd = function
     if ((0, _utils.isNodeEmpty)(node)) {
       return findAndSetTextSelection(selectionRelativeToNode, state.doc.resolve(to), _types.SelectionDirection.Before)(state, dispatch);
     }
-    var selectableNode = (0, _utils3.findLastChildNodeToSelect)(node);
+    var selectableNode = (0, _utils4.findLastChildNodeToSelect)(node);
     if (selectableNode) {
       var childNode = selectableNode.node,
         childPos = selectableNode.pos;
@@ -252,7 +253,7 @@ var setSelectionInsideAtNodeEnd = exports.setSelectionInsideAtNodeEnd = function
         return findAndSetTextSelection(selectionRelativeToNode, state.doc.resolve(selectionPos), _types.SelectionDirection.After)(state, dispatch);
       } else if (!(0, _selection.isIgnored)(node)) {
         return setSelectionRelativeToNode(selectionRelativeToNode, new _selection.GapCursorSelection(state.doc.resolve(selectionPos + 1), _selection.Side.RIGHT))(state, dispatch);
-      } else if ((0, _utils3.isSelectableContainerNode)(node)) {
+      } else if ((0, _utils4.isSelectableContainerNode)(node)) {
         return setSelectionRelativeToNode(selectionRelativeToNode, _state.NodeSelection.create(state.doc, selectionPos))(state, dispatch);
       }
     }
@@ -271,12 +272,21 @@ var selectNodeWithModA = exports.selectNodeWithModA = function selectNodeWithMod
     var isInCodeBlock = $from.sameParent($to) && $from.parent.type === state.schema.nodes.codeBlock;
 
     // If the selection is at the top level and not in a code block, or if a table is selected, do nothing
-    if (isTopLevelSelection && !isInCodeBlock || (0, _utils2.isTableSelected)(selection)) {
+    if (isTopLevelSelection && !isInCodeBlock) {
       return false;
     }
 
     // Get the depth of the first common ancestor node
     var commonAncestorDepth = $from.sharedDepth($to.pos);
+
+    // We need to adjust the common ancestor depth if a table is selected
+    // to skip the current table node and select the parent node instead
+    if ((0, _utils3.isTableSelected)(state.selection)) {
+      var table = (0, _utils2.findParentNodeOfType)(state.schema.nodes.table)(state.selection);
+      if (table) {
+        commonAncestorDepth = table.depth - 1;
+      }
+    }
     for (var depth = commonAncestorDepth; depth > 0; depth--) {
       var node = $from.node(depth);
       var isParentBlockQuote = node.type.name === 'blockquote';

package/dist/cjs/pm-plugins/keymap.js

@@ -18,7 +18,9 @@ function keymapPlugin() {
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   (0, _keymaps.bindKeymapWithCommand)(_keymaps.moveLeft.common, _commands.arrowLeft, list);
-  if ((0, _experiments.editorExperiment)('platform_editor_cmd_a_progressively_select_nodes', true)) {
+  if ((0, _experiments.editorExperiment)('platform_editor_cmd_a_progressively_select_nodes', true, {
+    exposure: true
+  })) {
     // Ignored via go/ees005
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     (0, _keymaps.bindKeymapWithCommand)(_keymaps.selectNode.common, (0, _commands.selectNodeWithModA)(), list);

package/dist/es2019/pm-plugins/commands.js

@@ -2,6 +2,7 @@
 import { isIgnored as isIgnoredByGapCursor, RelativeSelectionPos, GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
 import { isEmptyParagraph, isNodeEmpty } from '@atlaskit/editor-common/utils';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { isTableSelected } from '@atlaskit/editor-tables/utils';
 import { SelectionDirection, selectionPluginKey } from '../types';
 import { SelectionActionTypes } from './actions';
@@ -266,12 +267,21 @@ export const selectNodeWithModA = () => (state, dispatch) => {
   const isInCodeBlock = $from.sameParent($to) && $from.parent.type === state.schema.nodes.codeBlock;
 
   // If the selection is at the top level and not in a code block, or if a table is selected, do nothing
-  if (isTopLevelSelection && !isInCodeBlock || isTableSelected(selection)) {
+  if (isTopLevelSelection && !isInCodeBlock) {
     return false;
   }
 
   // Get the depth of the first common ancestor node
-  const commonAncestorDepth = $from.sharedDepth($to.pos);
+  let commonAncestorDepth = $from.sharedDepth($to.pos);
+
+  // We need to adjust the common ancestor depth if a table is selected
+  // to skip the current table node and select the parent node instead
+  if (isTableSelected(state.selection)) {
+    const table = findParentNodeOfType(state.schema.nodes.table)(state.selection);
+    if (table) {
+      commonAncestorDepth = table.depth - 1;
+    }
+  }
   for (let depth = commonAncestorDepth; depth > 0; depth--) {
     const node = $from.node(depth);
     const isParentBlockQuote = node.type.name === 'blockquote';

package/dist/es2019/pm-plugins/keymap.js

@@ -12,7 +12,9 @@ function keymapPlugin() {
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   bindKeymapWithCommand(moveLeft.common, arrowLeft, list);
-  if (editorExperiment('platform_editor_cmd_a_progressively_select_nodes', true)) {
+  if (editorExperiment('platform_editor_cmd_a_progressively_select_nodes', true, {
+    exposure: true
+  })) {
     // Ignored via go/ees005
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     bindKeymapWithCommand(selectNode.common, selectNodeWithModA(), list);

package/dist/esm/pm-plugins/commands.js

@@ -2,6 +2,7 @@
 import { isIgnored as isIgnoredByGapCursor, RelativeSelectionPos, GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
 import { isEmptyParagraph, isNodeEmpty } from '@atlaskit/editor-common/utils';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { isTableSelected } from '@atlaskit/editor-tables/utils';
 import { SelectionDirection, selectionPluginKey } from '../types';
 import { SelectionActionTypes } from './actions';
@@ -264,12 +265,21 @@ export var selectNodeWithModA = function selectNodeWithModA() {
     var isInCodeBlock = $from.sameParent($to) && $from.parent.type === state.schema.nodes.codeBlock;
 
     // If the selection is at the top level and not in a code block, or if a table is selected, do nothing
-    if (isTopLevelSelection && !isInCodeBlock || isTableSelected(selection)) {
+    if (isTopLevelSelection && !isInCodeBlock) {
       return false;
     }
 
     // Get the depth of the first common ancestor node
     var commonAncestorDepth = $from.sharedDepth($to.pos);
+
+    // We need to adjust the common ancestor depth if a table is selected
+    // to skip the current table node and select the parent node instead
+    if (isTableSelected(state.selection)) {
+      var table = findParentNodeOfType(state.schema.nodes.table)(state.selection);
+      if (table) {
+        commonAncestorDepth = table.depth - 1;
+      }
+    }
     for (var depth = commonAncestorDepth; depth > 0; depth--) {
       var node = $from.node(depth);
       var isParentBlockQuote = node.type.name === 'blockquote';

package/dist/esm/pm-plugins/keymap.js

@@ -12,7 +12,9 @@ function keymapPlugin() {
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   bindKeymapWithCommand(moveLeft.common, arrowLeft, list);
-  if (editorExperiment('platform_editor_cmd_a_progressively_select_nodes', true)) {
+  if (editorExperiment('platform_editor_cmd_a_progressively_select_nodes', true, {
+    exposure: true
+  })) {
     // Ignored via go/ees005
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     bindKeymapWithCommand(selectNode.common, selectNodeWithModA(), list);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-selection",
-	"version": "2.1.0",
+	"version": "2.1.2",
 	"description": "Selection plugin for @atlaskit/editor-core",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -20,13 +20,13 @@
 		"runReact18": true
 	},
 	"dependencies": {
-		"@atlaskit/editor-common": "^102.3.0",
+		"@atlaskit/editor-common": "^102.8.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.4.0",
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^3.5.0",
-		"@atlaskit/tokens": "^4.3.0",
+		"@atlaskit/tmp-editor-statsig": "^4.0.0",
+		"@atlaskit/tokens": "^4.5.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {