@atlaskit/editor-plugin-layout 27.0.3 → 27.0.5

package/dist/cjs/ui/toolbar.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,11 +8,12 @@ exports.layoutToolbarTitle = exports.buildToolbar = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = _interopRequireDefault(require("react"));
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _messages = _interopRequireWildcard(require("@atlaskit/editor-common/messages"));
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _messages = _interopRequireDefault(require("@atlaskit/editor-common/messages"));
+var _layout = require("@atlaskit/editor-common/messages/layout");
 var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _constants = require("@atlaskit/editor-shared-styles/constants");
 var _copy = _interopRequireDefault(require("@atlaskit/icon/core/copy"));
 var _delete = _interopRequireDefault(require("@atlaskit/icon/core/delete"));
 var _layoutOneColumn = _interopRequireDefault(require("@atlaskit/icon/core/layout-one-column"));
@@ -29,68 +29,67 @@ var _layoutColumnDistribution = require("../pm-plugins/utils/layout-column-distr
 var _LayoutColumnsIcon = require("./icons/LayoutColumnsIcon");
 var _LayoutThreeWithLeftSidebars = require("./icons/LayoutThreeWithLeftSidebars");
 var _LayoutThreeWithRightSidebars = require("./icons/LayoutThreeWithRightSidebars");
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LAYOUT_TYPES = [{
   id: 'editor.layout.twoEquals',
   type: 'two_equal',
-  title: _messages.layoutMessages.twoColumns,
+  title: _layout.toolbarMessages.twoColumns,
   icon: _layoutTwoColumns.default
 }, {
   id: 'editor.layout.threeEquals',
   type: 'three_equal',
-  title: _messages.layoutMessages.threeColumns,
+  title: _layout.toolbarMessages.threeColumns,
   icon: _layoutThreeColumns.default
 }];
 var LAYOUT_TYPES_WITH_SINGLE_COL = [{
   id: 'editor.layout.singeLayout',
   type: 'single',
-  title: _messages.layoutMessages.singleColumn,
+  title: _layout.toolbarMessages.singleColumn,
   icon: _layoutOneColumn.default
 }].concat(LAYOUT_TYPES);
 var SIDEBAR_LAYOUT_TYPES = [{
   id: 'editor.layout.twoRightSidebar',
   type: 'two_right_sidebar',
-  title: _messages.layoutMessages.rightSidebar,
+  title: _layout.toolbarMessages.rightSidebar,
   icon: _layoutTwoColumnsSidebarRight.default
 }, {
   id: 'editor.layout.twoLeftSidebar',
   type: 'two_left_sidebar',
-  title: _messages.layoutMessages.leftSidebar,
+  title: _layout.toolbarMessages.leftSidebar,
   icon: _layoutTwoColumnsSidebarLeft.default
 }, {
   id: 'editor.layout.threeWithSidebars',
   type: 'three_with_sidebars',
-  title: _messages.layoutMessages.threeColumnsWithSidebars,
+  title: _layout.toolbarMessages.threeColumnsWithSidebars,
   icon: _layoutThreeColumnsSidebars.default
 }];
 var LAYOUT_WITH_TWO_COL_DISTRIBUTION = [{
   id: 'editor.layout.twoRightSidebar',
   type: 'two_right_sidebar',
-  title: _messages.layoutMessages.rightSidebar,
+  title: _layout.toolbarMessages.rightSidebar,
   icon: _layoutTwoColumnsSidebarRight.default
 }, {
   id: 'editor.layout.twoLeftSidebar',
   type: 'two_left_sidebar',
-  title: _messages.layoutMessages.leftSidebar,
+  title: _layout.toolbarMessages.leftSidebar,
   icon: _layoutTwoColumnsSidebarLeft.default
 }];
 var LAYOUT_WITH_THREE_COL_DISTRIBUTION = [{
   id: 'editor.layout.threeWithSidebars',
   type: 'three_with_sidebars',
-  title: _messages.layoutMessages.threeColumnsWithSidebars,
+  title: _layout.toolbarMessages.threeColumnsWithSidebars,
   icon: _layoutThreeColumnsSidebars.default
 }, {
   id: 'editor.layout.threeRightSidebars',
   type: 'three_right_sidebars',
-  title: _messages.layoutMessages.threeColumnsWithRightSidebars,
+  title: _layout.toolbarMessages.threeColumnsWithRightSidebars,
   icon: _LayoutThreeWithRightSidebars.LayoutThreeWithRightSidebarsIcon,
   iconFallback: _LayoutThreeWithRightSidebars.LayoutThreeWithRightSidebarsIcon
 }, {
   id: 'editor.layout.threeLeftSidebars',
   type: 'three_left_sidebars',
-  title: _messages.layoutMessages.threeColumnsWithLeftSidebars,
+  title: _layout.toolbarMessages.threeColumnsWithLeftSidebars,
   icon: _LayoutThreeWithLeftSidebars.LayoutThreeWithLeftSidebarsIcon,
   iconFallback: _LayoutThreeWithLeftSidebars.LayoutThreeWithLeftSidebarsIcon
 }];
@@ -155,7 +154,7 @@ var getAdvancedLayoutItems = function getAdvancedLayoutItems(_ref) {
   var numberOfColumns = node.content.childCount || 2;
   var distributionOptions = numberOfColumns === 2 ? LAYOUT_WITH_TWO_COL_DISTRIBUTION : numberOfColumns === 3 ? LAYOUT_WITH_THREE_COL_DISTRIBUTION : [];
   var columnOptions = [{
-    title: intl.formatMessage(_messages.layoutMessages.columnOption, {
+    title: intl.formatMessage(_layout.toolbarMessages.columnOption, {
       count: 2
     }),
     //'2-columns',
@@ -163,7 +162,7 @@ var getAdvancedLayoutItems = function getAdvancedLayoutItems(_ref) {
     onClick: (0, _actions.setPresetLayout)(editorAnalyticsAPI)('two_equal'),
     selected: numberOfColumns === 2
   }, {
-    title: intl.formatMessage(_messages.layoutMessages.columnOption, {
+    title: intl.formatMessage(_layout.toolbarMessages.columnOption, {
       count: 3
     }),
     //'3-columns'
@@ -171,7 +170,7 @@ var getAdvancedLayoutItems = function getAdvancedLayoutItems(_ref) {
     onClick: (0, _actions.setPresetLayout)(editorAnalyticsAPI)('three_equal'),
     selected: numberOfColumns === 3
   }, {
-    title: intl.formatMessage(_messages.layoutMessages.columnOption, {
+    title: intl.formatMessage(_layout.toolbarMessages.columnOption, {
       count: 4
     }),
     //'4-columns'
@@ -179,7 +178,7 @@ var getAdvancedLayoutItems = function getAdvancedLayoutItems(_ref) {
     onClick: (0, _actions.setPresetLayout)(editorAnalyticsAPI)('four_equal'),
     selected: numberOfColumns === 4
   }, {
-    title: intl.formatMessage(_messages.layoutMessages.columnOption, {
+    title: intl.formatMessage(_layout.toolbarMessages.columnOption, {
       count: 5
     }),
     //'5-columns'
@@ -188,7 +187,7 @@ var getAdvancedLayoutItems = function getAdvancedLayoutItems(_ref) {
     selected: numberOfColumns === 5
   }];
   var dropdownOptions = [].concat((0, _toConsumableArray2.default)(allowAdvancedSingleColumnLayout ? [{
-    title: intl.formatMessage(_messages.layoutMessages.columnOption, {
+    title: intl.formatMessage(_layout.toolbarMessages.columnOption, {
       count: 1
     }),
     //'1-columns',
@@ -201,7 +200,7 @@ var getAdvancedLayoutItems = function getAdvancedLayoutItems(_ref) {
     icon: _tableColumnsDistribute.default,
     onClick: function onClick(editorState, dispatch) {
       var tr = (0, _actions.distributeLayoutColumns)(editorAnalyticsAPI)({
-        inputMethod: _analytics.INPUT_METHOD.FLOATING_TB,
+        inputMethod: _enums.INPUT_METHOD.FLOATING_TB,
         target: 'allColumns'
       })({
         tr: editorState.tr
@@ -213,12 +212,12 @@ var getAdvancedLayoutItems = function getAdvancedLayoutItems(_ref) {
       return true;
     },
     testId: 'layout-distribute-columns',
-    title: intl.formatMessage(_messages.layoutMessages.distributeColumns),
+    title: intl.formatMessage(_layout.toolbarMessages.distributeColumns),
     type: 'button'
   } : undefined;
   return [{
     type: 'dropdown',
-    title: intl.formatMessage(_messages.layoutMessages.columnOption, {
+    title: intl.formatMessage(_layout.toolbarMessages.columnOption, {
       count: numberOfColumns
     }),
     //`${numberOfColumns}-columns`,
@@ -254,7 +253,7 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(state, intl, pos
       icon: _delete.default,
       testId: _messages.default.remove.id,
       title: intl.formatMessage(_messages.default.remove),
-      onClick: (0, _actions.deleteActiveLayoutNode)(editorAnalyticsAPI, _analytics.INPUT_METHOD.FLOATING_TB),
+      onClick: (0, _actions.deleteActiveLayoutNode)(editorAnalyticsAPI, _enums.INPUT_METHOD.FLOATING_TB),
       onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true),
       onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false),
       onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true),
@@ -289,15 +288,15 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(state, intl, pos
         onClick: function onClick() {
           var _api$core, _api$floatingToolbar;
           api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute( // @ts-ignore
-          api === null || api === void 0 || (_api$floatingToolbar = api.floatingToolbar) === null || _api$floatingToolbar === void 0 ? void 0 : _api$floatingToolbar.commands.copyNode(nodeType, _analytics.INPUT_METHOD.FLOATING_TB));
+          api === null || api === void 0 || (_api$floatingToolbar = api.floatingToolbar) === null || _api$floatingToolbar === void 0 ? void 0 : _api$floatingToolbar.commands.copyNode(nodeType, _enums.INPUT_METHOD.FLOATING_TB));
           return true;
         },
         icon: /*#__PURE__*/_react.default.createElement(_copy.default, {
           label: ""
         })
-      }, hoverDecorationProps(nodeType, _editorSharedStyles.akEditorSelectedNodeClassName)), _objectSpread({
+      }, hoverDecorationProps(nodeType, _constants.akEditorSelectedNodeClassName)), _objectSpread({
         title: intl.formatMessage(_messages.default.delete),
-        onClick: (0, _actions.deleteActiveLayoutNode)(editorAnalyticsAPI, _analytics.INPUT_METHOD.FLOATING_TB),
+        onClick: (0, _actions.deleteActiveLayoutNode)(editorAnalyticsAPI, _enums.INPUT_METHOD.FLOATING_TB),
         icon: /*#__PURE__*/_react.default.createElement(_delete.default, {
           label: ""
         })
@@ -311,7 +310,7 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(state, intl, pos
         return (0, _utils.findDomRefAtPos)(pos, view.domAtPos.bind(view));
       },
       nodeType: nodeType,
-      groupLabel: intl.formatMessage(_messages.layoutMessages.floatingToolbarRadioGroupAriaLabel),
+      groupLabel: intl.formatMessage(_layout.toolbarMessages.floatingToolbarRadioGroupAriaLabel),
       items: [].concat((0, _toConsumableArray2.default)((0, _editorExperiment.editorExperiment)('advanced_layouts', true) ? getAdvancedLayoutItems({
         addSidebarLayouts: addSidebarLayouts,
         intl: intl,

package/dist/es2019/layoutPlugin.js

@@ -1,10 +1,12 @@
 import React from 'react';
 import { layoutSection, layoutSectionWithLocalId, layoutSectionWithSingleColumn, layoutSectionWithSingleColumnLocalId } from '@atlaskit/adf-schema/layout-section';
 import { layoutColumn, layoutColumnWithLocalId } from '@atlaskit/adf-schema/nodes/layout-column';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM, TRANSFORM_STRUCTURE_MENU_SECTION, TRANSFORM_STRUCTURE_MENU_SECTION_RANK } from '@atlaskit/editor-common/block-menu';
-import { layoutMessages, toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
-import { IconFiveColumnLayout, IconFourColumnLayout, IconLayout, IconOneColumnLayout, IconThreeColumnLayout, IconTwoColumnLayout } from '@atlaskit/editor-common/quick-insert';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { IconFiveColumnLayout, IconFourColumnLayout, IconLayout, IconOneColumnLayout, IconThreeColumnLayout, IconTwoColumnLayout } from '@atlaskit/editor-common/assets';
+import { TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM, TRANSFORM_STRUCTURE_MENU_SECTION } from '@atlaskit/editor-common/block-menu/key';
+import { TRANSFORM_STRUCTURE_MENU_SECTION_RANK } from '@atlaskit/editor-common/block-menu/rank';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
+import { toolbarMessages as layoutMessages } from '@atlaskit/editor-common/messages/layout';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNode } from '@atlaskit/editor-prosemirror/utils';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';

package/dist/es2019/nodeviews/index.js

@@ -1,7 +1,7 @@
 import React from 'react';
-import { isSSR } from '@atlaskit/editor-common/core-utils';
+import { isSSR } from '@atlaskit/editor-common/is-ssr';
 import ReactNodeView, { NodeViewContentHole } from '@atlaskit/editor-common/react-node-view';
-import { ignoreResizerMutations } from '@atlaskit/editor-common/resizer';
+import { ignoreResizerMutations } from '@atlaskit/editor-common/resizer/BreakoutResizer';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { LayoutSSRReactContextsProvider } from '../ui/LayoutSSRReactContextsProvider';

package/dist/es2019/nodeviews/layoutSectionView.js

@@ -1,10 +1,9 @@
-import { ignoreResizerMutations } from '@atlaskit/editor-common/resizer';
+import { ignoreResizerMutations } from '@atlaskit/editor-common/resizer/BreakoutResizer';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { isEmptyLayout } from './utils';
 const toDOM = (node, isEmpty) => {
   var _node$attrs$columnRul, _node$attrs$localId;
-  const computedEmpty = isEmpty !== null && isEmpty !== void 0 ? isEmpty : isEmptyLayout(node);
   return ['div', {
     class: 'layoutSectionView-content-wrap'
   }, ['div', {
@@ -14,7 +13,7 @@ const 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),
     ...(fg('platform_editor_adf_with_localid') && {
       'data-local-id': (_node$attrs$localId = node.attrs.localId) !== null && _node$attrs$localId !== void 0 ? _node$attrs$localId : ''
     })
@@ -30,7 +29,7 @@ const toDOM = (node, isEmpty) => {
  */
 export class LayoutSectionView {
   constructor(node) {
-    const isEmpty = fg('platform_editor_vanilla_node_views_patch_1') ? isEmptyLayout(node) : undefined;
+    const isEmpty = isEmptyLayout(node);
     const {
       dom,
       contentDOM
@@ -45,15 +44,12 @@ export class LayoutSectionView {
       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.
     const isEmpty = isEmptyLayout(node);
-    if (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 !== isEmptyLayout(this.node)) {
+    if (isEmpty !== this.isEmpty) {
       this.contentDOM.setAttribute('data-empty-layout', String(isEmpty));
+      this.isEmpty = isEmpty;
     }
     if (fg('platform_editor_adf_with_localid') && node.attrs.localId !== this.node.attrs.localId) {
       var _node$attrs$localId2;

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

@@ -1,6 +1,8 @@
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, LAYOUT_TYPE } from '@atlaskit/editor-common/analytics';
-import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
-import { flatmap, getStepRange, isEmptyDocument, mapChildren } from '@atlaskit/editor-common/utils';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { LAYOUT_TYPE } from '@atlaskit/editor-common/analytics/types/node-events';
+import { getStepRange, isEmptyDocument } from '@atlaskit/editor-common/utils';
+import { flatmap, mapChildren } from '@atlaskit/editor-common/utils/slice';
+import { withAnalytics } from '@atlaskit/editor-common/withAnalytics';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Mapping, StepMap } from '@atlaskit/editor-prosemirror/transform';

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

@@ -1,5 +1,5 @@
 import { bind } from 'bind-event-listener';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';

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

@@ -1,5 +1,6 @@
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { addColumnAfter, addColumnAfterVO, addColumnBefore, addColumnBeforeVO, bindKeymapWithEditorCommand, deleteColumn, keymap } from '@atlaskit/editor-common/keymaps';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { keymap } from '@atlaskit/editor-common/keymap';
+import { addColumnAfter, addColumnAfterVO, addColumnBefore, addColumnBeforeVO, bindKeymapWithEditorCommand, deleteColumn } from '@atlaskit/editor-common/keymaps';
 import { deleteLayoutColumn, insertLayoutColumn } from './actions';
 const bindLayoutColumnShortcut = (shortcut, command, list) => {
   if (!shortcut) {

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

@@ -1,6 +1,7 @@
-import { ACTION, ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { createSelectionClickHandler, GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
+import { createSelectionClickHandler, Side } from '@atlaskit/editor-common/selection';
+import { GapCursorSelection } from '@atlaskit/editor-common/selection/gap-cursor/selection';
 import { filterCommand as filter } from '@atlaskit/editor-common/utils';
 import { keydownHandler } from '@atlaskit/editor-prosemirror/keymap';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';

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

@@ -1,4 +1,4 @@
-import { isSSR } from '@atlaskit/editor-common/core-utils';
+import { isSSR } from '@atlaskit/editor-common/is-ssr';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';

package/dist/es2019/pm-plugins/utils/index.js

@@ -1,4 +1,4 @@
-import { GapCursorSelection } from '@atlaskit/editor-common/selection';
+import { GapCursorSelection } from '@atlaskit/editor-common/selection/gap-cursor/selection';
 // eslint-disable-next-line @typescript-eslint/consistent-type-imports
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';

package/dist/es2019/ui/LayoutBlockMenuItem.js

@@ -3,9 +3,9 @@ import "./LayoutBlockMenuItem.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { blockMenuMessages } from '@atlaskit/editor-common/messages';
-import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { messages as blockMenuMessages } from '@atlaskit/editor-common/messages/block-menu';
+import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar/toolbar-dropdown-item';
 import LayoutTwoColumnsIcon from '@atlaskit/icon/core/layout-two-columns';
 const styles = {
   svgOverflow: "_1wrmewfl _172sewfl"

package/dist/es2019/ui/LayoutColumnMenu/DeleteColumnDropdownItem.js

@@ -1,9 +1,11 @@
 import React, { useCallback } from 'react';
 import { useIntl } from 'react-intl';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { deleteColumn, getAriaKeyshortcuts, tooltip } from '@atlaskit/editor-common/keymaps';
-import { layoutMessages } from '@atlaskit/editor-common/messages';
-import { DeleteIcon, ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
+import { toolbarMessages as layoutMessages } from '@atlaskit/editor-common/messages/layout';
+import { DeleteIcon } from '@atlaskit/editor-toolbar/delete-icon';
+import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar/toolbar-dropdown-item';
+import { ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar/toolbar-keyboard-shortcut-hint';
 import { useSelectedLayoutColumns } from './useSelectedLayoutColumns';
 const DeleteColumnDropdownItem = ({
   api

package/dist/es2019/ui/LayoutColumnMenu/DistributeColumnsDropdownItem.js

@@ -1,8 +1,9 @@
 import React, { useCallback, useMemo } from 'react';
 import { useIntl } from 'react-intl';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { layoutMessages } from '@atlaskit/editor-common/messages';
-import { TableColumnsDistributeIcon, ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { toolbarMessages as layoutMessages } from '@atlaskit/editor-common/messages/layout';
+import { TableColumnsDistributeIcon } from '@atlaskit/editor-toolbar/columns-distribute-icon';
+import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar/toolbar-dropdown-item';
 import { isDistributedUniformly } from '../../pm-plugins/utils/layout-column-distribution';
 import { useSelectedLayoutColumns } from './useSelectedLayoutColumns';
 export const DistributeColumnsDropdownItem = ({

package/dist/es2019/ui/LayoutColumnMenu/InsertColumnDropdownItem.js

@@ -1,9 +1,12 @@
 import React, { useCallback } from 'react';
 import { useIntl } from 'react-intl';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { addColumnAfter, addColumnBefore, getAriaKeyshortcuts, tooltip } from '@atlaskit/editor-common/keymaps';
-import { layoutMessages } from '@atlaskit/editor-common/messages';
-import { TableColumnAddLeftIcon, TableColumnAddRightIcon, ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
+import { toolbarMessages as layoutMessages } from '@atlaskit/editor-common/messages/layout';
+import { TableColumnAddLeftIcon } from '@atlaskit/editor-toolbar/column-add-left-icon';
+import { TableColumnAddRightIcon } from '@atlaskit/editor-toolbar/column-add-right-icon';
+import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar/toolbar-dropdown-item';
+import { ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar/toolbar-keyboard-shortcut-hint';
 import { getEffectiveMaxLayoutColumns } from '../../pm-plugins/actions';
 import { useSelectedLayoutColumns } from './useSelectedLayoutColumns';
 const INSERT_COLUMN_OPTIONS = {

package/dist/es2019/ui/LayoutColumnMenu/VerticalAlignDropdownItem.js

@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
 import { useIntl } from 'react-intl';
-import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
+import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar/toolbar-dropdown-item';
 import { getLayoutColumnValign } from '../../pm-plugins/utils/layout-column-selection';
 import { useSelectedLayoutColumns } from './useSelectedLayoutColumns';
 import { VERTICAL_ALIGN_ICONS } from './verticalAlignIcons';

package/dist/es2019/ui/LayoutColumnMenu/VerticalAlignNestedMenu.js

@@ -1,7 +1,8 @@
 import React, { useMemo } from 'react';
 import { useIntl } from 'react-intl';
-import { layoutMessages } from '@atlaskit/editor-common/messages';
-import { NestedDropdownRightIcon, ToolbarNestedDropdownMenu } from '@atlaskit/editor-toolbar';
+import { toolbarMessages as layoutMessages } from '@atlaskit/editor-common/messages/layout';
+import { NestedDropdownRightIcon } from '@atlaskit/editor-toolbar/nested-dropdown-right-icon';
+import { ToolbarNestedDropdownMenu } from '@atlaskit/editor-toolbar/toolbar-nested-dropdown-menu';
 import { getLayoutColumnValign } from '../../pm-plugins/utils/layout-column-selection';
 import { useSelectedLayoutColumns } from './useSelectedLayoutColumns';
 import { VERTICAL_ALIGN_ICONS } from './verticalAlignIcons';

package/dist/es2019/ui/LayoutColumnMenu/components.js

@@ -1,7 +1,7 @@
 import React, { useContext } from 'react';
-import { layoutMessages } from '@atlaskit/editor-common/messages';
+import { toolbarMessages as layoutMessages } from '@atlaskit/editor-common/messages/layout';
 import { OutsideClickTargetRefContext } from '@atlaskit/editor-common/ui-react';
-import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
+import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar/toolbar-dropdown-item-section';
 import { ToolbarMenuContainer } from '@atlaskit/editor-toolbar/toolbar-menu-container';
 import { DeleteColumnDropdownItem } from './DeleteColumnDropdownItem';
 import { DistributeColumnsDropdownItem } from './DistributeColumnsDropdownItem';

package/dist/es2019/ui/LayoutColumnMenu/index.js

@@ -1,15 +1,16 @@
 import React, { useCallback, useEffect, useMemo, useRef } from 'react';
 import { bind } from 'bind-event-listener';
 import { surfaceDragHandleElementStore } from '@atlaskit/editor-common/block-controls/surface-drag-handle-element';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { DRAG_HANDLE_SELECTOR } from '@atlaskit/editor-common/styles';
-import { Popup } from '@atlaskit/editor-common/ui';
-import { ArrowKeyNavigationProvider, ArrowKeyNavigationType } from '@atlaskit/editor-common/ui-menu';
-import { withReactEditorViewOuterListeners } from '@atlaskit/editor-common/ui-react';
-import { UserIntentPopupWrapper } from '@atlaskit/editor-common/user-intent';
-import { akEditorFloatingOverlapPanelZIndex } from '@atlaskit/editor-shared-styles';
-import { ToolbarDropdownMenuProvider } from '@atlaskit/editor-toolbar';
-import { SurfaceRenderer } from '@atlaskit/editor-ui-control-model';
+import Popup from '@atlaskit/editor-common/Popup';
+import { DRAG_HANDLE_SELECTOR } from '@atlaskit/editor-common/styles/drag-handle';
+import { ArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu/ArrowKeyNavigationProvider';
+import { ArrowKeyNavigationType } from '@atlaskit/editor-common/ui-menu/ArrowKeyNavigationProvider/types';
+import withReactEditorViewOuterListeners from '@atlaskit/editor-common/ui-react/with-react-editor-view-outer-listeners';
+import { UserIntentPopupWrapper } from '@atlaskit/editor-common/UserIntentPopupWrapper';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { akEditorFloatingOverlapPanelZIndex } from '@atlaskit/editor-shared-styles/constants';
+import { ToolbarDropdownMenuProvider } from '@atlaskit/editor-toolbar/toolbar-dropdown-menu-context';
+import { SurfaceRenderer } from '@atlaskit/editor-ui-control-model/surface-renderer';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { getLayoutColumnMenuAnchorPos } from '../../pm-plugins/utils/layout-column-selection';
 import { LAYOUT_COLUMN_MENU_FALLBACKS } from './components';

package/dist/es2019/ui/LayoutColumnMenu/useSelectedLayoutColumns.js

@@ -1,4 +1,4 @@
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
 import { getSelectedLayoutColumnsFromSelection } from '../../pm-plugins/utils/layout-column-selection';
 export const useSelectedLayoutColumns = api => useSharedPluginStateWithSelector(api, ['selection'], ({
   selectionState

package/dist/es2019/ui/LayoutSSRReactContextsProvider.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { RawIntlProvider } from 'react-intl';
-import { isSSR } from '@atlaskit/editor-common/core-utils';
+import { isSSR } from '@atlaskit/editor-common/is-ssr';
 /**
  * Wraps the layout section nodeview children with the editor's actual
  * IntlProvider during SSR streaming (renderToStaticMarkup). This ensures any

package/dist/es2019/ui/global-styles.js

@@ -7,7 +7,7 @@ import { useMemo } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-global-styles, @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports
 import { Global, css, jsx } from '@emotion/react';
 import { useIntl } from 'react-intl';
-import { layoutMessages as messages } from '@atlaskit/editor-common/messages';
+import { toolbarMessages as messages } from '@atlaskit/editor-common/messages/layout';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 const PLACEHOLDER_SELECTOR = '.ProseMirror-focused .layoutSectionView-content-wrap.selected [data-layout-column] > [data-layout-content] > p:only-child:has(.ProseMirror-trailingBreak:only-child)';
 const layoutColumnDangerPreviewStyle = css({

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

@@ -1,6 +1,6 @@
 import React, { useCallback, useMemo } from 'react';
 import { useIntl } from 'react-intl';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics/types/enums';
 import { toolbarInsertBlockMessages } from '@atlaskit/editor-common/messages';
 import { QuickInsertMenuItem } from '@atlaskit/editor-common/quick-insert/menu-item';
 import { messages as quickInsertMessages } from '@atlaskit/editor-common/quick-insert/messages';

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

@@ -1,5 +1,6 @@
 import React from 'react';
-import { layoutMessages, toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
+import { toolbarMessages as layoutMessages } from '@atlaskit/editor-common/messages/layout';
 import { createQuickInsertMatcher } from '@atlaskit/editor-common/quick-insert/create-quick-insert-matcher';
 import { FIVE_COLUMNS_LAYOUT_MENU_ITEM, FOUR_COLUMNS_LAYOUT_MENU_ITEM, STRUCTURE_SECTION, THREE_COLUMNS_LAYOUT_MENU_ITEM, TWO_COLUMNS_LAYOUT_MENU_ITEM } from '@atlaskit/editor-common/quick-insert/keys';
 import { STRUCTURE_SECTION_RANK } from '@atlaskit/editor-common/quick-insert/rank';

package/dist/es2019/ui/toolbar.js

@@ -1,9 +1,10 @@
 import React from 'react';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import commonMessages, { layoutMessages, layoutMessages as toolbarMessages } from '@atlaskit/editor-common/messages';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import commonMessages from '@atlaskit/editor-common/messages';
+import { toolbarMessages as layoutMessages, toolbarMessages } from '@atlaskit/editor-common/messages/layout';
 import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
-import { akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
+import { akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles/constants';
 import CopyIcon from '@atlaskit/icon/core/copy';
 import DeleteIcon from '@atlaskit/icon/core/delete';
 import LayoutOneColumnIcon from '@atlaskit/icon/core/layout-one-column';

package/dist/esm/layoutPlugin.js

@@ -1,10 +1,12 @@
 import React from 'react';
 import { layoutSection, layoutSectionWithLocalId, layoutSectionWithSingleColumn, layoutSectionWithSingleColumnLocalId } from '@atlaskit/adf-schema/layout-section';
 import { layoutColumn, layoutColumnWithLocalId } from '@atlaskit/adf-schema/nodes/layout-column';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM, TRANSFORM_STRUCTURE_MENU_SECTION, TRANSFORM_STRUCTURE_MENU_SECTION_RANK } from '@atlaskit/editor-common/block-menu';
-import { layoutMessages, toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
-import { IconFiveColumnLayout, IconFourColumnLayout, IconLayout, IconOneColumnLayout, IconThreeColumnLayout, IconTwoColumnLayout } from '@atlaskit/editor-common/quick-insert';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { IconFiveColumnLayout, IconFourColumnLayout, IconLayout, IconOneColumnLayout, IconThreeColumnLayout, IconTwoColumnLayout } from '@atlaskit/editor-common/assets';
+import { TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM, TRANSFORM_STRUCTURE_MENU_SECTION } from '@atlaskit/editor-common/block-menu/key';
+import { TRANSFORM_STRUCTURE_MENU_SECTION_RANK } from '@atlaskit/editor-common/block-menu/rank';
+import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages/insert-block';
+import { toolbarMessages as layoutMessages } from '@atlaskit/editor-common/messages/layout';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNode } from '@atlaskit/editor-prosemirror/utils';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';

package/dist/esm/nodeviews/index.js

@@ -9,9 +9,9 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(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; }
 import React from 'react';
-import { isSSR } from '@atlaskit/editor-common/core-utils';
+import { isSSR } from '@atlaskit/editor-common/is-ssr';
 import ReactNodeView, { NodeViewContentHole } from '@atlaskit/editor-common/react-node-view';
-import { ignoreResizerMutations } from '@atlaskit/editor-common/resizer';
+import { ignoreResizerMutations } from '@atlaskit/editor-common/resizer/BreakoutResizer';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { LayoutSSRReactContextsProvider } from '../ui/LayoutSSRReactContextsProvider';