@atlaskit/editor-plugin-layout 23.0.3 → 23.0.5

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atlaskit/editor-plugin-layout
 
+## 23.0.5
+
+### Patch Changes
+
+- [`d7f1f4ebb1cd3`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d7f1f4ebb1cd3) -
+  Keep the shipped layout column delete shortcut behavior for explicitly selected columns. Remove
+  the `platform_editor_layout_column_delete_shortcut_fix` and
+  `platform_editor_layout_column_valign_rendering` experiment keys. Consumers of these keys must
+  remove their experiment reads and use the shipped behavior directly.
+- Updated dependencies
+
+## 23.0.4
+
+### Patch Changes
+
+- [`a4fe8636fa0ec`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a4fe8636fa0ec) -
+  Clean up the fully rolled out `platform_editor_layout_column_menu` experiment and the
+  `platform_editor_layout_column_menu_kill_switch_1` feature gate, retaining their shipped behavior.
+  Consumers must remove any direct `@atlaskit/tmp-editor-statsig` experiment override for
+  `platform_editor_layout_column_menu`.
+- Updated dependencies
+
 ## 23.0.3
 
 ### Patch Changes

package/dist/cjs/layoutPlugin.js

@@ -17,7 +17,6 @@ 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 _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"));
@@ -59,7 +58,7 @@ var selectIntoLayoutSection = exports.selectIntoLayoutSection = function selectI
   return tr;
 };
 var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
-  var _api$blockMenu, _api$analytics2;
+  var _api$blockMenu, _api$uiControlRegistr, _api$analytics2;
   var _ref$config = _ref.config,
     options = _ref$config === void 0 ? {} : _ref$config,
     api = _ref.api;
@@ -82,12 +81,9 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
       return Boolean(api === null || api === void 0 || (_api$blockMenu2 = api.blockMenu) === null || _api$blockMenu2 === void 0 ? void 0 : _api$blockMenu2.actions.isTransformOptionDisabled(LAYOUT_SECTION_NODE_NAME));
     }
   }]);
