@atlaskit/editor-plugin-layout 20.0.1 → 20.0.2

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-layout
 
+## 20.0.2
+
+### Patch Changes
+
+- [`1e8d2aad8e882`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1e8d2aad8e882) -
+  Remove the permanent `platform_editor_layout_typeahead_reorder` experiment and its temporary
+  Editor Statsig registration.
+- Updated dependencies
+
 ## 20.0.1
 
 ### Patch Changes

package/dist/cjs/layoutPlugin.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.selectIntoLayoutSection = exports.layoutPlugin = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _layoutColumn = require("@atlaskit/adf-schema/nodes/layout-column");
 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");
@@ -16,8 +16,8 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _actions = require("./pm-plugins/actions");
 var _keymap = _interopRequireDefault(require("./pm-plugins/keymap"));
 var _main = _interopRequireDefault(require("./pm-plugins/main"));
@@ -174,6 +174,34 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
           return tr;
         };
         if ((0, _editorExperiment.editorExperiment)('advanced_layouts', true)) {
+          var createAdvancedColumnLayoutOption = function createAdvancedColumnLayoutOption(_ref4) {
+            var columnCount = _ref4.columnCount,
+              descriptionColumnCount = _ref4.descriptionColumnCount,
+              Icon = _ref4.icon,
+              id = _ref4.id,
+              keyword = _ref4.keyword,
+              title = _ref4.title;
+            return {
+              id: id,
+              title: title,
+              description: formatMessage(_messages.toolbarInsertBlockMessages.columnsDescriptionAdvancedLayout, {
+                numberOfColumns: descriptionColumnCount
+              }),
+              keywords: ['layout', 'column', 'section', 'col', keyword],
+              priority: 1100,
+              icon: Icon,
+              action: function action(insert, state) {
+                var tr = insert((0, _actions.createMultiColumnLayoutSection)(state, columnCount));
+                if ((0, _fg.fg)('platform_editor_column_count_analytics')) {
+                  withInsertLayoutAnalytics(tr, columnCount);
+                } else {
+                  withInsertLayoutAnalytics(tr);
+                }
+                selectIntoLayoutSection(tr);
+                return tr;
+              }
+            };
+          };
           var advancedSingleColumnOption = allowAdvancedSingleColumnLayout ? [{
             id: 'onecolumnlayout',
             title: formatMessage(_messages.layoutMessages.singleColumnAdvancedLayout),
@@ -194,158 +222,43 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
               return tr;
             }
           }] : [];
