@atlaskit/editor-plugin-selection 1.5.5 → 1.6.0

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @atlaskit/editor-plugin-selection
 
+## 1.6.0
+
+### Minor Changes
+
+- [#169428](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/169428)
+  [`dc52eec1d2269`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/dc52eec1d2269) -
+  [ux] ED-25865 Auto include inline node as a part of selection when selection ends on an inline
+  node
+- [#169428](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/169428)
+  [`ded743b539788`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ded743b539788) -
+  [ux] ED-25865 auto expand selection to include inline node
+
+### Patch Changes
+
+- Updated dependencies
+
+## 1.5.6
+
+### Patch Changes
+
+- [#171440](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/171440)
+  [`835f7bbff3122`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/835f7bbff3122) -
+  ED-25816: refactors plugins to meet folder standards
+- Updated dependencies
+
 ## 1.5.5
 
 ### Patch Changes

package/dist/cjs/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "selectionPlugin", {
   enumerable: true,
   get: function get() {
-    return _plugin.selectionPlugin;
+    return _selectionPlugin.selectionPlugin;
   }
 });
-var _plugin = require("./plugin");
+var _selectionPlugin = require("./selectionPlugin");

package/dist/cjs/pm-plugins/auto-expand-selection-range-on-inline-node-key.js

@@ -0,0 +1,8 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.autoExpandSelectionRangeOnInlineNodePluginKey = void 0;
+var _state = require("@atlaskit/editor-prosemirror/state");
+var autoExpandSelectionRangeOnInlineNodePluginKey = exports.autoExpandSelectionRangeOnInlineNodePluginKey = new _state.PluginKey('autoExpandSelectionRangeOnInlineNodePlugin');

package/dist/cjs/pm-plugins/auto-expand-selection-range-on-inline-node-main.js

@@ -0,0 +1,67 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createAutoExpandSelectionRangeOnInlineNodePlugin = void 0;
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+var _state = require("@atlaskit/editor-prosemirror/state");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
+var _autoExpandSelectionRangeOnInlineNodeKey = require("./auto-expand-selection-range-on-inline-node-key");
+var createAutoExpandSelectionRangeOnInlineNodePlugin = exports.createAutoExpandSelectionRangeOnInlineNodePlugin = function createAutoExpandSelectionRangeOnInlineNodePlugin() {
+  var mouseDownElement = null;
+  return new _safePlugin.SafePlugin({
+    key: _autoExpandSelectionRangeOnInlineNodeKey.autoExpandSelectionRangeOnInlineNodePluginKey,
+    props: {
+      handleDOMEvents: {
+        mousedown: function mousedown(_view, event) {
+          mouseDownElement = event.target;
+        },
+        mouseup: function mouseup(view, event) {
+          var mouseUpElement = event.target;
+
+          // terminate early if mouse down and mouse up elements are the same -> e.g a click event
+          if (mouseDownElement === mouseUpElement) {
+            return;
+          }
+
+          // terminate early if mouse up event is not fired on inline node
+          if (!isMouseUpOnSupportedNode(mouseUpElement)) {
+            return;
+          }
+          var dispatch = view.dispatch,
+            state = view.state;
+          var selection = state.selection;
+
+          // terminate early if current selection is on a node
+          if (selection instanceof _state.NodeSelection) {
+            return;
+          }
+
+          // only expand range when experiment is enabled, also fire exposure events here
+          if ((0, _experiments.editorExperiment)('expand_selection_range_to_include_inline_node', true, {
+            exposure: true
+          })) {
+            // find the document position of the mouse up element
+            var elementStartPosition = view.posAtDOM(mouseUpElement, 0);
+
+            // find out the direction of selection
+            var isAnchorBeforeElement = selection.$anchor.pos <= elementStartPosition;
+            var expandedSelectionHeadPosition = isAnchorBeforeElement ? elementStartPosition + 1 : elementStartPosition;
+
+            // expand the selection to include the mouse up element
+            var tr = state.tr.setSelection(_state.TextSelection.create(state.doc, selection.$anchor.pos, expandedSelectionHeadPosition));
+            dispatch(tr);
+          }
+        }
+      }
+    }
+  });
+};
+var isMouseUpOnSupportedNode = function isMouseUpOnSupportedNode(mouseUpElement) {
+  var supportedNodes = ['emoji', 'status', 'date', 'mention', 'inlineCard'];
+  var supportedNodeViewContentClassNamesList = supportedNodes.map(function (nodeType) {
+    return ".".concat(nodeType, "View-content-wrap");
+  }).join(', ');
+  return !!mouseUpElement.closest(supportedNodeViewContentClassNamesList);
+};

package/dist/cjs/{commands.js → pm-plugins/commands.js}

@@ -7,10 +7,10 @@ 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 _types = require("../types");
 var _actions = require("./actions");
 var _gapCursorSelection = require("./gap-cursor-selection");
 var _pluginFactory = require("./plugin-factory");
-var _types = require("./types");
 var _utils2 = require("./utils");
 /* eslint-disable import/no-extraneous-dependencies */
 

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.onCreateSelectionBetween = void 0;
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 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) === '';
@@ -51,10 +52,23 @@ function findNextSelectionPosition(_ref) {
 
   //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 ((0, _platformFeatureFlags.fg)('platform_editor_fix_drag_and_drop_lists')) {
+    // prosemirror calls 'createSelectionBetween' for native 'drop' events, it passes $anchor
+    // and $head which are based on a transformed document, but only provides the original
+    // doc. Need to remap the $head pos to last element in doc to avoid RangeErrors.
+    if ($targetHead.pos >= doc.nodeSize) {
+      maybeNode = doc.resolve(doc.nodeSize - 2).nodeBefore;
+    } else if ($targetHead.pos !== DOC_START_POS) {
+      var justBeforeHeadPos = $targetHead.pos - 1;
+      var $resolvedJustBeforeHeadPos = doc.resolve(justBeforeHeadPos);
+      maybeNode = $resolvedJustBeforeHeadPos.nodeAfter;
+    }
+  } else {
+    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;

package/dist/cjs/{gap-cursor → pm-plugins/gap-cursor}/actions.js

@@ -9,7 +9,7 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _whitespace = require("@atlaskit/editor-common/whitespace");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
-var _gapCursorPluginKey = require("../pm-plugins/gap-cursor-plugin-key");
+var _gapCursorPluginKey = require("../gap-cursor-plugin-key");
 var _direction = require("./direction");
 var _selection2 = require("./selection");
 var _utils3 = require("./utils");

package/dist/cjs/{gap-cursor → pm-plugins/gap-cursor}/utils.js

@@ -9,6 +9,7 @@ exports.getMediaNearPos = getMediaNearPos;
 exports.isTextBlockNearPos = exports.isLeftCursor = exports.isIgnoredClick = void 0;
 var _mediaSingle = require("@atlaskit/editor-common/media-single");
 var _styles = require("@atlaskit/editor-common/styles");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _selection = require("./selection");
 var isLeftCursor = exports.isLeftCursor = function isLeftCursor(side) {
   return side === _selection.Side.LEFT;
@@ -133,5 +134,11 @@ var getComputedStyleForLayoutMode = exports.getComputedStyleForLayoutMode = func
       return window.getComputedStyle(tableContainer);
     }
   }
+  if ((0, _experiments.editorExperiment)('advanced_layouts', true) && node && node.type.name === 'layoutSection') {
+    var layoutSectionContainer = dom.querySelector('.layout-section-container');
+    if (layoutSectionContainer) {
+      return window.getComputedStyle(layoutSectionContainer);
+    }
+  }
   return style;
 };

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

