@atlaskit/editor-core 187.44.3 → 187.44.6

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-core
 
+## 187.44.6
+
+### Patch Changes
+
+- [`21305ee6254`](https://bitbucket.org/atlassian/atlassian-frontend/commits/21305ee6254) - ED-19874 Align the dropdown with the floating toolbar if there is a single button in the toolbar
+- [`f7f51be4eac`](https://bitbucket.org/atlassian/atlassian-frontend/commits/f7f51be4eac) - [ux] ED-19784: Adjust logic in onCreateSelectionBetween logic to prevent premature selections on multi-line selections inside block nodes.
+- Updated dependencies
+
+## 187.44.4
+
+### Patch Changes
+
+- [`fa39c6ce044`](https://bitbucket.org/atlassian/atlassian-frontend/commits/fa39c6ce044) - [ED-19775] Decouple selection plugin from the editor-core code
+- [`6b0dd092ac1`](https://bitbucket.org/atlassian/atlassian-frontend/commits/6b0dd092ac1) - ED-19729 media single performance optimization
+- Updated dependencies
+
 ## 187.44.3
 
 ### Patch Changes

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

@@ -14,7 +14,7 @@ var _classNames = require("../ui/class-names");
 var _commands = require("../commands");
 var _pluginFactory = require("../../selection/plugin-factory");
 var _types = require("../../selection/types");
-var _table = require("../../../utils/table");
+var _utils3 = require("@atlaskit/editor-common/utils");
 var isExpandNode = function isExpandNode(node) {
   return (node === null || node === void 0 ? void 0 : node.type.name) === 'expand' || (node === null || node === void 0 ? void 0 : node.type.name) === 'nestedExpand';
 };
@@ -88,7 +88,7 @@ function expandKeymap() {
       // however when an expand is in a table cell to the left of the
       // current table cell, arrow UP moves the cursor to the left
       // see ED-15425
-      if ((0, _table.isPositionNearTableRow)($from, schema, 'before') && !expand) {
+      if ((0, _utils3.isPositionNearTableRow)($from, schema, 'before') && !expand) {
         return false;
       }
       var prevCursorPos = Math.max($from.pos - $from.parentOffset - 1, 0);

package/dist/cjs/plugins/floating-toolbar/ui/Dropdown.js

@@ -28,7 +28,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-var dropdownExpandContainer = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  margin: 0px -4px;\n"])));
+var dropdownExpandContainer = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  margin: 0px ", ";\n"])), "var(--ds-space-negative-050, -4px)");
 var iconGroup = (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n"])));
 var CompositeIcon = function CompositeIcon(_ref) {
   var icon = _ref.icon;
@@ -121,7 +121,8 @@ var Dropdown = /*#__PURE__*/function (_Component) {
         buttonTestId = _this$props2.buttonTestId,
         dropdownWidth = _this$props2.dropdownWidth,
         editorView = _this$props2.editorView,
-        dropdownListId = _this$props2.dropdownListId;
+        dropdownListId = _this$props2.dropdownListId,
+        alignDropdownWithToolbar = _this$props2.alignDropdownWithToolbar;
       var trigger;
       if (icon) {
         var TriggerIcon = hideExpandIcon ? icon : (0, _react2.jsx)(CompositeIcon, {
@@ -175,7 +176,8 @@ var Dropdown = /*#__PURE__*/function (_Component) {
         fitHeight: fitHeight + fitTolerance,
         trigger: trigger,
         editorView: editorView,
-        dropdownListId: dropdownListId
+        dropdownListId: dropdownListId,
+        alignDropdownWithParentElement: alignDropdownWithToolbar
       }, Array.isArray(options) ? this.renderArrayOptions(options) : options.render({
         hide: this.hide,
         dispatchCommand: dispatchCommand

package/dist/cjs/plugins/floating-toolbar/ui/Toolbar.js

@@ -149,7 +149,8 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
           buttonTestId: item.testId,
           editorView: editorView,
           setDisableParentScroll: scrollable ? setDisableScroll : undefined,
-          dropdownListId: (item === null || item === void 0 ? void 0 : item.id) && "".concat(item.id, "-dropdownList")
+          dropdownListId: (item === null || item === void 0 ? void 0 : item.id) && "".concat(item.id, "-dropdownList"),
+          alignDropdownWithToolbar: items.length === 1
         });
       case 'select':
         if (item.selectType === 'list') {

package/dist/cjs/plugins/media/nodeviews/mediaSingle.js

@@ -303,6 +303,7 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
+      var _pluginInjectionApi$m;
       var _this$props2 = this.props,
         selected = _this$props2.selected,
         getPos = _this$props2.getPos,
@@ -350,8 +351,9 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
         height = _mediaSingle.DEFAULT_IMAGE_HEIGHT;
       }
       var isSelected = selected();
+      var currentMaxWidth = isSelected ? pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$m = pluginInjectionApi.media.sharedState.currentState()) === null || _pluginInjectionApi$m === void 0 ? void 0 : _pluginInjectionApi$m.currentMaxWidth : undefined;
       var contentWidthForLegacyExperience = (0, _mediaSingle.getMaxWidthForNestedNode)(view, getPos()) || lineLength;
-      var contentWidth = (0, _mediaSingle.getMaxWidthForNestedNodeNext)(view, getPos()) || lineLength;
+      var contentWidth = currentMaxWidth || lineLength;
       var mediaSingleProps = {
         layout: layout,
         width: width,

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

@@ -9,7 +9,7 @@ var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _utils = require("../../../utils");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _commands = require("@atlaskit/editor-prosemirror/commands");
-var _position = require("../../../utils/prosemirror/position");
+var _selection = require("@atlaskit/editor-common/selection");
 /**
  * Check if is an empty selection at the start of the node
  */
@@ -145,7 +145,7 @@ var maybeRemoveMediaSingleNode = function maybeRemoveMediaSingleNode(schema) {
     if (dispatch) {
       // Select media single, and remove paragraph if it's empty.
       (0, _commands.selectNodeBackward)(state, function (tr) {
-        if (isEmptyNodeInSchema($from.parent) && !(0, _position.atTheEndOfDoc)(state)) {
+        if (isEmptyNodeInSchema($from.parent) && !(0, _selection.atTheEndOfDoc)(state)) {
           tr.replace($from.pos - 1, $from.pos + $from.parent.nodeSize - 1); // Remove node
         }
 

package/dist/cjs/plugins/media/pm-plugins/main.js

@@ -37,7 +37,6 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _document = require("../../../utils/document");
 var _mediaCommon2 = require("@atlaskit/media-common");
 var _utils3 = require("../../../utils");
-var _CaptionPlaceholder = require("../ui/CaptionPlaceholder");
 var _reactIntlNext = require("react-intl-next");
 var _mediaTaskManager = require("./mediaTaskManager");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
@@ -775,7 +774,7 @@ var createPlugin = function createPlugin(_schema, options, reactContext, getIntl
       },
       handleClick: function handleClick(_editorView, _pos, event) {
         var _event$target;
-        var clickedInsideCaptionPlaceholder = (_event$target = event.target) === null || _event$target === void 0 ? void 0 : _event$target.closest("[data-id=\"".concat(_CaptionPlaceholder.CAPTION_PLACEHOLDER_ID, "\"]"));
+        var clickedInsideCaptionPlaceholder = (_event$target = event.target) === null || _event$target === void 0 ? void 0 : _event$target.closest("[data-id=\"".concat(_mediaSingle2.CAPTION_PLACEHOLDER_ID, "\"]"));
 
         // Workaround for Chrome given a regression introduced in prosemirror-view@1.18.6
         // Returning true prevents that updateSelection() is getting called in the commit below:

package/dist/cjs/plugins/media/toolbar/index.js

@@ -266,7 +266,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
         type: 'custom',
         fallback: [],
         render: function render(editorView) {
-          var _widthPlugin$sharedSt2;
+          var _widthPlugin$sharedSt2, _pluginInjectionApi$m;
           if (!editorView || !selectedMediaSingleNode) {
             return null;
           }
@@ -284,7 +284,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
           var _selectedMediaNode$at = selectedMediaNode.attrs,
             mediaWidth = _selectedMediaNode$at.width,
             mediaHeight = _selectedMediaNode$at.height;
-          var maxWidthForNestedNode = (0, _mediaSingle2.getMaxWidthForNestedNodeNext)(editorView, selectedMediaSingleNode.pos);
+          var maxWidthForNestedNode = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$m = pluginInjectionApi.media.sharedState.currentState()) === null || _pluginInjectionApi$m === void 0 ? void 0 : _pluginInjectionApi$m.currentMaxWidth;
           var maxWidth = maxWidthForNestedNode || _editorSharedStyles.akEditorFullWidthLayoutWidth;
           var isVideoFile = (0, _mediaSingle.isVideo)(selectedMediaNode.attrs.__fileMimeType);
           var minWidth = (0, _mediaSingle2.calcMinWidth)(isVideoFile, maxWidthForNestedNode || contentWidth);

package/dist/cjs/plugins/media/ui/CaptionPlaceholder/index.js

@@ -4,25 +4,24 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.CAPTION_PLACEHOLDER_ID = void 0;
+exports.default = void 0;
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
 var _colors = require("@atlaskit/theme/colors");
 var _messages = require("./messages");
+var _mediaSingle = require("@atlaskit/editor-common/media-single");
 var _templateObject;
 /** @jsx jsx */
-var placeholder = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  color: ", ";\n  width: 100%;\n  text-align: center;\n  margin-top: 8px !important;\n  display: block;\n"])), "var(--ds-text-subtlest, ".concat(_colors.N200, ")"));
-var CAPTION_PLACEHOLDER_ID = 'caption-placeholder';
-exports.CAPTION_PLACEHOLDER_ID = CAPTION_PLACEHOLDER_ID;
+var placeholder = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  color: ", ";\n  width: 100%;\n  text-align: center;\n  margin-top: ", " !important;\n  display: block;\n"])), "var(--ds-text-subtlest, ".concat(_colors.N200, ")"), "var(--ds-space-100, 8px)");
 var _default = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
   var onClick = _ref.onClick;
   return (0, _react2.jsx)("span", {
     ref: ref,
     css: placeholder,
     onClick: onClick,
-    "data-id": CAPTION_PLACEHOLDER_ID,
+    "data-id": _mediaSingle.CAPTION_PLACEHOLDER_ID,
     "data-testid": "caption-placeholder"
   }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.messages.placeholder));
 });

package/dist/cjs/plugins/media/utils/media-common.js

@@ -12,7 +12,6 @@ var _utils3 = require("../../../utils");
 var _slice = require("../../../utils/slice");
 var _dom = require("../../../utils/dom");
 var _isImage = require("./is-image");
-var _position = require("../../../utils/prosemirror/position");
 var _selection = require("@atlaskit/editor-common/selection");
 var _mediaClient = require("@atlaskit/media-client");
 var isMediaBlobUrlFromAttrs = function isMediaBlobUrlFromAttrs(attrs) {
@@ -36,7 +35,7 @@ var isSelectionMediaSingleNode = function isSelectionMediaSingleNode(state) {
 };
 exports.isSelectionMediaSingleNode = isSelectionMediaSingleNode;
 var posOfPrecedingMediaGroup = function posOfPrecedingMediaGroup(state) {
-  if (!(0, _position.atTheBeginningOfBlock)(state)) {
+  if (!(0, _selection.atTheBeginningOfBlock)(state)) {
     return;
   }
   return posOfMediaGroupAbove(state, state.selection.$from);
@@ -61,7 +60,7 @@ var posOfImmediateFollowingMediaGroup = function posOfImmediateFollowingMediaGro
   }
 };
 var posOfFollowingMediaGroup = function posOfFollowingMediaGroup(state) {
-  if (!(0, _position.atTheEndOfBlock)(state)) {
+  if (!(0, _selection.atTheEndOfBlock)(state)) {
     return;
   }
   return posOfMediaGroupBelow(state, state.selection.$to);
@@ -73,7 +72,7 @@ var posOfMediaGroupAbove = function posOfMediaGroupAbove(state, $pos) {
     adjacentPos = $pos.pos;
     adjacentNode = $pos.nodeBefore;
   } else {
-    adjacentPos = (0, _position.startPositionOfParent)($pos) - 1;
+    adjacentPos = (0, _selection.startPositionOfParent)($pos) - 1;
     adjacentNode = state.doc.resolve(adjacentPos).nodeBefore;
   }
   if (adjacentNode && adjacentNode.type === state.schema.nodes.mediaGroup) {
@@ -88,7 +87,7 @@ var posOfMediaGroupAbove = function posOfMediaGroupAbove(state, $pos) {
  */
 var isInsidePotentialEmptyParagraph = function isInsidePotentialEmptyParagraph(state) {
   var $from = state.selection.$from;
-  return $from.parent.type === state.schema.nodes.paragraph && (0, _position.atTheBeginningOfBlock)(state) && (0, _position.atTheEndOfBlock)(state);
+  return $from.parent.type === state.schema.nodes.paragraph && (0, _selection.atTheBeginningOfBlock)(state) && (0, _selection.atTheEndOfBlock)(state);
 };
 exports.isInsidePotentialEmptyParagraph = isInsidePotentialEmptyParagraph;
 var posOfMediaGroupBelow = function posOfMediaGroupBelow(state, $pos) {
@@ -99,7 +98,7 @@ var posOfMediaGroupBelow = function posOfMediaGroupBelow(state, $pos) {
     adjacentPos = $pos.pos;
     adjacentNode = $pos.nodeAfter;
   } else {
-    adjacentPos = (0, _position.endPositionOfParent)($pos);
+    adjacentPos = (0, _selection.endPositionOfParent)($pos);
     adjacentNode = state.doc.nodeAt(adjacentPos);
   }
   if (adjacentNode && adjacentNode.type === state.schema.nodes.mediaGroup) {
@@ -112,7 +111,7 @@ var posOfParentMediaGroup = function posOfParentMediaGroup(state, $pos) {
   var $from = state.selection.$from;
   $pos = $pos || $from;
   if ($pos.parent.type === state.schema.nodes.mediaGroup) {
-    return prepend ? (0, _position.startPositionOfParent)($pos) : (0, _position.endPositionOfParent)($pos) - 1;
+    return prepend ? (0, _selection.startPositionOfParent)($pos) : (0, _selection.endPositionOfParent)($pos) - 1;
   }
   return;
 };
@@ -139,7 +138,7 @@ var removeMediaNode = function removeMediaNode(view, node, getPos) {
   // If deleting a selected media node, we need to tell where the cursor to go next.
   // Prosemirror didn't gave us the behaviour of moving left if the media node is not the last one.
   // So we handle it ourselves.
-  if (selection.from === currentMediaNodePos && !isLastMediaNode && !(0, _position.atTheBeginningOfDoc)(state) && nodeBefore && nodeBefore.type.name === 'media') {
+  if (selection.from === currentMediaNodePos && !isLastMediaNode && !(0, _selection.atTheBeginningOfDoc)(state) && nodeBefore && nodeBefore.type.name === 'media') {
     var _nodeBefore = (0, _utils.findPositionOfNodeBefore)(tr.selection);
     if (_nodeBefore) {
       tr.setSelection(_state.NodeSelection.create(tr.doc, _nodeBefore));

package/dist/cjs/plugins/media/utils/media-files.js

@@ -9,7 +9,7 @@ var _utils = require("../../../utils");
 var _utils2 = require("@atlaskit/editor-common/utils");
 var _mediaCommon = require("./media-common");
 var _utils3 = require("@atlaskit/editor-prosemirror/utils");
-var _position = require("../../../utils/prosemirror/position");
+var _selection = require("@atlaskit/editor-common/selection");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var canInsertMediaInline = function canInsertMediaInline(state) {
   var node = state.schema.nodes.mediaInline.create({});
@@ -69,7 +69,7 @@ function isSelectionMediaGroup(state) {
 function shouldAppendParagraph(state, node) {
   var media = state.schema.nodes.media;
   var wasMediaNode = node && node.type === media;
-  return ((0, _utils.insideTableCell)(state) || (0, _utils.isInListItem)(state) || (0, _utils2.isInLayoutColumn)(state) || (0, _position.atTheEndOfDoc)(state) && (!(0, _mediaCommon.posOfPrecedingMediaGroup)(state) || (0, _mediaCommon.isSelectionNonMediaBlockNode)(state))) && !wasMediaNode;
+  return ((0, _utils.insideTableCell)(state) || (0, _utils.isInListItem)(state) || (0, _utils2.isInLayoutColumn)(state) || (0, _selection.atTheEndOfDoc)(state) && (!(0, _mediaCommon.posOfPrecedingMediaGroup)(state) || (0, _mediaCommon.isSelectionNonMediaBlockNode)(state))) && !wasMediaNode;
 }
 
 /**
@@ -257,10 +257,10 @@ var findMediaInsertPos = function findMediaInsertPos(state) {
   if ((0, _mediaCommon.isSelectionNonMediaBlockNode)(state)) {
     return $to.pos;
   }
-  if ((0, _position.atTheEndOfBlock)(state)) {
+  if ((0, _selection.atTheEndOfBlock)(state)) {
     return $to.pos + 1;
   }
-  if ((0, _position.atTheBeginningOfBlock)(state)) {
+  if ((0, _selection.atTheBeginningOfBlock)(state)) {
     return $from.pos - 1;
   }
   return $to.pos;
@@ -275,7 +275,7 @@ var findDeleteRange = function findDeleteRange(state) {
   if (!(0, _mediaCommon.isInsidePotentialEmptyParagraph)(state) || (0, _mediaCommon.posOfMediaGroupNearby)(state)) {
     return range($from.pos, $to.pos);
   }
-  return range((0, _position.startPositionOfParent)($from) - 1, (0, _position.endPositionOfParent)($to));
+  return range((0, _selection.startPositionOfParent)($from) - 1, (0, _selection.endPositionOfParent)($to));
 };
 var range = function range(start) {
   var end = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : start;
@@ -292,7 +292,7 @@ var setSelectionAfterMediaInsertion = function setSelectionAfterMediaInsertion(v
     return;
   }
   var $mediaPos = doc.resolve(mediaPos);
-  var endOfMediaGroup = (0, _position.endPositionOfParent)($mediaPos);
+  var endOfMediaGroup = (0, _selection.endPositionOfParent)($mediaPos);
   if (endOfMediaGroup + 1 >= doc.nodeSize - 1) {
     // if nothing after the media group, fallback to select the newest uploaded media item
     (0, _utils.setNodeSelection)(view, mediaPos);

package/dist/cjs/plugins/media/utils/media-single.js

@@ -19,7 +19,7 @@ var _slice = require("../../../utils/slice");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _insert = require("@atlaskit/editor-common/insert");
 var _isImage = require("./is-image");
-var _position = require("../../../utils/prosemirror/position");
+var _selection = require("@atlaskit/editor-common/selection");
 var _mediaCommon2 = require("@atlaskit/media-common");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 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; }
@@ -38,7 +38,7 @@ var getInsertMediaAnalytics = function getInsertMediaAnalytics(inputMethod, file
   };
 };
 function shouldAddParagraph(state) {
-  return (0, _position.atTheBeginningOfBlock)(state) && !(0, _utils2.checkNodeDown)(state.selection, state.doc, _utils3.isEmptyParagraph);
+  return (0, _selection.atTheBeginningOfBlock)(state) && !(0, _utils2.checkNodeDown)(state.selection, state.doc, _utils3.isEmptyParagraph);
 }
 function insertNodesWithOptionalParagraph(nodes) {
   var analyticsAttributes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};

package/dist/cjs/plugins/placeholder-text/index.js

@@ -12,7 +12,7 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _adfSchema = require("@atlaskit/adf-schema");
 var _text = _interopRequireDefault(require("@atlaskit/icon/glyph/media-services/text"));
 var _WithPluginState = _interopRequireDefault(require("../../ui/WithPluginState"));
-var _utils = require("../../utils");
+var _utils = require("@atlaskit/editor-common/utils");
 var _cursor = require("../fake-text-cursor/cursor");
 var _PlaceholderFloatingToolbar = _interopRequireDefault(require("./ui/PlaceholderFloatingToolbar"));
 var _actions = require("./actions");

package/dist/cjs/plugins/selection/commands.js

@@ -7,7 +7,6 @@ exports.setSelectionRelativeToNode = exports.setSelectionInsideAtNodeEnd = expor
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _gapCursorSelection = require("./gap-cursor-selection");
 var _isIgnored = require("../selection/gap-cursor/utils/is-ignored");
-var _document = require("../../utils/document");
 var _utils = require("@atlaskit/editor-common/utils");
 var _actions = require("./actions");
 var _pluginFactory = require("./plugin-factory");
@@ -203,7 +202,7 @@ var findAndSetTextSelection = function findAndSetTextSelection(selectionRelative
 };
 var setSelectionInsideAtNodeStart = function setSelectionInsideAtNodeStart(selectionRelativeToNode, node, pos) {
   return function (state, dispatch) {
-    if ((0, _document.isNodeEmpty)(node)) {
+    if ((0, _utils.isNodeEmpty)(node)) {
       return findAndSetTextSelection(selectionRelativeToNode, state.doc.resolve(pos), _types.SelectionDirection.After)(state, dispatch);
     }
     var selectableNode = (0, _utils2.findFirstChildNodeToSelect)(node);
@@ -226,7 +225,7 @@ var setSelectionInsideAtNodeStart = function setSelectionInsideAtNodeStart(selec
 };
 var setSelectionInsideAtNodeEnd = function setSelectionInsideAtNodeEnd(selectionRelativeToNode, node, from, to) {
   return function (state, dispatch) {
-    if ((0, _document.isNodeEmpty)(node)) {
+    if ((0, _utils.isNodeEmpty)(node)) {
       return findAndSetTextSelection(selectionRelativeToNode, state.doc.resolve(to), _types.SelectionDirection.Before)(state, dispatch);
     }
     var selectableNode = (0, _utils2.findLastChildNodeToSelect)(node);

package/dist/cjs/plugins/selection/gap-cursor/actions.js

@@ -6,26 +6,25 @@ Object.defineProperty(exports, "__esModule", {
 exports.shouldSkipGapCursor = exports.setSelectionTopLevelBlocks = exports.setGapCursorAtPos = exports.setCursorForTopLevelBlocks = exports.hasGapCursorPlugin = exports.deleteNode = exports.arrow = void 0;
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _utils2 = require("@atlaskit/editor-common/utils");
 var _direction = require("./direction");
 var _selection = require("./selection");
-var _utils3 = require("./utils");
+var _utils2 = require("./utils");
 var _isValidTargetNode = require("./utils/is-valid-target-node");
-var _position = require("../../../utils/prosemirror/position");
+var _selection2 = require("@atlaskit/editor-common/selection");
 var _gapCursorPluginKey = require("../pm-plugins/gap-cursor-plugin-key");
-var _table = require("../../../utils/table");
+var _utils3 = require("@atlaskit/editor-common/utils");
 var shouldSkipGapCursor = function shouldSkipGapCursor(direction, state, $pos) {
   var _$pos$nodeBefore;
   var doc = state.doc,
     schema = state.schema;
   switch (direction) {
     case _direction.Direction.UP:
-      if ((0, _position.atTheBeginningOfDoc)(state)) {
+      if ((0, _selection2.atTheBeginningOfDoc)(state)) {
         return false;
       }
-      return (0, _table.isPositionNearTableRow)($pos, schema, 'before') || (0, _utils3.isTextBlockNearPos)(doc, schema, $pos, -1) || (0, _utils2.isNodeBeforeMediaNode)($pos, state);
+      return (0, _utils3.isPositionNearTableRow)($pos, schema, 'before') || (0, _utils2.isTextBlockNearPos)(doc, schema, $pos, -1) || (0, _utils3.isNodeBeforeMediaNode)($pos, state);
     case _direction.Direction.DOWN:
-      return (0, _position.atTheEndOfDoc)(state) || (0, _utils3.isTextBlockNearPos)(doc, schema, $pos, 1) || (0, _table.isPositionNearTableRow)($pos, schema, 'after') || ((_$pos$nodeBefore = $pos.nodeBefore) === null || _$pos$nodeBefore === void 0 ? void 0 : _$pos$nodeBefore.type.name) === 'text' && !$pos.nodeAfter // end of a paragraph
+      return (0, _selection2.atTheEndOfDoc)(state) || (0, _utils2.isTextBlockNearPos)(doc, schema, $pos, 1) || (0, _utils3.isPositionNearTableRow)($pos, schema, 'after') || ((_$pos$nodeBefore = $pos.nodeBefore) === null || _$pos$nodeBefore === void 0 ? void 0 : _$pos$nodeBefore.type.name) === 'text' && !$pos.nodeAfter // end of a paragraph
       ;
 
     default:
@@ -38,7 +37,7 @@ exports.shouldSkipGapCursor = shouldSkipGapCursor;
 function shouldHandleMediaGapCursor(dir, state) {
   var _selection$$from$node;
   var selection = state.selection;
-  var upArrowFromGapCursorIntoMedia = selection instanceof _selection.GapCursorSelection && dir === _direction.Direction.UP && selection.$from.nodeBefore && (0, _utils2.isMediaNode)(selection.$from.nodeBefore);
+  var upArrowFromGapCursorIntoMedia = selection instanceof _selection.GapCursorSelection && dir === _direction.Direction.UP && selection.$from.nodeBefore && (0, _utils3.isMediaNode)(selection.$from.nodeBefore);
   var downArrowFromGapCursorIntoMediaGroup = selection instanceof _selection.GapCursorSelection && dir === _direction.Direction.DOWN && ((_selection$$from$node = selection.$from.nodeAfter) === null || _selection$$from$node === void 0 ? void 0 : _selection$$from$node.type.name) === 'mediaGroup';
   return upArrowFromGapCursorIntoMedia || downArrowFromGapCursorIntoMediaGroup;
 }
@@ -49,7 +48,7 @@ function handleMediaGapCursor(dir, state) {
   var selection = state.selection,
     tr = state.tr;
   var $pos = (0, _direction.isBackward)(dir) ? selection.$from : selection.$to;
-  if (dir === _direction.Direction.UP && selection.$from.nodeBefore && (0, _utils2.isMediaNode)(selection.$from.nodeBefore)) {
+  if (dir === _direction.Direction.UP && selection.$from.nodeBefore && (0, _utils3.isMediaNode)(selection.$from.nodeBefore)) {
     var _tr$doc$nodeAt;
     var nodeBeforePos = (0, _utils.findPositionOfNodeBefore)(tr.selection);
     if (nodeBeforePos && selection.side === 'right' && ((_tr$doc$nodeAt = tr.doc.nodeAt(nodeBeforePos)) === null || _tr$doc$nodeAt === void 0 ? void 0 : _tr$doc$nodeAt.type.name) === 'mediaSingle') {
@@ -94,7 +93,7 @@ var arrow = function arrow(dir, endOfTextblock) {
       if (selection.node.isInline) {
         return false;
       }
-      if (dir === _direction.Direction.UP && !(0, _position.atTheBeginningOfDoc)(state) && !(0, _utils2.isNodeBeforeMediaNode)($pos, state) || dir === _direction.Direction.DOWN) {
+      if (dir === _direction.Direction.UP && !(0, _selection2.atTheBeginningOfDoc)(state) && !(0, _utils3.isNodeBeforeMediaNode)($pos, state) || dir === _direction.Direction.DOWN) {
         // We dont add gap cursor on node selections going up and down
         // Except we do if we're going up for a block node which is the
         // first node in the document OR the node before is a media node
@@ -126,7 +125,7 @@ var arrow = function arrow(dir, endOfTextblock) {
     if (view) {
       var domAtPos = view.domAtPos.bind(view);
       var target = (0, _utils.findDomRefAtPos)($pos.pos, domAtPos);
-      if (target && target.textContent === _utils2.ZERO_WIDTH_SPACE) {
+      if (target && target.textContent === _utils3.ZERO_WIDTH_SPACE) {
         return false;
       }
     }

package/dist/cjs/plugins/selection/gap-cursor/utils.js

@@ -9,7 +9,7 @@ exports.getMediaNearPos = getMediaNearPos;
 exports.isTextBlockNearPos = exports.isLeftCursor = exports.isIgnoredClick = void 0;
 var _styles = require("@atlaskit/editor-common/styles");
 var _selection = require("./selection");
-var _CaptionPlaceholder = require("../../media/ui/CaptionPlaceholder");
+var _mediaSingle = require("@atlaskit/editor-common/media-single");
 var isLeftCursor = function isLeftCursor(side) {
   return side === _selection.Side.LEFT;
 };
@@ -96,7 +96,7 @@ var isIgnoredClick = function isIgnoredClick(elem) {
   }
 
   // check if we're clicking an image caption placeholder
-  if (elem.closest("[data-id=\"".concat(_CaptionPlaceholder.CAPTION_PLACEHOLDER_ID, "\"]"))) {
+  if (elem.closest("[data-id=\"".concat(_mediaSingle.CAPTION_PLACEHOLDER_ID, "\"]"))) {
     return true;
   }
 
@@ -124,7 +124,7 @@ var isIgnoredClick = function isIgnoredClick(elem) {
   return false;
 };
 
-/* 
+/*
   Calculates custom style for breakout mode
   Mainly to handle table width to include the numbered column width as well
 */

package/dist/cjs/plugins/selection/plugin-factory.js

@@ -9,16 +9,16 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
-var _pluginStateFactory = require("../../utils/plugin-state-factory");
+var _utils = require("@atlaskit/editor-common/utils");
 var _reducer = require("./reducer");
 var _types = require("./types");
-var _utils = require("./utils");
+var _utils2 = require("./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 handleDocChanged = function handleDocChanged(tr, pluginState) {
   // in some collab edge cases mapping decorations could throw an error
   try {
-    if (pluginState.decorationSet.find().length === 0 && (!tr.selectionSet || (0, _utils.getDecorations)(tr).find().length === 0)) {
+    if (pluginState.decorationSet.find().length === 0 && (!tr.selectionSet || (0, _utils2.getDecorations)(tr).find().length === 0)) {
       return pluginState;
     }
     var decorationSet = pluginState.decorationSet.map(tr.mapping, tr.doc);
@@ -33,14 +33,14 @@ var handleDocChanged = function handleDocChanged(tr, pluginState) {
 };
 var handleSelectionChanged = function handleSelectionChanged(tr, pluginState) {
   // Reset relative selection pos when user clicks to select a node
-  if ((tr.selection instanceof _state.NodeSelection && (0, _utils.isSelectableContainerNode)(tr.selection.node) || tr.selection instanceof _cellSelection.CellSelection) && !tr.getMeta(_types.selectionPluginKey)) {
+  if ((tr.selection instanceof _state.NodeSelection && (0, _utils2.isSelectableContainerNode)(tr.selection.node) || tr.selection instanceof _cellSelection.CellSelection) && !tr.getMeta(_types.selectionPluginKey)) {
     return _objectSpread(_objectSpread({}, pluginState), {}, {
       selectionRelativeToNode: undefined
     });
   }
   return pluginState;
 };
-var _pluginFactory = (0, _pluginStateFactory.pluginFactory)(_types.selectionPluginKey, _reducer.reducer, {
+var _pluginFactory = (0, _utils.pluginFactory)(_types.selectionPluginKey, _reducer.reducer, {
     onDocChanged: handleDocChanged,
     onSelectionChanged: handleSelectionChanged
   }),

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

@@ -5,6 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.onCreateSelectionBetween = void 0;
 var _state = require("@atlaskit/editor-prosemirror/state");
+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) {
   var doc = $pos.doc;
   if ($pos.pos + 1 > doc.content.size) {
@@ -42,8 +45,7 @@ var checkPositionNode = function checkPositionNode($pos) {
   if (maybeNode.isAtom) {
     return true;
   }
-  var isParentEmpty = maybeNode.content.size === 0 || maybeNode.textContent === '';
-  return isParentEmpty && _state.NodeSelection.isSelectable(maybeNode);
+  return isNodeContentEmpty(maybeNode) && _state.NodeSelection.isSelectable(maybeNode);
 };
 function findNextSelectionPosition(_ref) {
   var $targetHead = _ref.$targetHead,
@@ -60,7 +62,7 @@ function findNextSelectionPosition(_ref) {
   return null;
 }
 var onCreateSelectionBetween = function onCreateSelectionBetween(view, $anchor, $head) {
-  var _$head$parent;
+  var _$head$parent, _$head$parent2;
   if ($anchor.pos === $head.pos) {
     return null;
   }
@@ -72,6 +74,11 @@ var onCreateSelectionBetween = function onCreateSelectionBetween(view, $anchor,
   if ($head.depth === 1 && ((_$head$parent = $head.parent) === null || _$head$parent === void 0 ? void 0 : _$head$parent.type.name) === 'paragraph') {
     return null;
   }
+
+  // If head is at the beginning of a non-empty textblock, let ProseMirror handle the text selection
+  if ((_$head$parent2 = $head.parent) !== null && _$head$parent2 !== void 0 && _$head$parent2.isTextblock && !isNodeContentEmpty($head.parent) && $head.parentOffset === 0) {
+    return null;
+  }
   var $nextHeadPosition = findNextSelectionPosition({
     $targetHead: $head,
     $anchor: $anchor,

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

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
-var _keymaps = require("../../../keymaps");
+var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _commands = require("../commands");
 function keymapPlugin() {
   var list = {};

package/dist/cjs/plugins/selection/utils.js

@@ -38,7 +38,6 @@ var _view = require("@atlaskit/editor-prosemirror/view");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _selection = require("@atlaskit/editor-common/selection");
-var _commands = require("../../utils/commands");
 var _utils2 = require("@atlaskit/editor-common/utils");
 var _isIgnored = require("../selection/gap-cursor/utils/is-ignored");
 var _types = require("./types");
@@ -52,7 +51,7 @@ function createSelectionClickHandler(nodes, isValidTarget, options) {
         var _target = event.target;
         if (isValidTarget(_target)) {
           var selectionPos = options.getNodeSelectionPos ? options.getNodeSelectionPos(view.state, nodePos) : nodePos;
-          (0, _commands.selectNode)(selectionPos)(view.state, view.dispatch);
+          (0, _selection.selectNode)(selectionPos)(view.state, view.dispatch);
           return true;
         }
       }

package/dist/cjs/utils/commands.js

@@ -3,8 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.withScrollIntoView = exports.selectNode = exports.isNthParentOfType = void 0;
-var _state = require("@atlaskit/editor-prosemirror/state");
+exports.withScrollIntoView = exports.isNthParentOfType = void 0;
 /**
  * Creates a filter that checks if the node at a given number of parents above the current
  * selection is of the correct node type.
@@ -31,23 +30,4 @@ var withScrollIntoView = function withScrollIntoView(command) {
     }, view);
   };
 };
-
-/**
- * Insert content, delete a range and create a new selection
- * This function automatically handles the mapping of positions for insertion and deletion.
- * The new selection is handled as a function since it may not always be necessary to resolve a position to the transactions mapping
- *
- * @param getSelectionResolvedPos get the resolved position to create a new selection
- * @param insertions content to insert at the specified position
- * @param deletions the ranges to delete
- */
-exports.withScrollIntoView = withScrollIntoView;
-var selectNode = function selectNode(pos) {
-  return function (state, dispatch) {
-    if (dispatch) {
-      dispatch(state.tr.setSelection(new _state.NodeSelection(state.doc.resolve(pos))));
-    }
-    return true;
-  };
-};
-exports.selectNode = selectNode;
+exports.withScrollIntoView = withScrollIntoView;