@atlaskit/editor-plugin-layout 20.0.1 → 20.0.3

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';
@@ -55,7 +55,6 @@ export const layoutPlugin = ({
   api
 }) => {
   var _api$blockMenu, _api$analytics2;
-  const blockControlMigrationEnabled = isExperimentEnabled('platform_editor_block_control_migration');
   const isAdvancedLayoutEnabled = editorExperiment('advanced_layouts', true);
   const allowAdvancedSingleColumnLayout = isAdvancedLayoutEnabled && editorExperiment('single_column_layouts', true, {
     exposure: true
@@ -166,159 +165,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',
@@ -356,8 +276,7 @@ export const layoutPlugin = ({
         editorView: editorView,
         mountTo: popupsMountPoint,
         boundariesElement: popupsBoundariesElement,
-        scrollableElement: popupsScrollableElement,
-        useRegistryAnchor: blockControlMigrationEnabled
+        scrollableElement: popupsScrollableElement
       }) : null);
     },
     getSharedState(editorState) {

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/LayoutColumnMenu/index.js

@@ -10,6 +10,7 @@ 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 { 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';
 import { LAYOUT_COLUMN_MENU } from './keys';
@@ -42,8 +43,7 @@ export const LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMen
   editorView,
   mountTo,
   boundariesElement,
-  scrollableElement,
-  useRegistryAnchor
+  scrollableElement
 }) {
   var _api$uiControlRegistr, _api$uiControlRegistr2;
   const {
@@ -117,10 +117,11 @@ export const LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMen
     });
   }, [handleMenuKeyDown, isLayoutColumnMenuOpen]);
   const components = (_api$uiControlRegistr = api === null || api === void 0 ? void 0 : (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 ? void 0 : _api$uiControlRegistr2.actions.getComponents(LAYOUT_COLUMN_MENU.key)) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : [];
-  const legacyTarget = useMemo(() => isLayoutColumnMenuOpen && !useRegistryAnchor ? getLayoutColumnMenuTarget(editorView, selection, layoutColumnMenuAnchorPos) : null, [editorView, isLayoutColumnMenuOpen, layoutColumnMenuAnchorPos, selection, useRegistryAnchor]);
+  const hasValidMenuSelection = !isExperimentEnabled('platform_editor_block_control_migration') || selection !== undefined && getLayoutColumnMenuAnchorPos(selection, layoutColumnMenuAnchorPos) !== undefined;
+  const legacyTarget = useMemo(() => isLayoutColumnMenuOpen && !isExperimentEnabled('platform_editor_block_control_migration') ? getLayoutColumnMenuTarget(editorView, selection, layoutColumnMenuAnchorPos) : null, [editorView, isLayoutColumnMenuOpen, layoutColumnMenuAnchorPos, selection]);
   const surfaceTargetRef = useRef(null);
   const surfaceAnchorPosRef = useRef(undefined);
-  if (!useRegistryAnchor || !isLayoutColumnMenuOpen) {
+  if (!isExperimentEnabled('platform_editor_block_control_migration') || !isLayoutColumnMenuOpen) {
     surfaceTargetRef.current = null;
     surfaceAnchorPosRef.current = undefined;
   } else if (!surfaceTargetRef.current || surfaceAnchorPosRef.current !== layoutColumnMenuAnchorPos) {
@@ -128,7 +129,7 @@ export const LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMen
     surfaceTargetRef.current = (_surfaceDragHandleEle = surfaceDragHandleElementStore.get(editorView)) !== null && _surfaceDragHandleEle !== void 0 ? _surfaceDragHandleEle : surfaceTargetRef.current;
     surfaceAnchorPosRef.current = layoutColumnMenuAnchorPos;
   }
-  const target = useRegistryAnchor ? surfaceTargetRef.current : legacyTarget;
+  const target = isExperimentEnabled('platform_editor_block_control_migration') ? surfaceTargetRef.current : legacyTarget;
   const hasValidTarget = target instanceof HTMLElement;
   const positionLayoutColumnMenu = useCallback(position => {
     var _menuWrapperRef$curre;
@@ -147,17 +148,17 @@ export const LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMen
     return position;
   }, [editorView, scrollableElement, target]);
   useEffect(() => {
-    if (isLayoutColumnMenuOpen && (!hasValidTarget || components.length === 0)) {
+    if (isLayoutColumnMenuOpen && (!hasValidMenuSelection || !hasValidTarget || components.length === 0)) {
       closeLayoutColumnMenu();
     }
-  }, [closeLayoutColumnMenu, components.length, hasValidTarget, isLayoutColumnMenuOpen]);
+  }, [closeLayoutColumnMenu, components.length, hasValidMenuSelection, hasValidTarget, isLayoutColumnMenuOpen]);
   const {
     alignX,
     alignY,
     offset,
     useManualBelowFlip
   } = useMemo(() => getLayoutColumnMenuPositioningProps(), []);
-  if (!isLayoutColumnMenuOpen || components.length === 0 || !hasValidTarget) {
+  if (!isLayoutColumnMenuOpen || !hasValidMenuSelection || components.length === 0 || !hasValidTarget) {
     return null;
   }
   return /*#__PURE__*/React.createElement(PopupWithListeners, {

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';
@@ -56,7 +56,6 @@ export var layoutPlugin = function layoutPlugin(_ref) {
   var _ref$config = _ref.config,
     options = _ref$config === void 0 ? {} : _ref$config,
     api = _ref.api;
-  var blockControlMigrationEnabled = isExperimentEnabled('platform_editor_block_control_migration');
   var isAdvancedLayoutEnabled = editorExperiment('advanced_layouts', true);
   var allowAdvancedSingleColumnLayout = isAdvancedLayoutEnabled && editorExperiment('single_column_layouts', true, {
     exposure: true
@@ -167,6 +166,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 +214,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',
@@ -377,8 +289,7 @@ export var layoutPlugin = function layoutPlugin(_ref) {
         editorView: editorView,
         mountTo: popupsMountPoint,
         boundariesElement: popupsBoundariesElement,
-        scrollableElement: popupsScrollableElement,
-        useRegistryAnchor: blockControlMigrationEnabled
+        scrollableElement: popupsScrollableElement
       }) : null);
     },
     getSharedState: function getSharedState(editorState) {