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

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 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,11 @@ 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 _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 +37,21 @@ 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();
+    (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)()) {
+    var _$originalFrom$nodeAf2;
     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;
 };
@@ -139,12 +146,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;
 
@@ -168,6 +175,7 @@ var moveToLayout = exports.moveToLayout = function moveToLayout(api) {
           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/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,8 @@
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 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 +32,21 @@ 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();
+    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()) {
+    var _$originalFrom$nodeAf2;
     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;
 };
@@ -136,12 +143,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;
 
@@ -163,6 +170,7 @@ export const moveToLayout = api => (from, to, options) => ({
       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/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,8 @@
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 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 +31,21 @@ 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();
+    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()) {
+    var _$originalFrom$nodeAf2;
     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;
 };
@@ -133,12 +140,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;
 
@@ -162,6 +169,7 @@ export var moveToLayout = function moveToLayout(api) {
           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/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-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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "2.14.1",
+	"version": "2.14.2",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",