@atlaskit/editor-plugin-block-controls 3.5.3 → 3.6.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 3.6.0
+
+### Minor Changes
+
+- [#134217](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/134217)
+  [`96617e3a637fe`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/96617e3a637fe) -
+  ED-27127 updated text selection insertion logic
+
+## 3.5.4
+
+### Patch Changes
+
+- [#131064](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/131064)
+  [`24cad3d2de85a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/24cad3d2de85a) -
+  ED-27155: Clean up platform_editor_advanced_layouts_accessibility
+- Updated dependencies
+
 ## 3.5.3
 
 ### Patch Changes

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

@@ -158,7 +158,7 @@ var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShor
       var nodeIndex = $currentNodePos.index();
       var isLayoutColumnSelected = selection instanceof _state.NodeSelection && selection.node.type.name === 'layoutColumn';
       if (direction === _consts.DIRECTION.LEFT && shouldEnableNestedDndA11y) {
-        if (isTopLevelNode && (0, _experiments.editorExperiment)('advanced_layouts', true) && (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_accessibility')) {
+        if (isTopLevelNode && (0, _experiments.editorExperiment)('advanced_layouts', true)) {
           var _api$core, _api$core2;
           var nodeBefore = $currentNodePos.nodeBefore;
           if (nodeBefore) {
@@ -183,7 +183,7 @@ var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShor
           });
           api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.focus();
           return true;
-        } else if (isLayoutColumnSelected && (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_accessibility')) {
+        } else if (isLayoutColumnSelected) {
           var _$currentNodePos$node, _api$core3, _api$blockControls2;
           moveToPos = selection.from - (((_$currentNodePos$node = $currentNodePos.nodeBefore) === null || _$currentNodePos$node === void 0 ? void 0 : _$currentNodePos$node.nodeSize) || 1);
           api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || (_api$blockControls2 = _api$blockControls2.commands) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.moveToLayout(currentNodePos, moveToPos, {
@@ -202,7 +202,7 @@ var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShor
           moveToPos = $currentNodePos.start() - ((previousNode === null || previousNode === void 0 ? void 0 : previousNode.nodeSize) || 1);
         }
       } else if (direction === _consts.DIRECTION.RIGHT && shouldEnableNestedDndA11y) {
-        if (isTopLevelNode && (0, _experiments.editorExperiment)('advanced_layouts', true) && (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_accessibility')) {
+        if (isTopLevelNode && (0, _experiments.editorExperiment)('advanced_layouts', true)) {
           var _api$core4, _api$core5;
           var endOfDoc = $currentNodePos.end();
           moveToPos = $currentNodePos.posAtIndex($currentNodePos.index() + 1);
@@ -224,7 +224,7 @@ var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShor
           });
           api === null || api === void 0 || (_api$core5 = api.core) === null || _api$core5 === void 0 || _api$core5.actions.focus();
           return true;
-        } else if (isLayoutColumnSelected && (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_accessibility')) {
+        } else if (isLayoutColumnSelected) {
           var _api$core6, _api$blockControls4;
           var _index = $currentNodePos.index($currentNodePos.depth);
           var parent = $currentNodePos.node($currentNodePos.depth);
@@ -250,7 +250,7 @@ var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShor
           moveToPos = $currentNodePos.after($currentNodePos.depth) + 1;
         }
       } else if (direction === _consts.DIRECTION.UP) {
-        if (isLayoutColumnSelected && (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_accessibility')) {
+        if (isLayoutColumnSelected) {
           moveToPos = $currentNodePos.start() - 1;
         } else {
           var _nodeBefore = $currentNodePos.depth > 1 && nodeIndex === 0 && shouldEnableNestedDndA11y ? $currentNodePos.node($currentNodePos.depth) : $currentNodePos.nodeBefore;
@@ -263,7 +263,7 @@ var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShor
         if (nodeAfterPos > _endOfDoc) {
           return false;
         }
-        if (isLayoutColumnSelected && (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_accessibility')) {
+        if (isLayoutColumnSelected) {
           moveToPos = state.selection.$from.end() + 1;
         } else {
           var nodeAfter = state.doc.nodeAt(nodeAfterPos);
@@ -278,10 +278,10 @@ var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShor
       if (moveToPos > -1 && (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_multi_select_patch_2')) {
         var isDestDepthSameAsSource = $currentNodePos.depth === state.doc.resolve(moveToPos).depth;
         var isSourceLayoutColumn = nodeType === 'layoutColumn';
-        shouldMoveNode = (shouldEnableNestedDndA11y ? isDestDepthSameAsSource || isSourceLayoutColumn : true) || isSourceLayoutColumn && (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_accessibility');
+        shouldMoveNode = (shouldEnableNestedDndA11y ? isDestDepthSameAsSource || isSourceLayoutColumn : true) || isSourceLayoutColumn;
       } else {
         // only move the node if the destination is at the same depth, not support moving a nested node to a parent node
-        shouldMoveNode = (shouldEnableNestedDndA11y ? moveToPos > -1 && $currentNodePos.depth === state.doc.resolve(moveToPos).depth || nodeType === 'layoutColumn' : moveToPos > -1) || nodeType === 'layoutColumn' && (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_accessibility');
+        shouldMoveNode = (shouldEnableNestedDndA11y ? moveToPos > -1 && $currentNodePos.depth === state.doc.resolve(moveToPos).depth || nodeType === 'layoutColumn' : moveToPos > -1) || nodeType === 'layoutColumn';
       }
       var _expandSelectionBound = (0, _selection.expandSelectionBounds)($currentNodePos, selection.$to),
         $newAnchor = _expandSelectionBound.$anchor,

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

@@ -208,12 +208,15 @@ var newApply = exports.newApply = function newApply(api, formatMessage, tr, curr
     numReplaceSteps = _getTrMetadata.numReplaceSteps,
     isAllText = _getTrMetadata.isAllText,
     isReplacedWithSameSize = _getTrMetadata.isReplacedWithSameSize;
+  var meta = tr.getMeta(key);
 
   // When steps exist, remap existing decorations, activeNode and multi select positions
   if (tr.docChanged) {
     decorations = decorations.map(tr.mapping, tr.doc);
-    if (activeNode) {
-      if ((0, _experiments.editorExperiment)('platform_editor_controls', 'control')) {
+
+    // don't remap activeNode if it's being dragged
+    if ((0, _experiments.editorExperiment)('platform_editor_controls', 'control')) {
+      if (activeNode) {
         var mappedPos = tr.mapping.mapResult(activeNode.pos);
         isActiveNodeDeleted = mappedPos.deleted;
         activeNode = {
@@ -221,7 +224,9 @@ var newApply = exports.newApply = function newApply(api, formatMessage, tr, curr
           anchorName: activeNode.anchorName,
           nodeType: activeNode.nodeType
         };
-      } else {
+      }
+    } else {
+      if (activeNode && (meta === null || meta === void 0 ? void 0 : meta.isDragging) !== true) {
         var _mappedRootPos$pos, _mappedRootPos;
         var _mappedPos = tr.mapping.mapResult(activeNode.pos, -1);
         isActiveNodeDeleted = _mappedPos.deletedAfter;
@@ -245,7 +250,6 @@ var newApply = exports.newApply = function newApply(api, formatMessage, tr, curr
       multiSelectDnD.head = tr.mapping.map(multiSelectDnD.head);
     }
   }
-  var meta = tr.getMeta(key);
   var resizerMeta = tr.getMeta('is-resizer-resizing');
   isResizerResizing = resizerMeta !== null && resizerMeta !== void 0 ? resizerMeta : isResizerResizing;
   multiSelectDnD = (_meta$multiSelectDnD = meta === null || meta === void 0 ? void 0 : meta.multiSelectDnD) !== null && _meta$multiSelectDnD !== void 0 ? _meta$multiSelectDnD : multiSelectDnD;
@@ -295,7 +299,6 @@ var newApply = exports.newApply = function newApply(api, formatMessage, tr, curr
         }
       }
     } else {
-      // active node may have been deleted or replaced with another of the same size, if replaced go ahead and remap the active node
       if (latestActiveNode && (!isActiveNodeDeleted || isReplacedWithSameSize)) {
         var _nodeDecAtActivePos = getDecorationAtPos(decorations, latestActiveNode.pos, to);
         var rootNodeDecAtActivePos = getDecorationAtPos(decorations, latestActiveNode.rootPos, to);

package/dist/cjs/ui/drag-handle.js

@@ -561,7 +561,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
       setDragHandleDisabled(false);
     }
   }, [api === null || api === void 0 ? void 0 : api.blockControls.sharedState, isMultiSelect, isShiftDown, isTopLevelNode, view.state.doc, view.state.selection]);
-  var helpDescriptors = isTopLevelNode && (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_accessibility') ? [{
+  var helpDescriptors = isTopLevelNode ? [{
     description: formatMessage(_messages.blockControlsMessages.dragToMove)
   }, {
     description: formatMessage(_messages.blockControlsMessages.moveUp),
@@ -585,7 +585,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
     keymap: _keymaps.dragToMoveDown
   }];
   var isParentNodeOfTypeLayout;
-  if (!isTopLevelNode && ((0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_accessibility') || handleOptions !== null && handleOptions !== void 0 && handleOptions.isFocused) && (0, _experiments.editorExperiment)('nested-dnd', true)) {
+  if (!isTopLevelNode && (0, _experiments.editorExperiment)('nested-dnd', true)) {
     var pos = getPos();
     if (typeof pos === 'number') {
       var _$pos$parent;
@@ -605,7 +605,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
 
   // When advanced layout is on, layout column drag handle show only show 'Drag to move', no shortcuts
   if ((0, _experiments.editorExperiment)('advanced_layouts', true) && nodeType === 'layoutColumn') {
-    helpDescriptors = (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_accessibility') ? [{
+    helpDescriptors = [{
       description: formatMessage(_messages.blockControlsMessages.dragToRearrange)
     }, {
       description: formatMessage(_messages.blockControlsMessages.moveUp),
@@ -619,8 +619,6 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
     }, {
       description: formatMessage(_messages.blockControlsMessages.moveRight),
       keymap: _keymaps.dragToMoveRight
-    }] : [{
-      description: formatMessage(_messages.blockControlsMessages.dragToMove)
     }];
   }
   if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {

package/dist/cjs/ui/quick-insert-button.js

@@ -13,7 +13,9 @@ var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _messages = require("@atlaskit/editor-common/messages");
 var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _add = _interopRequireDefault(require("@atlaskit/icon/utility/add"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _primitives = require("@atlaskit/primitives");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 var _dragHandlePositions = require("../pm-plugins/utils/drag-handle-positions");
@@ -23,6 +25,7 @@ var _documentChecks = require("./utils/document-checks");
 var _editorCommands = require("./utils/editor-commands");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+var TEXT_PARENT_TYPES = ['paragraph', 'heading', 'blockquote', 'taskItem', 'decisionItem'];
 var buttonStyles = (0, _primitives.xcss)({
   boxSizing: 'border-box',
   display: 'flex',
@@ -140,22 +143,42 @@ var TypeAheadControl = exports.TypeAheadControl = function TypeAheadControl(_ref
       if (!(0, _documentChecks.isSelectionInNode)(start, view) || (0, _documentChecks.isNonEditableBlock)(start, view)) {
         api.core.actions.execute((0, _editorCommands.createNewLine)(start));
       }
-      if ((0, _documentChecks.isSelectionInNode)(start, view) && (0, _documentChecks.isNestedNodeSelected)(view)) {
-        // if the nested selected node is non-editable, then insert a newline below the selected node
-        if ((0, _documentChecks.isNonEditableBlock)(view.state.selection.from, view)) {
-          api.core.actions.execute((0, _editorCommands.createNewLine)(view.state.selection.from));
-        } else {
-          // otherwise need to force the selection to be at the start of the node, because
-          // prosemirror is keeping it as NodeSelection for nested nodes. Do this to keep it
-          // consistent NodeSelection for root level nodes.
-          api.core.actions.execute(function (_ref2) {
-            var tr = _ref2.tr;
-            (0, _editorCommands.createNewLine)(view.state.selection.from)({
-              tr: tr
+      if ((0, _documentChecks.isSelectionInNode)(start, view)) {
+        // text or element with be deselected and the / added immediately after the paragraph
+        // unless the selection is empty
+        var currentSelection = view.state.selection;
+        if ((0, _documentChecks.isInTextSelection)(view) && currentSelection.from !== currentSelection.to && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_1')) {
+          var currentParagraphNode = (0, _utils.findParentNode)(function (node) {
+            return TEXT_PARENT_TYPES.includes(node.type.name);
+          })(currentSelection);
+          if (currentParagraphNode) {
+            var newPos =
+            //if the current selection is selected from right to left, then set the selection to the start of the paragraph
+            currentSelection.anchor === currentSelection.to ? currentParagraphNode.pos : currentParagraphNode.pos + currentParagraphNode.node.nodeSize - 1;
+            api.core.actions.execute(function (_ref2) {
+              var tr = _ref2.tr;
+              tr.setSelection(_state.TextSelection.create(view.state.selection.$from.doc, newPos));
+              return tr;
             });
-            tr.setSelection(_state.TextSelection.create(tr.doc, view.state.selection.from));
-            return tr;
-          });
+          }
+        }
+        if ((0, _documentChecks.isNestedNodeSelected)(view)) {
+          // if the nested selected node is non-editable, then insert a newline below the selected node
+          if ((0, _documentChecks.isNonEditableBlock)(view.state.selection.from, view)) {
+            api.core.actions.execute((0, _editorCommands.createNewLine)(view.state.selection.from));
+          } else {
+            // otherwise need to force the selection to be at the start of the node, because
+            // prosemirror is keeping it as NodeSelection for nested nodes. Do this to keep it
+            // consistent NodeSelection for root level nodes.
+            api.core.actions.execute(function (_ref3) {
+              var tr = _ref3.tr;
+              (0, _editorCommands.createNewLine)(view.state.selection.from)({
+                tr: tr
+              });
+              tr.setSelection(_state.TextSelection.create(tr.doc, view.state.selection.from));
+              return tr;
+            });
+          }
         }
       }
     }

package/dist/cjs/ui/utils/document-checks.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isSelectionInNode = exports.isNonEditableBlock = exports.isNestedNodeSelected = void 0;
+exports.isSelectionInNode = exports.isNonEditableBlock = exports.isNestedNodeSelected = exports.isInTextSelection = void 0;
 var _state = require("@atlaskit/editor-prosemirror/state");
 var isNestedNodeSelected = exports.isNestedNodeSelected = function isNestedNodeSelected(view) {
   var selection = view.state.selection;
@@ -21,6 +21,17 @@ var isSelectionInNode = exports.isSelectionInNode = function isSelectionInNode(s
     $to = _view$state$selection.$to;
   return $from.pos >= startPos && endPos >= $to.pos;
 };
+
+// checks if the selection is in a text node
+var isInTextSelection = exports.isInTextSelection = function isInTextSelection(view) {
+  var selection = view.state.selection;
+  if (selection instanceof _state.TextSelection) {
+    return true;
+  } else if (selection instanceof _state.NodeSelection) {
+    // check if this is a node that can appear among text
+    return selection.node.isInline;
+  }
+};
 var isNonEditableBlock = exports.isNonEditableBlock = function isNonEditableBlock(start, view) {
   var node = view.state.doc.nodeAt(start);
   if (node === null) {

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

@@ -157,7 +157,7 @@ export const moveNodeViaShortcut = (api, direction, formatMessage) => {
       const nodeIndex = $currentNodePos.index();
       const isLayoutColumnSelected = selection instanceof NodeSelection && selection.node.type.name === 'layoutColumn';
       if (direction === DIRECTION.LEFT && shouldEnableNestedDndA11y) {
-        if (isTopLevelNode && editorExperiment('advanced_layouts', true) && fg('platform_editor_advanced_layouts_accessibility')) {
+        if (isTopLevelNode && editorExperiment('advanced_layouts', true)) {
           var _api$core, _api$core2;
           const nodeBefore = $currentNodePos.nodeBefore;
           if (nodeBefore) {
@@ -183,7 +183,7 @@ export const moveNodeViaShortcut = (api, direction, formatMessage) => {
           });
           api === null || api === void 0 ? void 0 : (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.focus();
           return true;
-        } else if (isLayoutColumnSelected && fg('platform_editor_advanced_layouts_accessibility')) {
+        } else if (isLayoutColumnSelected) {
           var _$currentNodePos$node, _api$core3, _api$blockControls2, _api$blockControls2$c;
           moveToPos = selection.from - (((_$currentNodePos$node = $currentNodePos.nodeBefore) === null || _$currentNodePos$node === void 0 ? void 0 : _$currentNodePos$node.nodeSize) || 1);
           api === null || api === void 0 ? void 0 : (_api$core3 = api.core) === null || _api$core3 === void 0 ? void 0 : _api$core3.actions.execute(api === null || api === void 0 ? void 0 : (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : (_api$blockControls2$c = _api$blockControls2.commands) === null || _api$blockControls2$c === void 0 ? void 0 : _api$blockControls2$c.moveToLayout(currentNodePos, moveToPos, {
@@ -202,7 +202,7 @@ export const moveNodeViaShortcut = (api, direction, formatMessage) => {
           moveToPos = $currentNodePos.start() - ((previousNode === null || previousNode === void 0 ? void 0 : previousNode.nodeSize) || 1);
         }
       } else if (direction === DIRECTION.RIGHT && shouldEnableNestedDndA11y) {
-        if (isTopLevelNode && editorExperiment('advanced_layouts', true) && fg('platform_editor_advanced_layouts_accessibility')) {
+        if (isTopLevelNode && editorExperiment('advanced_layouts', true)) {
           var _api$core4, _api$core5;
           const endOfDoc = $currentNodePos.end();
           moveToPos = $currentNodePos.posAtIndex($currentNodePos.index() + 1);
@@ -225,7 +225,7 @@ export const moveNodeViaShortcut = (api, direction, formatMessage) => {
           });
           api === null || api === void 0 ? void 0 : (_api$core5 = api.core) === null || _api$core5 === void 0 ? void 0 : _api$core5.actions.focus();
           return true;
-        } else if (isLayoutColumnSelected && fg('platform_editor_advanced_layouts_accessibility')) {
+        } else if (isLayoutColumnSelected) {
           var _api$core6, _api$blockControls4, _api$blockControls4$c;
           const index = $currentNodePos.index($currentNodePos.depth);
           const parent = $currentNodePos.node($currentNodePos.depth);
@@ -251,7 +251,7 @@ export const moveNodeViaShortcut = (api, direction, formatMessage) => {
           moveToPos = $currentNodePos.after($currentNodePos.depth) + 1;
         }
       } else if (direction === DIRECTION.UP) {
-        if (isLayoutColumnSelected && fg('platform_editor_advanced_layouts_accessibility')) {
+        if (isLayoutColumnSelected) {
           moveToPos = $currentNodePos.start() - 1;
         } else {
           const nodeBefore = $currentNodePos.depth > 1 && nodeIndex === 0 && shouldEnableNestedDndA11y ? $currentNodePos.node($currentNodePos.depth) : $currentNodePos.nodeBefore;
@@ -264,7 +264,7 @@ export const moveNodeViaShortcut = (api, direction, formatMessage) => {
         if (nodeAfterPos > endOfDoc) {
           return false;
         }
-        if (isLayoutColumnSelected && fg('platform_editor_advanced_layouts_accessibility')) {
+        if (isLayoutColumnSelected) {
           moveToPos = state.selection.$from.end() + 1;
         } else {
           const nodeAfter = state.doc.nodeAt(nodeAfterPos);
@@ -279,10 +279,10 @@ export const moveNodeViaShortcut = (api, direction, formatMessage) => {
       if (moveToPos > -1 && fg('platform_editor_elements_dnd_multi_select_patch_2')) {
         const isDestDepthSameAsSource = $currentNodePos.depth === state.doc.resolve(moveToPos).depth;
         const isSourceLayoutColumn = nodeType === 'layoutColumn';
-        shouldMoveNode = (shouldEnableNestedDndA11y ? isDestDepthSameAsSource || isSourceLayoutColumn : true) || isSourceLayoutColumn && fg('platform_editor_advanced_layouts_accessibility');
+        shouldMoveNode = (shouldEnableNestedDndA11y ? isDestDepthSameAsSource || isSourceLayoutColumn : true) || isSourceLayoutColumn;
       } else {
         // only move the node if the destination is at the same depth, not support moving a nested node to a parent node
-        shouldMoveNode = (shouldEnableNestedDndA11y ? moveToPos > -1 && $currentNodePos.depth === state.doc.resolve(moveToPos).depth || nodeType === 'layoutColumn' : moveToPos > -1) || nodeType === 'layoutColumn' && fg('platform_editor_advanced_layouts_accessibility');
+        shouldMoveNode = (shouldEnableNestedDndA11y ? moveToPos > -1 && $currentNodePos.depth === state.doc.resolve(moveToPos).depth || nodeType === 'layoutColumn' : moveToPos > -1) || nodeType === 'layoutColumn';
       }
       const {
         $anchor: $newAnchor,

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

@@ -207,12 +207,15 @@ export const newApply = (api, formatMessage, tr, currentState, newState, flags,
     isAllText,
     isReplacedWithSameSize
   } = getTrMetadata(tr);
+  const meta = tr.getMeta(key);
 
   // When steps exist, remap existing decorations, activeNode and multi select positions
   if (tr.docChanged) {
     decorations = decorations.map(tr.mapping, tr.doc);
-    if (activeNode) {
-      if (editorExperiment('platform_editor_controls', 'control')) {
+
+    // don't remap activeNode if it's being dragged
+    if (editorExperiment('platform_editor_controls', 'control')) {
+      if (activeNode) {
         const mappedPos = tr.mapping.mapResult(activeNode.pos);
         isActiveNodeDeleted = mappedPos.deleted;
         activeNode = {
@@ -220,7 +223,9 @@ export const newApply = (api, formatMessage, tr, currentState, newState, flags,
           anchorName: activeNode.anchorName,
           nodeType: activeNode.nodeType
         };
-      } else {
+      }
+    } else {
+      if (activeNode && (meta === null || meta === void 0 ? void 0 : meta.isDragging) !== true) {
         var _mappedRootPos$pos, _mappedRootPos;
         const mappedPos = tr.mapping.mapResult(activeNode.pos, -1);
         isActiveNodeDeleted = mappedPos.deletedAfter;
@@ -244,7 +249,6 @@ export const newApply = (api, formatMessage, tr, currentState, newState, flags,
       multiSelectDnD.head = tr.mapping.map(multiSelectDnD.head);
     }
   }
-  const meta = tr.getMeta(key);
   const resizerMeta = tr.getMeta('is-resizer-resizing');
   isResizerResizing = resizerMeta !== null && resizerMeta !== void 0 ? resizerMeta : isResizerResizing;
   multiSelectDnD = (_meta$multiSelectDnD = meta === null || meta === void 0 ? void 0 : meta.multiSelectDnD) !== null && _meta$multiSelectDnD !== void 0 ? _meta$multiSelectDnD : multiSelectDnD;
@@ -292,7 +296,6 @@ export const newApply = (api, formatMessage, tr, currentState, newState, flags,
         }
       }
     } else {
-      // active node may have been deleted or replaced with another of the same size, if replaced go ahead and remap the active node
       if (latestActiveNode && (!isActiveNodeDeleted || isReplacedWithSameSize)) {
         const nodeDecAtActivePos = getDecorationAtPos(decorations, latestActiveNode.pos, to);
         const rootNodeDecAtActivePos = getDecorationAtPos(decorations, latestActiveNode.rootPos, to);

package/dist/es2019/ui/drag-handle.js

@@ -547,7 +547,7 @@ export const DragHandle = ({
       setDragHandleDisabled(false);
     }
   }, [api === null || api === void 0 ? void 0 : api.blockControls.sharedState, isMultiSelect, isShiftDown, isTopLevelNode, view.state.doc, view.state.selection]);
-  let helpDescriptors = isTopLevelNode && fg('platform_editor_advanced_layouts_accessibility') ? [{
+  let helpDescriptors = isTopLevelNode ? [{
     description: formatMessage(blockControlsMessages.dragToMove)
   }, {
     description: formatMessage(blockControlsMessages.moveUp),
@@ -571,7 +571,7 @@ export const DragHandle = ({
     keymap: dragToMoveDown
   }];
   let isParentNodeOfTypeLayout;
-  if (!isTopLevelNode && (fg('platform_editor_advanced_layouts_accessibility') || handleOptions !== null && handleOptions !== void 0 && handleOptions.isFocused) && editorExperiment('nested-dnd', true)) {
+  if (!isTopLevelNode && editorExperiment('nested-dnd', true)) {
     const pos = getPos();
     if (typeof pos === 'number') {
       var _$pos$parent;
@@ -591,7 +591,7 @@ export const DragHandle = ({
 
   // When advanced layout is on, layout column drag handle show only show 'Drag to move', no shortcuts
   if (editorExperiment('advanced_layouts', true) && nodeType === 'layoutColumn') {
-    helpDescriptors = fg('platform_editor_advanced_layouts_accessibility') ? [{
+    helpDescriptors = [{
       description: formatMessage(blockControlsMessages.dragToRearrange)
     }, {
       description: formatMessage(blockControlsMessages.moveUp),
@@ -605,8 +605,6 @@ export const DragHandle = ({
     }, {
       description: formatMessage(blockControlsMessages.moveRight),
       keymap: dragToMoveRight
-    }] : [{
-      description: formatMessage(blockControlsMessages.dragToMove)
     }];
   }
   if (editorExperiment('platform_editor_controls', 'variant1')) {

package/dist/es2019/ui/quick-insert-button.js

@@ -4,14 +4,17 @@ import { ToolTipContent } from '@atlaskit/editor-common/keymaps';
 import { blockControlsMessages as messages } from '@atlaskit/editor-common/messages';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { findParentNode } from '@atlaskit/editor-prosemirror/utils';
 import AddIcon from '@atlaskit/icon/utility/add';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { Box, Pressable, xcss } from '@atlaskit/primitives';
 import Tooltip from '@atlaskit/tooltip';
 import { getTopPosition } from '../pm-plugins/utils/drag-handle-positions';
 import { getLeftPositionForRootElement } from '../pm-plugins/utils/widget-positions';
 import { rootElementGap, topPositionAdjustment, QUICK_INSERT_DIMENSIONS, QUICK_INSERT_LEFT_OFFSET } from './consts';
-import { isNestedNodeSelected, isNonEditableBlock, isSelectionInNode } from './utils/document-checks';
+import { isInTextSelection, isNestedNodeSelected, isNonEditableBlock, isSelectionInNode } from './utils/document-checks';
 import { createNewLine } from './utils/editor-commands';
+const TEXT_PARENT_TYPES = ['paragraph', 'heading', 'blockquote', 'taskItem', 'decisionItem'];
 const buttonStyles = xcss({
   boxSizing: 'border-box',
   display: 'flex',
@@ -127,23 +130,42 @@ export const TypeAheadControl = ({
       if (!isSelectionInNode(start, view) || isNonEditableBlock(start, view)) {
         api.core.actions.execute(createNewLine(start));
       }
-      if (isSelectionInNode(start, view) && isNestedNodeSelected(view)) {
-        // if the nested selected node is non-editable, then insert a newline below the selected node
-        if (isNonEditableBlock(view.state.selection.from, view)) {
-          api.core.actions.execute(createNewLine(view.state.selection.from));
-        } else {
-          // otherwise need to force the selection to be at the start of the node, because
-          // prosemirror is keeping it as NodeSelection for nested nodes. Do this to keep it
-          // consistent NodeSelection for root level nodes.
-          api.core.actions.execute(({
-            tr
-          }) => {
-            createNewLine(view.state.selection.from)({
+      if (isSelectionInNode(start, view)) {
+        // text or element with be deselected and the / added immediately after the paragraph
+        // unless the selection is empty
+        const currentSelection = view.state.selection;
+        if (isInTextSelection(view) && currentSelection.from !== currentSelection.to && fg('platform_editor_controls_patch_1')) {
+          const currentParagraphNode = findParentNode(node => TEXT_PARENT_TYPES.includes(node.type.name))(currentSelection);
+          if (currentParagraphNode) {
+            const newPos =
+            //if the current selection is selected from right to left, then set the selection to the start of the paragraph
+            currentSelection.anchor === currentSelection.to ? currentParagraphNode.pos : currentParagraphNode.pos + currentParagraphNode.node.nodeSize - 1;
+            api.core.actions.execute(({
               tr
+            }) => {
+              tr.setSelection(TextSelection.create(view.state.selection.$from.doc, newPos));
+              return tr;
             });
-            tr.setSelection(TextSelection.create(tr.doc, view.state.selection.from));
-            return tr;
-          });
+          }
+        }
+        if (isNestedNodeSelected(view)) {
+          // if the nested selected node is non-editable, then insert a newline below the selected node
+          if (isNonEditableBlock(view.state.selection.from, view)) {
+            api.core.actions.execute(createNewLine(view.state.selection.from));
+          } else {
+            // otherwise need to force the selection to be at the start of the node, because
+            // prosemirror is keeping it as NodeSelection for nested nodes. Do this to keep it
+            // consistent NodeSelection for root level nodes.
+            api.core.actions.execute(({
+              tr
+            }) => {
+              createNewLine(view.state.selection.from)({
+                tr
+              });
+              tr.setSelection(TextSelection.create(tr.doc, view.state.selection.from));
+              return tr;
+            });
+          }
         }
       }
     }

package/dist/es2019/ui/utils/document-checks.js

@@ -1,4 +1,4 @@
-import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
+import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 export const isNestedNodeSelected = view => {
   const selection = view.state.selection;
   return selection instanceof NodeSelection && selection.$from.depth > 1;
@@ -16,6 +16,17 @@ export const isSelectionInNode = (start, view) => {
   } = view.state.selection;
   return $from.pos >= startPos && endPos >= $to.pos;
 };
+
+// checks if the selection is in a text node
+export const isInTextSelection = view => {
+  const selection = view.state.selection;
+  if (selection instanceof TextSelection) {
+    return true;
+  } else if (selection instanceof NodeSelection) {
+    // check if this is a node that can appear among text
+    return selection.node.isInline;
+  }
+};
 export const isNonEditableBlock = (start, view) => {
   const node = view.state.doc.nodeAt(start);
   if (node === null) {

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

@@ -152,7 +152,7 @@ export var moveNodeViaShortcut = function moveNodeViaShortcut(api, direction, fo
       var nodeIndex = $currentNodePos.index();
       var isLayoutColumnSelected = selection instanceof NodeSelection && selection.node.type.name === 'layoutColumn';
       if (direction === DIRECTION.LEFT && shouldEnableNestedDndA11y) {
-        if (isTopLevelNode && editorExperiment('advanced_layouts', true) && fg('platform_editor_advanced_layouts_accessibility')) {
+        if (isTopLevelNode && editorExperiment('advanced_layouts', true)) {
           var _api$core, _api$core2;
           var nodeBefore = $currentNodePos.nodeBefore;
           if (nodeBefore) {
@@ -177,7 +177,7 @@ export var moveNodeViaShortcut = function moveNodeViaShortcut(api, direction, fo
           });
           api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.focus();
           return true;
-        } else if (isLayoutColumnSelected && fg('platform_editor_advanced_layouts_accessibility')) {
+        } else if (isLayoutColumnSelected) {
           var _$currentNodePos$node, _api$core3, _api$blockControls2;
           moveToPos = selection.from - (((_$currentNodePos$node = $currentNodePos.nodeBefore) === null || _$currentNodePos$node === void 0 ? void 0 : _$currentNodePos$node.nodeSize) || 1);
           api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || (_api$blockControls2 = _api$blockControls2.commands) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.moveToLayout(currentNodePos, moveToPos, {
@@ -196,7 +196,7 @@ export var moveNodeViaShortcut = function moveNodeViaShortcut(api, direction, fo
           moveToPos = $currentNodePos.start() - ((previousNode === null || previousNode === void 0 ? void 0 : previousNode.nodeSize) || 1);
         }
       } else if (direction === DIRECTION.RIGHT && shouldEnableNestedDndA11y) {
-        if (isTopLevelNode && editorExperiment('advanced_layouts', true) && fg('platform_editor_advanced_layouts_accessibility')) {
+        if (isTopLevelNode && editorExperiment('advanced_layouts', true)) {
           var _api$core4, _api$core5;
           var endOfDoc = $currentNodePos.end();
           moveToPos = $currentNodePos.posAtIndex($currentNodePos.index() + 1);
@@ -218,7 +218,7 @@ export var moveNodeViaShortcut = function moveNodeViaShortcut(api, direction, fo
           });
           api === null || api === void 0 || (_api$core5 = api.core) === null || _api$core5 === void 0 || _api$core5.actions.focus();
           return true;
-        } else if (isLayoutColumnSelected && fg('platform_editor_advanced_layouts_accessibility')) {
+        } else if (isLayoutColumnSelected) {
           var _api$core6, _api$blockControls4;
           var _index = $currentNodePos.index($currentNodePos.depth);
           var parent = $currentNodePos.node($currentNodePos.depth);
@@ -244,7 +244,7 @@ export var moveNodeViaShortcut = function moveNodeViaShortcut(api, direction, fo
           moveToPos = $currentNodePos.after($currentNodePos.depth) + 1;
         }
       } else if (direction === DIRECTION.UP) {
-        if (isLayoutColumnSelected && fg('platform_editor_advanced_layouts_accessibility')) {
+        if (isLayoutColumnSelected) {
           moveToPos = $currentNodePos.start() - 1;
         } else {
           var _nodeBefore = $currentNodePos.depth > 1 && nodeIndex === 0 && shouldEnableNestedDndA11y ? $currentNodePos.node($currentNodePos.depth) : $currentNodePos.nodeBefore;
@@ -257,7 +257,7 @@ export var moveNodeViaShortcut = function moveNodeViaShortcut(api, direction, fo
         if (nodeAfterPos > _endOfDoc) {
           return false;
         }
-        if (isLayoutColumnSelected && fg('platform_editor_advanced_layouts_accessibility')) {
+        if (isLayoutColumnSelected) {
           moveToPos = state.selection.$from.end() + 1;
         } else {
           var nodeAfter = state.doc.nodeAt(nodeAfterPos);
@@ -272,10 +272,10 @@ export var moveNodeViaShortcut = function moveNodeViaShortcut(api, direction, fo
       if (moveToPos > -1 && fg('platform_editor_elements_dnd_multi_select_patch_2')) {
         var isDestDepthSameAsSource = $currentNodePos.depth === state.doc.resolve(moveToPos).depth;
         var isSourceLayoutColumn = nodeType === 'layoutColumn';
-        shouldMoveNode = (shouldEnableNestedDndA11y ? isDestDepthSameAsSource || isSourceLayoutColumn : true) || isSourceLayoutColumn && fg('platform_editor_advanced_layouts_accessibility');
+        shouldMoveNode = (shouldEnableNestedDndA11y ? isDestDepthSameAsSource || isSourceLayoutColumn : true) || isSourceLayoutColumn;
       } else {
         // only move the node if the destination is at the same depth, not support moving a nested node to a parent node
-        shouldMoveNode = (shouldEnableNestedDndA11y ? moveToPos > -1 && $currentNodePos.depth === state.doc.resolve(moveToPos).depth || nodeType === 'layoutColumn' : moveToPos > -1) || nodeType === 'layoutColumn' && fg('platform_editor_advanced_layouts_accessibility');
+        shouldMoveNode = (shouldEnableNestedDndA11y ? moveToPos > -1 && $currentNodePos.depth === state.doc.resolve(moveToPos).depth || nodeType === 'layoutColumn' : moveToPos > -1) || nodeType === 'layoutColumn';
       }
       var _expandSelectionBound = expandSelectionBounds($currentNodePos, selection.$to),
         $newAnchor = _expandSelectionBound.$anchor,

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

@@ -201,12 +201,15 @@ export var newApply = function newApply(api, formatMessage, tr, currentState, ne
     numReplaceSteps = _getTrMetadata.numReplaceSteps,
     isAllText = _getTrMetadata.isAllText,
     isReplacedWithSameSize = _getTrMetadata.isReplacedWithSameSize;
+  var meta = tr.getMeta(key);
 
   // When steps exist, remap existing decorations, activeNode and multi select positions
   if (tr.docChanged) {
     decorations = decorations.map(tr.mapping, tr.doc);
-    if (activeNode) {
-      if (editorExperiment('platform_editor_controls', 'control')) {
+
+    // don't remap activeNode if it's being dragged
+    if (editorExperiment('platform_editor_controls', 'control')) {
+      if (activeNode) {
         var mappedPos = tr.mapping.mapResult(activeNode.pos);
         isActiveNodeDeleted = mappedPos.deleted;
         activeNode = {
@@ -214,7 +217,9 @@ export var newApply = function newApply(api, formatMessage, tr, currentState, ne
           anchorName: activeNode.anchorName,
           nodeType: activeNode.nodeType
         };
-      } else {
+      }
+    } else {
+      if (activeNode && (meta === null || meta === void 0 ? void 0 : meta.isDragging) !== true) {
         var _mappedRootPos$pos, _mappedRootPos;
         var _mappedPos = tr.mapping.mapResult(activeNode.pos, -1);
         isActiveNodeDeleted = _mappedPos.deletedAfter;
@@ -238,7 +243,6 @@ export var newApply = function newApply(api, formatMessage, tr, currentState, ne
       multiSelectDnD.head = tr.mapping.map(multiSelectDnD.head);
     }
   }
-  var meta = tr.getMeta(key);
   var resizerMeta = tr.getMeta('is-resizer-resizing');
   isResizerResizing = resizerMeta !== null && resizerMeta !== void 0 ? resizerMeta : isResizerResizing;
   multiSelectDnD = (_meta$multiSelectDnD = meta === null || meta === void 0 ? void 0 : meta.multiSelectDnD) !== null && _meta$multiSelectDnD !== void 0 ? _meta$multiSelectDnD : multiSelectDnD;
@@ -288,7 +292,6 @@ export var newApply = function newApply(api, formatMessage, tr, currentState, ne
         }
       }
     } else {
-      // active node may have been deleted or replaced with another of the same size, if replaced go ahead and remap the active node
       if (latestActiveNode && (!isActiveNodeDeleted || isReplacedWithSameSize)) {
         var _nodeDecAtActivePos = getDecorationAtPos(decorations, latestActiveNode.pos, to);
         var rootNodeDecAtActivePos = getDecorationAtPos(decorations, latestActiveNode.rootPos, to);

package/dist/esm/ui/drag-handle.js

@@ -558,7 +558,7 @@ export var DragHandle = function DragHandle(_ref) {
       setDragHandleDisabled(false);
     }
   }, [api === null || api === void 0 ? void 0 : api.blockControls.sharedState, isMultiSelect, isShiftDown, isTopLevelNode, view.state.doc, view.state.selection]);
-  var helpDescriptors = isTopLevelNode && fg('platform_editor_advanced_layouts_accessibility') ? [{
+  var helpDescriptors = isTopLevelNode ? [{
     description: formatMessage(blockControlsMessages.dragToMove)
   }, {
     description: formatMessage(blockControlsMessages.moveUp),
@@ -582,7 +582,7 @@ export var DragHandle = function DragHandle(_ref) {
     keymap: dragToMoveDown
   }];
   var isParentNodeOfTypeLayout;
-  if (!isTopLevelNode && (fg('platform_editor_advanced_layouts_accessibility') || handleOptions !== null && handleOptions !== void 0 && handleOptions.isFocused) && editorExperiment('nested-dnd', true)) {
+  if (!isTopLevelNode && editorExperiment('nested-dnd', true)) {
     var pos = getPos();
     if (typeof pos === 'number') {
       var _$pos$parent;
@@ -602,7 +602,7 @@ export var DragHandle = function DragHandle(_ref) {
 
   // When advanced layout is on, layout column drag handle show only show 'Drag to move', no shortcuts
   if (editorExperiment('advanced_layouts', true) && nodeType === 'layoutColumn') {
-    helpDescriptors = fg('platform_editor_advanced_layouts_accessibility') ? [{
+    helpDescriptors = [{
       description: formatMessage(blockControlsMessages.dragToRearrange)
     }, {
       description: formatMessage(blockControlsMessages.moveUp),
@@ -616,8 +616,6 @@ export var DragHandle = function DragHandle(_ref) {
     }, {
       description: formatMessage(blockControlsMessages.moveRight),
       keymap: dragToMoveRight
-    }] : [{
-      description: formatMessage(blockControlsMessages.dragToMove)
     }];
   }
   if (editorExperiment('platform_editor_controls', 'variant1')) {

package/dist/esm/ui/quick-insert-button.js

@@ -5,14 +5,17 @@ import { ToolTipContent } from '@atlaskit/editor-common/keymaps';
 import { blockControlsMessages as messages } from '@atlaskit/editor-common/messages';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { findParentNode } from '@atlaskit/editor-prosemirror/utils';
 import AddIcon from '@atlaskit/icon/utility/add';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { Box, Pressable, xcss } from '@atlaskit/primitives';
 import Tooltip from '@atlaskit/tooltip';
 import { getTopPosition } from '../pm-plugins/utils/drag-handle-positions';
 import { getLeftPositionForRootElement } from '../pm-plugins/utils/widget-positions';
 import { rootElementGap, topPositionAdjustment, QUICK_INSERT_DIMENSIONS, QUICK_INSERT_LEFT_OFFSET } from './consts';
-import { isNestedNodeSelected, isNonEditableBlock, isSelectionInNode } from './utils/document-checks';
+import { isInTextSelection, isNestedNodeSelected, isNonEditableBlock, isSelectionInNode } from './utils/document-checks';
 import { createNewLine } from './utils/editor-commands';
+var TEXT_PARENT_TYPES = ['paragraph', 'heading', 'blockquote', 'taskItem', 'decisionItem'];
 var buttonStyles = xcss({
   boxSizing: 'border-box',
   display: 'flex',
@@ -130,22 +133,42 @@ export var TypeAheadControl = function TypeAheadControl(_ref) {
       if (!isSelectionInNode(start, view) || isNonEditableBlock(start, view)) {
         api.core.actions.execute(createNewLine(start));
       }
-      if (isSelectionInNode(start, view) && isNestedNodeSelected(view)) {
-        // if the nested selected node is non-editable, then insert a newline below the selected node
-        if (isNonEditableBlock(view.state.selection.from, view)) {
-          api.core.actions.execute(createNewLine(view.state.selection.from));
-        } else {
-          // otherwise need to force the selection to be at the start of the node, because
-          // prosemirror is keeping it as NodeSelection for nested nodes. Do this to keep it
-          // consistent NodeSelection for root level nodes.
-          api.core.actions.execute(function (_ref2) {
-            var tr = _ref2.tr;
-            createNewLine(view.state.selection.from)({
-              tr: tr
+      if (isSelectionInNode(start, view)) {
+        // text or element with be deselected and the / added immediately after the paragraph
+        // unless the selection is empty
+        var currentSelection = view.state.selection;
+        if (isInTextSelection(view) && currentSelection.from !== currentSelection.to && fg('platform_editor_controls_patch_1')) {
+          var currentParagraphNode = findParentNode(function (node) {
+            return TEXT_PARENT_TYPES.includes(node.type.name);
+          })(currentSelection);
+          if (currentParagraphNode) {
+            var newPos =
+            //if the current selection is selected from right to left, then set the selection to the start of the paragraph
+            currentSelection.anchor === currentSelection.to ? currentParagraphNode.pos : currentParagraphNode.pos + currentParagraphNode.node.nodeSize - 1;
+            api.core.actions.execute(function (_ref2) {
+              var tr = _ref2.tr;
+              tr.setSelection(TextSelection.create(view.state.selection.$from.doc, newPos));
+              return tr;
             });
-            tr.setSelection(TextSelection.create(tr.doc, view.state.selection.from));
-            return tr;
-          });
+          }
+        }
+        if (isNestedNodeSelected(view)) {
+          // if the nested selected node is non-editable, then insert a newline below the selected node
+          if (isNonEditableBlock(view.state.selection.from, view)) {
+            api.core.actions.execute(createNewLine(view.state.selection.from));
+          } else {
+            // otherwise need to force the selection to be at the start of the node, because
+            // prosemirror is keeping it as NodeSelection for nested nodes. Do this to keep it
+            // consistent NodeSelection for root level nodes.
+            api.core.actions.execute(function (_ref3) {
+              var tr = _ref3.tr;
+              createNewLine(view.state.selection.from)({
+                tr: tr
+              });
+              tr.setSelection(TextSelection.create(tr.doc, view.state.selection.from));
+              return tr;
+            });
+          }
         }
       }
     }

package/dist/esm/ui/utils/document-checks.js

@@ -1,4 +1,4 @@
-import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
+import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 export var isNestedNodeSelected = function isNestedNodeSelected(view) {
   var selection = view.state.selection;
   return selection instanceof NodeSelection && selection.$from.depth > 1;
@@ -15,6 +15,17 @@ export var isSelectionInNode = function isSelectionInNode(start, view) {
     $to = _view$state$selection.$to;
   return $from.pos >= startPos && endPos >= $to.pos;
 };
+
+// checks if the selection is in a text node
+export var isInTextSelection = function isInTextSelection(view) {
+  var selection = view.state.selection;
+  if (selection instanceof TextSelection) {
+    return true;
+  } else if (selection instanceof NodeSelection) {
+    // check if this is a node that can appear among text
+    return selection.node.isInline;
+  }
+};
 export var isNonEditableBlock = function isNonEditableBlock(start, view) {
   var node = view.state.doc.nodeAt(start);
   if (node === null) {

package/dist/types/ui/utils/document-checks.d.ts

@@ -1,4 +1,5 @@
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 export declare const isNestedNodeSelected: (view: EditorView) => boolean;
 export declare const isSelectionInNode: (start: number, view: EditorView) => boolean;
+export declare const isInTextSelection: (view: EditorView) => boolean | undefined;
 export declare const isNonEditableBlock: (start: number, view: EditorView) => boolean;

package/dist/types-ts4.5/ui/utils/document-checks.d.ts

@@ -1,4 +1,5 @@
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 export declare const isNestedNodeSelected: (view: EditorView) => boolean;
 export declare const isSelectionInNode: (start: number, view: EditorView) => boolean;
+export declare const isInTextSelection: (view: EditorView) => boolean | undefined;
 export declare const isNonEditableBlock: (start: number, view: EditorView) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "3.5.3",
+	"version": "3.6.0",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,7 +33,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
-		"@atlaskit/editor-common": "^102.13.0",
+		"@atlaskit/editor-common": "^102.15.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^2.0.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^2.0.0",
@@ -46,14 +46,14 @@
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.4.0",
 		"@atlaskit/editor-tables": "^2.9.0",
-		"@atlaskit/icon": "^25.0.0",
+		"@atlaskit/icon": "^25.3.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^1.5.0",
 		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^2.1.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.0.0",
 		"@atlaskit/primitives": "^14.2.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^4.4.0",
+		"@atlaskit/tmp-editor-statsig": "^4.5.0",
 		"@atlaskit/tokens": "^4.5.0",
 		"@atlaskit/tooltip": "^20.0.0",
 		"@babel/runtime": "^7.0.0",
@@ -129,9 +129,6 @@
 		"platform_editor_dnd_handle_highlight_fix_firefox": {
 			"type": "boolean"
 		},
-		"platform_editor_advanced_layouts_accessibility": {
-			"type": "boolean"
-		},
 		"platform_editor_track_node_types": {
 			"type": "boolean"
 		},
@@ -164,6 +161,9 @@
 		},
 		"platform_editor_multi_body_extension_extensibility": {
 			"type": "boolean"
+		},
+		"platform_editor_controls_patch_1": {
+			"type": "boolean"
 		}
 	}
 }