@atlaskit/editor-plugin-selection 0.1.2 → 0.2.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-selection
 
+## 0.2.0
+
+### Minor Changes
+
+- [#65084](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/65084) [`609bca09a972`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/609bca09a972) - expose selection as part of the shared state
+
+### Patch Changes
+
+- Updated dependencies
+
+## 0.1.3
+
+### Patch Changes
+
+- [#63289](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/63289) [`f75faa16e84d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f75faa16e84d) - [ux] ED-20209: Fixed selection behaviour for Atomic and empty+selectable nodes and updated related tests.
+
 ## 0.1.2
 
 ### Patch Changes

package/dist/cjs/plugin.js

@@ -44,7 +44,8 @@ var selectionPlugin = exports.selectionPlugin = function selectionPlugin(_ref2)
       }
       var pluginState = _types.selectionPluginKey.getState(editorState);
       return {
-        selectionRelativeToNode: pluginState === null || pluginState === void 0 ? void 0 : pluginState.selectionRelativeToNode
+        selectionRelativeToNode: pluginState === null || pluginState === void 0 ? void 0 : pluginState.selectionRelativeToNode,
+        selection: pluginState === null || pluginState === void 0 ? void 0 : pluginState.selection
       };
     },
     pmPlugins: function pmPlugins() {

package/dist/cjs/pm-plugins/events/create-selection-between.js

@@ -5,43 +5,36 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.onCreateSelectionBetween = void 0;
 var _state = require("@atlaskit/editor-prosemirror/state");
+var DOC_START_POS = 0;
 function isNodeContentEmpty(maybeNode) {
   return (maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.content.size) === 0 || (maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.textContent) === '';
 }
-function findEmptySelectableParentNodePosition($pos, isValidPosition) {
+function findEmptySelectableParentNodePosition($pos) {
   var doc = $pos.doc;
-  if ($pos.pos + 1 > doc.content.size) {
+  if ($pos.pos > doc.content.size) {
     return null;
   }
+  if (isCurrentNodeAtomOrEmptySelectable($pos)) {
+    return $pos;
+  }
   if ($pos.nodeBefore !== null) {
-    if (isValidPosition($pos)) {
-      return $pos;
-    }
-
-    // We can not use `$pos.before()` because ProseMirror throws an error when depth is zero.
-    var currentPosIndex = $pos.index();
-    if (currentPosIndex === 0) {
-      return null;
-    }
-    var previousIndex = currentPosIndex - 1;
-    var $previousPos = $pos.doc.resolve($pos.posAtIndex(previousIndex));
-    if (isValidPosition($previousPos)) {
-      return $previousPos;
-    }
     return null;
   }
-  if (isValidPosition($pos)) {
-    return $pos;
-  }
   if ($pos.depth === 0 && $pos.pos === 0) {
     return $pos;
   }
   var positionLevelUp = $pos.before();
   var resolvedPositionLevelUp = doc.resolve(positionLevelUp);
-  return findEmptySelectableParentNodePosition(resolvedPositionLevelUp, isValidPosition);
+  return findEmptySelectableParentNodePosition(resolvedPositionLevelUp);
 }
-var checkPositionNode = function checkPositionNode($pos) {
-  var maybeNode = $pos.nodeAfter;
+var isCurrentNodeAtomOrEmptySelectable = function isCurrentNodeAtomOrEmptySelectable($pos) {
+  //ED-20209: Using $resolvedJustBeforeNodePos so that $resolvedJustBeforeNodePos.nodeAfter return the node at $pos.pos even if that is an atomic node
+  if ($pos.pos === DOC_START_POS) {
+    return false;
+  }
+  var justBeforeNodePos = $pos.pos - 1;
+  var $resolvedjustBeforePos = $pos.doc.resolve(justBeforeNodePos);
+  var maybeNode = $resolvedjustBeforePos.nodeAfter;
   if (!maybeNode || !maybeNode.isBlock) {
     return false;
   }
@@ -55,12 +48,33 @@ function findNextSelectionPosition(_ref) {
     $anchor = _ref.$anchor,
     doc = _ref.doc;
   var direction = $anchor.pos < $targetHead.pos ? 'down' : 'up';
-  var maybeNextPosition = findEmptySelectableParentNodePosition($targetHead, checkPositionNode);
-  if (maybeNextPosition && maybeNextPosition.nodeAfter) {
-    var nodeAfter = maybeNextPosition.nodeAfter;
-    var pos = maybeNextPosition.pos;
-    var nextPositionToSelect = direction === 'down' ? Math.min(nodeAfter.nodeSize + pos, doc.content.size) : Math.max(pos, 0);
-    return doc.resolve(nextPositionToSelect);
+
+  //ED-20209: If the targetHead position is just before some node, Then return $targetHead and not select any node.
+  var maybeNode = null;
+  if ($targetHead.pos !== DOC_START_POS) {
+    var justBeforeHeadPos = $targetHead.pos - 1;
+    var $resolvedJustBeforeHeadPos = doc.resolve(justBeforeHeadPos);
+    maybeNode = $resolvedJustBeforeHeadPos.nodeAfter;
+  }
+  if (maybeNode === null) {
+    maybeNode = $targetHead.nodeAfter;
+    if (maybeNode !== null) {
+      $targetHead = doc.resolve($targetHead.pos + 1);
+    } else {
+      return null;
+    }
+  }
+  var maybeNextPosition = findEmptySelectableParentNodePosition($targetHead);
+  if (maybeNextPosition) {
+    var justBeforeMaybeNextPos = maybeNextPosition.pos - 1;
+    if (direction === 'up') {
+      return doc.resolve(Math.max(justBeforeMaybeNextPos, 0));
+    } else {
+      var maybeNextNode = doc.resolve(justBeforeMaybeNextPos).nodeAfter;
+      if (maybeNextNode) {
+        return doc.resolve(Math.min(justBeforeMaybeNextPos + maybeNextNode.nodeSize, doc.content.size));
+      }
+    }
   }
   return null;
 }

package/dist/es2019/plugin.js

@@ -35,7 +35,8 @@ export const selectionPlugin = ({
     }
     const pluginState = selectionPluginKey.getState(editorState);
     return {
-      selectionRelativeToNode: pluginState === null || pluginState === void 0 ? void 0 : pluginState.selectionRelativeToNode
+      selectionRelativeToNode: pluginState === null || pluginState === void 0 ? void 0 : pluginState.selectionRelativeToNode,
+      selection: pluginState === null || pluginState === void 0 ? void 0 : pluginState.selection
     };
   },
   pmPlugins() {

package/dist/es2019/pm-plugins/events/create-selection-between.js

@@ -1,43 +1,36 @@
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+const DOC_START_POS = 0;
 function isNodeContentEmpty(maybeNode) {
   return (maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.content.size) === 0 || (maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.textContent) === '';
 }
-function findEmptySelectableParentNodePosition($pos, isValidPosition) {
+function findEmptySelectableParentNodePosition($pos) {
   const {
     doc
   } = $pos;
-  if ($pos.pos + 1 > doc.content.size) {
+  if ($pos.pos > doc.content.size) {
     return null;
   }
+  if (isCurrentNodeAtomOrEmptySelectable($pos)) {
+    return $pos;
+  }
   if ($pos.nodeBefore !== null) {
-    if (isValidPosition($pos)) {
-      return $pos;
-    }
-
-    // We can not use `$pos.before()` because ProseMirror throws an error when depth is zero.
-    const currentPosIndex = $pos.index();
-    if (currentPosIndex === 0) {
-      return null;
-    }
-    const previousIndex = currentPosIndex - 1;
-    const $previousPos = $pos.doc.resolve($pos.posAtIndex(previousIndex));
-    if (isValidPosition($previousPos)) {
-      return $previousPos;
-    }
     return null;
   }
-  if (isValidPosition($pos)) {
-    return $pos;
-  }
   if ($pos.depth === 0 && $pos.pos === 0) {
     return $pos;
   }
   const positionLevelUp = $pos.before();
   const resolvedPositionLevelUp = doc.resolve(positionLevelUp);
-  return findEmptySelectableParentNodePosition(resolvedPositionLevelUp, isValidPosition);
+  return findEmptySelectableParentNodePosition(resolvedPositionLevelUp);
 }
-const checkPositionNode = $pos => {
-  const maybeNode = $pos.nodeAfter;
+const isCurrentNodeAtomOrEmptySelectable = $pos => {
+  //ED-20209: Using $resolvedJustBeforeNodePos so that $resolvedJustBeforeNodePos.nodeAfter return the node at $pos.pos even if that is an atomic node
+  if ($pos.pos === DOC_START_POS) {
+    return false;
+  }
+  const justBeforeNodePos = $pos.pos - 1;
+  const $resolvedjustBeforePos = $pos.doc.resolve(justBeforeNodePos);
+  const maybeNode = $resolvedjustBeforePos.nodeAfter;
   if (!maybeNode || !maybeNode.isBlock) {
     return false;
   }
@@ -52,12 +45,33 @@ function findNextSelectionPosition({
   doc
 }) {
   const direction = $anchor.pos < $targetHead.pos ? 'down' : 'up';
-  const maybeNextPosition = findEmptySelectableParentNodePosition($targetHead, checkPositionNode);
-  if (maybeNextPosition && maybeNextPosition.nodeAfter) {
-    const nodeAfter = maybeNextPosition.nodeAfter;
-    const pos = maybeNextPosition.pos;
-    const nextPositionToSelect = direction === 'down' ? Math.min(nodeAfter.nodeSize + pos, doc.content.size) : Math.max(pos, 0);
-    return doc.resolve(nextPositionToSelect);
+
+  //ED-20209: If the targetHead position is just before some node, Then return $targetHead and not select any node.
+  let maybeNode = null;
+  if ($targetHead.pos !== DOC_START_POS) {
+    const justBeforeHeadPos = $targetHead.pos - 1;
+    const $resolvedJustBeforeHeadPos = doc.resolve(justBeforeHeadPos);
+    maybeNode = $resolvedJustBeforeHeadPos.nodeAfter;
+  }
+  if (maybeNode === null) {
+    maybeNode = $targetHead.nodeAfter;
+    if (maybeNode !== null) {
+      $targetHead = doc.resolve($targetHead.pos + 1);
+    } else {
+      return null;
+    }
+  }
+  const maybeNextPosition = findEmptySelectableParentNodePosition($targetHead);
+  if (maybeNextPosition) {
+    const justBeforeMaybeNextPos = maybeNextPosition.pos - 1;
+    if (direction === 'up') {
+      return doc.resolve(Math.max(justBeforeMaybeNextPos, 0));
+    } else {
+      const maybeNextNode = doc.resolve(justBeforeMaybeNextPos).nodeAfter;
+      if (maybeNextNode) {
+        return doc.resolve(Math.min(justBeforeMaybeNextPos + maybeNextNode.nodeSize, doc.content.size));
+      }
+    }
   }
   return null;
 }

package/dist/esm/plugin.js

@@ -37,7 +37,8 @@ export var selectionPlugin = function selectionPlugin(_ref2) {
       }
       var pluginState = selectionPluginKey.getState(editorState);
       return {
-        selectionRelativeToNode: pluginState === null || pluginState === void 0 ? void 0 : pluginState.selectionRelativeToNode
+        selectionRelativeToNode: pluginState === null || pluginState === void 0 ? void 0 : pluginState.selectionRelativeToNode,
+        selection: pluginState === null || pluginState === void 0 ? void 0 : pluginState.selection
       };
     },
     pmPlugins: function pmPlugins() {

package/dist/esm/pm-plugins/events/create-selection-between.js

@@ -1,41 +1,34 @@
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+var DOC_START_POS = 0;
 function isNodeContentEmpty(maybeNode) {
   return (maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.content.size) === 0 || (maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.textContent) === '';
 }
-function findEmptySelectableParentNodePosition($pos, isValidPosition) {
+function findEmptySelectableParentNodePosition($pos) {
   var doc = $pos.doc;
-  if ($pos.pos + 1 > doc.content.size) {
+  if ($pos.pos > doc.content.size) {
     return null;
   }
+  if (isCurrentNodeAtomOrEmptySelectable($pos)) {
+    return $pos;
+  }
   if ($pos.nodeBefore !== null) {
-    if (isValidPosition($pos)) {
-      return $pos;
-    }
-
-    // We can not use `$pos.before()` because ProseMirror throws an error when depth is zero.
-    var currentPosIndex = $pos.index();
-    if (currentPosIndex === 0) {
-      return null;
-    }
-    var previousIndex = currentPosIndex - 1;
-    var $previousPos = $pos.doc.resolve($pos.posAtIndex(previousIndex));
-    if (isValidPosition($previousPos)) {
-      return $previousPos;
-    }
     return null;
   }
-  if (isValidPosition($pos)) {
-    return $pos;
-  }
   if ($pos.depth === 0 && $pos.pos === 0) {
     return $pos;
   }
   var positionLevelUp = $pos.before();
   var resolvedPositionLevelUp = doc.resolve(positionLevelUp);
-  return findEmptySelectableParentNodePosition(resolvedPositionLevelUp, isValidPosition);
+  return findEmptySelectableParentNodePosition(resolvedPositionLevelUp);
 }
-var checkPositionNode = function checkPositionNode($pos) {
-  var maybeNode = $pos.nodeAfter;
+var isCurrentNodeAtomOrEmptySelectable = function isCurrentNodeAtomOrEmptySelectable($pos) {
+  //ED-20209: Using $resolvedJustBeforeNodePos so that $resolvedJustBeforeNodePos.nodeAfter return the node at $pos.pos even if that is an atomic node
+  if ($pos.pos === DOC_START_POS) {
+    return false;
+  }
+  var justBeforeNodePos = $pos.pos - 1;
+  var $resolvedjustBeforePos = $pos.doc.resolve(justBeforeNodePos);
+  var maybeNode = $resolvedjustBeforePos.nodeAfter;
   if (!maybeNode || !maybeNode.isBlock) {
     return false;
   }
@@ -49,12 +42,33 @@ function findNextSelectionPosition(_ref) {
     $anchor = _ref.$anchor,
     doc = _ref.doc;
   var direction = $anchor.pos < $targetHead.pos ? 'down' : 'up';
-  var maybeNextPosition = findEmptySelectableParentNodePosition($targetHead, checkPositionNode);
-  if (maybeNextPosition && maybeNextPosition.nodeAfter) {
-    var nodeAfter = maybeNextPosition.nodeAfter;
-    var pos = maybeNextPosition.pos;
-    var nextPositionToSelect = direction === 'down' ? Math.min(nodeAfter.nodeSize + pos, doc.content.size) : Math.max(pos, 0);
-    return doc.resolve(nextPositionToSelect);
+
+  //ED-20209: If the targetHead position is just before some node, Then return $targetHead and not select any node.
+  var maybeNode = null;
+  if ($targetHead.pos !== DOC_START_POS) {
+    var justBeforeHeadPos = $targetHead.pos - 1;
+    var $resolvedJustBeforeHeadPos = doc.resolve(justBeforeHeadPos);
+    maybeNode = $resolvedJustBeforeHeadPos.nodeAfter;
+  }
+  if (maybeNode === null) {
+    maybeNode = $targetHead.nodeAfter;
+    if (maybeNode !== null) {
+      $targetHead = doc.resolve($targetHead.pos + 1);
+    } else {
+      return null;
+    }
+  }
+  var maybeNextPosition = findEmptySelectableParentNodePosition($targetHead);
+  if (maybeNextPosition) {
+    var justBeforeMaybeNextPos = maybeNextPosition.pos - 1;
+    if (direction === 'up') {
+      return doc.resolve(Math.max(justBeforeMaybeNextPos, 0));
+    } else {
+      var maybeNextNode = doc.resolve(justBeforeMaybeNextPos).nodeAfter;
+      if (maybeNextNode) {
+        return doc.resolve(Math.min(justBeforeMaybeNextPos + maybeNextNode.nodeSize, doc.content.size));
+      }
+    }
   }
   return null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-selection",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "description": "Selection plugin for @atlaskit/editor-core",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -17,12 +17,13 @@
   "atlassian": {
     "team": "Editor: Lego",
     "releaseModel": "continuous",
-    "singleton": true
+    "singleton": true,
+    "runReact18": false
   },
   "dependencies": {
-    "@atlaskit/editor-common": "^76.27.0",
+    "@atlaskit/editor-common": "^76.39.0",
     "@atlaskit/editor-prosemirror": "1.1.0",
-    "@atlaskit/editor-shared-styles": "^2.7.0",
+    "@atlaskit/editor-shared-styles": "^2.9.0",
     "@atlaskit/editor-tables": "^2.3.10",
     "@babel/runtime": "^7.0.0"
   },
@@ -43,7 +44,6 @@
     "@atlaskit/media-test-helpers": "^33.0.0",
     "@atlaskit/ssr": "*",
     "@atlaskit/visual-regression": "*",
-    "@atlaskit/webdriver-runner": "*",
     "@atlassian/atlassian-frontend-prettier-config-1.0.0": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.0",
     "@testing-library/react": "^12.1.5",
     "react-dom": "^16.8.0",