@atlaskit/editor-plugin-layout 27.0.3 → 27.0.5

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-layout
 
+## 27.0.5
+
+### Patch Changes
+
+- [`1469d7073322c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1469d7073322c) -
+  Clean up feature gate `platform_editor_vanilla_node_views_patch_1`
+
+## 27.0.4
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 27.0.3
 
 ### Patch Changes

package/dist/cjs/layoutPlugin.js

@@ -8,10 +8,12 @@ exports.selectIntoLayoutSection = exports.layoutPlugin = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _layoutSection = require("@atlaskit/adf-schema/layout-section");
 var _layoutColumn = require("@atlaskit/adf-schema/nodes/layout-column");
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _blockMenu = require("@atlaskit/editor-common/block-menu");
-var _messages = require("@atlaskit/editor-common/messages");
-var _quickInsert = require("@atlaskit/editor-common/quick-insert");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _assets = require("@atlaskit/editor-common/assets");
+var _key = require("@atlaskit/editor-common/block-menu/key");
+var _rank = require("@atlaskit/editor-common/block-menu/rank");
+var _insertBlock = require("@atlaskit/editor-common/messages/insert-block");
+var _layout = require("@atlaskit/editor-common/messages/layout");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
@@ -69,11 +71,11 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
   var isRegisteredSlashCommandEnabled = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_slash_command') && isAdvancedLayoutEnabled;
   api === null || api === void 0 || (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 || _api$blockMenu.actions.registerBlockMenuComponents([{
     type: 'block-menu-item',
-    key: _blockMenu.TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key,
+    key: _key.TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key,
     parent: {
       type: 'block-menu-section',
-      key: _blockMenu.TRANSFORM_STRUCTURE_MENU_SECTION.key,
-      rank: _blockMenu.TRANSFORM_STRUCTURE_MENU_SECTION_RANK[_blockMenu.TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key]
+      key: _key.TRANSFORM_STRUCTURE_MENU_SECTION.key,
+      rank: _rank.TRANSFORM_STRUCTURE_MENU_SECTION_RANK[_key.TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key]
     },
     component: (0, _LayoutBlockMenuItem.createLayoutBlockMenuItem)(api),
     isHidden: function isHidden() {
@@ -159,14 +161,14 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
         var withInsertLayoutAnalytics = function withInsertLayoutAnalytics(tr, columnCount) {
           var _api$analytics3;
           api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 || (_api$analytics3 = _api$analytics3.actions) === null || _api$analytics3 === void 0 || _api$analytics3.attachAnalyticsEvent({
-            action: _analytics.ACTION.INSERTED,
-            actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
-            actionSubjectId: _analytics.ACTION_SUBJECT_ID.LAYOUT,
+            action: _enums.ACTION.INSERTED,
+            actionSubject: _enums.ACTION_SUBJECT.DOCUMENT,
+            actionSubjectId: _enums.ACTION_SUBJECT_ID.LAYOUT,
             attributes: {
-              inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT,
+              inputMethod: _enums.INPUT_METHOD.QUICK_INSERT,
               columnCount: columnCount
             },
-            eventType: _analytics.EVENT_TYPE.TRACK
+            eventType: _enums.EVENT_TYPE.TRACK
           })(tr);
           return tr;
         };
@@ -181,7 +183,7 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
             return {
               id: id,
               title: title,
-              description: formatMessage(_messages.toolbarInsertBlockMessages.columnsDescriptionAdvancedLayout, {
+              description: formatMessage(_insertBlock.toolbarInsertBlockMessages.columnsDescriptionAdvancedLayout, {
                 numberOfColumns: descriptionColumnCount
               }),
               keywords: ['layout', 'column', 'section', 'col', keyword],
@@ -201,12 +203,12 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
           };
           var advancedSingleColumnOption = allowAdvancedSingleColumnLayout ? [{
             id: 'onecolumnlayout',
-            title: formatMessage(_messages.layoutMessages.singleColumnAdvancedLayout),
-            description: formatMessage(_messages.toolbarInsertBlockMessages.singleColumnsDescriptionAdvancedLayout),
+            title: formatMessage(_layout.toolbarMessages.singleColumnAdvancedLayout),
+            description: formatMessage(_insertBlock.toolbarInsertBlockMessages.singleColumnsDescriptionAdvancedLayout),
             keywords: ['layout', 'column', 'section', 'col', 'single column'],
             priority: 1100,
             icon: function icon() {
-              return /*#__PURE__*/_react.default.createElement(_quickInsert.IconOneColumnLayout, null);
+              return /*#__PURE__*/_react.default.createElement(_assets.IconOneColumnLayout, null);
             },
             action: function action(insert, state) {
               var tr = insert((0, _actions.createMultiColumnLayoutSection)(state, 1));
@@ -223,60 +225,60 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
             columnCount: 2,
             descriptionColumnCount: 'two',
             icon: function icon() {
-              return /*#__PURE__*/_react.default.createElement(_quickInsert.IconTwoColumnLayout, null);
+              return /*#__PURE__*/_react.default.createElement(_assets.IconTwoColumnLayout, null);
             },
             id: 'twocolumnslayout',
             keyword: 'two column',
-            title: formatMessage(_messages.layoutMessages.twoColumnsAdvancedLayout)
+            title: formatMessage(_layout.toolbarMessages.twoColumnsAdvancedLayout)
           })].concat(advancedSingleColumnOption, [createAdvancedColumnLayoutOption({
             columnCount: 3,
             descriptionColumnCount: 'three',
             icon: function icon() {
-              return /*#__PURE__*/_react.default.createElement(_quickInsert.IconThreeColumnLayout, null);
+              return /*#__PURE__*/_react.default.createElement(_assets.IconThreeColumnLayout, null);
             },
             id: 'threecolumnslayout',
             keyword: 'three column',
-            title: formatMessage(_messages.layoutMessages.threeColumnsAdvancedLayout)
+            title: formatMessage(_layout.toolbarMessages.threeColumnsAdvancedLayout)
           }), createAdvancedColumnLayoutOption({
             columnCount: 4,
             descriptionColumnCount: 'four',
             icon: function icon() {
-              return /*#__PURE__*/_react.default.createElement(_quickInsert.IconFourColumnLayout, null);
+              return /*#__PURE__*/_react.default.createElement(_assets.IconFourColumnLayout, null);
             },
             id: 'fourcolumnslayout',
             keyword: 'four column',
-            title: formatMessage(_messages.layoutMessages.fourColumns)
+            title: formatMessage(_layout.toolbarMessages.fourColumns)
           }), createAdvancedColumnLayoutOption({
             columnCount: 5,
             descriptionColumnCount: 'five',
             icon: function icon() {
-              return /*#__PURE__*/_react.default.createElement(_quickInsert.IconFiveColumnLayout, null);
+              return /*#__PURE__*/_react.default.createElement(_assets.IconFiveColumnLayout, null);
             },
             id: 'fivecolumnslayout',
             keyword: 'five column',
-            title: formatMessage(_messages.layoutMessages.fiveColumns)
+            title: formatMessage(_layout.toolbarMessages.fiveColumns)
           })]);
         } else {
           return [{
             id: 'layout',
-            title: formatMessage(_messages.toolbarInsertBlockMessages.columns),
-            description: formatMessage(_messages.toolbarInsertBlockMessages.columnsDescription),
+            title: formatMessage(_insertBlock.toolbarInsertBlockMessages.columns),
+            description: formatMessage(_insertBlock.toolbarInsertBlockMessages.columnsDescription),
             keywords: ['column', 'section'],
             priority: 1100,
             icon: function icon() {
-              return /*#__PURE__*/_react.default.createElement(_quickInsert.IconLayout, null);
+              return /*#__PURE__*/_react.default.createElement(_assets.IconLayout, null);
             },
             action: function action(insert, state) {
               var _api$analytics4;
               var tr = insert((0, _actions.createDefaultLayoutSection)(state));
               api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 || (_api$analytics4 = _api$analytics4.actions) === null || _api$analytics4 === void 0 || _api$analytics4.attachAnalyticsEvent({
-                action: _analytics.ACTION.INSERTED,
-                actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
-                actionSubjectId: _analytics.ACTION_SUBJECT_ID.LAYOUT,
+                action: _enums.ACTION.INSERTED,
+                actionSubject: _enums.ACTION_SUBJECT.DOCUMENT,
+                actionSubjectId: _enums.ACTION_SUBJECT_ID.LAYOUT,
                 attributes: {
-                  inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT
+                  inputMethod: _enums.INPUT_METHOD.QUICK_INSERT
                 },
-                eventType: _analytics.EVENT_TYPE.TRACK
+                eventType: _enums.EVENT_TYPE.TRACK
               })(tr);
               return tr;
             }

package/dist/cjs/nodeviews/index.js

@@ -13,9 +13,9 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
-var _coreUtils = require("@atlaskit/editor-common/core-utils");
+var _isSsr = require("@atlaskit/editor-common/is-ssr");
 var _reactNodeView = _interopRequireWildcard(require("@atlaskit/editor-common/react-node-view"));
-var _resizer = require("@atlaskit/editor-common/resizer");
+var _BreakoutResizer = require("@atlaskit/editor-common/resizer/BreakoutResizer");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _LayoutSSRReactContextsProvider = require("../ui/LayoutSSRReactContextsProvider");
@@ -154,7 +154,7 @@ var LayoutSectionView = exports.LayoutSectionView = /*#__PURE__*/function (_Reac
       // LayoutSSRReactContextsProvider wraps the placeholder to inject the
       // editor's IntlShape, defending against any descendants that call
       // `useIntl()` during renderToStaticMarkup.
-      if ((0, _coreUtils.isSSR)()) {
+      if ((0, _isSsr.isSSR)()) {
         return /*#__PURE__*/_react.default.createElement(_LayoutSSRReactContextsProvider.LayoutSSRReactContextsProvider, {
           intl: this.intl
         }, /*#__PURE__*/_react.default.createElement(_reactNodeView.NodeViewContentHole, {
@@ -173,7 +173,7 @@ var LayoutSectionView = exports.LayoutSectionView = /*#__PURE__*/function (_Reac
   }, {
     key: "ignoreMutation",
     value: function ignoreMutation(mutation) {
-      return (0, _resizer.ignoreResizerMutations)(mutation);
+      return (0, _BreakoutResizer.ignoreResizerMutations)(mutation);
     }
   }]);
 }(_reactNodeView.default);

package/dist/cjs/nodeviews/layoutSectionView.js

@@ -8,7 +8,7 @@ exports.LayoutSectionView = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _resizer = require("@atlaskit/editor-common/resizer");
+var _BreakoutResizer = require("@atlaskit/editor-common/resizer/BreakoutResizer");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _utils = require("./utils");
@@ -16,7 +16,6 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var toDOM = function toDOM(node, isEmpty) {
   var _node$attrs$columnRul, _node$attrs$localId;
-  var computedEmpty = isEmpty !== null && isEmpty !== void 0 ? isEmpty : (0, _utils.isEmptyLayout)(node);
   return ['div', {
     class: 'layoutSectionView-content-wrap'
   }, ['div', {
@@ -26,7 +25,7 @@ var toDOM = function toDOM(node, isEmpty) {
     // `?? ''` keeps unset attributes out of the DOM as `"null"`, which adf-schema's`parseDOM`
     // reads back as a truthy string.
     'data-column-rule-style': (_node$attrs$columnRul = node.attrs.columnRuleStyle) !== null && _node$attrs$columnRul !== void 0 ? _node$attrs$columnRul : '',
-    'data-empty-layout': String(computedEmpty)
+    'data-empty-layout': String(isEmpty)
   }, (0, _fg.fg)('platform_editor_adf_with_localid') && {
     'data-local-id': (_node$attrs$localId = node.attrs.localId) !== null && _node$attrs$localId !== void 0 ? _node$attrs$localId : ''
   }), 0]]];
@@ -42,7 +41,7 @@ var toDOM = function toDOM(node, isEmpty) {
 var LayoutSectionView = exports.LayoutSectionView = /*#__PURE__*/function () {
   function LayoutSectionView(node) {
     (0, _classCallCheck2.default)(this, LayoutSectionView);
-    var isEmpty = (0, _fg.fg)('platform_editor_vanilla_node_views_patch_1') ? (0, _utils.isEmptyLayout)(node) : undefined;
+    var isEmpty = (0, _utils.isEmptyLayout)(node);
     var _ref = _model.DOMSerializer.renderSpec(document, toDOM(node, isEmpty)),
       dom = _ref.dom,
       contentDOM = _ref.contentDOM;
@@ -58,15 +57,12 @@ var LayoutSectionView = exports.LayoutSectionView = /*#__PURE__*/function () {
         var _node$attrs$columnRul2;
         this.contentDOM.setAttribute('data-column-rule-style', (_node$attrs$columnRul2 = node.attrs.columnRuleStyle) !== null && _node$attrs$columnRul2 !== void 0 ? _node$attrs$columnRul2 : '');
       }
+
+      // Cache isEmpty so update() does not call isEmptyLayout on the previous node.
       var isEmpty = (0, _utils.isEmptyLayout)(node);
-      if ((0, _fg.fg)('platform_editor_vanilla_node_views_patch_1')) {
-        // Cache isEmpty so update() does not call isEmptyLayout on the previous node.
-        if (isEmpty !== this.isEmpty) {
-          this.contentDOM.setAttribute('data-empty-layout', String(isEmpty));
-          this.isEmpty = isEmpty;
-        }
-      } else if (isEmpty !== (0, _utils.isEmptyLayout)(this.node)) {
+      if (isEmpty !== this.isEmpty) {
         this.contentDOM.setAttribute('data-empty-layout', String(isEmpty));
+        this.isEmpty = isEmpty;
       }
       if ((0, _fg.fg)('platform_editor_adf_with_localid') && node.attrs.localId !== this.node.attrs.localId) {
         var _node$attrs$localId2;
@@ -78,7 +74,7 @@ var LayoutSectionView = exports.LayoutSectionView = /*#__PURE__*/function () {
   }, {
     key: "ignoreMutation",
     value: function ignoreMutation(mutation) {
-      return (0, _resizer.ignoreResizerMutations)(mutation);
+      return (0, _BreakoutResizer.ignoreResizerMutations)(mutation);
     }
   }]);
 }();

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

@@ -9,9 +9,11 @@ exports.forceSectionToPresetLayout = forceSectionToPresetLayout;
 exports.getEffectiveMaxLayoutColumns = getEffectiveMaxLayoutColumns;
 exports.toggleLayoutColumnMenu = exports.setPresetLayout = exports.setLayoutColumnValign = exports.setLayoutColumnDangerPreview = exports.insertLayoutColumnsWithAnalytics = exports.insertLayoutColumns = exports.insertLayoutColumn = exports.getSelectedLayout = exports.getPresetLayout = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _nodeEvents = require("@atlaskit/editor-common/analytics/types/node-events");
 var _utils = require("@atlaskit/editor-common/utils");
+var _slice = require("@atlaskit/editor-common/utils/slice");
+var _withAnalytics = require("@atlaskit/editor-common/withAnalytics");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
@@ -71,7 +73,7 @@ var getWidthsForPreset = function getWidthsForPreset(presetLayout) {
 var isValidLayoutWidthDistributions = function isValidLayoutWidthDistributions(layoutSection) {
   var totalWidth = 0;
   var hasInvalidWidth = false;
-  (0, _utils.mapChildren)(layoutSection, function (column) {
+  (0, _slice.mapChildren)(layoutSection, function (column) {
     return column.attrs.width;
   }).forEach(function (width) {
     if (typeof width === 'number' && isFinite(width) && width > 0 && width <= 100) {
@@ -88,7 +90,7 @@ var isValidLayoutWidthDistributions = function isValidLayoutWidthDistributions(l
  * inside the layoutSection node
  */
 var getPresetLayout = exports.getPresetLayout = function getPresetLayout(section) {
-  var widths = (0, _utils.mapChildren)(section, function (column) {
+  var widths = (0, _slice.mapChildren)(section, function (column) {
     return column.attrs.width;
   }).join(',');
   if ((0, _editorExperiment.editorExperiment)('advanced_layouts', true)) {
@@ -179,15 +181,15 @@ var insertLayoutColumns = exports.insertLayoutColumns = function insertLayoutCol
 };
 var insertLayoutColumnsWithAnalytics = exports.insertLayoutColumnsWithAnalytics = function insertLayoutColumnsWithAnalytics(editorAnalyticsAPI) {
   return function (inputMethod) {
-    return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
-      action: _analytics.ACTION.INSERTED,
-      actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.LAYOUT,
+    return (0, _withAnalytics.withAnalytics)(editorAnalyticsAPI, {
+      action: _enums.ACTION.INSERTED,
+      actionSubject: _enums.ACTION_SUBJECT.DOCUMENT,
+      actionSubjectId: _enums.ACTION_SUBJECT_ID.LAYOUT,
       attributes: {
         inputMethod: inputMethod,
         columnCount: (0, _fg.fg)('platform_editor_column_count_analytics') ? 2 : undefined
       },
-      eventType: _analytics.EVENT_TYPE.TRACK
+      eventType: _enums.EVENT_TYPE.TRACK
     })(function (state, dispatch) {
       if (dispatch) {
         dispatch((0, _utils2.safeInsert)(createDefaultLayoutSection(state))(state.tr));
@@ -317,7 +319,7 @@ function columnWidth(node, schema, widths) {
   var truncatedWidths = widths.map(function (w) {
     return Number(w.toFixed(2));
   });
-  return (0, _utils.flatmap)(node.content, function (column, idx) {
+  return (0, _slice.flatmap)(node.content, function (column, idx) {
     if (column.type === layoutColumn) {
       return layoutColumn.create(_objectSpread(_objectSpread({}, column.attrs), {}, {
         width: truncatedWidths[idx]
@@ -370,13 +372,13 @@ var setPresetLayout = exports.setPresetLayout = function setPresetLayout(editorA
       var tr = forceSectionToPresetLayout(state, node, pos, layout);
       if (tr) {
         editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
-          action: _analytics.ACTION.CHANGED_LAYOUT,
-          actionSubject: _analytics.ACTION_SUBJECT.LAYOUT,
+          action: _enums.ACTION.CHANGED_LAYOUT,
+          actionSubject: _enums.ACTION_SUBJECT.LAYOUT,
           attributes: {
             previousLayout: formatLayoutName(selectedLayout),
             newLayout: formatLayoutName(layout)
           },
-          eventType: _analytics.EVENT_TYPE.TRACK
+          eventType: _enums.EVENT_TYPE.TRACK
         })(tr);
         tr.setMeta('scrollIntoView', false);
         if (dispatch) {
@@ -494,13 +496,13 @@ var deleteActiveLayoutNode = exports.deleteActiveLayoutNode = function deleteAct
       if (dispatch) {
         var tr = state.tr.delete(pos, pos + node.nodeSize);
         editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
-          action: _analytics.ACTION.DELETED,
-          actionSubject: _analytics.ACTION_SUBJECT.LAYOUT,
+          action: _enums.ACTION.DELETED,
+          actionSubject: _enums.ACTION_SUBJECT.LAYOUT,
           attributes: {
             layout: formatLayoutName(selectedLayout),
             inputMethod: inputMethod
           },
-          eventType: _analytics.EVENT_TYPE.TRACK
+          eventType: _enums.EVENT_TYPE.TRACK
         })(tr);
         dispatch(tr);
       }
@@ -513,36 +515,36 @@ var formatLayoutName = function formatLayoutName(layout) {
   if ((0, _editorExperiment.editorExperiment)('advanced_layouts', true)) {
     switch (layout) {
       case 'single':
-        return _analytics.LAYOUT_TYPE.SINGLE_COL;
+        return _nodeEvents.LAYOUT_TYPE.SINGLE_COL;
       case 'two_equal':
-        return _analytics.LAYOUT_TYPE.TWO_COLS_EQUAL;
+        return _nodeEvents.LAYOUT_TYPE.TWO_COLS_EQUAL;
       case 'three_equal':
-        return _analytics.LAYOUT_TYPE.THREE_COLS_EQUAL;
+        return _nodeEvents.LAYOUT_TYPE.THREE_COLS_EQUAL;
       case 'two_left_sidebar':
-        return _analytics.LAYOUT_TYPE.LEFT_SIDEBAR;
+        return _nodeEvents.LAYOUT_TYPE.LEFT_SIDEBAR;
       case 'two_right_sidebar':
-        return _analytics.LAYOUT_TYPE.RIGHT_SIDEBAR;
+        return _nodeEvents.LAYOUT_TYPE.RIGHT_SIDEBAR;
       case 'three_with_sidebars':
-        return _analytics.LAYOUT_TYPE.THREE_WITH_SIDEBARS;
+        return _nodeEvents.LAYOUT_TYPE.THREE_WITH_SIDEBARS;
       case 'four_equal':
-        return _analytics.LAYOUT_TYPE.FOUR_COLS_EQUAL;
+        return _nodeEvents.LAYOUT_TYPE.FOUR_COLS_EQUAL;
       case 'five_equal':
-        return _analytics.LAYOUT_TYPE.FIVE_COLS_EQUAL;
+        return _nodeEvents.LAYOUT_TYPE.FIVE_COLS_EQUAL;
     }
   }
   switch (layout) {
     case 'single':
-      return _analytics.LAYOUT_TYPE.SINGLE_COL;
+      return _nodeEvents.LAYOUT_TYPE.SINGLE_COL;
     case 'two_equal':
-      return _analytics.LAYOUT_TYPE.TWO_COLS_EQUAL;
+      return _nodeEvents.LAYOUT_TYPE.TWO_COLS_EQUAL;
     case 'three_equal':
-      return _analytics.LAYOUT_TYPE.THREE_COLS_EQUAL;
+      return _nodeEvents.LAYOUT_TYPE.THREE_COLS_EQUAL;
     case 'two_left_sidebar':
-      return _analytics.LAYOUT_TYPE.LEFT_SIDEBAR;
+      return _nodeEvents.LAYOUT_TYPE.LEFT_SIDEBAR;
     case 'two_right_sidebar':
-      return _analytics.LAYOUT_TYPE.RIGHT_SIDEBAR;
+      return _nodeEvents.LAYOUT_TYPE.RIGHT_SIDEBAR;
     case 'three_with_sidebars':
-      return _analytics.LAYOUT_TYPE.THREE_WITH_SIDEBARS;
+      return _nodeEvents.LAYOUT_TYPE.THREE_WITH_SIDEBARS;
   }
 };
 var LAYOUT_COLUMN_INSERT_META = exports.LAYOUT_COLUMN_INSERT_META = 'layoutColumnInsert';
@@ -617,7 +619,7 @@ function getEffectiveMaxLayoutColumns() {
   return (0, _editorExperiment.editorExperiment)('advanced_layouts', true) ? _consts.MAX_LAYOUT_COLUMNS : _consts.MAX_STANDARD_LAYOUT_COLUMNS;
 }
 var insertLayoutColumnAt = function insertLayoutColumnAt(side, editorAnalyticsAPI) {
-  var inputMethod = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : _analytics.INPUT_METHOD.LAYOUT_COLUMN_MENU;
+  var inputMethod = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : _enums.INPUT_METHOD.LAYOUT_COLUMN_MENU;
   return function (_ref5) {
     var tr = _ref5.tr;
     var selectedLayoutColumnsResult = (0, _layoutColumnSelection.getLayoutColumnsFromContentSelection)(tr.selection);
@@ -635,7 +637,7 @@ var insertLayoutColumnAt = function insertLayoutColumnAt(side, editorAnalyticsAP
       return null;
     }
     var insertIndex = side === 'left' ? selectedColumnIndex : selectedColumnIndex + 1;
-    var existingWidths = (0, _utils.mapChildren)(layoutSectionNode, function (column) {
+    var existingWidths = (0, _slice.mapChildren)(layoutSectionNode, function (column) {
       return column.attrs.width;
     });
     var redistributedWidths = (0, _layoutColumnDistribution.redistributeProportionally)(existingWidths, insertIndex, getEffectiveMaxLayoutColumns(), _consts.MIN_LAYOUT_COLUMN_WIDTH_PERCENT);
@@ -687,9 +689,9 @@ var insertLayoutColumnAt = function insertLayoutColumnAt(side, editorAnalyticsAP
       tr.setSelection(restoredSelection);
     }
     editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
-      action: _analytics.ACTION.INSERTED,
-      actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.LAYOUT_COLUMN,
+      action: _enums.ACTION.INSERTED,
+      actionSubject: _enums.ACTION_SUBJECT.DOCUMENT,
+      actionSubjectId: _enums.ACTION_SUBJECT_ID.LAYOUT_COLUMN,
       attributes: {
         endIndex: endIndex,
         inputMethod: inputMethod,
@@ -699,7 +701,7 @@ var insertLayoutColumnAt = function insertLayoutColumnAt(side, editorAnalyticsAP
         side: side,
         startIndex: startIndex
       },
-      eventType: _analytics.EVENT_TYPE.TRACK
+      eventType: _enums.EVENT_TYPE.TRACK
     })(tr);
     tr.setMeta('scrollIntoView', false);
     return tr;
@@ -708,7 +710,7 @@ var insertLayoutColumnAt = function insertLayoutColumnAt(side, editorAnalyticsAP
 var insertLayoutColumn = exports.insertLayoutColumn = function insertLayoutColumn(_ref6, editorAnalyticsAPI, api) {
   var side = _ref6.side,
     _ref6$inputMethod = _ref6.inputMethod,
-    inputMethod = _ref6$inputMethod === void 0 ? _analytics.INPUT_METHOD.LAYOUT_COLUMN_MENU : _ref6$inputMethod;
+    inputMethod = _ref6$inputMethod === void 0 ? _enums.INPUT_METHOD.LAYOUT_COLUMN_MENU : _ref6$inputMethod;
   return function (_ref7) {
     var tr = _ref7.tr;
     var result = insertLayoutColumnAt(side, editorAnalyticsAPI, inputMethod)({
@@ -723,7 +725,7 @@ var insertLayoutColumn = exports.insertLayoutColumn = function insertLayoutColum
 var setLayoutColumnValign = exports.setLayoutColumnValign = function setLayoutColumnValign(_ref8, editorAnalyticsAPI, api) {
   var valign = _ref8.valign,
     _ref8$inputMethod = _ref8.inputMethod,
-    inputMethod = _ref8$inputMethod === void 0 ? _analytics.INPUT_METHOD.LAYOUT_COLUMN_MENU : _ref8$inputMethod;
+    inputMethod = _ref8$inputMethod === void 0 ? _enums.INPUT_METHOD.LAYOUT_COLUMN_MENU : _ref8$inputMethod;
   return function (_ref9) {
     var tr = _ref9.tr;
     var selectedLayoutColumnsResult = (0, _layoutColumnSelection.getSelectedLayoutColumnsFromSelection)(tr.selection);
@@ -751,9 +753,9 @@ var setLayoutColumnValign = exports.setLayoutColumnValign = function setLayoutCo
       }));
     });
     editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
-      action: _analytics.ACTION.UPDATED,
-      actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.LAYOUT_COLUMN,
+      action: _enums.ACTION.UPDATED,
+      actionSubject: _enums.ACTION_SUBJECT.DOCUMENT,
+      actionSubjectId: _enums.ACTION_SUBJECT_ID.LAYOUT_COLUMN,
       attributes: {
         columnCount: layoutSectionNode.childCount,
         endIndex: endIndex,
@@ -764,7 +766,7 @@ var setLayoutColumnValign = exports.setLayoutColumnValign = function setLayoutCo
         updatedCount: updatedColumnCount,
         valign: valign
       },
-      eventType: _analytics.EVENT_TYPE.TRACK
+      eventType: _enums.EVENT_TYPE.TRACK
     })(tr);
     tr.setMeta('scrollIntoView', false);
     mapLayoutColumnPreservedSelection(tr, api);
@@ -775,7 +777,7 @@ var distributeLayoutColumns = exports.distributeLayoutColumns = function distrib
   return function () {
     var _ref10 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
       _ref10$inputMethod = _ref10.inputMethod,
-      inputMethod = _ref10$inputMethod === void 0 ? _analytics.INPUT_METHOD.LAYOUT_COLUMN_MENU : _ref10$inputMethod,
+      inputMethod = _ref10$inputMethod === void 0 ? _enums.INPUT_METHOD.LAYOUT_COLUMN_MENU : _ref10$inputMethod,
       _ref10$target = _ref10.target,
       target = _ref10$target === void 0 ? 'selectedColumns' : _ref10$target;
     return function (_ref11) {
@@ -788,7 +790,7 @@ var distributeLayoutColumns = exports.distributeLayoutColumns = function distrib
         startIndex = selectedLayoutColumnsResult.startIndex,
         endIndex = selectedLayoutColumnsResult.endIndex,
         selectedLayoutColumns = selectedLayoutColumnsResult.selectedLayoutColumns;
-      var existingWidths = (0, _utils.mapChildren)(layoutSectionNode, function (column) {
+      var existingWidths = (0, _slice.mapChildren)(layoutSectionNode, function (column) {
         return column.attrs.width;
       });
       var selectedWidths = selectedLayoutColumns.map(function (_ref12) {
@@ -833,9 +835,9 @@ var distributeLayoutColumns = exports.distributeLayoutColumns = function distrib
         }));
       });
       editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
-        action: _analytics.ACTION.UPDATED,
-        actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
-        actionSubjectId: _analytics.ACTION_SUBJECT_ID.LAYOUT_COLUMN,
+        action: _enums.ACTION.UPDATED,
+        actionSubject: _enums.ACTION_SUBJECT.DOCUMENT,
+        actionSubjectId: _enums.ACTION_SUBJECT_ID.LAYOUT_COLUMN,
         attributes: {
           columnCount: layoutSectionNode.childCount,
           endIndex: endIndex,
@@ -844,7 +846,7 @@ var distributeLayoutColumns = exports.distributeLayoutColumns = function distrib
           startIndex: startIndex,
           target: target
         },
-        eventType: _analytics.EVENT_TYPE.TRACK
+        eventType: _enums.EVENT_TYPE.TRACK
       })(tr);
       tr.setMeta('scrollIntoView', false);
       mapLayoutColumnPreservedSelection(tr, api);
@@ -882,7 +884,7 @@ var setLayoutColumnDangerPreview = exports.setLayoutColumnDangerPreview = functi
 var deleteLayoutColumn = exports.deleteLayoutColumn = function deleteLayoutColumn() {
   var _ref17 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     _ref17$inputMethod = _ref17.inputMethod,
-    inputMethod = _ref17$inputMethod === void 0 ? _analytics.INPUT_METHOD.LAYOUT_COLUMN_MENU : _ref17$inputMethod;
+    inputMethod = _ref17$inputMethod === void 0 ? _enums.INPUT_METHOD.LAYOUT_COLUMN_MENU : _ref17$inputMethod;
   var editorAnalyticsAPI = arguments.length > 1 ? arguments[1] : undefined;
   var api = arguments.length > 2 ? arguments[2] : undefined;
   return function (_ref18) {
@@ -906,9 +908,9 @@ var deleteLayoutColumn = exports.deleteLayoutColumn = function deleteLayoutColum
     });
     var emitDeleteColumnAnalytics = function emitDeleteColumnAnalytics(newColumnCount) {
       editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
-        action: _analytics.ACTION.DELETED,
-        actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
-        actionSubjectId: _analytics.ACTION_SUBJECT_ID.LAYOUT_COLUMN,
+        action: _enums.ACTION.DELETED,
+        actionSubject: _enums.ACTION_SUBJECT.DOCUMENT,
+        actionSubjectId: _enums.ACTION_SUBJECT_ID.LAYOUT_COLUMN,
         attributes: {
           endIndex: endIndex,
           hadContent: hadContent,
@@ -918,7 +920,7 @@ var deleteLayoutColumn = exports.deleteLayoutColumn = function deleteLayoutColum
           selectedCount: selectedLayoutColumns.length,
           startIndex: startIndex
         },
-        eventType: _analytics.EVENT_TYPE.TRACK
+        eventType: _enums.EVENT_TYPE.TRACK
       })(tr);
     };
 
@@ -943,7 +945,7 @@ var deleteLayoutColumn = exports.deleteLayoutColumn = function deleteLayoutColum
     });
 
     // Redistribute widths proportionally among remaining columns using shared utility
-    var existingWidths = (0, _utils.mapChildren)(layoutSectionNode, function (column) {
+    var existingWidths = (0, _slice.mapChildren)(layoutSectionNode, function (column) {
       return column.attrs.width;
     });
     var redistributed = selectedLayoutColumns.map(function (_, i) {

package/dist/cjs/pm-plugins/column-resize-divider.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.getColumnDividerDecorations = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _bindEventListener = require("bind-event-listener");
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
@@ -93,17 +93,17 @@ var dispatchColumnWidths = function dispatchColumnWidths(view, sectionPos, leftC
     }
   }
   editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
-    action: _analytics.ACTION.DRAGGED,
-    actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
-    actionSubjectId: _analytics.ACTION_SUBJECT_ID.LAYOUT_COLUMN,
+    action: _enums.ACTION.DRAGGED,
+    actionSubject: _enums.ACTION_SUBJECT.DOCUMENT,
+    actionSubjectId: _enums.ACTION_SUBJECT_ID.LAYOUT_COLUMN,
     attributes: {
       columnCount: sectionNode.childCount,
       leftColumnIndex: leftColIndex,
       leftColumnWidth: Number(leftWidth.toFixed(2)),
       rightColumnWidth: Number(rightWidth.toFixed(2)),
-      inputMethod: _analytics.INPUT_METHOD.DRAG
+      inputMethod: _enums.INPUT_METHOD.DRAG
     },
-    eventType: _analytics.EVENT_TYPE.TRACK
+    eventType: _enums.EVENT_TYPE.TRACK
   })(tr);
   view.dispatch(tr);
 };

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

@@ -4,7 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _keymap = require("@atlaskit/editor-common/keymap");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _actions = require("./actions");
 var bindLayoutColumnShortcut = function bindLayoutColumnShortcut(shortcut, command, list) {
@@ -23,23 +24,23 @@ function keymapPlugin(_ref) {
   var list = {};
   bindLayoutColumnShortcut(_keymaps.addColumnBefore.common, (0, _actions.insertLayoutColumn)({
     side: 'left',
-    inputMethod: _analytics.INPUT_METHOD.SHORTCUT
+    inputMethod: _enums.INPUT_METHOD.SHORTCUT
   }, api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, api), list);
   bindLayoutColumnShortcut(_keymaps.addColumnBeforeVO.common, (0, _actions.insertLayoutColumn)({
     side: 'left',
-    inputMethod: _analytics.INPUT_METHOD.SHORTCUT
+    inputMethod: _enums.INPUT_METHOD.SHORTCUT
   }, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, api), list);
   bindLayoutColumnShortcut(_keymaps.addColumnAfter.common, (0, _actions.insertLayoutColumn)({
     side: 'right',
-    inputMethod: _analytics.INPUT_METHOD.SHORTCUT
+    inputMethod: _enums.INPUT_METHOD.SHORTCUT
   }, api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions, api), list);
   bindLayoutColumnShortcut(_keymaps.addColumnAfterVO.common, (0, _actions.insertLayoutColumn)({
     side: 'right',
-    inputMethod: _analytics.INPUT_METHOD.SHORTCUT
+    inputMethod: _enums.INPUT_METHOD.SHORTCUT
   }, api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions, api), list);
   bindLayoutColumnShortcut(_keymaps.deleteColumn.common, (0, _actions.deleteLayoutColumn)({
-    inputMethod: _analytics.INPUT_METHOD.SHORTCUT
+    inputMethod: _enums.INPUT_METHOD.SHORTCUT
   }, api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions, api), list);
-  return (0, _keymaps.keymap)(list);
+  return (0, _keymap.keymap)(list);
 }
 var _default = exports.default = keymapPlugin;