@atlaskit/editor-plugin-layout 1.12.7 → 1.12.9

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-layout
 
+## 1.12.9
+
+### Patch Changes
+
+- [#170473](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/170473)
+  [`2c463f9682286`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2c463f9682286) -
+  ED-25813: refactors plugins to meet folder standards
+- Updated dependencies
+
+## 1.12.8
+
+### Patch Changes
+
+- [#169277](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/169277)
+  [`4d8433c0b731a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/4d8433c0b731a) -
+  ED-25872 improve placeholder usability for layout
+- Updated dependencies
+
 ## 1.12.7
 
 ### Patch Changes

package/dist/cjs/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "layoutPlugin", {
   enumerable: true,
   get: function get() {
-    return _plugin.layoutPlugin;
+    return _layoutPlugin.layoutPlugin;
   }
 });
-var _plugin = require("./plugin");
+var _layoutPlugin = require("./layoutPlugin");

package/dist/cjs/{plugin.js → layoutPlugin.js}

@@ -18,13 +18,13 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _messages = require("@atlaskit/editor-common/messages");
 var _quickInsert = require("@atlaskit/editor-common/quick-insert");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _actions = require("./actions");
+var _actions = require("./pm-plugins/actions");
 var _main = _interopRequireDefault(require("./pm-plugins/main"));
 var _pluginKey = require("./pm-plugins/plugin-key");
 var _resizing = _interopRequireDefault(require("./pm-plugins/resizing"));
-var _toolbar = require("./toolbar");
+var _preRelease = require("./pm-plugins/utils/preRelease");
 var _globalStyles = require("./ui/global-styles");
-var _preRelease = require("./utils/preRelease");
+var _toolbar = require("./ui/toolbar");
 var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
   var _api$analytics;
   var _ref$config = _ref.config,
@@ -87,7 +87,7 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
             return /*#__PURE__*/_react.default.createElement(_quickInsert.IconTwoColumnLayout, null);
           },
           action: function action(insert, state) {
-            var tr = insert((0, _actions.createMultiColumnLayoutSection)(state, 2, formatMessage));
+            var tr = insert((0, _actions.createMultiColumnLayoutSection)(state, 2));
             return tr;
           }
         }, {
@@ -100,7 +100,7 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
             return /*#__PURE__*/_react.default.createElement(_quickInsert.IconThreeColumnLayout, null);
           },
           action: function action(insert, state) {
-            var tr = insert((0, _actions.createMultiColumnLayoutSection)(state, 3, formatMessage));
+            var tr = insert((0, _actions.createMultiColumnLayoutSection)(state, 3));
             return tr;
           }
         }, {
@@ -113,7 +113,7 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
             return /*#__PURE__*/_react.default.createElement(_quickInsert.IconFourColumnLayout, null);
           },
           action: function action(insert, state) {
-            var tr = insert((0, _actions.createMultiColumnLayoutSection)(state, 4, formatMessage));
+            var tr = insert((0, _actions.createMultiColumnLayoutSection)(state, 4));
             return tr;
           }
         }, {
@@ -126,7 +126,7 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
             return /*#__PURE__*/_react.default.createElement(_quickInsert.IconFiveColumnLayout, null);
           },
           action: function action(insert, state) {
-            var tr = insert((0, _actions.createMultiColumnLayoutSection)(state, 5, formatMessage));
+            var tr = insert((0, _actions.createMultiColumnLayoutSection)(state, 5));
             return tr;
           }
         }] : [{

package/dist/cjs/layoutPluginType.js

@@ -0,0 +1,12 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "pluginKey", {
+  enumerable: true,
+  get: function get() {
+    return _pluginKey.pluginKey;
+  }
+});
+var _pluginKey = require("./pm-plugins/plugin-key");

package/dist/cjs/{actions.js → pm-plugins/actions.js}

@@ -10,14 +10,13 @@ exports.setPresetLayout = exports.insertLayoutColumnsWithAnalytics = exports.ins
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
-var _messages = require("@atlaskit/editor-common/messages");
 var _utils = require("@atlaskit/editor-common/utils");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _consts = require("./consts");
-var _pluginKey = require("./pm-plugins/plugin-key");
+var _pluginKey = require("./plugin-key");
 var _preRelease = require("./utils/preRelease");
 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; }
@@ -135,46 +134,31 @@ var getSelectedLayout = exports.getSelectedLayout = function getSelectedLayout(m
   }
   return current;
 };
-var createPlaceholderNode = function createPlaceholderNode(schema, formatMessage) {
-  if (!formatMessage) {
-    return undefined;
-  }
-  var _schema$nodes = schema.nodes,
-    paragraph = _schema$nodes.paragraph,
-    placeholder = _schema$nodes.placeholder;
-  //create a paragraph node with content of placeholder node
-  var placeholderNode = placeholder.createChecked({
-    text: formatMessage(_messages.layoutMessages.layoutPlaceholder)
-  });
-  return paragraph.createAndFill(undefined, placeholderNode);
-};
-var createMultiColumnLayoutSection = exports.createMultiColumnLayoutSection = function createMultiColumnLayoutSection(state, numberOfColumns, formatMessage) {
+var createMultiColumnLayoutSection = exports.createMultiColumnLayoutSection = function createMultiColumnLayoutSection(state) {
+  var numberOfColumns = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
   var _state$schema$nodes = state.schema.nodes,
     layoutSection = _state$schema$nodes.layoutSection,
     layoutColumn = _state$schema$nodes.layoutColumn;
-  var placeholder = createPlaceholderNode(state.schema, formatMessage);
-  var layoutColumnNode = layoutColumn.createAndFill({
-    width: _consts.EVEN_DISTRIBUTED_COL_WIDTHS[numberOfColumns]
-  }, placeholder);
   var columns = _model.Fragment.fromArray(Array.from({
     length: numberOfColumns
   }, function () {
-    return layoutColumnNode;
+    return layoutColumn.createAndFill({
+      width: _consts.EVEN_DISTRIBUTED_COL_WIDTHS[numberOfColumns]
+    });
   }));
   return layoutSection.createAndFill(undefined, columns);
 };
-var createDefaultLayoutSection = exports.createDefaultLayoutSection = function createDefaultLayoutSection(state, formatMessage) {
+var createDefaultLayoutSection = exports.createDefaultLayoutSection = function createDefaultLayoutSection(state) {
   var _state$schema$nodes2 = state.schema.nodes,
     layoutSection = _state$schema$nodes2.layoutSection,
     layoutColumn = _state$schema$nodes2.layoutColumn;
-  var placeholder = (0, _preRelease.isPreRelease2)() ? createPlaceholderNode(state.schema, formatMessage) : undefined;
 
   // create a 50-50 layout by default
   var columns = _model.Fragment.fromArray([layoutColumn.createAndFill({
     width: 50
-  }, placeholder), layoutColumn.createAndFill({
+  }), layoutColumn.createAndFill({
     width: 50
-  }, placeholder)]);
+  })]);
   return layoutSection.createAndFill(undefined, columns);
 };
 var insertLayoutColumns = exports.insertLayoutColumns = function insertLayoutColumns(state, dispatch) {
@@ -184,7 +168,7 @@ var insertLayoutColumns = exports.insertLayoutColumns = function insertLayoutCol
   return true;
 };
 var insertLayoutColumnsWithAnalytics = exports.insertLayoutColumnsWithAnalytics = function insertLayoutColumnsWithAnalytics(editorAnalyticsAPI) {
-  return function (inputMethod, formatMessage) {
+  return function (inputMethod) {
     return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
       action: _analytics.ACTION.INSERTED,
       actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
@@ -195,7 +179,7 @@ var insertLayoutColumnsWithAnalytics = exports.insertLayoutColumnsWithAnalytics
       eventType: _analytics.EVENT_TYPE.TRACK
     })(function (state, dispatch) {
       if (dispatch) {
-        dispatch((0, _utils2.safeInsert)(createDefaultLayoutSection(state, formatMessage))(state.tr));
+        dispatch((0, _utils2.safeInsert)(createDefaultLayoutSection(state))(state.tr));
       }
       return true;
     });
@@ -205,26 +189,21 @@ var insertLayoutColumnsWithAnalytics = exports.insertLayoutColumnsWithAnalytics
 /**
  * Add a column to the right of existing layout
  */
-function addColumn(schema, pos, formatMessage) {
+function addColumn(schema, pos) {
   if (!(0, _preRelease.isPreRelease2)()) {
     return function (tr) {
       tr.replaceWith(tr.mapping.map(pos), tr.mapping.map(pos), schema.nodes.layoutColumn.createAndFill());
     };
   }
-  var placeholder = createPlaceholderNode(schema, formatMessage);
   return function (tr) {
-    tr.replaceWith(tr.mapping.map(pos), tr.mapping.map(pos), schema.nodes.layoutColumn.createAndFill(undefined, placeholder));
+    tr.replaceWith(tr.mapping.map(pos), tr.mapping.map(pos), schema.nodes.layoutColumn.createAndFill(undefined));
   };
 }
-var containPlaceholderOnly = function containPlaceholderOnly(node, schema) {
-  var _node$firstChild, _node$firstChild2;
-  return node.childCount === 1 && ((_node$firstChild = node.firstChild) === null || _node$firstChild === void 0 ? void 0 : _node$firstChild.childCount) === 1 && ((_node$firstChild2 = node.firstChild) === null || _node$firstChild2 === void 0 || (_node$firstChild2 = _node$firstChild2.firstChild) === null || _node$firstChild2 === void 0 ? void 0 : _node$firstChild2.type) === schema.nodes.placeholder;
-};
 function removeLastColumnInLayout(column, columnPos, insideRightEdgePos) {
   return function (tr) {
     // check if the column only contains a paragraph with a placeholder text
     // if so, remove the whole column, otherwise just remove the paragraph
-    if ((0, _utils.isEmptyDocument)(column) || containPlaceholderOnly(column, tr.doc.type.schema)) {
+    if ((0, _utils.isEmptyDocument)(column)) {
       tr.replaceRange(tr.mapping.map(columnPos - 1), tr.mapping.map(insideRightEdgePos), _model.Slice.empty);
     } else {
       tr.replaceRange(tr.mapping.map(columnPos - 1), tr.mapping.map(columnPos + 1), _model.Slice.empty);
@@ -249,10 +228,9 @@ var fromThreeColstoOne = function fromThreeColstoOne(node, tr, insideRightEdgePo
 };
 var increaseColumns = function increaseColumns(schema, pos) {
   var newColumnsNumber = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
-  var formatMessage = arguments.length > 3 ? arguments[3] : undefined;
   return function (tr) {
     for (var i = 0; i < newColumnsNumber; i++) {
-      addColumn(schema, pos, formatMessage)(tr);
+      addColumn(schema, pos)(tr);
     }
   };
 };
@@ -276,7 +254,7 @@ var decreaseColumns = function decreaseColumns(node, insideRightEdgePos) {
  * Switching from 3 -> 2 moves all the content of the third col inside the second before
  * removing it
  */
-function forceColumnStructure(state, node, pos, presetLayout, formatMessage) {
+function forceColumnStructure(state, node, pos, presetLayout) {
   var tr = state.tr;
   var insideRightEdgeOfLayoutSection = pos + node.nodeSize - 1;
   var numCols = node.childCount;
@@ -289,7 +267,7 @@ function forceColumnStructure(state, node, pos, presetLayout, formatMessage) {
 
     // 2 columns -> 3 columns
   } else if (THREE_COL_LAYOUTS.indexOf(presetLayout) >= 0 && numCols === 2) {
-    fromTwoColsToThree(state.schema, insideRightEdgeOfLayoutSection, formatMessage)(tr);
+    fromTwoColsToThree(state.schema, insideRightEdgeOfLayoutSection)(tr);
 
     // 2 columns -> 1 column
   } else if (ONE_COL_LAYOUTS.indexOf(presetLayout) >= 0 && numCols === 2) {
@@ -310,13 +288,13 @@ function forceColumnStructure(state, node, pos, presetLayout, formatMessage) {
   }
   return tr;
 }
-function forceColumnStructureNew(state, node, pos, presetLayout, formatMessage) {
+function forceColumnStructureNew(state, node, pos, presetLayout) {
   var tr = state.tr;
   var insideRightEdgeOfLayoutSection = pos + node.nodeSize - 1;
   var numCols = node.childCount;
   var columnChange = getWidthsForPreset(presetLayout).length - numCols;
   if (columnChange > 0) {
-    increaseColumns(state.schema, insideRightEdgeOfLayoutSection, columnChange, formatMessage)(tr);
+    increaseColumns(state.schema, insideRightEdgeOfLayoutSection, columnChange)(tr);
   } else if (columnChange < 0) {
     decreaseColumns(node, insideRightEdgeOfLayoutSection, -columnChange)(tr);
   }
@@ -344,9 +322,9 @@ function forceColumnWidths(state, tr, pos, presetLayout) {
   }
   return tr.replaceWith(pos + 1, pos + node.nodeSize - 1, columnWidth(node, state.schema, getWidthsForPreset(presetLayout)));
 }
-function forceSectionToPresetLayout(state, node, pos, presetLayout, formatMessage) {
+function forceSectionToPresetLayout(state, node, pos, presetLayout) {
   var forceColumnStructureFn = (0, _preRelease.isPreRelease2)() ? forceColumnStructureNew : forceColumnStructure;
-  var tr = forceColumnStructureFn(state, node, pos, presetLayout, formatMessage);
+  var tr = forceColumnStructureFn(state, node, pos, presetLayout);
 
   // save the selection here, since forcing column widths causes a change over the
   // entire layoutSection, which remaps selection to the end. not remapping here
@@ -357,7 +335,7 @@ function forceSectionToPresetLayout(state, node, pos, presetLayout, formatMessag
   return tr.setSelection(state.selection instanceof _state.NodeSelection ? new _state.NodeSelection(selectionPos$) : new _state.TextSelection(selectionPos$));
 }
 var setPresetLayout = exports.setPresetLayout = function setPresetLayout(editorAnalyticsAPI) {
-  return function (layout, formatMessage) {
+  return function (layout) {
     return function (state, dispatch) {
       var _ref = _pluginKey.pluginKey.getState(state),
         pos = _ref.pos,
@@ -369,7 +347,7 @@ var setPresetLayout = exports.setPresetLayout = function setPresetLayout(editorA
       if (!node) {
         return false;
       }
-      var tr = forceSectionToPresetLayout(state, node, pos, layout, formatMessage);
+      var tr = forceSectionToPresetLayout(state, node, pos, layout);
       if (tr) {
         editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
           action: _analytics.ACTION.CHANGED_LAYOUT,

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

@@ -13,9 +13,9 @@ var _keymap = require("@atlaskit/editor-prosemirror/keymap");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _actions = require("../actions");
-var _utils3 = require("../utils");
+var _actions = require("./actions");
 var _pluginKey = require("./plugin-key");
+var _utils3 = require("./utils");
 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 DEFAULT_LAYOUT = exports.DEFAULT_LAYOUT = 'two_equal';

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

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.pluginKey = exports.default = void 0;
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _nodeViews = require("../node-views");
+var _nodeviews = require("../nodeviews");
 var pluginKey = exports.pluginKey = new _state.PluginKey('layoutResizingPlugin');
 var _default = exports.default = function _default(options, pluginInjectionApi, portalProviderAPI, eventDispatcher) {
   return new _safePlugin.SafePlugin({
@@ -14,7 +14,7 @@ var _default = exports.default = function _default(options, pluginInjectionApi,
     props: {
       nodeViews: {
         layoutSection: function layoutSection(node, view, getPos) {
-          return new _nodeViews.LayoutSectionView({
+          return new _nodeviews.LayoutSectionView({
             node: node,
             view: view,
             getPos: getPos,

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

@@ -4,26 +4,41 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.GlobalStylesWrapper = void 0;
-var _react = require("@emotion/react");
+var _react = require("react");
+var _react2 = require("@emotion/react");
+var _reactIntlNext = require("react-intl-next");
+var _messages = require("@atlaskit/editor-common/messages");
 /**
  * @jsxRuntime classic
  * @jsx jsx
  */
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-global-styles, @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 
-var globalStyles = (0, _react.css)({
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
-  '.ProseMirror [data-layout-column] span.pm-placeholder__text[data-placeholder]': {
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles -- Ignored via go/DSP-18766
-    '&::after': {
-      color: "var(--ds-text-disabled, #A5ADBA)",
-      font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
-      fontStyle: 'italic'
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-global-styles, @atlaskit/ui-styling-standard/use-compiled
+
+var getPlaceholderStyle = function getPlaceholderStyle(message) {
+  return (0, _react2.css)({
+    // when paragraph is the only child, and it only has a trailingBreak.
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
+    '.ProseMirror [data-layout-column] > [data-layout-content] > p:only-child:has(.ProseMirror-trailingBreak:only-child)': {
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles -- Ignored via go/DSP-18766
+      '&::before': {
+        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
+        content: "\"".concat(message, "\""),
+        position: 'absolute',
+        color: "var(--ds-text-disabled, #A5ADBA)",
+        font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
+        marginTop: "var(--ds-space-050, 4px)"
+      }
     }
-  }
-});
+  });
+};
 var GlobalStylesWrapper = exports.GlobalStylesWrapper = function GlobalStylesWrapper() {
-  return (0, _react.jsx)(_react.Global, {
-    styles: globalStyles
+  var _useIntl = (0, _reactIntlNext.useIntl)(),
+    formatMessage = _useIntl.formatMessage;
+  var placeholderStyle = (0, _react.useMemo)(function () {
+    return getPlaceholderStyle(formatMessage(_messages.layoutMessages.layoutPlaceholder));
+  }, [formatMessage]);
+  return (0, _react2.jsx)(_react2.Global, {
+    styles: placeholderStyle
   });
 };

package/dist/cjs/{toolbar.js → ui/toolbar.js}

@@ -24,10 +24,10 @@ var _layoutTwoLeftSidebar = _interopRequireDefault(require("@atlaskit/icon/glyph
 var _layoutTwoRightSidebar = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/layout-two-right-sidebar"));
 var _remove = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/remove"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _actions = require("./actions");
-var _LayoutThreeWithLeftSidebars = require("./ui/icons/LayoutThreeWithLeftSidebars");
-var _LayoutThreeWithRightSidebars = require("./ui/icons/LayoutThreeWithRightSidebars");
-var _preRelease = require("./utils/preRelease");
+var _actions = require("../pm-plugins/actions");
+var _preRelease = require("../pm-plugins/utils/preRelease");
+var _LayoutThreeWithLeftSidebars = require("./icons/LayoutThreeWithLeftSidebars");
+var _LayoutThreeWithRightSidebars = require("./icons/LayoutThreeWithRightSidebars");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var LAYOUT_TYPES = [{
@@ -123,7 +123,7 @@ var buildLayoutButton = function buildLayoutButton(intl, item, currentLayout, ed
     iconFallback: item.iconFallback,
     testId: item.title.id ? "".concat(item.title.id) : undefined,
     title: intl.formatMessage(item.title),
-    onClick: (0, _actions.setPresetLayout)(editorAnalyticsAPI)(item.type, intl.formatMessage),
+    onClick: (0, _actions.setPresetLayout)(editorAnalyticsAPI)(item.type),
     selected: !!currentLayout && currentLayout === item.type,
     tabIndex: null
   };
@@ -149,7 +149,7 @@ var getAdvancedLayoutItems = function getAdvancedLayoutItems(_ref) {
     }),
     //'2-columns',
     icon: iconPlaceholder,
-    onClick: (0, _actions.setPresetLayout)(editorAnalyticsAPI)('two_equal', intl.formatMessage),
+    onClick: (0, _actions.setPresetLayout)(editorAnalyticsAPI)('two_equal'),
     selected: numberOfColumns === 2
   }, {
     title: intl.formatMessage(_messages.layoutMessages.columnOption, {
@@ -157,7 +157,7 @@ var getAdvancedLayoutItems = function getAdvancedLayoutItems(_ref) {
     }),
     //'3-columns'
     icon: iconPlaceholder,
-    onClick: (0, _actions.setPresetLayout)(editorAnalyticsAPI)('three_equal', intl.formatMessage),
+    onClick: (0, _actions.setPresetLayout)(editorAnalyticsAPI)('three_equal'),
     selected: numberOfColumns === 3
   }, {
     title: intl.formatMessage(_messages.layoutMessages.columnOption, {
@@ -165,7 +165,7 @@ var getAdvancedLayoutItems = function getAdvancedLayoutItems(_ref) {
     }),
     //'4-columns'
     icon: iconPlaceholder,
-    onClick: (0, _actions.setPresetLayout)(editorAnalyticsAPI)('four_equal', intl.formatMessage),
+    onClick: (0, _actions.setPresetLayout)(editorAnalyticsAPI)('four_equal'),
     selected: numberOfColumns === 4
   }, {
     title: intl.formatMessage(_messages.layoutMessages.columnOption, {
@@ -173,7 +173,7 @@ var getAdvancedLayoutItems = function getAdvancedLayoutItems(_ref) {
     }),
     //'5-columns'
     icon: iconPlaceholder,
-    onClick: (0, _actions.setPresetLayout)(editorAnalyticsAPI)('five_equal', intl.formatMessage),
+    onClick: (0, _actions.setPresetLayout)(editorAnalyticsAPI)('five_equal'),
     selected: numberOfColumns === 5
   }];
   return [{

package/dist/es2019/index.js

@@ -1 +1 @@
-export { layoutPlugin } from './plugin';
+export { layoutPlugin } from './layoutPlugin';

package/dist/es2019/{plugin.js → layoutPlugin.js}

@@ -5,13 +5,13 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } f
 import { layoutMessages, toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { IconFiveColumnLayout, IconFourColumnLayout, IconLayout, IconThreeColumnLayout, IconTwoColumnLayout } from '@atlaskit/editor-common/quick-insert';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { createDefaultLayoutSection, createMultiColumnLayoutSection, insertLayoutColumnsWithAnalytics } from './actions';
+import { createDefaultLayoutSection, createMultiColumnLayoutSection, insertLayoutColumnsWithAnalytics } from './pm-plugins/actions';
 import { default as createLayoutPlugin } from './pm-plugins/main';
 import { pluginKey } from './pm-plugins/plugin-key';
 import { default as createLayoutResizingPlugin } from './pm-plugins/resizing';
-import { buildToolbar } from './toolbar';
+import { isPreRelease2 } from './pm-plugins/utils/preRelease';
 import { GlobalStylesWrapper } from './ui/global-styles';
-import { isPreRelease2 } from './utils/preRelease';
+import { buildToolbar } from './ui/toolbar';
 export { pluginKey };
 export const layoutPlugin = ({
   config: options = {},
@@ -71,7 +71,7 @@ export const layoutPlugin = ({
         priority: 1100,
         icon: () => /*#__PURE__*/React.createElement(IconTwoColumnLayout, null),
         action(insert, state) {
-          const tr = insert(createMultiColumnLayoutSection(state, 2, formatMessage));
+          const tr = insert(createMultiColumnLayoutSection(state, 2));
           return tr;
         }
       }, {
@@ -82,7 +82,7 @@ export const layoutPlugin = ({
         priority: 1100,
         icon: () => /*#__PURE__*/React.createElement(IconThreeColumnLayout, null),
         action(insert, state) {
-          const tr = insert(createMultiColumnLayoutSection(state, 3, formatMessage));
+          const tr = insert(createMultiColumnLayoutSection(state, 3));
           return tr;
         }
       }, {
@@ -93,7 +93,7 @@ export const layoutPlugin = ({
         priority: 1100,
         icon: () => /*#__PURE__*/React.createElement(IconFourColumnLayout, null),
         action(insert, state) {
-          const tr = insert(createMultiColumnLayoutSection(state, 4, formatMessage));
+          const tr = insert(createMultiColumnLayoutSection(state, 4));
           return tr;
         }
       }, {
@@ -104,7 +104,7 @@ export const layoutPlugin = ({
         priority: 1100,
         icon: () => /*#__PURE__*/React.createElement(IconFiveColumnLayout, null),
         action(insert, state) {
-          const tr = insert(createMultiColumnLayoutSection(state, 5, formatMessage));
+          const tr = insert(createMultiColumnLayoutSection(state, 5));
           return tr;
         }
       }] : [{

package/dist/es2019/layoutPluginType.js

@@ -0,0 +1,2 @@
+import { pluginKey } from './pm-plugins/plugin-key';
+export { pluginKey };