-  if ((0, _expValEquals.expValEquals)('platform_editor_layout_column_menu', 'isEnabled', true)) {
-    var _api$uiControlRegistr;
-    api === null || api === void 0 || (_api$uiControlRegistr = api.uiControlRegistry) === null || _api$uiControlRegistr === void 0 || _api$uiControlRegistr.actions.register((0, _components.getLayoutColumnMenuComponents)({
-      api: api
-    }));
-  }
+  api === null || api === void 0 || (_api$uiControlRegistr = api.uiControlRegistry) === null || _api$uiControlRegistr === void 0 || _api$uiControlRegistr.actions.register((0, _components.getLayoutColumnMenuComponents)({
+    api: api
+  }));
   if (isRegisteredSlashCommandEnabled) {
     var _api$uiControlRegistr2;
     api === null || api === void 0 || (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 || _api$uiControlRegistr2.actions.register((0, _getLayoutQuickInsertComponents.getLayoutQuickInsertComponents)({
@@ -113,16 +109,14 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
           return (0, _main.default)(options, api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
         }
       }];
-      if ((0, _expValEquals.expValEquals)('platform_editor_layout_column_menu', 'isEnabled', true)) {
-        plugins.push({
-          name: 'layoutKeymap',
-          plugin: function plugin() {
-            return (0, _keymap.default)({
-              api: api
-            });
-          }
-        });
-      }
+      plugins.push({
+        name: 'layoutKeymap',
+        plugin: function plugin() {
+          return (0, _keymap.default)({
+            api: api
+          });
+        }
+      });
       if ((options.editorAppearance === 'full-page' || options.editorAppearance === 'full-width' || options.editorAppearance === 'max') && api && (0, _editorExperiment.editorExperiment)('advanced_layouts', true)) {
         plugins.push({
           name: 'layoutResizing',
@@ -291,7 +285,7 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
         popupsMountPoint = _ref5.popupsMountPoint,
         popupsBoundariesElement = _ref5.popupsBoundariesElement,
         popupsScrollableElement = _ref5.popupsScrollableElement;
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _editorExperiment.editorExperiment)('advanced_layouts', true) ? /*#__PURE__*/_react.default.createElement(_globalStyles.GlobalStylesWrapper, null) : null, (0, _expValEquals.expValEquals)('platform_editor_layout_column_menu', 'isEnabled', true) && editorView ? /*#__PURE__*/_react.default.createElement(_LayoutColumnMenu.LayoutColumnMenu, {
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _editorExperiment.editorExperiment)('advanced_layouts', true) ? /*#__PURE__*/_react.default.createElement(_globalStyles.GlobalStylesWrapper, null) : null, editorView ? /*#__PURE__*/_react.default.createElement(_LayoutColumnMenu.LayoutColumnMenu, {
         api: api,
         editorView: editorView,
         mountTo: popupsMountPoint,

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

@@ -18,7 +18,6 @@ var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 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");
@@ -621,9 +620,6 @@ var insertLayoutColumnAt = function insertLayoutColumnAt(side, editorAnalyticsAP
   var inputMethod = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : _analytics.INPUT_METHOD.LAYOUT_COLUMN_MENU;
   return function (_ref5) {
     var tr = _ref5.tr;
-    if (!(0, _expValEquals.expValEquals)('platform_editor_layout_column_menu', 'isEnabled', true)) {
-      return null;
-    }
     var selectedLayoutColumnsResult = (0, _layoutColumnSelection.getLayoutColumnsFromContentSelection)(tr.selection);
     if (!selectedLayoutColumnsResult || selectedLayoutColumnsResult.selectedLayoutColumns.length === 0) {
       return null;
@@ -685,12 +681,10 @@ var insertLayoutColumnAt = function insertLayoutColumnAt(side, editorAnalyticsAP
 
     // Inserting left shifts positions at/after the new column right by its size; inserting
     // right leaves them unchanged. Remap the original selection through that mapping.
-    if (!(0, _fg.fg)('platform_editor_layout_column_menu_kill_switch_1')) {
-      var insertMapping = side === 'left' ? new _transform.Mapping([new _transform.StepMap([insertedColumnPos, 0, newColumn.nodeSize])]) : new _transform.Mapping();
-      var restoredSelection = remapSelectionThroughMapping(originalSelection, insertMapping, tr.doc);
-      if (restoredSelection) {
-        tr.setSelection(restoredSelection);
-      }
+    var insertMapping = side === 'left' ? new _transform.Mapping([new _transform.StepMap([insertedColumnPos, 0, newColumn.nodeSize])]) : new _transform.Mapping();
+    var restoredSelection = remapSelectionThroughMapping(originalSelection, insertMapping, tr.doc);
+    if (restoredSelection) {
+      tr.setSelection(restoredSelection);
     }
     editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
       action: _analytics.ACTION.INSERTED,
@@ -732,9 +726,6 @@ var setLayoutColumnValign = exports.setLayoutColumnValign = function setLayoutCo
     inputMethod = _ref8$inputMethod === void 0 ? _analytics.INPUT_METHOD.LAYOUT_COLUMN_MENU : _ref8$inputMethod;
   return function (_ref9) {
     var tr = _ref9.tr;
-    if (!(0, _expValEquals.expValEquals)('platform_editor_layout_column_menu', 'isEnabled', true)) {
-      return null;
-    }
     var selectedLayoutColumnsResult = (0, _layoutColumnSelection.getSelectedLayoutColumnsFromSelection)(tr.selection);
     if (!selectedLayoutColumnsResult) {
       return null;
@@ -789,9 +780,6 @@ var distributeLayoutColumns = exports.distributeLayoutColumns = function distrib
       target = _ref10$target === void 0 ? 'selectedColumns' : _ref10$target;
     return function (_ref11) {
       var tr = _ref11.tr;
-      if (!(0, _expValEquals.expValEquals)('platform_editor_layout_column_menu', 'isEnabled', true)) {
-        return null;
-      }
       var selectedLayoutColumnsResult = target === 'allColumns' ? (0, _layoutColumnSelection.getAllLayoutColumnsFromSelection)(tr.selection) : (0, _layoutColumnSelection.getSelectedLayoutColumnsFromSelection)(tr.selection);
       if (!selectedLayoutColumnsResult || selectedLayoutColumnsResult.selectedLayoutColumns.length < 2) {
         return null;
@@ -900,14 +888,10 @@ var deleteLayoutColumn = exports.deleteLayoutColumn = function deleteLayoutColum
   return function (_ref18) {
     var _api$blockControls4;
     var tr = _ref18.tr;
-    if (!(0, _expValEquals.expValEquals)('platform_editor_layout_column_menu', 'isEnabled', true)) {
-      return null;
-    }
-
     // Only delete columns that are explicitly selected (a column NodeSelection or a selection
     // fully containing columns). This stops a bare caret inside a column — including inside
     // nested content such as a table — from deleting the whole column via the delete shortcut.
-    var selectedLayoutColumnsResult = (0, _expValEquals.expValEquals)('platform_editor_layout_column_delete_shortcut_fix', 'isEnabled', true) ? (0, _layoutColumnSelection.getSelectedLayoutColumnsFromSelection)(tr.selection) : (0, _layoutColumnSelection.getLayoutColumnsFromContentSelection)(tr.selection);
+    var selectedLayoutColumnsResult = (0, _layoutColumnSelection.getSelectedLayoutColumnsFromSelection)(tr.selection);
     if (!selectedLayoutColumnsResult || selectedLayoutColumnsResult.selectedLayoutColumns.length === 0) {
       return null;
     }
@@ -972,17 +956,14 @@ var deleteLayoutColumn = exports.deleteLayoutColumn = function deleteLayoutColum
     }, existingWidths);
     var updatedLayoutSectionNode = layoutSectionNode.copy(_model.Fragment.fromArray(remainingColumns));
 
-    // The cursor-in-column (keyboard) path has a plain text selection; the menu path has a
-    // column NodeSelection whose post-delete landing is owned by the block-controls
-    // preserved-selection plugin, so we only restore the caret for the former.
+    // A text selection can fully contain columns. Restore its caret in a remaining column;
+    // block controls own the landing for a column NodeSelection.
     var hadTextSelection = tr.selection instanceof _state.TextSelection;
     tr.replaceWith(layoutSectionPos + 1, layoutSectionPos + layoutSectionNode.nodeSize - 1, columnWidth(updatedLayoutSectionNode, tr.doc.type.schema, redistributed));
 
-    // Land the caret in a remaining column — the one now occupying the deleted slot, or the
-    // last column when the deleted slot no longer exists. Otherwise the replace above maps
-    // the caret out of the layout to the following paragraph.
+    // Keep a text selection within the layout after the selected columns are removed.
     var remainingColumnCount = remainingColumns.length;
-    if (hadTextSelection && !(0, _fg.fg)('platform_editor_layout_column_menu_kill_switch_1') && remainingColumnCount > 0) {
+    if (hadTextSelection && remainingColumnCount > 0) {
       var targetColumnIndex = Math.min(startIndex, remainingColumnCount - 1);
       var updatedSectionNode = tr.doc.nodeAt(layoutSectionPos);
       if (updatedSectionNode) {

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

@@ -12,7 +12,6 @@ var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
-var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _consts = require("./consts");
 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; }
@@ -84,8 +83,7 @@ var dispatchColumnWidths = function dispatchColumnWidths(view, sectionPos, leftC
 
   // Capture the selection before the replace below, which otherwise maps the caret out of
   // the layout to the following paragraph. Restored at the same positions afterwards.
-  var shouldPreserveSelection = !(0, _fg.fg)('platform_editor_layout_column_menu_kill_switch_1');
-  var selectionBeforeResize = shouldPreserveSelection ? state.selection : null;
+  var selectionBeforeResize = state.selection;
   tr.replaceWith(sectionPos + 1, sectionPos + sectionNode.nodeSize - 1, _model.Fragment.from(newColumns));
   tr.setMeta('layoutColumnResize', true);
   tr.setMeta('scrollIntoView', false);

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

@@ -17,7 +17,6 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _view2 = require("@atlaskit/editor-prosemirror/view");
 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");
@@ -35,7 +34,7 @@ var DEFAULT_LAYOUT = exports.DEFAULT_LAYOUT = 'two_equal';
  * Returns `true` when it placed a selection and consumed the click, else `false`.
  */
 var applyBlankSpaceGapCursor = function applyBlankSpaceGapCursor(view, event) {
-  if (!(0, _expValEquals.expValEquals)('platform_editor_layout_column_menu', 'isEnabled', true) || !(0, _editorExperiment.editorExperiment)('advanced_layouts', true)) {
+  if (!(0, _editorExperiment.editorExperiment)('advanced_layouts', true)) {
     return false;
   }
   var gapTarget = (0, _utils3.getGapCursorTargetForBlankSpaceClick)(view, event);

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

@@ -8,7 +8,6 @@ var _selection = require("@atlaskit/editor-common/selection");
 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 _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
@@ -71,18 +70,12 @@ var supportsBlankSpaceGapCursorFallback = function supportsBlankSpaceGapCursorFa
 /**
  * For a blank-space click inside a layout column — above the first child (middle/bottom-aligned
  * columns) or below the last child (any alignment) — return the ProseMirror position and side
- * for a gap cursor. Returns `undefined` when the kill switch is ON, the click is outside a
- * layoutColumn, or the Y coordinate is not in blank space.
- *
- * The `advanced_layouts` / `platform_editor_layout_column_menu` gates live in the caller
- * (`applyBlankSpaceGapCursor`); only the kill switch is checked here.
+ * for a gap cursor. Returns `undefined` when the click is outside a layoutColumn or the Y
+ * coordinate is not in blank space. The `advanced_layouts` gate lives in the caller
+ * (`applyBlankSpaceGapCursor`).
  */
 var getGapCursorTargetForBlankSpaceClick = exports.getGapCursorTargetForBlankSpaceClick = function getGapCursorTargetForBlankSpaceClick(view, event) {
   var _columnNode$attrs;
-  if ((0, _fg.fg)('platform_editor_layout_column_menu_kill_switch_1')) {
-    return undefined;
-  }
-
   // Resolve the column from the DOM target so it works even when posAtCoords returns null
   // (nothing rendered at the clicked Y).
   var target = event.target;

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

@@ -21,11 +21,11 @@ var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-ex
 var _layoutColumnSelection = require("../../pm-plugins/utils/layout-column-selection");
 var _components = require("./components");
 var _keys = require("./keys");
-var _utils = require("./utils");
 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); }
 var PopupWithListeners = (0, _uiReact.withReactEditorViewOuterListeners)(_ui.Popup);
 var TOOLBAR_MENU_SELECTOR = '[data-toolbar-component="menu"]';
 var NESTED_DROPDOWN_MENU_SELECTOR = '[data-toolbar-nested-dropdown-menu]';
+var LAYOUT_COLUMN_MENU_POPUP_OFFSET_BELOW = [0, 2];
 
 /**
  * Returns the drag handle button for the selected layout column.
@@ -139,34 +139,11 @@ var LayoutColumnMenu = exports.LayoutColumnMenu = /*#__PURE__*/_react.default.me
   }
   var target = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_block_control_migration') ? surfaceTargetRef.current : legacyTarget;
   var hasValidTarget = target instanceof HTMLElement;
-  var positionLayoutColumnMenu = (0, _react.useCallback)(function (position) {
-    var _menuWrapperRef$curre;
-    var popup = (_menuWrapperRef$curre = menuWrapperRef.current) === null || _menuWrapperRef$curre === void 0 ? void 0 : _menuWrapperRef$curre.parentElement;
-    if (!(target instanceof HTMLElement) || !(popup instanceof HTMLElement)) {
-      return position;
-    }
-    if ((0, _utils.shouldOpenLayoutColumnMenuBelow)({
-      editorView: editorView,
-      popup: popup,
-      scrollableElement: scrollableElement,
-      target: target
-    })) {
-      return (0, _utils.calculateFallbackBottomPosition)(position, target, popup);
-    }
-    return position;
-  }, [editorView, scrollableElement, target]);
   (0, _react.useEffect)(function () {
     if (isLayoutColumnMenuOpen && (!hasValidMenuSelection || !hasValidTarget || components.length === 0)) {
       closeLayoutColumnMenu();
     }
   }, [closeLayoutColumnMenu, components.length, hasValidMenuSelection, hasValidTarget, isLayoutColumnMenuOpen]);
-  var _useMemo = (0, _react.useMemo)(function () {
-      return (0, _utils.getLayoutColumnMenuPositioningProps)();
-    }, []),
-    alignX = _useMemo.alignX,
-    alignY = _useMemo.alignY,
-    offset = _useMemo.offset,
-    useManualBelowFlip = _useMemo.useManualBelowFlip;
   if (!isLayoutColumnMenuOpen || !hasValidMenuSelection || components.length === 0 || !hasValidTarget) {
     return null;
   }
@@ -176,13 +153,10 @@ var LayoutColumnMenu = exports.LayoutColumnMenu = /*#__PURE__*/_react.default.me
     boundariesElement: boundariesElement,
     scrollableElement: scrollableElement,
     zIndex: _editorSharedStyles.akEditorFloatingOverlapPanelZIndex,
-    alignX: alignX,
-    alignY: alignY,
     forcePlacement: true,
     preventOverflow: true,
     stick: true,
-    offset: offset,
-    onPositionCalculated: useManualBelowFlip ? positionLayoutColumnMenu : undefined,
+    offset: LAYOUT_COLUMN_MENU_POPUP_OFFSET_BELOW,
     handleClickOutside: handleClickOutside,
     handleEscapeKeydown: closeLayoutColumnMenu,
     focusTrap: openedViaKeyboard ? focusTrap : undefined

package/dist/cjs/ui/toolbar.js

@@ -24,7 +24,6 @@ var _layoutTwoColumnsSidebarLeft = _interopRequireDefault(require("@atlaskit/ico
 var _layoutTwoColumnsSidebarRight = _interopRequireDefault(require("@atlaskit/icon/core/layout-two-columns-sidebar-right"));
 var _tableColumnsDistribute = _interopRequireDefault(require("@atlaskit/icon/core/table-columns-distribute"));
 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");
@@ -66,47 +65,6 @@ var SIDEBAR_LAYOUT_TYPES = [{
   title: _messages.layoutMessages.threeColumnsWithSidebars,
   icon: _layoutThreeColumnsSidebars.default
 }];
-
-// These are used for advanced layout options
-var LAYOUT_WITH_TWO_COL_DISTRIBUTION_OLD = [{
-  id: 'editor.layout.twoEquals',
-  type: 'two_equal',
-  title: _messages.layoutMessages.twoColumns,
-  icon: _layoutTwoColumns.default
-}, {
-  id: 'editor.layout.twoRightSidebar',
-  type: 'two_right_sidebar',
-  title: _messages.layoutMessages.rightSidebar,
-  icon: _layoutTwoColumnsSidebarRight.default
-}, {
-  id: 'editor.layout.twoLeftSidebar',
-  type: 'two_left_sidebar',
-  title: _messages.layoutMessages.leftSidebar,
-  icon: _layoutTwoColumnsSidebarLeft.default
-}];
-var LAYOUT_WITH_THREE_COL_DISTRIBUTION_OLD = [{
-  id: 'editor.layout.threeEquals',
-  type: 'three_equal',
-  title: _messages.layoutMessages.threeColumns,
-  icon: _layoutThreeColumns.default
-}, {
-  id: 'editor.layout.threeWithSidebars',
-  type: 'three_with_sidebars',
-  title: _messages.layoutMessages.threeColumnsWithSidebars,
-  icon: _layoutThreeColumnsSidebars.default
-}, {
-  id: 'editor.layout.threeRightSidebars',
-  type: 'three_right_sidebars',
-  title: _messages.layoutMessages.threeColumnsWithRightSidebars,
-  icon: _LayoutThreeWithRightSidebars.LayoutThreeWithRightSidebarsIcon,
-  iconFallback: _LayoutThreeWithRightSidebars.LayoutThreeWithRightSidebarsIcon
-}, {
-  id: 'editor.layout.threeLeftSidebars',
-  type: 'three_left_sidebars',
-  title: _messages.layoutMessages.threeColumnsWithLeftSidebars,
-  icon: _LayoutThreeWithLeftSidebars.LayoutThreeWithLeftSidebarsIcon,
-  iconFallback: _LayoutThreeWithLeftSidebars.LayoutThreeWithLeftSidebarsIcon
-}];
 var LAYOUT_WITH_TWO_COL_DISTRIBUTION = [{
   id: 'editor.layout.twoRightSidebar',
   type: 'two_right_sidebar',
@@ -195,8 +153,7 @@ var getAdvancedLayoutItems = function getAdvancedLayoutItems(_ref) {
     currentLayout = _ref.currentLayout,
     allowAdvancedSingleColumnLayout = _ref.allowAdvancedSingleColumnLayout;
   var numberOfColumns = node.content.childCount || 2;
-  var isLayoutColumnMenuEnabled = (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_layout_column_menu', 'isEnabled', true);
-  var distributionOptions = isLayoutColumnMenuEnabled ? numberOfColumns === 2 ? LAYOUT_WITH_TWO_COL_DISTRIBUTION : numberOfColumns === 3 ? LAYOUT_WITH_THREE_COL_DISTRIBUTION : [] : numberOfColumns === 2 ? LAYOUT_WITH_TWO_COL_DISTRIBUTION_OLD : numberOfColumns === 3 ? LAYOUT_WITH_THREE_COL_DISTRIBUTION_OLD : [];
+  var distributionOptions = numberOfColumns === 2 ? LAYOUT_WITH_TWO_COL_DISTRIBUTION : numberOfColumns === 3 ? LAYOUT_WITH_THREE_COL_DISTRIBUTION : [];
   var columnOptions = [{
     title: intl.formatMessage(_messages.layoutMessages.columnOption, {
       count: 2
@@ -239,7 +196,7 @@ var getAdvancedLayoutItems = function getAdvancedLayoutItems(_ref) {
     onClick: (0, _actions.setPresetLayout)(editorAnalyticsAPI)('single'),
     selected: numberOfColumns === 1
   }] : []), columnOptions);
-  var distributeColumnsButton = isLayoutColumnMenuEnabled && numberOfColumns > 1 ? {
+  var distributeColumnsButton = numberOfColumns > 1 ? {
     disabled: (0, _layoutColumnDistribution.isDistributedUniformly)(getLayoutColumnWidths(node)),
     icon: _tableColumnsDistribute.default,
     onClick: function onClick(editorState, dispatch) {

package/dist/es2019/layoutPlugin.js

@@ -10,7 +10,6 @@ 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 { 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';
@@ -54,7 +53,7 @@ export const layoutPlugin = ({
   config: options = {},
   api
 }) => {
-  var _api$blockMenu, _api$analytics2;
+  var _api$blockMenu, _api$uiControlRegistr, _api$analytics2;
   const isAdvancedLayoutEnabled = editorExperiment('advanced_layouts', true);
   const allowAdvancedSingleColumnLayout = isAdvancedLayoutEnabled && editorExperiment('single_column_layouts', true, {
     exposure: true
@@ -74,12 +73,9 @@ export const layoutPlugin = ({
       return Boolean(api === null || api === void 0 ? void 0 : (_api$blockMenu2 = api.blockMenu) === null || _api$blockMenu2 === void 0 ? void 0 : _api$blockMenu2.actions.isTransformOptionDisabled(LAYOUT_SECTION_NODE_NAME));
     }
   }]);
-  if (expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
-    var _api$uiControlRegistr;
-    api === null || api === void 0 ? void 0 : (_api$uiControlRegistr = api.uiControlRegistry) === null || _api$uiControlRegistr === void 0 ? void 0 : _api$uiControlRegistr.actions.register(getLayoutColumnMenuComponents({
-      api
-    }));
-  }
+  api === null || api === void 0 ? void 0 : (_api$uiControlRegistr = api.uiControlRegistry) === null || _api$uiControlRegistr === void 0 ? void 0 : _api$uiControlRegistr.actions.register(getLayoutColumnMenuComponents({
+    api
+  }));
   if (isRegisteredSlashCommandEnabled) {
     var _api$uiControlRegistr2;
     api === null || api === void 0 ? void 0 : (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 ? void 0 : _api$uiControlRegistr2.actions.register(getLayoutQuickInsertComponents({
@@ -105,14 +101,12 @@ export const layoutPlugin = ({
           return createLayoutPlugin(options, api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
         }
       }];
-      if (expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
-        plugins.push({
-          name: 'layoutKeymap',
-          plugin: () => createLayoutKeymapPlugin({
-            api
-          })
-        });
-      }
+      plugins.push({
+        name: 'layoutKeymap',
+        plugin: () => createLayoutKeymapPlugin({
+          api
+        })
+      });
       if ((options.editorAppearance === 'full-page' || options.editorAppearance === 'full-width' || options.editorAppearance === 'max') && api && editorExperiment('advanced_layouts', true)) {
         plugins.push({
           name: 'layoutResizing',
@@ -271,7 +265,7 @@ export const layoutPlugin = ({
       popupsBoundariesElement,
       popupsScrollableElement
     }) {
-      return /*#__PURE__*/React.createElement(React.Fragment, null, editorExperiment('advanced_layouts', true) ? /*#__PURE__*/React.createElement(GlobalStylesWrapper, null) : null, expValEquals('platform_editor_layout_column_menu', 'isEnabled', true) && editorView ? /*#__PURE__*/React.createElement(LayoutColumnMenu, {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, editorExperiment('advanced_layouts', true) ? /*#__PURE__*/React.createElement(GlobalStylesWrapper, null) : null, editorView ? /*#__PURE__*/React.createElement(LayoutColumnMenu, {
         api: api,
         editorView: editorView,
         mountTo: popupsMountPoint,

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

@@ -7,7 +7,6 @@ import { Mapping, StepMap } from '@atlaskit/editor-prosemirror/transform';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 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';
@@ -591,9 +590,6 @@ export function getEffectiveMaxLayoutColumns() {
 const insertLayoutColumnAt = (side, editorAnalyticsAPI, inputMethod = INPUT_METHOD.LAYOUT_COLUMN_MENU) => ({
   tr
 }) => {
-  if (!expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
-    return null;
-  }
   const selectedLayoutColumnsResult = getLayoutColumnsFromContentSelection(tr.selection);
   if (!selectedLayoutColumnsResult || selectedLayoutColumnsResult.selectedLayoutColumns.length === 0) {
     return null;
@@ -657,12 +653,10 @@ const insertLayoutColumnAt = (side, editorAnalyticsAPI, inputMethod = INPUT_METH
 
   // Inserting left shifts positions at/after the new column right by its size; inserting
   // right leaves them unchanged. Remap the original selection through that mapping.
-  if (!fg('platform_editor_layout_column_menu_kill_switch_1')) {
-    const insertMapping = side === 'left' ? new Mapping([new StepMap([insertedColumnPos, 0, newColumn.nodeSize])]) : new Mapping();
-    const restoredSelection = remapSelectionThroughMapping(originalSelection, insertMapping, tr.doc);
-    if (restoredSelection) {
-      tr.setSelection(restoredSelection);
-    }
+  const insertMapping = side === 'left' ? new Mapping([new StepMap([insertedColumnPos, 0, newColumn.nodeSize])]) : new Mapping();
+  const restoredSelection = remapSelectionThroughMapping(originalSelection, insertMapping, tr.doc);
+  if (restoredSelection) {
+    tr.setSelection(restoredSelection);
   }
   editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
     action: ACTION.INSERTED,
@@ -702,9 +696,6 @@ export const setLayoutColumnValign = ({
 }, editorAnalyticsAPI, api) => ({
   tr
 }) => {
-  if (!expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
-    return null;
-  }
   const selectedLayoutColumnsResult = getSelectedLayoutColumnsFromSelection(tr.selection);
   if (!selectedLayoutColumnsResult) {
     return null;
@@ -758,9 +749,6 @@ export const distributeLayoutColumns = (editorAnalyticsAPI, api) => ({
 } = {}) => ({
   tr
 }) => {
-  if (!expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
-    return null;
-  }
   const selectedLayoutColumnsResult = target === 'allColumns' ? getAllLayoutColumnsFromSelection(tr.selection) : getSelectedLayoutColumnsFromSelection(tr.selection);
   if (!selectedLayoutColumnsResult || selectedLayoutColumnsResult.selectedLayoutColumns.length < 2) {
     return null;
@@ -864,14 +852,10 @@ export const deleteLayoutColumn = ({
   tr
 }) => {
   var _api$blockControls4;
-  if (!expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
-    return null;
-  }
-
   // Only delete columns that are explicitly selected (a column NodeSelection or a selection
   // fully containing columns). This stops a bare caret inside a column — including inside
   // nested content such as a table — from deleting the whole column via the delete shortcut.
-  const selectedLayoutColumnsResult = expValEquals('platform_editor_layout_column_delete_shortcut_fix', 'isEnabled', true) ? getSelectedLayoutColumnsFromSelection(tr.selection) : getLayoutColumnsFromContentSelection(tr.selection);
+  const selectedLayoutColumnsResult = getSelectedLayoutColumnsFromSelection(tr.selection);
   if (!selectedLayoutColumnsResult || selectedLayoutColumnsResult.selectedLayoutColumns.length === 0) {
     return null;
   }
@@ -931,17 +915,14 @@ export const deleteLayoutColumn = ({
   .reverse().reduce((widths, selectedIndex) => redistributeAfterDeletion(widths, selectedIndex, MIN_LAYOUT_COLUMN_WIDTH_PERCENT), existingWidths);
   const updatedLayoutSectionNode = layoutSectionNode.copy(Fragment.fromArray(remainingColumns));
 
-  // The cursor-in-column (keyboard) path has a plain text selection; the menu path has a
-  // column NodeSelection whose post-delete landing is owned by the block-controls
-  // preserved-selection plugin, so we only restore the caret for the former.
+  // A text selection can fully contain columns. Restore its caret in a remaining column;
+  // block controls own the landing for a column NodeSelection.
   const hadTextSelection = tr.selection instanceof TextSelection;
   tr.replaceWith(layoutSectionPos + 1, layoutSectionPos + layoutSectionNode.nodeSize - 1, columnWidth(updatedLayoutSectionNode, tr.doc.type.schema, redistributed));
 
-  // Land the caret in a remaining column — the one now occupying the deleted slot, or the
-  // last column when the deleted slot no longer exists. Otherwise the replace above maps
-  // the caret out of the layout to the following paragraph.
+  // Keep a text selection within the layout after the selected columns are removed.
   const remainingColumnCount = remainingColumns.length;
-  if (hadTextSelection && !fg('platform_editor_layout_column_menu_kill_switch_1') && remainingColumnCount > 0) {
+  if (hadTextSelection && remainingColumnCount > 0) {
     const targetColumnIndex = Math.min(startIndex, remainingColumnCount - 1);
     const updatedSectionNode = tr.doc.nodeAt(layoutSectionPos);
     if (updatedSectionNode) {

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

@@ -4,7 +4,6 @@ import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { MIN_LAYOUT_COLUMN_WIDTH_PERCENT } from './consts';
 
 /**
@@ -78,8 +77,7 @@ const dispatchColumnWidths = (view, sectionPos, leftColIndex, leftWidth, rightWi
 
   // Capture the selection before the replace below, which otherwise maps the caret out of
   // the layout to the following paragraph. Restored at the same positions afterwards.
-  const shouldPreserveSelection = !fg('platform_editor_layout_column_menu_kill_switch_1');
-  const selectionBeforeResize = shouldPreserveSelection ? state.selection : null;
+  const selectionBeforeResize = state.selection;
   tr.replaceWith(sectionPos + 1, sectionPos + sectionNode.nodeSize - 1, Fragment.from(newColumns));
   tr.setMeta('layoutColumnResize', true);
   tr.setMeta('scrollIntoView', false);

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

@@ -8,7 +8,6 @@ import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosem
 import { findParentNodeClosestToPos, findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 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';
@@ -24,7 +23,7 @@ export const DEFAULT_LAYOUT = 'two_equal';
  * Returns `true` when it placed a selection and consumed the click, else `false`.
  */
 const applyBlankSpaceGapCursor = (view, event) => {
-  if (!expValEquals('platform_editor_layout_column_menu', 'isEnabled', true) || !editorExperiment('advanced_layouts', true)) {
+  if (!editorExperiment('advanced_layouts', true)) {
     return false;
   }
   const gapTarget = getGapCursorTargetForBlankSpaceClick(view, event);

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

@@ -3,7 +3,6 @@ import { GapCursorSelection } from '@atlaskit/editor-common/selection';
 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 { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 export const getMaybeLayoutSection = state => {
@@ -66,18 +65,12 @@ const supportsBlankSpaceGapCursorFallback = node => (node === null || node === v
 /**
  * For a blank-space click inside a layout column — above the first child (middle/bottom-aligned
  * columns) or below the last child (any alignment) — return the ProseMirror position and side
- * for a gap cursor. Returns `undefined` when the kill switch is ON, the click is outside a
- * layoutColumn, or the Y coordinate is not in blank space.
- *
- * The `advanced_layouts` / `platform_editor_layout_column_menu` gates live in the caller
- * (`applyBlankSpaceGapCursor`); only the kill switch is checked here.
+ * for a gap cursor. Returns `undefined` when the click is outside a layoutColumn or the Y
+ * coordinate is not in blank space. The `advanced_layouts` gate lives in the caller
+ * (`applyBlankSpaceGapCursor`).
  */
 export const getGapCursorTargetForBlankSpaceClick = (view, event) => {
   var _columnNode$attrs;
-  if (fg('platform_editor_layout_column_menu_kill_switch_1')) {
-    return undefined;
-  }
-
   // Resolve the column from the DOM target so it works even when posAtCoords returns null
   // (nothing rendered at the clicked Y).
   const target = event.target;