-          if ((0, _expValEquals.expValEquals)('platform_editor_layout_typeahead_reorder', 'isEnabled', true)) {
-            var createAdvancedColumnLayoutOption = function createAdvancedColumnLayoutOption(_ref4) {
-              var columnCount = _ref4.columnCount,
-                descriptionColumnCount = _ref4.descriptionColumnCount,
-                Icon = _ref4.icon,
-                id = _ref4.id,
-                keyword = _ref4.keyword,
-                title = _ref4.title;
-              return {
-                id: id,
-                title: title,
-                description: formatMessage(_messages.toolbarInsertBlockMessages.columnsDescriptionAdvancedLayout, {
-                  numberOfColumns: descriptionColumnCount
-                }),
-                keywords: ['layout', 'column', 'section', 'col', keyword],
-                priority: 1100,
-                icon: Icon,
-                action: function action(insert, state) {
-                  var tr = insert((0, _actions.createMultiColumnLayoutSection)(state, columnCount));
-                  if ((0, _fg.fg)('platform_editor_column_count_analytics')) {
-                    withInsertLayoutAnalytics(tr, columnCount);
-                  } else {
-                    withInsertLayoutAnalytics(tr);
-                  }
-                  selectIntoLayoutSection(tr);
-                  return tr;
-                }
-              };
-            };
-            return [createAdvancedColumnLayoutOption({
-              columnCount: 2,
-              descriptionColumnCount: 'two',
-              icon: function icon() {
-                return /*#__PURE__*/_react.default.createElement(_quickInsert.IconTwoColumnLayout, null);
-              },
-              id: 'twocolumnslayout',
-              keyword: 'two column',
-              title: formatMessage(_messages.layoutMessages.twoColumnsAdvancedLayout)
-            })].concat(advancedSingleColumnOption, [createAdvancedColumnLayoutOption({
-              columnCount: 3,
-              descriptionColumnCount: 'three',
-              icon: function icon() {
-                return /*#__PURE__*/_react.default.createElement(_quickInsert.IconThreeColumnLayout, null);
-              },
-              id: 'threecolumnslayout',
-              keyword: 'three column',
-              title: formatMessage(_messages.layoutMessages.threeColumnsAdvancedLayout)
-            }), createAdvancedColumnLayoutOption({
-              columnCount: 4,
-              descriptionColumnCount: 'four',
-              icon: function icon() {
-                return /*#__PURE__*/_react.default.createElement(_quickInsert.IconFourColumnLayout, null);
-              },
-              id: 'fourcolumnslayout',
-              keyword: 'four column',
-              title: formatMessage(_messages.layoutMessages.fourColumns)
-            }), createAdvancedColumnLayoutOption({
-              columnCount: 5,
-              descriptionColumnCount: 'five',
-              icon: function icon() {
-                return /*#__PURE__*/_react.default.createElement(_quickInsert.IconFiveColumnLayout, null);
-              },
-              id: 'fivecolumnslayout',
-              keyword: 'five column',
-              title: formatMessage(_messages.layoutMessages.fiveColumns)
-            })]);
-          }
-          return [].concat(advancedSingleColumnOption, [{
-            id: 'twocolumnslayout',
-            title: formatMessage(_messages.layoutMessages.twoColumnsAdvancedLayout),
-            description: formatMessage(_messages.toolbarInsertBlockMessages.columnsDescriptionAdvancedLayout, {
-              numberOfColumns: 'two'
-            }),
-            keywords: ['layout', 'column', 'section', 'col', 'two column'],
-            priority: 1100,
+          return [createAdvancedColumnLayoutOption({
+            columnCount: 2,
+            descriptionColumnCount: 'two',
             icon: function icon() {
               return /*#__PURE__*/_react.default.createElement(_quickInsert.IconTwoColumnLayout, null);
             },
-            action: function action(insert, state) {
-              var tr = insert((0, _actions.createMultiColumnLayoutSection)(state, 2));
-              if ((0, _fg.fg)('platform_editor_column_count_analytics')) {
-                withInsertLayoutAnalytics(tr, 2);
-              } else {
-                withInsertLayoutAnalytics(tr);
-              }
-              selectIntoLayoutSection(tr);
-              return tr;
-            }
-          }, {
-            id: 'threecolumnslayout',
-            title: formatMessage(_messages.layoutMessages.threeColumnsAdvancedLayout),
-            description: formatMessage(_messages.toolbarInsertBlockMessages.columnsDescriptionAdvancedLayout, {
-              numberOfColumns: 'three'
-            }),
-            keywords: ['layout', 'column', 'section', 'col', 'three column'],
-            priority: 1100,
+            id: 'twocolumnslayout',
+            keyword: 'two column',
+            title: formatMessage(_messages.layoutMessages.twoColumnsAdvancedLayout)
+          })].concat(advancedSingleColumnOption, [createAdvancedColumnLayoutOption({
+            columnCount: 3,
+            descriptionColumnCount: 'three',
             icon: function icon() {
               return /*#__PURE__*/_react.default.createElement(_quickInsert.IconThreeColumnLayout, null);
             },
-            action: function action(insert, state) {
-              var tr = insert((0, _actions.createMultiColumnLayoutSection)(state, 3));
-              if ((0, _fg.fg)('platform_editor_column_count_analytics')) {
-                withInsertLayoutAnalytics(tr, 3);
-              } else {
-                withInsertLayoutAnalytics(tr);
-              }
-              selectIntoLayoutSection(tr);
-              return tr;
-            }
-          }, {
-            id: 'fourcolumnslayout',
-            title: formatMessage(_messages.layoutMessages.fourColumns),
-            description: formatMessage(_messages.toolbarInsertBlockMessages.columnsDescriptionAdvancedLayout, {
-              numberOfColumns: 'four'
-            }),
-            keywords: ['layout', 'column', 'section', 'col', 'four column'],
-            priority: 1100,
+            id: 'threecolumnslayout',
+            keyword: 'three column',
+            title: formatMessage(_messages.layoutMessages.threeColumnsAdvancedLayout)
+          }), createAdvancedColumnLayoutOption({
+            columnCount: 4,
+            descriptionColumnCount: 'four',
             icon: function icon() {
               return /*#__PURE__*/_react.default.createElement(_quickInsert.IconFourColumnLayout, null);
             },
-            action: function action(insert, state) {
-              var tr = insert((0, _actions.createMultiColumnLayoutSection)(state, 4));
-              if ((0, _fg.fg)('platform_editor_column_count_analytics')) {
-                withInsertLayoutAnalytics(tr, 4);
-              } else {
-                withInsertLayoutAnalytics(tr);
-              }
-              selectIntoLayoutSection(tr);
-              return tr;
-            }
-          }, {
-            id: 'fivecolumnslayout',
-            title: formatMessage(_messages.layoutMessages.fiveColumns),
-            description: formatMessage(_messages.toolbarInsertBlockMessages.columnsDescriptionAdvancedLayout, {
-              numberOfColumns: 'five'
-            }),
-            keywords: ['layout', 'column', 'section', 'col', 'five column'],
-            priority: 1100,
+            id: 'fourcolumnslayout',
+            keyword: 'four column',
+            title: formatMessage(_messages.layoutMessages.fourColumns)
+          }), createAdvancedColumnLayoutOption({
+            columnCount: 5,
+            descriptionColumnCount: 'five',
             icon: function icon() {
               return /*#__PURE__*/_react.default.createElement(_quickInsert.IconFiveColumnLayout, null);
             },
-            action: function action(insert, state) {
-              var tr = insert((0, _actions.createMultiColumnLayoutSection)(state, 5));
-              if ((0, _fg.fg)('platform_editor_column_count_analytics')) {
-                withInsertLayoutAnalytics(tr, 5);
-              } else {
-                withInsertLayoutAnalytics(tr);
-              }
-              selectIntoLayoutSection(tr);
-              return tr;
-            }
-          }]);
+            id: 'fivecolumnslayout',
+            keyword: 'five column',
+            title: formatMessage(_messages.layoutMessages.fiveColumns)
+          })]);
         } else {
           return [{
             id: 'layout',

package/dist/cjs/nodeviews/index.js

@@ -20,8 +20,8 @@ var _resizer = require("@atlaskit/editor-common/resizer");
 var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _utils = require("../pm-plugins/utils");
 var _LayoutSSRReactContextsProvider = require("../ui/LayoutSSRReactContextsProvider");
 var _utils2 = require("./utils");

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

@@ -17,8 +17,8 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _consts = require("./consts");
 var _pluginKey = require("./plugin-key");
 var _layoutColumnDistribution = require("./utils/layout-column-distribution");

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

@@ -16,8 +16,8 @@ var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _view2 = require("@atlaskit/editor-prosemirror/view");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _actions = require("./actions");
 var _columnResizeDivider = require("./column-resize-divider");
 var _consts = require("./consts");

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

@@ -9,8 +9,8 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 // eslint-disable-next-line @typescript-eslint/consistent-type-imports
 
 var getMaybeLayoutSection = exports.getMaybeLayoutSection = function getMaybeLayoutSection(state) {

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

@@ -10,10 +10,10 @@ var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _menuItem = require("@atlaskit/editor-common/quick-insert/menu-item");
-var _layoutThreeColumns = _interopRequireDefault(require("@atlaskit/icon/core/layout-three-columns"));
-var _layoutTwoColumns = _interopRequireDefault(require("@atlaskit/icon/core/layout-two-columns"));
 var _layoutFiveColumns = _interopRequireDefault(require("@atlaskit/icon-lab/core/layout-five-columns"));
 var _layoutFourColumns = _interopRequireDefault(require("@atlaskit/icon-lab/core/layout-four-columns"));
+var _layoutThreeColumns = _interopRequireDefault(require("@atlaskit/icon/core/layout-three-columns"));
+var _layoutTwoColumns = _interopRequireDefault(require("@atlaskit/icon/core/layout-two-columns"));
 var _layoutPlugin = require("../../layoutPlugin");
 var _actions = require("../../pm-plugins/actions");
 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); }

package/dist/cjs/ui/toolbar.js

@@ -23,8 +23,8 @@ var _layoutTwoColumns = _interopRequireDefault(require("@atlaskit/icon/core/layo
 var _layoutTwoColumnsSidebarLeft = _interopRequireDefault(require("@atlaskit/icon/core/layout-two-columns-sidebar-left"));
 var _layoutTwoColumnsSidebarRight = _interopRequireDefault(require("@atlaskit/icon/core/layout-two-columns-sidebar-right"));
 var _tableColumnsDistribute = _interopRequireDefault(require("@atlaskit/icon/core/table-columns-distribute"));
-var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
+var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _actions = require("../pm-plugins/actions");
 var _layoutColumnDistribution = require("../pm-plugins/utils/layout-column-distribution");
 var _LayoutColumnsIcon = require("./icons/LayoutColumnsIcon");

package/dist/es2019/entry-points/layout-plugin.js

@@ -1,2 +1,3 @@
 /* eslint-disable @atlaskit/editor/no-re-export */
+
 export { layoutPlugin } from '../layoutPlugin';

package/dist/es2019/layoutPlugin.js

@@ -1,6 +1,6 @@
 import React from 'react';
-import { layoutColumn, layoutColumnWithLocalId } from '@atlaskit/adf-schema/nodes/layout-column';
 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';
@@ -9,8 +9,8 @@ import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNode } from '@atlaskit/editor-prosemirror/utils';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { createDefaultLayoutSection, createMultiColumnLayoutSection, deleteLayoutColumn, distributeLayoutColumns, insertLayoutColumn, insertLayoutColumnsWithAnalytics, setLayoutColumnDangerPreview, setLayoutColumnValign, toggleLayoutColumnMenu } from './pm-plugins/actions';
 import { default as createLayoutKeymapPlugin } from './pm-plugins/keymap';
 import { default as createLayoutPlugin } from './pm-plugins/main';
@@ -166,159 +166,80 @@ export const layoutPlugin = ({
           return tr;
         };
         if (editorExperiment('advanced_layouts', true)) {
-          const advancedSingleColumnOption = allowAdvancedSingleColumnLayout ? [{
-            id: 'onecolumnlayout',
-            title: formatMessage(layoutMessages.singleColumnAdvancedLayout),
-            description: formatMessage(messages.singleColumnsDescriptionAdvancedLayout),
-            keywords: ['layout', 'column', 'section', 'col', 'single column'],
-            priority: 1100,
-            icon: () => /*#__PURE__*/React.createElement(IconOneColumnLayout, null),
-            action(insert, state) {
-              const tr = insert(createMultiColumnLayoutSection(state, 1));
-              if (fg('platform_editor_column_count_analytics')) {
-                withInsertLayoutAnalytics(tr, 1);
-              } else {
-                withInsertLayoutAnalytics(tr);
-              }
-              selectIntoLayoutSection(tr);
-              return tr;
-            }
-          }] : [];
-          if (expValEquals('platform_editor_layout_typeahead_reorder', 'isEnabled', true)) {
-            const createAdvancedColumnLayoutOption = ({
-              columnCount,
-              descriptionColumnCount,
-              icon: Icon,
-              id,
-              keyword,
-              title
-            }) => ({
-              id,
-              title,
-              description: formatMessage(messages.columnsDescriptionAdvancedLayout, {
-                numberOfColumns: descriptionColumnCount
-              }),
-              keywords: ['layout', 'column', 'section', 'col', keyword],
-              priority: 1100,
-              icon: Icon,
-              action(insert, state) {
-                const tr = insert(createMultiColumnLayoutSection(state, columnCount));
-                if (fg('platform_editor_column_count_analytics')) {
-                  withInsertLayoutAnalytics(tr, columnCount);
-                } else {
-                  withInsertLayoutAnalytics(tr);
-                }
-                selectIntoLayoutSection(tr);
-                return tr;
-              }
-            });
-            return [createAdvancedColumnLayoutOption({
-              columnCount: 2,
-              descriptionColumnCount: 'two',
-              icon: () => /*#__PURE__*/React.createElement(IconTwoColumnLayout, null),
-              id: 'twocolumnslayout',
-              keyword: 'two column',
-              title: formatMessage(layoutMessages.twoColumnsAdvancedLayout)
-            }), ...advancedSingleColumnOption, createAdvancedColumnLayoutOption({
-              columnCount: 3,
-              descriptionColumnCount: 'three',
-              icon: () => /*#__PURE__*/React.createElement(IconThreeColumnLayout, null),
-              id: 'threecolumnslayout',
-              keyword: 'three column',
-              title: formatMessage(layoutMessages.threeColumnsAdvancedLayout)
-            }), createAdvancedColumnLayoutOption({
-              columnCount: 4,
-              descriptionColumnCount: 'four',
-              icon: () => /*#__PURE__*/React.createElement(IconFourColumnLayout, null),
-              id: 'fourcolumnslayout',
-              keyword: 'four column',
-              title: formatMessage(layoutMessages.fourColumns)
-            }), createAdvancedColumnLayoutOption({
-              columnCount: 5,
-              descriptionColumnCount: 'five',
-              icon: () => /*#__PURE__*/React.createElement(IconFiveColumnLayout, null),
-              id: 'fivecolumnslayout',
-              keyword: 'five column',
-              title: formatMessage(layoutMessages.fiveColumns)
-            })];
-          }
-          return [...advancedSingleColumnOption, {
-            id: 'twocolumnslayout',
-            title: formatMessage(layoutMessages.twoColumnsAdvancedLayout),
+          const createAdvancedColumnLayoutOption = ({
+            columnCount,
+            descriptionColumnCount,
+            icon: Icon,
+            id,
+            keyword,
+            title
+          }) => ({
+            id,
+            title,
             description: formatMessage(messages.columnsDescriptionAdvancedLayout, {
-              numberOfColumns: 'two'
+              numberOfColumns: descriptionColumnCount
             }),
-            keywords: ['layout', 'column', 'section', 'col', 'two column'],
+            keywords: ['layout', 'column', 'section', 'col', keyword],
             priority: 1100,
-            icon: () => /*#__PURE__*/React.createElement(IconTwoColumnLayout, null),
+            icon: Icon,
             action(insert, state) {
-              const tr = insert(createMultiColumnLayoutSection(state, 2));
+              const tr = insert(createMultiColumnLayoutSection(state, columnCount));
               if (fg('platform_editor_column_count_analytics')) {
-                withInsertLayoutAnalytics(tr, 2);
+                withInsertLayoutAnalytics(tr, columnCount);
               } else {
                 withInsertLayoutAnalytics(tr);
               }
               selectIntoLayoutSection(tr);
               return tr;
             }
-          }, {
-            id: 'threecolumnslayout',
-            title: formatMessage(layoutMessages.threeColumnsAdvancedLayout),
-            description: formatMessage(messages.columnsDescriptionAdvancedLayout, {
-              numberOfColumns: 'three'
-            }),
-            keywords: ['layout', 'column', 'section', 'col', 'three column'],
+          });
+          const advancedSingleColumnOption = allowAdvancedSingleColumnLayout ? [{
+            id: 'onecolumnlayout',
+            title: formatMessage(layoutMessages.singleColumnAdvancedLayout),
+            description: formatMessage(messages.singleColumnsDescriptionAdvancedLayout),
+            keywords: ['layout', 'column', 'section', 'col', 'single column'],
             priority: 1100,
-            icon: () => /*#__PURE__*/React.createElement(IconThreeColumnLayout, null),
+            icon: () => /*#__PURE__*/React.createElement(IconOneColumnLayout, null),
             action(insert, state) {
-              const tr = insert(createMultiColumnLayoutSection(state, 3));
+              const tr = insert(createMultiColumnLayoutSection(state, 1));
               if (fg('platform_editor_column_count_analytics')) {
-                withInsertLayoutAnalytics(tr, 3);
+                withInsertLayoutAnalytics(tr, 1);
               } else {
                 withInsertLayoutAnalytics(tr);
               }
               selectIntoLayoutSection(tr);
               return tr;
             }
-          }, {
-            id: 'fourcolumnslayout',
-            title: formatMessage(layoutMessages.fourColumns),
-            description: formatMessage(messages.columnsDescriptionAdvancedLayout, {
-              numberOfColumns: 'four'
-            }),
-            keywords: ['layout', 'column', 'section', 'col', 'four column'],
-            priority: 1100,
+          }] : [];
+          return [createAdvancedColumnLayoutOption({
+            columnCount: 2,
+            descriptionColumnCount: 'two',
+            icon: () => /*#__PURE__*/React.createElement(IconTwoColumnLayout, null),
+            id: 'twocolumnslayout',
+            keyword: 'two column',
+            title: formatMessage(layoutMessages.twoColumnsAdvancedLayout)
+          }), ...advancedSingleColumnOption, createAdvancedColumnLayoutOption({
+            columnCount: 3,
+            descriptionColumnCount: 'three',
+            icon: () => /*#__PURE__*/React.createElement(IconThreeColumnLayout, null),
+            id: 'threecolumnslayout',
+            keyword: 'three column',
+            title: formatMessage(layoutMessages.threeColumnsAdvancedLayout)
+          }), createAdvancedColumnLayoutOption({
+            columnCount: 4,
+            descriptionColumnCount: 'four',
             icon: () => /*#__PURE__*/React.createElement(IconFourColumnLayout, null),
-            action(insert, state) {
-              const tr = insert(createMultiColumnLayoutSection(state, 4));
-              if (fg('platform_editor_column_count_analytics')) {
-                withInsertLayoutAnalytics(tr, 4);
-              } else {
-                withInsertLayoutAnalytics(tr);
-              }
-              selectIntoLayoutSection(tr);
-              return tr;
-            }
-          }, {
-            id: 'fivecolumnslayout',
-            title: formatMessage(layoutMessages.fiveColumns),
-            description: formatMessage(messages.columnsDescriptionAdvancedLayout, {
-              numberOfColumns: 'five'
-            }),
-            keywords: ['layout', 'column', 'section', 'col', 'five column'],
-            priority: 1100,
+            id: 'fourcolumnslayout',
+            keyword: 'four column',
+            title: formatMessage(layoutMessages.fourColumns)
+          }), createAdvancedColumnLayoutOption({
+            columnCount: 5,
+            descriptionColumnCount: 'five',
             icon: () => /*#__PURE__*/React.createElement(IconFiveColumnLayout, null),
-            action(insert, state) {
-              const tr = insert(createMultiColumnLayoutSection(state, 5));
-              if (fg('platform_editor_column_count_analytics')) {
-                withInsertLayoutAnalytics(tr, 5);
-              } else {
-                withInsertLayoutAnalytics(tr);
-              }
-              selectIntoLayoutSection(tr);
-              return tr;
-            }
-          }];
+            id: 'fivecolumnslayout',
+            keyword: 'five column',
+            title: formatMessage(layoutMessages.fiveColumns)
+          })];
         } else {
           return [{
             id: 'layout',

package/dist/es2019/nodeviews/index.js

@@ -6,8 +6,8 @@ import { BreakoutResizer, ignoreResizerMutations } from '@atlaskit/editor-common
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { selectIntoLayout } from '../pm-plugins/utils';
 import { LayoutSSRReactContextsProvider } from '../ui/LayoutSSRReactContextsProvider';
 import { isEmptyLayout } from './utils';

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

@@ -6,8 +6,8 @@ import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state
 import { Mapping, StepMap } from '@atlaskit/editor-prosemirror/transform';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { DEFAULT_LAYOUT_COLUMN_VALIGN, EVEN_DISTRIBUTED_COL_WIDTHS, MAX_LAYOUT_COLUMNS, MAX_STANDARD_LAYOUT_COLUMNS, MIN_LAYOUT_COLUMN_WIDTH_PERCENT } from './consts';
 import { pluginKey } from './plugin-key';
 import { calculateDistribution, isDistributedUniformly, redistributeAfterDeletion, redistributeProportionally } from './utils/layout-column-distribution';

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

@@ -7,8 +7,8 @@ import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeClosestToPos, findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { fixColumnSizes, fixColumnStructure, getSelectedLayout, LAYOUT_COLUMN_INSERT_META } from './actions';
 import { getColumnDividerDecorations } from './column-resize-divider';
 import { EVEN_DISTRIBUTED_COL_WIDTHS } from './consts';

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

@@ -4,8 +4,8 @@ import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 export const getMaybeLayoutSection = state => {
   const {
     schema: {

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

@@ -2,10 +2,10 @@ import React, { useCallback } from 'react';
 import { useIntl } from 'react-intl';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { QuickInsertMenuItem } from '@atlaskit/editor-common/quick-insert/menu-item';
-import LayoutThreeColumnsIcon from '@atlaskit/icon/core/layout-three-columns';
-import LayoutTwoColumnsIcon from '@atlaskit/icon/core/layout-two-columns';
 import LayoutFiveColumnsIcon from '@atlaskit/icon-lab/core/layout-five-columns';
 import LayoutFourColumnsIcon from '@atlaskit/icon-lab/core/layout-four-columns';
+import LayoutThreeColumnsIcon from '@atlaskit/icon/core/layout-three-columns';
+import LayoutTwoColumnsIcon from '@atlaskit/icon/core/layout-two-columns';
 import { selectIntoLayoutSection } from '../../layoutPlugin';
 import { createMultiColumnLayoutSection } from '../../pm-plugins/actions';
 const icons = {

package/dist/es2019/ui/toolbar.js

@@ -13,8 +13,8 @@ import LayoutTwoColumnsIcon from '@atlaskit/icon/core/layout-two-columns';
 import LayoutTwoColumnsSidebarLeftIcon from '@atlaskit/icon/core/layout-two-columns-sidebar-left';
 import LayoutTwoColumnsSidebarRightIcon from '@atlaskit/icon/core/layout-two-columns-sidebar-right';
 import TableColumnsDistributeIcon from '@atlaskit/icon/core/table-columns-distribute';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { deleteActiveLayoutNode, distributeLayoutColumns, getPresetLayout, setPresetLayout } from '../pm-plugins/actions';
 import { isDistributedUniformly } from '../pm-plugins/utils/layout-column-distribution';
 import { EditorLayoutFiveColumnsIcon, EditorLayoutFourColumnsIcon } from './icons/LayoutColumnsIcon';

package/dist/esm/entry-points/layout-plugin.js

@@ -1,2 +1,3 @@
 /* eslint-disable @atlaskit/editor/no-re-export */
+
 export { layoutPlugin } from '../layoutPlugin';

package/dist/esm/layoutPlugin.js

@@ -1,6 +1,6 @@
 import React from 'react';
-import { layoutColumn, layoutColumnWithLocalId } from '@atlaskit/adf-schema/nodes/layout-column';
 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';
@@ -9,8 +9,8 @@ import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNode } from '@atlaskit/editor-prosemirror/utils';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { createDefaultLayoutSection, createMultiColumnLayoutSection, deleteLayoutColumn as _deleteLayoutColumn, distributeLayoutColumns as _distributeLayoutColumns, insertLayoutColumn as _insertLayoutColumn, insertLayoutColumnsWithAnalytics, setLayoutColumnDangerPreview, setLayoutColumnValign as _setLayoutColumnValign, toggleLayoutColumnMenu } from './pm-plugins/actions';
 import { default as createLayoutKeymapPlugin } from './pm-plugins/keymap';
 import { default as createLayoutPlugin } from './pm-plugins/main';
@@ -167,6 +167,34 @@ export var layoutPlugin = function layoutPlugin(_ref) {
           return tr;
         };
         if (editorExperiment('advanced_layouts', true)) {
+          var createAdvancedColumnLayoutOption = function createAdvancedColumnLayoutOption(_ref4) {
+            var columnCount = _ref4.columnCount,
+              descriptionColumnCount = _ref4.descriptionColumnCount,
+              Icon = _ref4.icon,
+              id = _ref4.id,
+              keyword = _ref4.keyword,
+              title = _ref4.title;
+            return {
+              id: id,
+              title: title,
+              description: formatMessage(messages.columnsDescriptionAdvancedLayout, {
+                numberOfColumns: descriptionColumnCount
+              }),
+              keywords: ['layout', 'column', 'section', 'col', keyword],
+              priority: 1100,
+              icon: Icon,
+              action: function action(insert, state) {
+                var tr = insert(createMultiColumnLayoutSection(state, columnCount));
+                if (fg('platform_editor_column_count_analytics')) {
+                  withInsertLayoutAnalytics(tr, columnCount);
+                } else {
+                  withInsertLayoutAnalytics(tr);
+                }
+                selectIntoLayoutSection(tr);
+                return tr;
+              }
+            };
+          };
           var advancedSingleColumnOption = allowAdvancedSingleColumnLayout ? [{
             id: 'onecolumnlayout',
             title: formatMessage(layoutMessages.singleColumnAdvancedLayout),
@@ -187,158 +215,43 @@ export var layoutPlugin = function layoutPlugin(_ref) {
               return tr;
             }
           }] : [];
-          if (expValEquals('platform_editor_layout_typeahead_reorder', 'isEnabled', true)) {
-            var createAdvancedColumnLayoutOption = function createAdvancedColumnLayoutOption(_ref4) {
-              var columnCount = _ref4.columnCount,
-                descriptionColumnCount = _ref4.descriptionColumnCount,
-                Icon = _ref4.icon,
-                id = _ref4.id,
-                keyword = _ref4.keyword,
-                title = _ref4.title;
-              return {
-                id: id,
-                title: title,
-                description: formatMessage(messages.columnsDescriptionAdvancedLayout, {
-                  numberOfColumns: descriptionColumnCount
-                }),
-                keywords: ['layout', 'column', 'section', 'col', keyword],
-                priority: 1100,
-                icon: Icon,
-                action: function action(insert, state) {
-                  var tr = insert(createMultiColumnLayoutSection(state, columnCount));
-                  if (fg('platform_editor_column_count_analytics')) {
-                    withInsertLayoutAnalytics(tr, columnCount);
-                  } else {
-                    withInsertLayoutAnalytics(tr);
-                  }
-                  selectIntoLayoutSection(tr);
-                  return tr;
-                }
-              };
-            };
-            return [createAdvancedColumnLayoutOption({
-              columnCount: 2,
-              descriptionColumnCount: 'two',
-              icon: function icon() {
-                return /*#__PURE__*/React.createElement(IconTwoColumnLayout, null);
-              },
-              id: 'twocolumnslayout',
-              keyword: 'two column',
-              title: formatMessage(layoutMessages.twoColumnsAdvancedLayout)
-            })].concat(advancedSingleColumnOption, [createAdvancedColumnLayoutOption({
-              columnCount: 3,
-              descriptionColumnCount: 'three',
-              icon: function icon() {
-                return /*#__PURE__*/React.createElement(IconThreeColumnLayout, null);
-              },
-              id: 'threecolumnslayout',
-              keyword: 'three column',
-              title: formatMessage(layoutMessages.threeColumnsAdvancedLayout)
-            }), createAdvancedColumnLayoutOption({
-              columnCount: 4,
-              descriptionColumnCount: 'four',
-              icon: function icon() {
-                return /*#__PURE__*/React.createElement(IconFourColumnLayout, null);
-              },
-              id: 'fourcolumnslayout',
-              keyword: 'four column',
-              title: formatMessage(layoutMessages.fourColumns)
-            }), createAdvancedColumnLayoutOption({
-              columnCount: 5,
-              descriptionColumnCount: 'five',
-              icon: function icon() {
-                return /*#__PURE__*/React.createElement(IconFiveColumnLayout, null);
-              },
-              id: 'fivecolumnslayout',
-              keyword: 'five column',
-              title: formatMessage(layoutMessages.fiveColumns)
-            })]);
-          }
-          return [].concat(advancedSingleColumnOption, [{
-            id: 'twocolumnslayout',
-            title: formatMessage(layoutMessages.twoColumnsAdvancedLayout),
-            description: formatMessage(messages.columnsDescriptionAdvancedLayout, {
-              numberOfColumns: 'two'
-            }),
-            keywords: ['layout', 'column', 'section', 'col', 'two column'],
-            priority: 1100,
+          return [createAdvancedColumnLayoutOption({
+            columnCount: 2,
+            descriptionColumnCount: 'two',
             icon: function icon() {
               return /*#__PURE__*/React.createElement(IconTwoColumnLayout, null);
             },
-            action: function action(insert, state) {
-              var tr = insert(createMultiColumnLayoutSection(state, 2));
-              if (fg('platform_editor_column_count_analytics')) {
-                withInsertLayoutAnalytics(tr, 2);
-              } else {
-                withInsertLayoutAnalytics(tr);
-              }
-              selectIntoLayoutSection(tr);
-              return tr;
-            }
-          }, {
-            id: 'threecolumnslayout',
-            title: formatMessage(layoutMessages.threeColumnsAdvancedLayout),
-            description: formatMessage(messages.columnsDescriptionAdvancedLayout, {
-              numberOfColumns: 'three'
-            }),
-            keywords: ['layout', 'column', 'section', 'col', 'three column'],
-            priority: 1100,
+            id: 'twocolumnslayout',
+            keyword: 'two column',
+            title: formatMessage(layoutMessages.twoColumnsAdvancedLayout)
+          })].concat(advancedSingleColumnOption, [createAdvancedColumnLayoutOption({
+            columnCount: 3,
+            descriptionColumnCount: 'three',
             icon: function icon() {
               return /*#__PURE__*/React.createElement(IconThreeColumnLayout, null);
             },
-            action: function action(insert, state) {
-              var tr = insert(createMultiColumnLayoutSection(state, 3));
-              if (fg('platform_editor_column_count_analytics')) {
-                withInsertLayoutAnalytics(tr, 3);
-              } else {
-                withInsertLayoutAnalytics(tr);
-              }
-              selectIntoLayoutSection(tr);
-              return tr;
-            }
-          }, {
-            id: 'fourcolumnslayout',
-            title: formatMessage(layoutMessages.fourColumns),
-            description: formatMessage(messages.columnsDescriptionAdvancedLayout, {
-              numberOfColumns: 'four'
-            }),
-            keywords: ['layout', 'column', 'section', 'col', 'four column'],
-            priority: 1100,
+            id: 'threecolumnslayout',
+            keyword: 'three column',
+            title: formatMessage(layoutMessages.threeColumnsAdvancedLayout)
+          }), createAdvancedColumnLayoutOption({
+            columnCount: 4,
+            descriptionColumnCount: 'four',
             icon: function icon() {
               return /*#__PURE__*/React.createElement(IconFourColumnLayout, null);
             },
-            action: function action(insert, state) {
-              var tr = insert(createMultiColumnLayoutSection(state, 4));
-              if (fg('platform_editor_column_count_analytics')) {
-                withInsertLayoutAnalytics(tr, 4);
-              } else {
-                withInsertLayoutAnalytics(tr);
-              }
-              selectIntoLayoutSection(tr);
-              return tr;
-            }
-          }, {
-            id: 'fivecolumnslayout',
-            title: formatMessage(layoutMessages.fiveColumns),
-            description: formatMessage(messages.columnsDescriptionAdvancedLayout, {
-              numberOfColumns: 'five'
-            }),
-            keywords: ['layout', 'column', 'section', 'col', 'five column'],
-            priority: 1100,
+            id: 'fourcolumnslayout',
+            keyword: 'four column',
+            title: formatMessage(layoutMessages.fourColumns)
+          }), createAdvancedColumnLayoutOption({
+            columnCount: 5,
+            descriptionColumnCount: 'five',
             icon: function icon() {
               return /*#__PURE__*/React.createElement(IconFiveColumnLayout, null);
             },
-            action: function action(insert, state) {
-              var tr = insert(createMultiColumnLayoutSection(state, 5));
-              if (fg('platform_editor_column_count_analytics')) {
-                withInsertLayoutAnalytics(tr, 5);
-              } else {
-                withInsertLayoutAnalytics(tr);
-              }
-              selectIntoLayoutSection(tr);
-              return tr;
-            }
-          }]);
+            id: 'fivecolumnslayout',
+            keyword: 'five column',
+            title: formatMessage(layoutMessages.fiveColumns)
+          })]);
         } else {
           return [{
             id: 'layout',

package/dist/esm/nodeviews/index.js

@@ -16,8 +16,8 @@ import { BreakoutResizer, ignoreResizerMutations } from '@atlaskit/editor-common
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { selectIntoLayout } from '../pm-plugins/utils';
 import { LayoutSSRReactContextsProvider } from '../ui/LayoutSSRReactContextsProvider';
 import { isEmptyLayout } from './utils';

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

@@ -9,8 +9,8 @@ import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state
 import { Mapping, StepMap } from '@atlaskit/editor-prosemirror/transform';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { DEFAULT_LAYOUT_COLUMN_VALIGN, EVEN_DISTRIBUTED_COL_WIDTHS, MAX_LAYOUT_COLUMNS, MAX_STANDARD_LAYOUT_COLUMNS, MIN_LAYOUT_COLUMN_WIDTH_PERCENT } from './consts';
 import { pluginKey } from './plugin-key';
 import { calculateDistribution, isDistributedUniformly, redistributeAfterDeletion, redistributeProportionally } from './utils/layout-column-distribution';

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

@@ -11,8 +11,8 @@ import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeClosestToPos, findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { fixColumnSizes, fixColumnStructure, getSelectedLayout, LAYOUT_COLUMN_INSERT_META } from './actions';
 import { getColumnDividerDecorations } from './column-resize-divider';
 import { EVEN_DISTRIBUTED_COL_WIDTHS } from './consts';

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

@@ -4,8 +4,8 @@ import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 export var getMaybeLayoutSection = function getMaybeLayoutSection(state) {
   var _state$schema$nodes = state.schema.nodes,
     layoutSection = _state$schema$nodes.layoutSection,

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

@@ -2,10 +2,10 @@ import React, { useCallback } from 'react';
 import { useIntl } from 'react-intl';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { QuickInsertMenuItem } from '@atlaskit/editor-common/quick-insert/menu-item';
-import LayoutThreeColumnsIcon from '@atlaskit/icon/core/layout-three-columns';
-import LayoutTwoColumnsIcon from '@atlaskit/icon/core/layout-two-columns';
 import LayoutFiveColumnsIcon from '@atlaskit/icon-lab/core/layout-five-columns';
 import LayoutFourColumnsIcon from '@atlaskit/icon-lab/core/layout-four-columns';
+import LayoutThreeColumnsIcon from '@atlaskit/icon/core/layout-three-columns';
+import LayoutTwoColumnsIcon from '@atlaskit/icon/core/layout-two-columns';
 import { selectIntoLayoutSection } from '../../layoutPlugin';
 import { createMultiColumnLayoutSection } from '../../pm-plugins/actions';
 var icons = {

package/dist/esm/ui/toolbar.js

@@ -17,8 +17,8 @@ import LayoutTwoColumnsIcon from '@atlaskit/icon/core/layout-two-columns';
 import LayoutTwoColumnsSidebarLeftIcon from '@atlaskit/icon/core/layout-two-columns-sidebar-left';
 import LayoutTwoColumnsSidebarRightIcon from '@atlaskit/icon/core/layout-two-columns-sidebar-right';
 import TableColumnsDistributeIcon from '@atlaskit/icon/core/table-columns-distribute';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { deleteActiveLayoutNode, distributeLayoutColumns, getPresetLayout, setPresetLayout } from '../pm-plugins/actions';
 import { isDistributedUniformly } from '../pm-plugins/utils/layout-column-distribution';
 import { EditorLayoutFiveColumnsIcon, EditorLayoutFourColumnsIcon } from './icons/LayoutColumnsIcon';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-layout",
-	"version": "20.0.1",
+	"version": "20.0.2",
 	"description": "Layout plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -37,20 +37,20 @@
 		"@atlaskit/editor-plugin-width": "^20.0.0",
 		"@atlaskit/editor-prosemirror": "^9.0.0",
 		"@atlaskit/editor-shared-styles": "^4.3.0",
-		"@atlaskit/editor-toolbar": "^2.6.0",
+		"@atlaskit/editor-toolbar": "^2.7.0",
 		"@atlaskit/editor-ui-control-model": "^2.9.0",
 		"@atlaskit/icon": "^37.7.0",
 		"@atlaskit/icon-lab": "^7.9.0",
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
-		"@atlaskit/tmp-editor-statsig": "^200.0.0",
+		"@atlaskit/tmp-editor-statsig": "^201.0.0",
 		"@atlaskit/tokens": "^18.2.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"bind-event-listener": "^3.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^123.0.0",
+		"@atlaskit/editor-common": "^123.2.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},