@@ -7,9 +7,9 @@ exports.default = keymapPlugin;
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _commands = require("@atlaskit/editor-prosemirror/commands");
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
-var _actions = require("../gap-cursor/actions");
-var _direction = require("../gap-cursor/direction");
-var _selection = require("../gap-cursor/selection");
+var _actions = require("./gap-cursor/actions");
+var _direction = require("./gap-cursor/direction");
+var _selection = require("./gap-cursor/selection");
 function keymapPlugin() {
   var map = {};
   (0, _keymaps.bindKeymapWithCommand)(_keymaps.insertNewLine.common, function (state, dispatch, view) {

package/dist/cjs/pm-plugins/gap-cursor-main.js

@@ -10,11 +10,11 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _view2 = require("@atlaskit/editor-prosemirror/view");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
-var _actions = require("../gap-cursor/actions");
-var _direction = require("../gap-cursor/direction");
-var _utils2 = require("../gap-cursor/utils");
-var _placeGapCursor = require("../gap-cursor/utils/place-gap-cursor");
 var _gapCursorPluginKey = require("./gap-cursor-plugin-key");
+var _actions = require("./gap-cursor/actions");
+var _direction = require("./gap-cursor/direction");
+var _utils2 = require("./gap-cursor/utils");
+var _placeGapCursor = require("./gap-cursor/utils/place-gap-cursor");
 var plugin = new _safePlugin.SafePlugin({
   key: _gapCursorPluginKey.gapCursorPluginKey,
   state: {

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

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

package/dist/cjs/pm-plugins/mark-boundary-cursor-main.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.createMarkBoundaryCursorPlugin = void 0;
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _markBoundaryCursorDecoration = require("../mark-boundary-cursor/ui/mark-boundary-cursor-decoration");
-var _activeMarksSide = require("../mark-boundary-cursor/utils/active-marks-side");
 var _markBoundaryCursorPluginKey = require("./mark-boundary-cursor-plugin-key");
+var _markBoundaryCursorDecoration = require("./mark-boundary-cursor/ui/mark-boundary-cursor-decoration");
+var _activeMarksSide = require("./mark-boundary-cursor/utils/active-marks-side");
 var createMarkBoundaryCursorPlugin = exports.createMarkBoundaryCursorPlugin = function createMarkBoundaryCursorPlugin() {
   return new _safePlugin.SafePlugin({
     key: _markBoundaryCursorPluginKey.markBoundaryCursorPluginKey,

package/dist/cjs/{plugin-factory.js → pm-plugins/plugin-factory.js}

@@ -10,8 +10,8 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
+var _types = require("../types");
 var _reducer = require("./reducer");
-var _types = require("./types");
 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; }

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

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.getInitialState = exports.createPlugin = void 0;
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _actions = require("../actions");
-var _pluginFactory = require("../plugin-factory");
 var _types = require("../types");
-var _utils = require("../utils");
+var _actions = require("./actions");
 var _createSelectionBetween = require("./events/create-selection-between");
 var _keydown = require("./events/keydown");
+var _pluginFactory = require("./plugin-factory");
+var _utils = require("./utils");
 var getInitialState = exports.getInitialState = function getInitialState(state) {
   return {
     decorationSet: (0, _utils.getDecorations)(state.tr),

package/dist/cjs/{utils.js → pm-plugins/utils.js}

@@ -17,7 +17,7 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
-var _types = require("./types");
+var _types = require("../types");
 var getDecorations = exports.getDecorations = function getDecorations(tr) {
   if (tr.selection instanceof _state.NodeSelection) {
     return _view.DecorationSet.create(tr.doc, [_view.Decoration.node(tr.selection.from, tr.selection.to, {

package/dist/cjs/{plugin.js → selectionPlugin.js}

@@ -7,7 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.selectionPlugin = exports.default = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _commands = require("./commands");
+var _autoExpandSelectionRangeOnInlineNodeMain = require("./pm-plugins/auto-expand-selection-range-on-inline-node-main");
+var _commands = require("./pm-plugins/commands");
 var _gapCursorKeymap = _interopRequireDefault(require("./pm-plugins/gap-cursor-keymap"));
 var _gapCursorMain = _interopRequireDefault(require("./pm-plugins/gap-cursor-main"));
 var _gapCursorPluginKey = require("./pm-plugins/gap-cursor-plugin-key");
@@ -77,6 +78,11 @@ var selectionPlugin = exports.selectionPlugin = function selectionPlugin(_ref2)
         plugin: function plugin() {
           return (0, _markBoundaryCursorMain.createMarkBoundaryCursorPlugin)();
         }
+      }] : []), (0, _toConsumableArray2.default)((0, _platformFeatureFlags.fg)('editor_auto_expand_selection_on_inline_node') ? [{
+        name: 'autoExpandSelectionRangeOnInlineNode',
+        plugin: function plugin() {
+          return (0, _autoExpandSelectionRangeOnInlineNodeMain.createAutoExpandSelectionRangeOnInlineNodePlugin)();
+        }
       }] : []));
     }
   };

package/dist/cjs/selectionPluginType.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/es2019/index.js

@@ -1 +1 @@
-export { selectionPlugin } from './plugin';
+export { selectionPlugin } from './selectionPlugin';

package/dist/es2019/pm-plugins/auto-expand-selection-range-on-inline-node-key.js

@@ -0,0 +1,2 @@
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+export const autoExpandSelectionRangeOnInlineNodePluginKey = new PluginKey('autoExpandSelectionRangeOnInlineNodePlugin');

package/dist/es2019/pm-plugins/auto-expand-selection-range-on-inline-node-main.js

@@ -0,0 +1,63 @@
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
+import { autoExpandSelectionRangeOnInlineNodePluginKey } from './auto-expand-selection-range-on-inline-node-key';
+export const createAutoExpandSelectionRangeOnInlineNodePlugin = () => {
+  let mouseDownElement = null;
+  return new SafePlugin({
+    key: autoExpandSelectionRangeOnInlineNodePluginKey,
+    props: {
+      handleDOMEvents: {
+        mousedown: (_view, event) => {
+          mouseDownElement = event.target;
+        },
+        mouseup: (view, event) => {
+          const mouseUpElement = event.target;
+
+          // terminate early if mouse down and mouse up elements are the same -> e.g a click event
+          if (mouseDownElement === mouseUpElement) {
+            return;
+          }
+
+          // terminate early if mouse up event is not fired on inline node
+          if (!isMouseUpOnSupportedNode(mouseUpElement)) {
+            return;
+          }
+          const {
+            dispatch,
+            state
+          } = view;
+          const {
+            selection
+          } = state;
+
+          // terminate early if current selection is on a node
+          if (selection instanceof NodeSelection) {
+            return;
+          }
+
+          // only expand range when experiment is enabled, also fire exposure events here
+          if (editorExperiment('expand_selection_range_to_include_inline_node', true, {
+            exposure: true
+          })) {
+            // find the document position of the mouse up element
+            const elementStartPosition = view.posAtDOM(mouseUpElement, 0);
+
+            // find out the direction of selection
+            const isAnchorBeforeElement = selection.$anchor.pos <= elementStartPosition;
+            const expandedSelectionHeadPosition = isAnchorBeforeElement ? elementStartPosition + 1 : elementStartPosition;
+
+            // expand the selection to include the mouse up element
+            const tr = state.tr.setSelection(TextSelection.create(state.doc, selection.$anchor.pos, expandedSelectionHeadPosition));
+            dispatch(tr);
+          }
+        }
+      }
+    }
+  });
+};
+const isMouseUpOnSupportedNode = mouseUpElement => {
+  const supportedNodes = ['emoji', 'status', 'date', 'mention', 'inlineCard'];
+  const supportedNodeViewContentClassNamesList = supportedNodes.map(nodeType => `.${nodeType}View-content-wrap`).join(', ');
+  return !!mouseUpElement.closest(supportedNodeViewContentClassNamesList);
+};

package/dist/es2019/{commands.js → pm-plugins/commands.js}

@@ -2,10 +2,10 @@
 import { isIgnored as isIgnoredByGapCursor } from '@atlaskit/editor-common/selection';
 import { isEmptyParagraph, isNodeEmpty } from '@atlaskit/editor-common/utils';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { RelativeSelectionPos, SelectionDirection, selectionPluginKey } from '../types';
 import { SelectionActionTypes } from './actions';
 import { GapCursorSelection, Side } from './gap-cursor-selection';
 import { createCommand, getPluginState } from './plugin-factory';
-import { RelativeSelectionPos, SelectionDirection, selectionPluginKey } from './types';
 import { findFirstChildNodeToSelect, findLastChildNodeToSelect, findSelectableContainerAfter, findSelectableContainerBefore, findSelectableContainerParent, isSelectableContainerNode, isSelectionAtEndOfParentNode, isSelectionAtStartOfParentNode } from './utils';
 export const selectNearNode = (selectionRelativeToNode, selection) => ({
   tr

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

@@ -1,4 +1,5 @@
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { fg } from '@atlaskit/platform-feature-flags';
 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) === '';
@@ -48,10 +49,23 @@ function findNextSelectionPosition({
 
   //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 (fg('platform_editor_fix_drag_and_drop_lists')) {
+    // prosemirror calls 'createSelectionBetween' for native 'drop' events, it passes $anchor
+    // and $head which are based on a transformed document, but only provides the original
+    // doc. Need to remap the $head pos to last element in doc to avoid RangeErrors.
+    if ($targetHead.pos >= doc.nodeSize) {
+      maybeNode = doc.resolve(doc.nodeSize - 2).nodeBefore;
+    } else if ($targetHead.pos !== DOC_START_POS) {
+      const justBeforeHeadPos = $targetHead.pos - 1;
+      const $resolvedJustBeforeHeadPos = doc.resolve(justBeforeHeadPos);
+      maybeNode = $resolvedJustBeforeHeadPos.nodeAfter;
+    }
+  } else {
+    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;

package/dist/es2019/{gap-cursor → pm-plugins/gap-cursor}/actions.js

@@ -3,7 +3,7 @@ import { isMediaNode, isNodeBeforeMediaNode, isPositionNearTableRow } from '@atl
 import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/whitespace';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos, findPositionOfNodeBefore, removeNodeBefore } from '@atlaskit/editor-prosemirror/utils';
-import { gapCursorPluginKey } from '../pm-plugins/gap-cursor-plugin-key';
+import { gapCursorPluginKey } from '../gap-cursor-plugin-key';
 import { Direction, isBackward, isForward } from './direction';
 import { GapCursorSelection, Side } from './selection';
 import { isTextBlockNearPos } from './utils';

package/dist/es2019/{gap-cursor → pm-plugins/gap-cursor}/utils.js

@@ -1,5 +1,6 @@
 import { CAPTION_PLACEHOLDER_ID } from '@atlaskit/editor-common/media-single';
 import { TableSharedCssClassName, UnsupportedSharedCssClassName } from '@atlaskit/editor-common/styles';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { Side } from './selection';
 export const isLeftCursor = side => side === Side.LEFT;
 export function getMediaNearPos(doc, $pos, schema, dir = -1) {
@@ -120,5 +121,11 @@ export const getComputedStyleForLayoutMode = (dom, node, style) => {
       return window.getComputedStyle(tableContainer);
     }
   }
+  if (editorExperiment('advanced_layouts', true) && node && node.type.name === 'layoutSection') {
+    const layoutSectionContainer = dom.querySelector('.layout-section-container');
+    if (layoutSectionContainer) {
+      return window.getComputedStyle(layoutSectionContainer);
+    }
+  }
   return style;
 };

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

@@ -1,9 +1,9 @@
 import { backspace, bindKeymapWithCommand, deleteKey, insertNewLine, moveDown, moveLeft, moveRight, moveUp } from '@atlaskit/editor-common/keymaps';
 import { createParagraphNear } from '@atlaskit/editor-prosemirror/commands';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
-import { arrow, deleteNode } from '../gap-cursor/actions';
-import { Direction } from '../gap-cursor/direction';
-import { GapCursorSelection } from '../gap-cursor/selection';
+import { arrow, deleteNode } from './gap-cursor/actions';
+import { Direction } from './gap-cursor/direction';
+import { GapCursorSelection } from './gap-cursor/selection';
 export default function keymapPlugin() {
   const map = {};
   bindKeymapWithCommand(insertNewLine.common, (state, dispatch, view) => {

package/dist/es2019/pm-plugins/gap-cursor-main.js

@@ -4,11 +4,11 @@ import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findPositionOfNodeBefore } from '@atlaskit/editor-prosemirror/utils';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
-import { deleteNode } from '../gap-cursor/actions';
-import { Direction } from '../gap-cursor/direction';
-import { getLayoutModeFromTargetNode, isIgnoredClick } from '../gap-cursor/utils';
-import { toDOM } from '../gap-cursor/utils/place-gap-cursor';
 import { gapCursorPluginKey } from './gap-cursor-plugin-key';
+import { deleteNode } from './gap-cursor/actions';
+import { Direction } from './gap-cursor/direction';
+import { getLayoutModeFromTargetNode, isIgnoredClick } from './gap-cursor/utils';
+import { toDOM } from './gap-cursor/utils/place-gap-cursor';
 const plugin = new SafePlugin({
   key: gapCursorPluginKey,
   state: {

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

@@ -1,6 +1,6 @@
 import { bindKeymapWithCommand, moveLeft, moveRight } from '@atlaskit/editor-common/keymaps';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
-import { arrowLeft, arrowRight } from '../commands';
+import { arrowLeft, arrowRight } from './commands';
 function keymapPlugin() {
   const list = {};
   bindKeymapWithCommand(moveRight.common, arrowRight, list);

package/dist/es2019/pm-plugins/mark-boundary-cursor-main.js

@@ -1,8 +1,8 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { createMarkBoundaryCursorDecoration } from '../mark-boundary-cursor/ui/mark-boundary-cursor-decoration';
-import { getActiveMarksSide } from '../mark-boundary-cursor/utils/active-marks-side';
 import { markBoundaryCursorPluginKey } from './mark-boundary-cursor-plugin-key';
+import { createMarkBoundaryCursorDecoration } from './mark-boundary-cursor/ui/mark-boundary-cursor-decoration';
+import { getActiveMarksSide } from './mark-boundary-cursor/utils/active-marks-side';
 export const createMarkBoundaryCursorPlugin = () => {
   return new SafePlugin({
     key: markBoundaryCursorPluginKey,

package/dist/es2019/{plugin-factory.js → pm-plugins/plugin-factory.js}

@@ -2,8 +2,8 @@ import { pluginFactory } from '@atlaskit/editor-common/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
+import { selectionPluginKey } from '../types';
 import { reducer } from './reducer';
-import { selectionPluginKey } from './types';
 import { getDecorations, isSelectableContainerNode } from './utils';
 const handleDocChanged = (tr, pluginState) => {
   // in some collab edge cases mapping decorations could throw an error

package/dist/es2019/pm-plugins/selection-main.js

@@ -1,11 +1,11 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { SelectionActionTypes } from '../actions';
-import { createPluginState, getPluginState } from '../plugin-factory';
 import { selectionPluginKey } from '../types';
-import { getDecorations, shouldRecalcDecorations } from '../utils';
+import { SelectionActionTypes } from './actions';
 import { onCreateSelectionBetween } from './events/create-selection-between';
 import { createOnKeydown } from './events/keydown';
+import { createPluginState, getPluginState } from './plugin-factory';
+import { getDecorations, shouldRecalcDecorations } from './utils';
 export const getInitialState = state => ({
   decorationSet: getDecorations(state.tr),
   selection: state.selection

package/dist/es2019/{utils.js → pm-plugins/utils.js}

@@ -4,7 +4,7 @@ import { AllSelection, NodeSelection, Selection, TextSelection } from '@atlaskit
 import { findParentNode, flatten } from '@atlaskit/editor-prosemirror/utils';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
-import { selectionPluginKey } from './types';
+import { selectionPluginKey } from '../types';
 export const getDecorations = tr => {
   if (tr.selection instanceof NodeSelection) {
     return DecorationSet.create(tr.doc, [Decoration.node(tr.selection.from, tr.selection.to, {

package/dist/es2019/{plugin.js → selectionPlugin.js}

@@ -1,5 +1,6 @@
 import { fg } from '@atlaskit/platform-feature-flags';
-import { selectNearNode } from './commands';
+import { createAutoExpandSelectionRangeOnInlineNodePlugin } from './pm-plugins/auto-expand-selection-range-on-inline-node-main';
+import { selectNearNode } from './pm-plugins/commands';
 import gapCursorKeymapPlugin from './pm-plugins/gap-cursor-keymap';
 import gapCursorPlugin from './pm-plugins/gap-cursor-main';
 import { gapCursorPluginKey } from './pm-plugins/gap-cursor-plugin-key';
@@ -60,6 +61,9 @@ export const selectionPlugin = ({
     }, ...(fg('platform_editor_mark_boundary_cursor') ? [{
       name: 'markBoundaryCursor',
       plugin: () => createMarkBoundaryCursorPlugin()
+    }] : []), ...(fg('editor_auto_expand_selection_on_inline_node') ? [{
+      name: 'autoExpandSelectionRangeOnInlineNode',
+      plugin: () => createAutoExpandSelectionRangeOnInlineNodePlugin()
     }] : [])];
   }
 });

package/dist/es2019/selectionPluginType.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/index.js

@@ -1 +1 @@
-export { selectionPlugin } from './plugin';
+export { selectionPlugin } from './selectionPlugin';

package/dist/esm/pm-plugins/auto-expand-selection-range-on-inline-node-key.js

@@ -0,0 +1,2 @@
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+export var autoExpandSelectionRangeOnInlineNodePluginKey = new PluginKey('autoExpandSelectionRangeOnInlineNodePlugin');