@atlaskit/editor-plugin-block-controls 2.14.1 → 2.14.3

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 2.14.3
+
+### Patch Changes
+
+- [#169746](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/169746)
+  [`5bfb485e85507`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5bfb485e85507) -
+  [ux] [ED-25925] After drag and drop to create a new layout or update an existing layout,
+  placecursor at the end of last node in the newly created column
+
+## 2.14.2
+
+### Patch Changes
+
+- [#169716](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/169716)
+  [`4fbd1fe0084b3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/4fbd1fe0084b3) -
+  ED-25072 update and insert layout analytics.
+
 ## 2.14.1
 
 ### Patch Changes

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

@@ -20,6 +20,7 @@ var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _main = require("../pm-plugins/main");
 var _utils4 = require("../pm-plugins/utils");
 var _consts = require("../pm-plugins/utils/consts");
+var _fireAnalytics = require("../pm-plugins/utils/fire-analytics");
 var _getSelection = require("../pm-plugins/utils/getSelection");
 var _removeFromSource = require("../pm-plugins/utils/remove-from-source");
 var _validation = require("../pm-plugins/utils/validation");
@@ -160,7 +161,7 @@ var moveNode = exports.moveNode = function moveNode(api) {
     var inputMethod = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : _analytics.INPUT_METHOD.DRAG_AND_DROP;
     var formatMessage = arguments.length > 3 ? arguments[3] : undefined;
     return function (_ref4) {
-      var _node$nodeSize, _api$analytics;
+      var _node$nodeSize;
       var tr = _ref4.tr;
       var node = tr.doc.nodeAt(start);
       var resolvedNode = tr.doc.resolve(start);
@@ -169,11 +170,11 @@ var moveNode = exports.moveNode = function moveNode(api) {
       }
       var size = (_node$nodeSize = node === null || node === void 0 ? void 0 : node.nodeSize) !== null && _node$nodeSize !== void 0 ? _node$nodeSize : 1;
       var end = start + size;
+      var $from = tr.doc.resolve(start);
       var mappedTo;
       if ((0, _experiments.editorExperiment)('nested-dnd', true)) {
         var nodeCopy = tr.doc.slice(start, end, false); // cut the content
         var $to = tr.doc.resolve(to);
-        var $from = tr.doc.resolve(start);
         var destType = $to.node().type;
         var destParent = $to.node($to.depth);
         var sourceNode = $from.nodeAfter;
@@ -217,19 +218,25 @@ var moveNode = exports.moveNode = function moveNode(api) {
       });
       api === null || api === void 0 || api.core.actions.focus();
       var $mappedTo = tr.doc.resolve(mappedTo);
-      api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.attachAnalyticsEvent({
-        eventType: _analytics.EVENT_TYPE.TRACK,
-        action: _analytics.ACTION.MOVED,
-        actionSubject: _analytics.ACTION_SUBJECT.ELEMENT,
-        actionSubjectId: _analytics.ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
-        attributes: _objectSpread({
-          nodeDepth: resolvedNode.depth,
-          nodeType: node.type.name,
-          destinationNodeDepth: $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.depth
-        }, (0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_23873') && {
-          inputMethod: inputMethod
-        })
-      })(tr);
+      if ((0, _experiments.editorExperiment)('advanced_layouts', true)) {
+        (0, _fireAnalytics.fireMoveNodeAnalytics)(tr, inputMethod, resolvedNode.depth, node.type.name, $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.depth, $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.parent.type.name, $from.sameParent($mappedTo), api);
+      } else {
+        var _api$analytics;
+        api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.attachAnalyticsEvent({
+          eventType: _analytics.EVENT_TYPE.TRACK,
+          action: _analytics.ACTION.MOVED,
+          actionSubject: _analytics.ACTION_SUBJECT.ELEMENT,
+          actionSubjectId: _analytics.ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
+          attributes: _objectSpread({
+            nodeDepth: resolvedNode.depth,
+            nodeType: node.type.name,
+            destinationNodeDepth: $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.depth,
+            destinationNodeType: $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.parent.type.name
+          }, (0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_23873') && {
+            inputMethod: inputMethod
+          })
+        })(tr);
+      }
       if ((0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_23873')) {
         var _api$accessibilityUti;
         var movedMessage = to > start ? _messages.blockControlsMessages.movedDown : _messages.blockControlsMessages.movedup;

package/dist/cjs/editor-commands/move-to-layout.js

@@ -4,9 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.moveToLayout = void 0;
+var _analytics = require("@atlaskit/editor-common/analytics");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _consts = require("../pm-plugins/utils/consts");
+var _fireAnalytics = require("../pm-plugins/utils/fire-analytics");
 var _removeFromSource = require("../pm-plugins/utils/remove-from-source");
 var _updateColumnWidths = require("../pm-plugins/utils/update-column-widths");
 var _validation = require("../pm-plugins/utils/validation");
@@ -35,16 +38,29 @@ var createNewLayout = function createNewLayout(schema, layoutContents) {
   }
   return null;
 };
-var moveToExistingLayout = function moveToExistingLayout(toLayout, toLayoutPos, sourceNode, from, to, tr, isSameLayout) {
+var moveToExistingLayout = function moveToExistingLayout(toLayout, toLayoutPos, sourceNode, from, to, tr, $originalFrom, $originalTo, api) {
+  var isSameLayout = (0, _validation.isInSameLayout)($originalFrom, $originalTo);
   if (isSameLayout) {
+    var _$originalFrom$nodeAf;
     // reorder columns
     tr.delete(from, from + sourceNode.nodeSize);
     var mappedTo = tr.mapping.map(to);
-    tr.insert(mappedTo, sourceNode).setSelection(new _state.NodeSelection(tr.doc.resolve(mappedTo))).scrollIntoView();
+    tr.insert(mappedTo, sourceNode);
+    if (!(0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1')) {
+      tr.setSelection(new _state.NodeSelection(tr.doc.resolve(mappedTo))).scrollIntoView();
+    }
+    (0, _fireAnalytics.fireMoveNodeAnalytics)(tr, _analytics.INPUT_METHOD.DRAG_AND_DROP, $originalFrom.depth, ((_$originalFrom$nodeAf = $originalFrom.nodeAfter) === null || _$originalFrom$nodeAf === void 0 ? void 0 : _$originalFrom$nodeAf.type.name) || '', 1, 'layoutSection', true, api);
   } else if (toLayout.childCount < (0, _consts.maxLayoutColumnSupported)()) {
-    insertToDestination(tr, to, sourceNode, toLayout, toLayoutPos);
-    var mappedFrom = tr.mapping.map(from);
-    (0, _removeFromSource.removeFromSource)(tr, tr.doc.resolve(mappedFrom));
+    var _$originalFrom$nodeAf2;
+    if ((0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1')) {
+      (0, _removeFromSource.removeFromSource)(tr, tr.doc.resolve(from));
+      insertToDestination(tr, tr.mapping.map(to), sourceNode, toLayout, tr.mapping.map(toLayoutPos));
+    } else {
+      insertToDestination(tr, to, sourceNode, toLayout, toLayoutPos);
+      var mappedFrom = tr.mapping.map(from);
+      (0, _removeFromSource.removeFromSource)(tr, tr.doc.resolve(mappedFrom));
+    }
+    (0, _fireAnalytics.fireMoveNodeAnalytics)(tr, _analytics.INPUT_METHOD.DRAG_AND_DROP, $originalFrom.depth, ((_$originalFrom$nodeAf2 = $originalFrom.nodeAfter) === null || _$originalFrom$nodeAf2 === void 0 ? void 0 : _$originalFrom$nodeAf2.type.name) || '', 1, 'layoutSection', false, api);
   }
   return tr;
 };
@@ -56,7 +72,10 @@ var insertToDestination = function insertToDestination(tr, to, sourceNode, toLay
   var content = layoutColumn.createChecked({
     width: newColumnWidth
   }, sourceNode.type.name === 'layoutColumn' ? sourceNode.content : sourceNode);
-  tr.insert(to, content).setSelection(new _state.NodeSelection(tr.doc.resolve(to))).scrollIntoView();
+  tr.insert(to, content);
+  if (!(0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1')) {
+    tr.setSelection(new _state.NodeSelection(tr.doc.resolve(to))).scrollIntoView();
+  }
   return tr;
 };
 
@@ -139,12 +158,12 @@ var moveToLayout = exports.moveToLayout = function moveToLayout(api) {
       }
       if (toNode.type === layoutSection) {
         var toPos = options !== null && options !== void 0 && options.moveToEnd ? to + toNode.nodeSize - 1 : to + 1;
-        return moveToExistingLayout(toNode, to, fromNodeWithoutBreakout, from, toPos, tr, (0, _validation.isInSameLayout)($from, $to));
+        return moveToExistingLayout(toNode, to, fromNodeWithoutBreakout, from, toPos, tr, $from, $to, api);
       } else if (toNode.type === layoutColumn) {
         var toLayout = $to.parent;
         var toLayoutPos = to - $to.parentOffset - 1;
         var _toPos = options !== null && options !== void 0 && options.moveToEnd ? to + toNode.nodeSize : to;
-        return moveToExistingLayout(toLayout, toLayoutPos, fromNodeWithoutBreakout, from, _toPos, tr, (0, _validation.isInSameLayout)($from, $to));
+        return moveToExistingLayout(toLayout, toLayoutPos, fromNodeWithoutBreakout, from, _toPos, tr, $from, $to, api);
       } else {
         var toNodeWithoutBreakout = toNode;
 
@@ -164,10 +183,14 @@ var moveToLayout = exports.moveToLayout = function moveToLayout(api) {
         if (newLayout) {
           tr = (0, _removeFromSource.removeFromSource)(tr, $from);
           var mappedTo = tr.mapping.map(to);
-          tr.delete(mappedTo, mappedTo + toNodeWithoutBreakout.nodeSize).insert(mappedTo, newLayout).setSelection(new _state.NodeSelection(tr.doc.resolve(mappedTo))).scrollIntoView();
+          tr.delete(mappedTo, mappedTo + toNodeWithoutBreakout.nodeSize).insert(mappedTo, newLayout);
+          if (!(0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1')) {
+            tr.setSelection(new _state.NodeSelection(tr.doc.resolve(mappedTo))).scrollIntoView();
+          }
           breakoutMode && tr.setNodeMarkup(mappedTo, newLayout.type, newLayout.attrs, [breakout.create({
             mode: breakoutMode
           })]);
+          (0, _fireAnalytics.fireInsertLayoutAnalytics)(tr, api);
         }
         return tr;
       }

package/dist/cjs/pm-plugins/utils/fire-analytics.js

@@ -0,0 +1,36 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.fireMoveNodeAnalytics = exports.fireInsertLayoutAnalytics = void 0;
+var _analytics = require("@atlaskit/editor-common/analytics");
+var fireMoveNodeAnalytics = exports.fireMoveNodeAnalytics = function fireMoveNodeAnalytics(tr, inputMethod, fromDepth, fromNodeType, toDepth, toNodeType, isSameParent, api) {
+  var _api$analytics;
+  return api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 ? void 0 : _api$analytics.attachAnalyticsEvent({
+    eventType: _analytics.EVENT_TYPE.TRACK,
+    action: _analytics.ACTION.MOVED,
+    actionSubject: _analytics.ACTION_SUBJECT.ELEMENT,
+    actionSubjectId: _analytics.ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
+    attributes: {
+      nodeDepth: fromDepth,
+      nodeType: fromNodeType,
+      destinationNodeDepth: toDepth,
+      destinationNodeType: toNodeType,
+      isSameParent: isSameParent,
+      inputMethod: inputMethod
+    }
+  })(tr);
+};
+var fireInsertLayoutAnalytics = exports.fireInsertLayoutAnalytics = function fireInsertLayoutAnalytics(tr, api) {
+  var _api$analytics2;
+  api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || (_api$analytics2 = _api$analytics2.actions) === null || _api$analytics2 === void 0 || _api$analytics2.attachAnalyticsEvent({
+    action: _analytics.ACTION.INSERTED,
+    actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
+    actionSubjectId: _analytics.ACTION_SUBJECT_ID.LAYOUT,
+    attributes: {
+      inputMethod: _analytics.INPUT_METHOD.DRAG_AND_DROP
+    },
+    eventType: _analytics.EVENT_TYPE.TRACK
+  })(tr);
+};

package/dist/cjs/pm-plugins/utils/update-selection.js

@@ -0,0 +1,44 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.updateSelection = exports.getInsertLayoutStep = void 0;
+var _selection = require("@atlaskit/editor-common/selection");
+var _state = require("@atlaskit/editor-prosemirror/state");
+var _transform = require("@atlaskit/editor-prosemirror/transform");
+var getInsertLayoutStep = exports.getInsertLayoutStep = function getInsertLayoutStep(tr) {
+  return tr.steps.find(function (step) {
+    var _step$slice$content$f;
+    return step instanceof _transform.ReplaceStep && ['layoutSection', 'layoutColumn'].includes(((_step$slice$content$f = step.slice.content.firstChild) === null || _step$slice$content$f === void 0 ? void 0 : _step$slice$content$f.type.name) || '');
+  });
+};
+var updateSelection = exports.updateSelection = function updateSelection(tr, to, insertAtRight) {
+  var _lastNode;
+  var $to = tr.doc.resolve(to);
+  var toNode = $to.nodeAfter;
+  var lastNode = toNode === null || toNode === void 0 ? void 0 : toNode.content.lastChild;
+  if (!toNode || !lastNode) {
+    return tr;
+  }
+  var offset = toNode.nodeSize;
+
+  // drop at the start of the layoutSection or to create a new layoutSection
+  if (toNode.type.name === 'layoutSection') {
+    if (insertAtRight) {
+      var _toNode$content$lastC;
+      lastNode = (_toNode$content$lastC = toNode.content.lastChild) === null || _toNode$content$lastC === void 0 ? void 0 : _toNode$content$lastC.lastChild;
+      offset = toNode.nodeSize - 1;
+    } else {
+      var _toNode$content$first, _toNode$content$first2;
+      lastNode = (_toNode$content$first = toNode.content.firstChild) === null || _toNode$content$first === void 0 ? void 0 : _toNode$content$first.lastChild;
+      offset = 1 + (((_toNode$content$first2 = toNode.content.firstChild) === null || _toNode$content$first2 === void 0 ? void 0 : _toNode$content$first2.nodeSize) || 0);
+    }
+  }
+  if (['paragraph', 'heading'].includes(((_lastNode = lastNode) === null || _lastNode === void 0 ? void 0 : _lastNode.type.name) || '')) {
+    tr.setSelection(_state.TextSelection.near(tr.doc.resolve(to + offset - 2)));
+  } else if (lastNode) {
+    tr.setSelection(new _selection.GapCursorSelection(tr.doc.resolve(to + offset - 1), _selection.Side.RIGHT));
+  }
+  return tr;
+};

package/dist/cjs/ui/drop-target-layout.js

@@ -10,6 +10,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = require("react");
 var _react2 = require("@emotion/react");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _box = require("@atlaskit/pragmatic-drag-and-drop-react-drop-indicator/box");
 var _adapter = require("@atlaskit/pragmatic-drag-and-drop/element/adapter");
 var _colors = require("@atlaskit/theme/colors");
@@ -17,6 +18,7 @@ var _decorationsCommon = require("../pm-plugins/decorations-common");
 var _activeAnchorTracker = require("../pm-plugins/utils/active-anchor-tracker");
 var _anchorUtils = require("../pm-plugins/utils/anchor-utils");
 var _dragTargetDebug = require("../pm-plugins/utils/drag-target-debug");
+var _updateSelection = require("../pm-plugins/utils/update-selection");
 /**
  * @jsxRuntime classic
  * @jsx jsx
@@ -78,10 +80,32 @@ var DropTargetLayout = exports.DropTargetLayout = function DropTargetLayout(prop
       return;
     }
     var to = getPos();
+    var mappedTo;
     if (to !== undefined) {
-      var _api$core, _api$blockControls2;
+      var _api$core;
       var from = activeNode.pos;
-      api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.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(from, to));
+      api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function (_ref2) {
+        var _api$blockControls2;
+        var tr = _ref2.tr;
+        api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || (_api$blockControls2 = _api$blockControls2.commands) === null || _api$blockControls2 === void 0 || _api$blockControls2.moveToLayout(from, to)({
+          tr: tr
+        });
+        if ((0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1')) {
+          var insertColumnStep = (0, _updateSelection.getInsertLayoutStep)(tr);
+          mappedTo = insertColumnStep === null || insertColumnStep === void 0 ? void 0 : insertColumnStep.from;
+        }
+        return tr;
+      });
+      if ((0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1')) {
+        var _api$core2;
+        api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(function (_ref3) {
+          var tr = _ref3.tr;
+          if (mappedTo !== undefined) {
+            (0, _updateSelection.updateSelection)(tr, mappedTo);
+          }
+          return tr;
+        });
+      }
     }
   }, [api, getPos, activeNode]);
   (0, _react.useEffect)(function () {

package/dist/cjs/ui/inline-drop-target.js

@@ -10,6 +10,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = require("react");
 var _react2 = require("@emotion/react");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _box = require("@atlaskit/pragmatic-drag-and-drop-react-drop-indicator/box");
 var _adapter = require("@atlaskit/pragmatic-drag-and-drop/element/adapter");
 var _colors = require("@atlaskit/theme/colors");
@@ -17,6 +18,7 @@ var _decorationsCommon = require("../pm-plugins/decorations-common");
 var _activeAnchorTracker = require("../pm-plugins/utils/active-anchor-tracker");
 var _anchorUtils = require("../pm-plugins/utils/anchor-utils");
 var _dragTargetDebug = require("../pm-plugins/utils/drag-target-debug");
+var _updateSelection = require("../pm-plugins/utils/update-selection");
 /* eslint-disable @atlaskit/design-system/consistent-css-prop-usage */
 /* eslint-disable @atlaskit/ui-styling-standard/no-unsafe-values */
 /**
@@ -188,16 +190,39 @@ var InlineDropTarget = exports.InlineDropTarget = function InlineDropTarget(_ref
       return;
     }
     var toPos = getPos();
+    var mappedTo;
     if (activeNode && toPos !== undefined) {
-      var _api$core, _api$blockControls2;
+      var _api$core;
       var start = activeNode.pos;
-      api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.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(start, toPos, {
-        moveToEnd: position === 'right'
-      }));
+      var moveToEnd = position === 'right';
+      api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function (_ref3) {
+        var _api$blockControls2;
+        var tr = _ref3.tr;
+        api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || (_api$blockControls2 = _api$blockControls2.commands) === null || _api$blockControls2 === void 0 || _api$blockControls2.moveToLayout(start, toPos, {
+          moveToEnd: moveToEnd
+        })({
+          tr: tr
+        });
+        if ((0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1')) {
+          var insertLayoutStep = (0, _updateSelection.getInsertLayoutStep)(tr);
+          mappedTo = insertLayoutStep === null || insertLayoutStep === void 0 ? void 0 : insertLayoutStep.from;
+        }
+        return tr;
+      });
+      if ((0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1')) {
+        var _api$core2;
+        api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(function (_ref4) {
+          var tr = _ref4.tr;
+          if (mappedTo !== undefined) {
+            (0, _updateSelection.updateSelection)(tr, mappedTo, moveToEnd);
+          }
+          return tr;
+        });
+      }
     }
   }, [api, getPos, position]);
   var hoverZoneRectStyle = (0, _react.useMemo)(function () {
-    var _ref3;
+    var _ref5;
     var isLayoutNode = (nextNode === null || nextNode === void 0 ? void 0 : nextNode.type.name) === 'layoutSection';
     var layoutAdjustment = isLayoutNode ? {
       width: 11,
@@ -205,7 +230,7 @@ var InlineDropTarget = exports.InlineDropTarget = function InlineDropTarget(_ref
       top: 6,
       bottom: 2
     } : undefined;
-    return _ref3 = {}, (0, _defineProperty2.default)(_ref3, HOVER_ZONE_WIDTH, nodeDimension.widthOffset ? "calc((100% - ".concat(nodeDimension.width, ")/2 - ").concat(GAP, "px + ").concat(nodeDimension.widthOffset, " - ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.width) || 0, "px)") : "calc((100% - ".concat(nodeDimension.width, ")/2 - ").concat(GAP, "px - ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.width) || 0, "px)")), (0, _defineProperty2.default)(_ref3, HOVER_ZONE_HEIGHT, "calc(".concat(nodeDimension.height, " + ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.height) || 0, "px)")), (0, _defineProperty2.default)(_ref3, HOVER_ZONE_TOP, "calc(".concat(nodeDimension.top, " + ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.top) || 0, "px)")), (0, _defineProperty2.default)(_ref3, HOVER_ZONE_BOTTOM, "calc(".concat(nodeDimension.bottom, " - ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.bottom) || 0, "px)")), (0, _defineProperty2.default)(_ref3, HOVER_ZONE_ANCHOR_NAME, anchorName), _ref3;
+    return _ref5 = {}, (0, _defineProperty2.default)(_ref5, HOVER_ZONE_WIDTH, nodeDimension.widthOffset ? "calc((100% - ".concat(nodeDimension.width, ")/2 - ").concat(GAP, "px + ").concat(nodeDimension.widthOffset, " - ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.width) || 0, "px)") : "calc((100% - ".concat(nodeDimension.width, ")/2 - ").concat(GAP, "px - ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.width) || 0, "px)")), (0, _defineProperty2.default)(_ref5, HOVER_ZONE_HEIGHT, "calc(".concat(nodeDimension.height, " + ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.height) || 0, "px)")), (0, _defineProperty2.default)(_ref5, HOVER_ZONE_TOP, "calc(".concat(nodeDimension.top, " + ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.top) || 0, "px)")), (0, _defineProperty2.default)(_ref5, HOVER_ZONE_BOTTOM, "calc(".concat(nodeDimension.bottom, " - ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.bottom) || 0, "px)")), (0, _defineProperty2.default)(_ref5, HOVER_ZONE_ANCHOR_NAME, anchorName), _ref5;
   }, [nextNode === null || nextNode === void 0 ? void 0 : nextNode.type.name, nodeDimension, anchorName]);
   var dropIndicatorPos = (0, _react.useMemo)(function () {
     return isLeftPosition ? 'right' : 'left';

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

@@ -12,6 +12,7 @@ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { key } from '../pm-plugins/main';
 import { getNestedNodePosition, selectNode } from '../pm-plugins/utils';
 import { DIRECTION } from '../pm-plugins/utils/consts';
+import { fireMoveNodeAnalytics } from '../pm-plugins/utils/fire-analytics';
 import { setCursorPositionAtMovedNode } from '../pm-plugins/utils/getSelection';
 import { removeFromSource } from '../pm-plugins/utils/remove-from-source';
 import { canMoveNodeToIndex, isInsideTable, transformSliceExpandToNestedExpand } from '../pm-plugins/utils/validation';
@@ -155,7 +156,7 @@ export const moveNodeViaShortcut = (api, direction, formatMessage) => {
 export const moveNode = api => (start, to, inputMethod = INPUT_METHOD.DRAG_AND_DROP, formatMessage) => ({
   tr
 }) => {
-  var _node$nodeSize, _api$analytics;
+  var _node$nodeSize;
   const node = tr.doc.nodeAt(start);
   const resolvedNode = tr.doc.resolve(start);
   if (!node) {
@@ -163,11 +164,11 @@ export const moveNode = api => (start, to, inputMethod = INPUT_METHOD.DRAG_AND_D
   }
   const size = (_node$nodeSize = node === null || node === void 0 ? void 0 : node.nodeSize) !== null && _node$nodeSize !== void 0 ? _node$nodeSize : 1;
   const end = start + size;
+  const $from = tr.doc.resolve(start);
   let mappedTo;
   if (editorExperiment('nested-dnd', true)) {
     const nodeCopy = tr.doc.slice(start, end, false); // cut the content
     const $to = tr.doc.resolve(to);
-    const $from = tr.doc.resolve(start);
     const destType = $to.node().type;
     const destParent = $to.node($to.depth);
     const sourceNode = $from.nodeAfter;
@@ -211,20 +212,26 @@ export const moveNode = api => (start, to, inputMethod = INPUT_METHOD.DRAG_AND_D
   });
   api === null || api === void 0 ? void 0 : api.core.actions.focus();
   const $mappedTo = tr.doc.resolve(mappedTo);
-  api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions.attachAnalyticsEvent({
-    eventType: EVENT_TYPE.TRACK,
-    action: ACTION.MOVED,
-    actionSubject: ACTION_SUBJECT.ELEMENT,
-    actionSubjectId: ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
-    attributes: {
-      nodeDepth: resolvedNode.depth,
-      nodeType: node.type.name,
-      destinationNodeDepth: $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.depth,
-      ...(fg('platform_editor_element_drag_and_drop_ed_23873') && {
-        inputMethod
-      })
-    }
-  })(tr);
+  if (editorExperiment('advanced_layouts', true)) {
+    fireMoveNodeAnalytics(tr, inputMethod, resolvedNode.depth, node.type.name, $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.depth, $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.parent.type.name, $from.sameParent($mappedTo), api);
+  } else {
+    var _api$analytics;
+    api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions.attachAnalyticsEvent({
+      eventType: EVENT_TYPE.TRACK,
+      action: ACTION.MOVED,
+      actionSubject: ACTION_SUBJECT.ELEMENT,
+      actionSubjectId: ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
+      attributes: {
+        nodeDepth: resolvedNode.depth,
+        nodeType: node.type.name,
+        destinationNodeDepth: $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.depth,
+        destinationNodeType: $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.parent.type.name,
+        ...(fg('platform_editor_element_drag_and_drop_ed_23873') && {
+          inputMethod
+        })
+      }
+    })(tr);
+  }
   if (fg('platform_editor_element_drag_and_drop_ed_23873')) {
     var _api$accessibilityUti;
     const movedMessage = to > start ? blockControlsMessages.movedDown : blockControlsMessages.movedup;

package/dist/es2019/editor-commands/move-to-layout.js

@@ -1,6 +1,9 @@
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { maxLayoutColumnSupported } from '../pm-plugins/utils/consts';
+import { fireInsertLayoutAnalytics, fireMoveNodeAnalytics } from '../pm-plugins/utils/fire-analytics';
 import { removeFromSource } from '../pm-plugins/utils/remove-from-source';
 import { updateColumnWidths } from '../pm-plugins/utils/update-column-widths';
 import { isInSameLayout } from '../pm-plugins/utils/validation';
@@ -30,16 +33,29 @@ const createNewLayout = (schema, layoutContents) => {
   }
   return null;
 };
-const moveToExistingLayout = (toLayout, toLayoutPos, sourceNode, from, to, tr, isSameLayout) => {
+const moveToExistingLayout = (toLayout, toLayoutPos, sourceNode, from, to, tr, $originalFrom, $originalTo, api) => {
+  const isSameLayout = isInSameLayout($originalFrom, $originalTo);
   if (isSameLayout) {
+    var _$originalFrom$nodeAf;
     // reorder columns
     tr.delete(from, from + sourceNode.nodeSize);
     const mappedTo = tr.mapping.map(to);
-    tr.insert(mappedTo, sourceNode).setSelection(new NodeSelection(tr.doc.resolve(mappedTo))).scrollIntoView();
+    tr.insert(mappedTo, sourceNode);
+    if (!fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
+      tr.setSelection(new NodeSelection(tr.doc.resolve(mappedTo))).scrollIntoView();
+    }
+    fireMoveNodeAnalytics(tr, INPUT_METHOD.DRAG_AND_DROP, $originalFrom.depth, ((_$originalFrom$nodeAf = $originalFrom.nodeAfter) === null || _$originalFrom$nodeAf === void 0 ? void 0 : _$originalFrom$nodeAf.type.name) || '', 1, 'layoutSection', true, api);
   } else if (toLayout.childCount < maxLayoutColumnSupported()) {
-    insertToDestination(tr, to, sourceNode, toLayout, toLayoutPos);
-    const mappedFrom = tr.mapping.map(from);
-    removeFromSource(tr, tr.doc.resolve(mappedFrom));
+    var _$originalFrom$nodeAf2;
+    if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
+      removeFromSource(tr, tr.doc.resolve(from));
+      insertToDestination(tr, tr.mapping.map(to), sourceNode, toLayout, tr.mapping.map(toLayoutPos));
+    } else {
+      insertToDestination(tr, to, sourceNode, toLayout, toLayoutPos);
+      const mappedFrom = tr.mapping.map(from);
+      removeFromSource(tr, tr.doc.resolve(mappedFrom));
+    }
+    fireMoveNodeAnalytics(tr, INPUT_METHOD.DRAG_AND_DROP, $originalFrom.depth, ((_$originalFrom$nodeAf2 = $originalFrom.nodeAfter) === null || _$originalFrom$nodeAf2 === void 0 ? void 0 : _$originalFrom$nodeAf2.type.name) || '', 1, 'layoutSection', false, api);
   }
   return tr;
 };
@@ -53,7 +69,10 @@ const insertToDestination = (tr, to, sourceNode, toLayout, toLayoutPos) => {
   const content = layoutColumn.createChecked({
     width: newColumnWidth
   }, sourceNode.type.name === 'layoutColumn' ? sourceNode.content : sourceNode);
-  tr.insert(to, content).setSelection(new NodeSelection(tr.doc.resolve(to))).scrollIntoView();
+  tr.insert(to, content);
+  if (!fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
+    tr.setSelection(new NodeSelection(tr.doc.resolve(to))).scrollIntoView();
+  }
   return tr;
 };
 
@@ -136,12 +155,12 @@ export const moveToLayout = api => (from, to, options) => ({
   }
   if (toNode.type === layoutSection) {
     const toPos = options !== null && options !== void 0 && options.moveToEnd ? to + toNode.nodeSize - 1 : to + 1;
-    return moveToExistingLayout(toNode, to, fromNodeWithoutBreakout, from, toPos, tr, isInSameLayout($from, $to));
+    return moveToExistingLayout(toNode, to, fromNodeWithoutBreakout, from, toPos, tr, $from, $to, api);
   } else if (toNode.type === layoutColumn) {
     const toLayout = $to.parent;
     const toLayoutPos = to - $to.parentOffset - 1;
     const toPos = options !== null && options !== void 0 && options.moveToEnd ? to + toNode.nodeSize : to;
-    return moveToExistingLayout(toLayout, toLayoutPos, fromNodeWithoutBreakout, from, toPos, tr, isInSameLayout($from, $to));
+    return moveToExistingLayout(toLayout, toLayoutPos, fromNodeWithoutBreakout, from, toPos, tr, $from, $to, api);
   } else {
     let toNodeWithoutBreakout = toNode;
 
@@ -159,10 +178,14 @@ export const moveToLayout = api => (from, to, options) => ({
     if (newLayout) {
       tr = removeFromSource(tr, $from);
       const mappedTo = tr.mapping.map(to);
-      tr.delete(mappedTo, mappedTo + toNodeWithoutBreakout.nodeSize).insert(mappedTo, newLayout).setSelection(new NodeSelection(tr.doc.resolve(mappedTo))).scrollIntoView();
+      tr.delete(mappedTo, mappedTo + toNodeWithoutBreakout.nodeSize).insert(mappedTo, newLayout);
+      if (!fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
+        tr.setSelection(new NodeSelection(tr.doc.resolve(mappedTo))).scrollIntoView();
+      }
       breakoutMode && tr.setNodeMarkup(mappedTo, newLayout.type, newLayout.attrs, [breakout.create({
         mode: breakoutMode
       })]);
+      fireInsertLayoutAnalytics(tr, api);
     }
     return tr;
   }

package/dist/es2019/pm-plugins/utils/fire-analytics.js

@@ -0,0 +1,30 @@
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+export const fireMoveNodeAnalytics = (tr, inputMethod, fromDepth, fromNodeType, toDepth, toNodeType, isSameParent, api) => {
+  var _api$analytics, _api$analytics$action;
+  return api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : (_api$analytics$action = _api$analytics.actions) === null || _api$analytics$action === void 0 ? void 0 : _api$analytics$action.attachAnalyticsEvent({
+    eventType: EVENT_TYPE.TRACK,
+    action: ACTION.MOVED,
+    actionSubject: ACTION_SUBJECT.ELEMENT,
+    actionSubjectId: ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
+    attributes: {
+      nodeDepth: fromDepth,
+      nodeType: fromNodeType,
+      destinationNodeDepth: toDepth,
+      destinationNodeType: toNodeType,
+      isSameParent: isSameParent,
+      inputMethod
+    }
+  })(tr);
+};
+export const fireInsertLayoutAnalytics = (tr, api) => {
+  var _api$analytics2, _api$analytics2$actio;
+  api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : (_api$analytics2$actio = _api$analytics2.actions) === null || _api$analytics2$actio === void 0 ? void 0 : _api$analytics2$actio.attachAnalyticsEvent({
+    action: ACTION.INSERTED,
+    actionSubject: ACTION_SUBJECT.DOCUMENT,
+    actionSubjectId: ACTION_SUBJECT_ID.LAYOUT,
+    attributes: {
+      inputMethod: INPUT_METHOD.DRAG_AND_DROP
+    },
+    eventType: EVENT_TYPE.TRACK
+  })(tr);
+};

package/dist/es2019/pm-plugins/utils/update-selection.js

@@ -0,0 +1,36 @@
+import { GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
+import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
+export const getInsertLayoutStep = tr => tr.steps.find(step => {
+  var _step$slice$content$f;
+  return step instanceof ReplaceStep && ['layoutSection', 'layoutColumn'].includes(((_step$slice$content$f = step.slice.content.firstChild) === null || _step$slice$content$f === void 0 ? void 0 : _step$slice$content$f.type.name) || '');
+});
+export const updateSelection = (tr, to, insertAtRight) => {
+  var _lastNode;
+  const $to = tr.doc.resolve(to);
+  const toNode = $to.nodeAfter;
+  let lastNode = toNode === null || toNode === void 0 ? void 0 : toNode.content.lastChild;
+  if (!toNode || !lastNode) {
+    return tr;
+  }
+  let offset = toNode.nodeSize;
+
+  // drop at the start of the layoutSection or to create a new layoutSection
+  if (toNode.type.name === 'layoutSection') {
+    if (insertAtRight) {
+      var _toNode$content$lastC;
+      lastNode = (_toNode$content$lastC = toNode.content.lastChild) === null || _toNode$content$lastC === void 0 ? void 0 : _toNode$content$lastC.lastChild;
+      offset = toNode.nodeSize - 1;
+    } else {
+      var _toNode$content$first, _toNode$content$first2;
+      lastNode = (_toNode$content$first = toNode.content.firstChild) === null || _toNode$content$first === void 0 ? void 0 : _toNode$content$first.lastChild;
+      offset = 1 + (((_toNode$content$first2 = toNode.content.firstChild) === null || _toNode$content$first2 === void 0 ? void 0 : _toNode$content$first2.nodeSize) || 0);
+    }
+  }
+  if (['paragraph', 'heading'].includes(((_lastNode = lastNode) === null || _lastNode === void 0 ? void 0 : _lastNode.type.name) || '')) {
+    tr.setSelection(TextSelection.near(tr.doc.resolve(to + offset - 2)));
+  } else if (lastNode) {
+    tr.setSelection(new GapCursorSelection(tr.doc.resolve(to + offset - 1), Side.RIGHT));
+  }
+  return tr;
+};

package/dist/es2019/ui/drop-target-layout.js

@@ -7,6 +7,7 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
 import { css, jsx } from '@emotion/react';
 import { layoutBreakpointWidth } from '@atlaskit/editor-shared-styles';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { DropIndicator } from '@atlaskit/pragmatic-drag-and-drop-react-drop-indicator/box';
 import { dropTargetForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { B200 } from '@atlaskit/theme/colors';
@@ -14,6 +15,7 @@ import { getNodeAnchor } from '../pm-plugins/decorations-common';
 import { useActiveAnchorTracker } from '../pm-plugins/utils/active-anchor-tracker';
 import { isAnchorSupported } from '../pm-plugins/utils/anchor-utils';
 import { isBlocksDragTargetDebug } from '../pm-plugins/utils/drag-target-debug';
+import { getInsertLayoutStep, updateSelection } from '../pm-plugins/utils/update-selection';
 
 // 8px gap + 16px on left and right
 const DROP_TARGET_LAYOUT_DROP_ZONE_WIDTH = 40;
@@ -70,12 +72,36 @@ export const DropTargetLayout = props => {
       return;
     }
     const to = getPos();
+    let mappedTo;
     if (to !== undefined) {
-      var _api$core, _api$blockControls2, _api$blockControls2$c;
+      var _api$core;
       const {
         pos: from
       } = activeNode;
-      api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.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(from, to));
+      api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(({
+        tr
+      }) => {
+        var _api$blockControls2, _api$blockControls2$c;
+        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(from, to)({
+          tr
+        });
+        if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
+          const insertColumnStep = getInsertLayoutStep(tr);
+          mappedTo = insertColumnStep === null || insertColumnStep === void 0 ? void 0 : insertColumnStep.from;
+        }
+        return tr;
+      });
+      if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
+        var _api$core2;
+        api === null || api === void 0 ? void 0 : (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.execute(({
+          tr
+        }) => {
+          if (mappedTo !== undefined) {
+            updateSelection(tr, mappedTo);
+          }
+          return tr;
+        });
+      }
     }
   }, [api, getPos, activeNode]);
   useEffect(() => {

package/dist/es2019/ui/inline-drop-target.js

@@ -9,6 +9,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
 import { css, jsx } from '@emotion/react';
 import { akEditorBreakoutPadding } from '@atlaskit/editor-shared-styles';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { DropIndicator } from '@atlaskit/pragmatic-drag-and-drop-react-drop-indicator/box';
 import { dropTargetForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { B200 } from '@atlaskit/theme/colors';
@@ -16,6 +17,7 @@ import { getNodeAnchor } from '../pm-plugins/decorations-common';
 import { useActiveAnchorTracker } from '../pm-plugins/utils/active-anchor-tracker';
 import { isAnchorSupported } from '../pm-plugins/utils/anchor-utils';
 import { isBlocksDragTargetDebug } from '../pm-plugins/utils/drag-target-debug';
+import { getInsertLayoutStep, updateSelection } from '../pm-plugins/utils/update-selection';
 const HOVER_ZONE_WIDTH = '--editor-blocks-inline-hover-zone-width';
 const HOVER_ZONE_HEIGHT = '--editor-blocks-inline-hover-zone-height';
 const HOVER_ZONE_TOP = '--editor-blocks-inline-hover-zone-top';
@@ -175,14 +177,39 @@ export const InlineDropTarget = ({
       return;
     }
     const toPos = getPos();
+    let mappedTo;
     if (activeNode && toPos !== undefined) {
-      var _api$core, _api$blockControls2, _api$blockControls2$c;
+      var _api$core;
       const {
         pos: start
       } = activeNode;
-      api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.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(start, toPos, {
-        moveToEnd: position === 'right'
-      }));
+      const moveToEnd = position === 'right';
+      api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(({
+        tr
+      }) => {
+        var _api$blockControls2, _api$blockControls2$c;
+        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(start, toPos, {
+          moveToEnd
+        })({
+          tr
+        });
+        if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
+          const insertLayoutStep = getInsertLayoutStep(tr);
+          mappedTo = insertLayoutStep === null || insertLayoutStep === void 0 ? void 0 : insertLayoutStep.from;
+        }
+        return tr;
+      });
+      if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
+        var _api$core2;
+        api === null || api === void 0 ? void 0 : (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.execute(({
+          tr
+        }) => {
+          if (mappedTo !== undefined) {
+            updateSelection(tr, mappedTo, moveToEnd);
+          }
+          return tr;
+        });
+      }
     }
   }, [api, getPos, position]);
   const hoverZoneRectStyle = useMemo(() => {

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

@@ -15,6 +15,7 @@ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { key } from '../pm-plugins/main';
 import { getNestedNodePosition, selectNode } from '../pm-plugins/utils';
 import { DIRECTION } from '../pm-plugins/utils/consts';
+import { fireMoveNodeAnalytics } from '../pm-plugins/utils/fire-analytics';
 import { setCursorPositionAtMovedNode } from '../pm-plugins/utils/getSelection';
 import { removeFromSource } from '../pm-plugins/utils/remove-from-source';
 import { canMoveNodeToIndex, isInsideTable, transformSliceExpandToNestedExpand } from '../pm-plugins/utils/validation';
@@ -154,7 +155,7 @@ export var moveNode = function moveNode(api) {
     var inputMethod = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : INPUT_METHOD.DRAG_AND_DROP;
     var formatMessage = arguments.length > 3 ? arguments[3] : undefined;
     return function (_ref4) {
-      var _node$nodeSize, _api$analytics;
+      var _node$nodeSize;
       var tr = _ref4.tr;
       var node = tr.doc.nodeAt(start);
       var resolvedNode = tr.doc.resolve(start);
@@ -163,11 +164,11 @@ export var moveNode = function moveNode(api) {
       }
       var size = (_node$nodeSize = node === null || node === void 0 ? void 0 : node.nodeSize) !== null && _node$nodeSize !== void 0 ? _node$nodeSize : 1;
       var end = start + size;
+      var $from = tr.doc.resolve(start);
       var mappedTo;
       if (editorExperiment('nested-dnd', true)) {
         var nodeCopy = tr.doc.slice(start, end, false); // cut the content
         var $to = tr.doc.resolve(to);
-        var $from = tr.doc.resolve(start);
         var destType = $to.node().type;
         var destParent = $to.node($to.depth);
         var sourceNode = $from.nodeAfter;
@@ -211,19 +212,25 @@ export var moveNode = function moveNode(api) {
       });
       api === null || api === void 0 || api.core.actions.focus();
       var $mappedTo = tr.doc.resolve(mappedTo);
-      api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.attachAnalyticsEvent({
-        eventType: EVENT_TYPE.TRACK,
-        action: ACTION.MOVED,
-        actionSubject: ACTION_SUBJECT.ELEMENT,
-        actionSubjectId: ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
-        attributes: _objectSpread({
-          nodeDepth: resolvedNode.depth,
-          nodeType: node.type.name,
-          destinationNodeDepth: $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.depth
-        }, fg('platform_editor_element_drag_and_drop_ed_23873') && {
-          inputMethod: inputMethod
-        })
-      })(tr);
+      if (editorExperiment('advanced_layouts', true)) {
+        fireMoveNodeAnalytics(tr, inputMethod, resolvedNode.depth, node.type.name, $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.depth, $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.parent.type.name, $from.sameParent($mappedTo), api);
+      } else {
+        var _api$analytics;
+        api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.attachAnalyticsEvent({
+          eventType: EVENT_TYPE.TRACK,
+          action: ACTION.MOVED,
+          actionSubject: ACTION_SUBJECT.ELEMENT,
+          actionSubjectId: ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
+          attributes: _objectSpread({
+            nodeDepth: resolvedNode.depth,
+            nodeType: node.type.name,
+            destinationNodeDepth: $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.depth,
+            destinationNodeType: $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.parent.type.name
+          }, fg('platform_editor_element_drag_and_drop_ed_23873') && {
+            inputMethod: inputMethod
+          })
+        })(tr);
+      }
       if (fg('platform_editor_element_drag_and_drop_ed_23873')) {
         var _api$accessibilityUti;
         var movedMessage = to > start ? blockControlsMessages.movedDown : blockControlsMessages.movedup;

package/dist/esm/editor-commands/move-to-layout.js

@@ -1,6 +1,9 @@
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { maxLayoutColumnSupported } from '../pm-plugins/utils/consts';
+import { fireInsertLayoutAnalytics, fireMoveNodeAnalytics } from '../pm-plugins/utils/fire-analytics';
 import { removeFromSource } from '../pm-plugins/utils/remove-from-source';
 import { updateColumnWidths } from '../pm-plugins/utils/update-column-widths';
 import { isInSameLayout } from '../pm-plugins/utils/validation';
@@ -29,16 +32,29 @@ var createNewLayout = function createNewLayout(schema, layoutContents) {
   }
   return null;
 };
-var moveToExistingLayout = function moveToExistingLayout(toLayout, toLayoutPos, sourceNode, from, to, tr, isSameLayout) {
+var moveToExistingLayout = function moveToExistingLayout(toLayout, toLayoutPos, sourceNode, from, to, tr, $originalFrom, $originalTo, api) {
+  var isSameLayout = isInSameLayout($originalFrom, $originalTo);
   if (isSameLayout) {
+    var _$originalFrom$nodeAf;
     // reorder columns
     tr.delete(from, from + sourceNode.nodeSize);
     var mappedTo = tr.mapping.map(to);
-    tr.insert(mappedTo, sourceNode).setSelection(new NodeSelection(tr.doc.resolve(mappedTo))).scrollIntoView();
+    tr.insert(mappedTo, sourceNode);
+    if (!fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
+      tr.setSelection(new NodeSelection(tr.doc.resolve(mappedTo))).scrollIntoView();
+    }
+    fireMoveNodeAnalytics(tr, INPUT_METHOD.DRAG_AND_DROP, $originalFrom.depth, ((_$originalFrom$nodeAf = $originalFrom.nodeAfter) === null || _$originalFrom$nodeAf === void 0 ? void 0 : _$originalFrom$nodeAf.type.name) || '', 1, 'layoutSection', true, api);
   } else if (toLayout.childCount < maxLayoutColumnSupported()) {
-    insertToDestination(tr, to, sourceNode, toLayout, toLayoutPos);
-    var mappedFrom = tr.mapping.map(from);
-    removeFromSource(tr, tr.doc.resolve(mappedFrom));
+    var _$originalFrom$nodeAf2;
+    if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
+      removeFromSource(tr, tr.doc.resolve(from));
+      insertToDestination(tr, tr.mapping.map(to), sourceNode, toLayout, tr.mapping.map(toLayoutPos));
+    } else {
+      insertToDestination(tr, to, sourceNode, toLayout, toLayoutPos);
+      var mappedFrom = tr.mapping.map(from);
+      removeFromSource(tr, tr.doc.resolve(mappedFrom));
+    }
+    fireMoveNodeAnalytics(tr, INPUT_METHOD.DRAG_AND_DROP, $originalFrom.depth, ((_$originalFrom$nodeAf2 = $originalFrom.nodeAfter) === null || _$originalFrom$nodeAf2 === void 0 ? void 0 : _$originalFrom$nodeAf2.type.name) || '', 1, 'layoutSection', false, api);
   }
   return tr;
 };
@@ -50,7 +66,10 @@ var insertToDestination = function insertToDestination(tr, to, sourceNode, toLay
   var content = layoutColumn.createChecked({
     width: newColumnWidth
   }, sourceNode.type.name === 'layoutColumn' ? sourceNode.content : sourceNode);
-  tr.insert(to, content).setSelection(new NodeSelection(tr.doc.resolve(to))).scrollIntoView();
+  tr.insert(to, content);
+  if (!fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
+    tr.setSelection(new NodeSelection(tr.doc.resolve(to))).scrollIntoView();
+  }
   return tr;
 };
 
@@ -133,12 +152,12 @@ export var moveToLayout = function moveToLayout(api) {
       }
       if (toNode.type === layoutSection) {
         var toPos = options !== null && options !== void 0 && options.moveToEnd ? to + toNode.nodeSize - 1 : to + 1;
-        return moveToExistingLayout(toNode, to, fromNodeWithoutBreakout, from, toPos, tr, isInSameLayout($from, $to));
+        return moveToExistingLayout(toNode, to, fromNodeWithoutBreakout, from, toPos, tr, $from, $to, api);
       } else if (toNode.type === layoutColumn) {
         var toLayout = $to.parent;
         var toLayoutPos = to - $to.parentOffset - 1;
         var _toPos = options !== null && options !== void 0 && options.moveToEnd ? to + toNode.nodeSize : to;
-        return moveToExistingLayout(toLayout, toLayoutPos, fromNodeWithoutBreakout, from, _toPos, tr, isInSameLayout($from, $to));
+        return moveToExistingLayout(toLayout, toLayoutPos, fromNodeWithoutBreakout, from, _toPos, tr, $from, $to, api);
       } else {
         var toNodeWithoutBreakout = toNode;
 
@@ -158,10 +177,14 @@ export var moveToLayout = function moveToLayout(api) {
         if (newLayout) {
           tr = removeFromSource(tr, $from);
           var mappedTo = tr.mapping.map(to);
-          tr.delete(mappedTo, mappedTo + toNodeWithoutBreakout.nodeSize).insert(mappedTo, newLayout).setSelection(new NodeSelection(tr.doc.resolve(mappedTo))).scrollIntoView();
+          tr.delete(mappedTo, mappedTo + toNodeWithoutBreakout.nodeSize).insert(mappedTo, newLayout);
+          if (!fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
+            tr.setSelection(new NodeSelection(tr.doc.resolve(mappedTo))).scrollIntoView();
+          }
           breakoutMode && tr.setNodeMarkup(mappedTo, newLayout.type, newLayout.attrs, [breakout.create({
             mode: breakoutMode
           })]);
+          fireInsertLayoutAnalytics(tr, api);
         }
         return tr;
       }

package/dist/esm/pm-plugins/utils/fire-analytics.js

@@ -0,0 +1,30 @@
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+export var fireMoveNodeAnalytics = function fireMoveNodeAnalytics(tr, inputMethod, fromDepth, fromNodeType, toDepth, toNodeType, isSameParent, api) {
+  var _api$analytics;
+  return api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 ? void 0 : _api$analytics.attachAnalyticsEvent({
+    eventType: EVENT_TYPE.TRACK,
+    action: ACTION.MOVED,
+    actionSubject: ACTION_SUBJECT.ELEMENT,
+    actionSubjectId: ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
+    attributes: {
+      nodeDepth: fromDepth,
+      nodeType: fromNodeType,
+      destinationNodeDepth: toDepth,
+      destinationNodeType: toNodeType,
+      isSameParent: isSameParent,
+      inputMethod: inputMethod
+    }
+  })(tr);
+};
+export var fireInsertLayoutAnalytics = function fireInsertLayoutAnalytics(tr, api) {
+  var _api$analytics2;
+  api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || (_api$analytics2 = _api$analytics2.actions) === null || _api$analytics2 === void 0 || _api$analytics2.attachAnalyticsEvent({
+    action: ACTION.INSERTED,
+    actionSubject: ACTION_SUBJECT.DOCUMENT,
+    actionSubjectId: ACTION_SUBJECT_ID.LAYOUT,
+    attributes: {
+      inputMethod: INPUT_METHOD.DRAG_AND_DROP
+    },
+    eventType: EVENT_TYPE.TRACK
+  })(tr);
+};

package/dist/esm/pm-plugins/utils/update-selection.js

@@ -0,0 +1,38 @@
+import { GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
+import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
+export var getInsertLayoutStep = function getInsertLayoutStep(tr) {
+  return tr.steps.find(function (step) {
+    var _step$slice$content$f;
+    return step instanceof ReplaceStep && ['layoutSection', 'layoutColumn'].includes(((_step$slice$content$f = step.slice.content.firstChild) === null || _step$slice$content$f === void 0 ? void 0 : _step$slice$content$f.type.name) || '');
+  });
+};
+export var updateSelection = function updateSelection(tr, to, insertAtRight) {
+  var _lastNode;
+  var $to = tr.doc.resolve(to);
+  var toNode = $to.nodeAfter;
+  var lastNode = toNode === null || toNode === void 0 ? void 0 : toNode.content.lastChild;
+  if (!toNode || !lastNode) {
+    return tr;
+  }
+  var offset = toNode.nodeSize;
+
+  // drop at the start of the layoutSection or to create a new layoutSection
+  if (toNode.type.name === 'layoutSection') {
+    if (insertAtRight) {
+      var _toNode$content$lastC;
+      lastNode = (_toNode$content$lastC = toNode.content.lastChild) === null || _toNode$content$lastC === void 0 ? void 0 : _toNode$content$lastC.lastChild;
+      offset = toNode.nodeSize - 1;
+    } else {
+      var _toNode$content$first, _toNode$content$first2;
+      lastNode = (_toNode$content$first = toNode.content.firstChild) === null || _toNode$content$first === void 0 ? void 0 : _toNode$content$first.lastChild;
+      offset = 1 + (((_toNode$content$first2 = toNode.content.firstChild) === null || _toNode$content$first2 === void 0 ? void 0 : _toNode$content$first2.nodeSize) || 0);
+    }
+  }
+  if (['paragraph', 'heading'].includes(((_lastNode = lastNode) === null || _lastNode === void 0 ? void 0 : _lastNode.type.name) || '')) {
+    tr.setSelection(TextSelection.near(tr.doc.resolve(to + offset - 2)));
+  } else if (lastNode) {
+    tr.setSelection(new GapCursorSelection(tr.doc.resolve(to + offset - 1), Side.RIGHT));
+  }
+  return tr;
+};

package/dist/esm/ui/drop-target-layout.js

@@ -9,6 +9,7 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
 import { css, jsx } from '@emotion/react';
 import { layoutBreakpointWidth } from '@atlaskit/editor-shared-styles';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { DropIndicator } from '@atlaskit/pragmatic-drag-and-drop-react-drop-indicator/box';
 import { dropTargetForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { B200 } from '@atlaskit/theme/colors';
@@ -16,6 +17,7 @@ import { getNodeAnchor } from '../pm-plugins/decorations-common';
 import { useActiveAnchorTracker } from '../pm-plugins/utils/active-anchor-tracker';
 import { isAnchorSupported } from '../pm-plugins/utils/anchor-utils';
 import { isBlocksDragTargetDebug } from '../pm-plugins/utils/drag-target-debug';
+import { getInsertLayoutStep, updateSelection } from '../pm-plugins/utils/update-selection';
 
 // 8px gap + 16px on left and right
 var DROP_TARGET_LAYOUT_DROP_ZONE_WIDTH = 40;
@@ -71,10 +73,32 @@ export var DropTargetLayout = function DropTargetLayout(props) {
       return;
     }
     var to = getPos();
+    var mappedTo;
     if (to !== undefined) {
-      var _api$core, _api$blockControls2;
+      var _api$core;
       var from = activeNode.pos;
-      api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.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(from, to));
+      api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function (_ref2) {
+        var _api$blockControls2;
+        var tr = _ref2.tr;
+        api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || (_api$blockControls2 = _api$blockControls2.commands) === null || _api$blockControls2 === void 0 || _api$blockControls2.moveToLayout(from, to)({
+          tr: tr
+        });
+        if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
+          var insertColumnStep = getInsertLayoutStep(tr);
+          mappedTo = insertColumnStep === null || insertColumnStep === void 0 ? void 0 : insertColumnStep.from;
+        }
+        return tr;
+      });
+      if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
+        var _api$core2;
+        api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(function (_ref3) {
+          var tr = _ref3.tr;
+          if (mappedTo !== undefined) {
+            updateSelection(tr, mappedTo);
+          }
+          return tr;
+        });
+      }
     }
   }, [api, getPos, activeNode]);
   useEffect(function () {

package/dist/esm/ui/inline-drop-target.js

@@ -11,6 +11,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
 import { css, jsx } from '@emotion/react';
 import { akEditorBreakoutPadding } from '@atlaskit/editor-shared-styles';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { DropIndicator } from '@atlaskit/pragmatic-drag-and-drop-react-drop-indicator/box';
 import { dropTargetForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { B200 } from '@atlaskit/theme/colors';
@@ -18,6 +19,7 @@ import { getNodeAnchor } from '../pm-plugins/decorations-common';
 import { useActiveAnchorTracker } from '../pm-plugins/utils/active-anchor-tracker';
 import { isAnchorSupported } from '../pm-plugins/utils/anchor-utils';
 import { isBlocksDragTargetDebug } from '../pm-plugins/utils/drag-target-debug';
+import { getInsertLayoutStep, updateSelection } from '../pm-plugins/utils/update-selection';
 var HOVER_ZONE_WIDTH = '--editor-blocks-inline-hover-zone-width';
 var HOVER_ZONE_HEIGHT = '--editor-blocks-inline-hover-zone-height';
 var HOVER_ZONE_TOP = '--editor-blocks-inline-hover-zone-top';
@@ -180,16 +182,39 @@ export var InlineDropTarget = function InlineDropTarget(_ref) {
       return;
     }
     var toPos = getPos();
+    var mappedTo;
     if (activeNode && toPos !== undefined) {
-      var _api$core, _api$blockControls2;
+      var _api$core;
       var start = activeNode.pos;
-      api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.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(start, toPos, {
-        moveToEnd: position === 'right'
-      }));
+      var moveToEnd = position === 'right';
+      api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function (_ref3) {
+        var _api$blockControls2;
+        var tr = _ref3.tr;
+        api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || (_api$blockControls2 = _api$blockControls2.commands) === null || _api$blockControls2 === void 0 || _api$blockControls2.moveToLayout(start, toPos, {
+          moveToEnd: moveToEnd
+        })({
+          tr: tr
+        });
+        if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
+          var insertLayoutStep = getInsertLayoutStep(tr);
+          mappedTo = insertLayoutStep === null || insertLayoutStep === void 0 ? void 0 : insertLayoutStep.from;
+        }
+        return tr;
+      });
+      if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
+        var _api$core2;
+        api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(function (_ref4) {
+          var tr = _ref4.tr;
+          if (mappedTo !== undefined) {
+            updateSelection(tr, mappedTo, moveToEnd);
+          }
+          return tr;
+        });
+      }
     }
   }, [api, getPos, position]);
   var hoverZoneRectStyle = useMemo(function () {
-    var _ref3;
+    var _ref5;
     var isLayoutNode = (nextNode === null || nextNode === void 0 ? void 0 : nextNode.type.name) === 'layoutSection';
     var layoutAdjustment = isLayoutNode ? {
       width: 11,
@@ -197,7 +222,7 @@ export var InlineDropTarget = function InlineDropTarget(_ref) {
       top: 6,
       bottom: 2
     } : undefined;
-    return _ref3 = {}, _defineProperty(_ref3, HOVER_ZONE_WIDTH, nodeDimension.widthOffset ? "calc((100% - ".concat(nodeDimension.width, ")/2 - ").concat(GAP, "px + ").concat(nodeDimension.widthOffset, " - ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.width) || 0, "px)") : "calc((100% - ".concat(nodeDimension.width, ")/2 - ").concat(GAP, "px - ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.width) || 0, "px)")), _defineProperty(_ref3, HOVER_ZONE_HEIGHT, "calc(".concat(nodeDimension.height, " + ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.height) || 0, "px)")), _defineProperty(_ref3, HOVER_ZONE_TOP, "calc(".concat(nodeDimension.top, " + ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.top) || 0, "px)")), _defineProperty(_ref3, HOVER_ZONE_BOTTOM, "calc(".concat(nodeDimension.bottom, " - ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.bottom) || 0, "px)")), _defineProperty(_ref3, HOVER_ZONE_ANCHOR_NAME, anchorName), _ref3;
+    return _ref5 = {}, _defineProperty(_ref5, HOVER_ZONE_WIDTH, nodeDimension.widthOffset ? "calc((100% - ".concat(nodeDimension.width, ")/2 - ").concat(GAP, "px + ").concat(nodeDimension.widthOffset, " - ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.width) || 0, "px)") : "calc((100% - ".concat(nodeDimension.width, ")/2 - ").concat(GAP, "px - ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.width) || 0, "px)")), _defineProperty(_ref5, HOVER_ZONE_HEIGHT, "calc(".concat(nodeDimension.height, " + ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.height) || 0, "px)")), _defineProperty(_ref5, HOVER_ZONE_TOP, "calc(".concat(nodeDimension.top, " + ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.top) || 0, "px)")), _defineProperty(_ref5, HOVER_ZONE_BOTTOM, "calc(".concat(nodeDimension.bottom, " - ").concat((layoutAdjustment === null || layoutAdjustment === void 0 ? void 0 : layoutAdjustment.bottom) || 0, "px)")), _defineProperty(_ref5, HOVER_ZONE_ANCHOR_NAME, anchorName), _ref5;
   }, [nextNode === null || nextNode === void 0 ? void 0 : nextNode.type.name, nodeDimension, anchorName]);
   var dropIndicatorPos = useMemo(function () {
     return isLeftPosition ? 'right' : 'left';

package/dist/types/pm-plugins/utils/fire-analytics.d.ts

@@ -0,0 +1,5 @@
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import { type Transaction } from '@atlaskit/editor-prosemirror/state';
+import { type BlockControlsPlugin } from '../../blockControlsPluginType';
+export declare const fireMoveNodeAnalytics: (tr: Transaction, inputMethod: string, fromDepth: number, fromNodeType: string, toDepth?: number, toNodeType?: string, isSameParent?: boolean, api?: ExtractInjectionAPI<BlockControlsPlugin>) => boolean | undefined;
+export declare const fireInsertLayoutAnalytics: (tr: Transaction, api?: ExtractInjectionAPI<BlockControlsPlugin>) => void;

package/dist/types/pm-plugins/utils/update-selection.d.ts

@@ -0,0 +1,3 @@
+import { type Transaction } from '@atlaskit/editor-prosemirror/state';
+export declare const getInsertLayoutStep: (tr: Transaction) => import("prosemirror-transform").Step | undefined;
+export declare const updateSelection: (tr: Transaction, to: number, insertAtRight?: boolean) => Transaction;

package/dist/types-ts4.5/pm-plugins/utils/fire-analytics.d.ts

@@ -0,0 +1,5 @@
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import { type Transaction } from '@atlaskit/editor-prosemirror/state';
+import { type BlockControlsPlugin } from '../../blockControlsPluginType';
+export declare const fireMoveNodeAnalytics: (tr: Transaction, inputMethod: string, fromDepth: number, fromNodeType: string, toDepth?: number, toNodeType?: string, isSameParent?: boolean, api?: ExtractInjectionAPI<BlockControlsPlugin>) => boolean | undefined;
+export declare const fireInsertLayoutAnalytics: (tr: Transaction, api?: ExtractInjectionAPI<BlockControlsPlugin>) => void;

package/dist/types-ts4.5/pm-plugins/utils/update-selection.d.ts

@@ -0,0 +1,3 @@
+import { type Transaction } from '@atlaskit/editor-prosemirror/state';
+export declare const getInsertLayoutStep: (tr: Transaction) => import("prosemirror-transform").Step | undefined;
+export declare const updateSelection: (tr: Transaction, to: number, insertAtRight?: boolean) => Transaction;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "2.14.1",
+	"version": "2.14.3",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,12 +31,12 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-common": "^96.0.0",
+		"@atlaskit/editor-common": "^96.2.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^1.2.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
 		"@atlaskit/editor-plugin-feature-flags": "^1.2.0",
-		"@atlaskit/editor-plugin-quick-insert": "^1.7.0",
+		"@atlaskit/editor-plugin-quick-insert": "^1.8.0",
 		"@atlaskit/editor-plugin-width": "^1.3.0",
 		"@atlaskit/editor-prosemirror": "6.2.1",
 		"@atlaskit/editor-shared-styles": "^3.2.0",
@@ -44,11 +44,11 @@
 		"@atlaskit/icon": "^23.0.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^1.4.0",
-		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^2.0.0",
+		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^2.1.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^1.1.0",
 		"@atlaskit/primitives": "^13.3.0",
 		"@atlaskit/theme": "^14.0.0",
-		"@atlaskit/tmp-editor-statsig": "^2.22.0",
+		"@atlaskit/tmp-editor-statsig": "^2.23.0",
 		"@atlaskit/tokens": "^2.4.0",
 		"@atlaskit/tooltip": "^18.9.0",
 		"@babel/runtime": "^7.0.0",
@@ -165,6 +165,9 @@
 		},
 		"platform_editor_use_nested_table_pm_nodes": {
 			"type": "boolean"
+		},
+		"platform_editor_advanced_layouts_post_fix_patch_1": {
+			"type": "boolean"
 		}
 	}
 }