@atlaskit/editor-plugin-layout 23.0.3 → 23.0.5

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

@@ -14,10 +14,10 @@ import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-e
 import { getLayoutColumnMenuAnchorPos } from '../../pm-plugins/utils/layout-column-selection';
 import { LAYOUT_COLUMN_MENU_FALLBACKS } from './components';
 import { LAYOUT_COLUMN_MENU } from './keys';
-import { calculateFallbackBottomPosition, getLayoutColumnMenuPositioningProps, shouldOpenLayoutColumnMenuBelow } from './utils';
 const PopupWithListeners = withReactEditorViewOuterListeners(Popup);
 const TOOLBAR_MENU_SELECTOR = '[data-toolbar-component="menu"]';
 const NESTED_DROPDOWN_MENU_SELECTOR = '[data-toolbar-nested-dropdown-menu]';
+const LAYOUT_COLUMN_MENU_POPUP_OFFSET_BELOW = [0, 2];
 
 /**
  * Returns the drag handle button for the selected layout column.
@@ -131,33 +131,11 @@ export const LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMen
   }
   const target = isExperimentEnabled('platform_editor_block_control_migration') ? surfaceTargetRef.current : legacyTarget;
   const hasValidTarget = target instanceof HTMLElement;
-  const positionLayoutColumnMenu = useCallback(position => {
-    var _menuWrapperRef$curre;
-    const 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 (shouldOpenLayoutColumnMenuBelow({
-      editorView,
-      popup,
-      scrollableElement,
-      target
-    })) {
-      return calculateFallbackBottomPosition(position, target, popup);
-    }
-    return position;
-  }, [editorView, scrollableElement, target]);
   useEffect(() => {
     if (isLayoutColumnMenuOpen && (!hasValidMenuSelection || !hasValidTarget || components.length === 0)) {
       closeLayoutColumnMenu();
     }
   }, [closeLayoutColumnMenu, components.length, hasValidMenuSelection, hasValidTarget, isLayoutColumnMenuOpen]);
-  const {
-    alignX,
-    alignY,
-    offset,
-    useManualBelowFlip
-  } = useMemo(() => getLayoutColumnMenuPositioningProps(), []);
   if (!isLayoutColumnMenuOpen || !hasValidMenuSelection || components.length === 0 || !hasValidTarget) {
     return null;
   }
@@ -167,13 +145,10 @@ export const LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMen
     boundariesElement: boundariesElement,
     scrollableElement: scrollableElement,
     zIndex: 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/es2019/ui/toolbar.js

@@ -14,7 +14,6 @@ import LayoutTwoColumnsSidebarLeftIcon from '@atlaskit/icon/core/layout-two-colu
 import LayoutTwoColumnsSidebarRightIcon from '@atlaskit/icon/core/layout-two-columns-sidebar-right';
 import TableColumnsDistributeIcon from '@atlaskit/icon/core/table-columns-distribute';
 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';
@@ -53,47 +52,6 @@ const SIDEBAR_LAYOUT_TYPES = [{
   title: toolbarMessages.threeColumnsWithSidebars,
   icon: LayoutThreeColumnsSidebarsIcon
 }];
-
-// These are used for advanced layout options
-const LAYOUT_WITH_TWO_COL_DISTRIBUTION_OLD = [{
-  id: 'editor.layout.twoEquals',
-  type: 'two_equal',
-  title: toolbarMessages.twoColumns,
-  icon: LayoutTwoColumnsIcon
-}, {
-  id: 'editor.layout.twoRightSidebar',
-  type: 'two_right_sidebar',
-  title: toolbarMessages.rightSidebar,
-  icon: LayoutTwoColumnsSidebarRightIcon
-}, {
-  id: 'editor.layout.twoLeftSidebar',
-  type: 'two_left_sidebar',
-  title: toolbarMessages.leftSidebar,
-  icon: LayoutTwoColumnsSidebarLeftIcon
-}];
-const LAYOUT_WITH_THREE_COL_DISTRIBUTION_OLD = [{
-  id: 'editor.layout.threeEquals',
-  type: 'three_equal',
-  title: toolbarMessages.threeColumns,
-  icon: LayoutThreeColumnsIcon
-}, {
-  id: 'editor.layout.threeWithSidebars',
-  type: 'three_with_sidebars',
-  title: toolbarMessages.threeColumnsWithSidebars,
-  icon: LayoutThreeColumnsSidebarsIcon
-}, {
-  id: 'editor.layout.threeRightSidebars',
-  type: 'three_right_sidebars',
-  title: toolbarMessages.threeColumnsWithRightSidebars,
-  icon: LayoutThreeWithRightSidebarsIcon,
-  iconFallback: LayoutThreeWithRightSidebarsIcon
-}, {
-  id: 'editor.layout.threeLeftSidebars',
-  type: 'three_left_sidebars',
-  title: toolbarMessages.threeColumnsWithLeftSidebars,
-  icon: LayoutThreeWithLeftSidebarsIcon,
-  iconFallback: LayoutThreeWithLeftSidebarsIcon
-}];
 const LAYOUT_WITH_TWO_COL_DISTRIBUTION = [{
   id: 'editor.layout.twoRightSidebar',
   type: 'two_right_sidebar',
@@ -179,8 +137,7 @@ const getAdvancedLayoutItems = ({
   allowAdvancedSingleColumnLayout
 }) => {
   const numberOfColumns = node.content.childCount || 2;
-  const isLayoutColumnMenuEnabled = expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true);
-  const 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 : [];
+  const distributionOptions = numberOfColumns === 2 ? LAYOUT_WITH_TWO_COL_DISTRIBUTION : numberOfColumns === 3 ? LAYOUT_WITH_THREE_COL_DISTRIBUTION : [];
   const columnOptions = [{
     title: intl.formatMessage(layoutMessages.columnOption, {
       count: 2
@@ -223,7 +180,7 @@ const getAdvancedLayoutItems = ({
     onClick: setPresetLayout(editorAnalyticsAPI)('single'),
     selected: numberOfColumns === 1
   }] : []), ...columnOptions];
-  const distributeColumnsButton = isLayoutColumnMenuEnabled && numberOfColumns > 1 ? {
+  const distributeColumnsButton = numberOfColumns > 1 ? {
     disabled: isDistributedUniformly(getLayoutColumnWidths(node)),
     icon: TableColumnsDistributeIcon,
     onClick: (editorState, dispatch) => {

package/dist/esm/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 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';
@@ -52,7 +51,7 @@ export var selectIntoLayoutSection = function selectIntoLayoutSection(tr) {
   return tr;
 };
 export var 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;
@@ -75,12 +74,9 @@ export var 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 (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(getLayoutColumnMenuComponents({
-      api: api
-    }));
-  }
+  api === null || api === void 0 || (_api$uiControlRegistr = api.uiControlRegistry) === null || _api$uiControlRegistr === void 0 || _api$uiControlRegistr.actions.register(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(getLayoutQuickInsertComponents({
@@ -106,16 +102,14 @@ export var layoutPlugin = function layoutPlugin(_ref) {
           return createLayoutPlugin(options, api === null || api === 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: function plugin() {
-            return createLayoutKeymapPlugin({
-              api: api
-            });
-          }
-        });
-      }
+      plugins.push({
+        name: 'layoutKeymap',
+        plugin: function plugin() {
+          return createLayoutKeymapPlugin({
+            api: api
+          });
+        }
+      });
       if ((options.editorAppearance === 'full-page' || options.editorAppearance === 'full-width' || options.editorAppearance === 'max') && api && editorExperiment('advanced_layouts', true)) {
         plugins.push({
           name: 'layoutResizing',
@@ -284,7 +278,7 @@ export var layoutPlugin = function layoutPlugin(_ref) {
         popupsMountPoint = _ref5.popupsMountPoint,
         popupsBoundariesElement = _ref5.popupsBoundariesElement,
         popupsScrollableElement = _ref5.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/esm/pm-plugins/actions.js

@@ -10,7 +10,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';
@@ -611,9 +610,6 @@ var insertLayoutColumnAt = function insertLayoutColumnAt(side, editorAnalyticsAP
   var inputMethod = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : INPUT_METHOD.LAYOUT_COLUMN_MENU;
   return function (_ref5) {
     var tr = _ref5.tr;
-    if (!expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
-      return null;
-    }
     var selectedLayoutColumnsResult = getLayoutColumnsFromContentSelection(tr.selection);
     if (!selectedLayoutColumnsResult || selectedLayoutColumnsResult.selectedLayoutColumns.length === 0) {
       return null;
@@ -675,12 +671,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 (!fg('platform_editor_layout_column_menu_kill_switch_1')) {
-      var insertMapping = side === 'left' ? new Mapping([new StepMap([insertedColumnPos, 0, newColumn.nodeSize])]) : new Mapping();
-      var restoredSelection = remapSelectionThroughMapping(originalSelection, insertMapping, tr.doc);
-      if (restoredSelection) {
-        tr.setSelection(restoredSelection);
-      }
+    var insertMapping = side === 'left' ? new Mapping([new StepMap([insertedColumnPos, 0, newColumn.nodeSize])]) : new Mapping();
+    var restoredSelection = remapSelectionThroughMapping(originalSelection, insertMapping, tr.doc);
+    if (restoredSelection) {
+      tr.setSelection(restoredSelection);
     }
     editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
       action: ACTION.INSERTED,
@@ -722,9 +716,6 @@ export var setLayoutColumnValign = function setLayoutColumnValign(_ref8, editorA
     inputMethod = _ref8$inputMethod === void 0 ? INPUT_METHOD.LAYOUT_COLUMN_MENU : _ref8$inputMethod;
   return function (_ref9) {
     var tr = _ref9.tr;
-    if (!expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
-      return null;
-    }
     var selectedLayoutColumnsResult = getSelectedLayoutColumnsFromSelection(tr.selection);
     if (!selectedLayoutColumnsResult) {
       return null;
@@ -779,9 +770,6 @@ export var distributeLayoutColumns = function distributeLayoutColumns(editorAnal
       target = _ref10$target === void 0 ? 'selectedColumns' : _ref10$target;
     return function (_ref11) {
       var tr = _ref11.tr;
-      if (!expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
-        return null;
-      }
       var selectedLayoutColumnsResult = target === 'allColumns' ? getAllLayoutColumnsFromSelection(tr.selection) : getSelectedLayoutColumnsFromSelection(tr.selection);
       if (!selectedLayoutColumnsResult || selectedLayoutColumnsResult.selectedLayoutColumns.length < 2) {
         return null;
@@ -890,14 +878,10 @@ export var deleteLayoutColumn = function deleteLayoutColumn() {
   return function (_ref18) {
     var _api$blockControls4;
     var tr = _ref18.tr;
-    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.
-    var selectedLayoutColumnsResult = expValEquals('platform_editor_layout_column_delete_shortcut_fix', 'isEnabled', true) ? getSelectedLayoutColumnsFromSelection(tr.selection) : getLayoutColumnsFromContentSelection(tr.selection);
+    var selectedLayoutColumnsResult = getSelectedLayoutColumnsFromSelection(tr.selection);
     if (!selectedLayoutColumnsResult || selectedLayoutColumnsResult.selectedLayoutColumns.length === 0) {
       return null;
     }
@@ -962,17 +946,14 @@ export var deleteLayoutColumn = function deleteLayoutColumn() {
     }, existingWidths);
     var 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.
     var 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.
     var remainingColumnCount = remainingColumns.length;
-    if (hadTextSelection && !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/esm/pm-plugins/column-resize-divider.js

@@ -7,7 +7,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 @@ 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 = !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, Fragment.from(newColumns));
   tr.setMeta('layoutColumnResize', true);
   tr.setMeta('scrollIntoView', false);

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

@@ -12,7 +12,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';
@@ -28,7 +27,7 @@ export var DEFAULT_LAYOUT = 'two_equal';
  * Returns `true` when it placed a selection and consumed the click, else `false`.
  */
 var applyBlankSpaceGapCursor = function applyBlankSpaceGapCursor(view, event) {
-  if (!expValEquals('platform_editor_layout_column_menu', 'isEnabled', true) || !editorExperiment('advanced_layouts', true)) {
+  if (!editorExperiment('advanced_layouts', true)) {
     return false;
   }
   var gapTarget = getGapCursorTargetForBlankSpaceClick(view, event);

package/dist/esm/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 var getMaybeLayoutSection = function getMaybeLayoutSection(state) {
@@ -64,18 +63,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`).
  */
 export var getGapCursorTargetForBlankSpaceClick = function 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).
   var target = event.target;

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

@@ -14,10 +14,10 @@ import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-e
 import { getLayoutColumnMenuAnchorPos } from '../../pm-plugins/utils/layout-column-selection';
 import { LAYOUT_COLUMN_MENU_FALLBACKS } from './components';
 import { LAYOUT_COLUMN_MENU } from './keys';
-import { calculateFallbackBottomPosition, getLayoutColumnMenuPositioningProps, shouldOpenLayoutColumnMenuBelow } from './utils';
 var PopupWithListeners = withReactEditorViewOuterListeners(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.
@@ -131,34 +131,11 @@ export var LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMenu(
   }
   var target = isExperimentEnabled('platform_editor_block_control_migration') ? surfaceTargetRef.current : legacyTarget;
   var hasValidTarget = target instanceof HTMLElement;
-  var positionLayoutColumnMenu = 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 (shouldOpenLayoutColumnMenuBelow({
-      editorView: editorView,
-      popup: popup,
-      scrollableElement: scrollableElement,
-      target: target
-    })) {
-      return calculateFallbackBottomPosition(position, target, popup);
-    }
-    return position;
-  }, [editorView, scrollableElement, target]);
   useEffect(function () {
     if (isLayoutColumnMenuOpen && (!hasValidMenuSelection || !hasValidTarget || components.length === 0)) {
       closeLayoutColumnMenu();
     }
   }, [closeLayoutColumnMenu, components.length, hasValidMenuSelection, hasValidTarget, isLayoutColumnMenuOpen]);
-  var _useMemo = useMemo(function () {
-      return getLayoutColumnMenuPositioningProps();
-    }, []),
-    alignX = _useMemo.alignX,
-    alignY = _useMemo.alignY,
-    offset = _useMemo.offset,
-    useManualBelowFlip = _useMemo.useManualBelowFlip;
   if (!isLayoutColumnMenuOpen || !hasValidMenuSelection || components.length === 0 || !hasValidTarget) {
     return null;
   }
@@ -168,13 +145,10 @@ export var LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMenu(
     boundariesElement: boundariesElement,
     scrollableElement: scrollableElement,
     zIndex: 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/esm/ui/toolbar.js

@@ -18,7 +18,6 @@ import LayoutTwoColumnsSidebarLeftIcon from '@atlaskit/icon/core/layout-two-colu
 import LayoutTwoColumnsSidebarRightIcon from '@atlaskit/icon/core/layout-two-columns-sidebar-right';
 import TableColumnsDistributeIcon from '@atlaskit/icon/core/table-columns-distribute';
 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';
@@ -57,47 +56,6 @@ var SIDEBAR_LAYOUT_TYPES = [{
   title: toolbarMessages.threeColumnsWithSidebars,
   icon: LayoutThreeColumnsSidebarsIcon
 }];
-
-// These are used for advanced layout options
-var LAYOUT_WITH_TWO_COL_DISTRIBUTION_OLD = [{
-  id: 'editor.layout.twoEquals',
-  type: 'two_equal',
-  title: toolbarMessages.twoColumns,
-  icon: LayoutTwoColumnsIcon
-}, {
-  id: 'editor.layout.twoRightSidebar',
-  type: 'two_right_sidebar',
-  title: toolbarMessages.rightSidebar,
-  icon: LayoutTwoColumnsSidebarRightIcon
-}, {
-  id: 'editor.layout.twoLeftSidebar',
-  type: 'two_left_sidebar',
-  title: toolbarMessages.leftSidebar,
-  icon: LayoutTwoColumnsSidebarLeftIcon
-}];
-var LAYOUT_WITH_THREE_COL_DISTRIBUTION_OLD = [{
-  id: 'editor.layout.threeEquals',
-  type: 'three_equal',
-  title: toolbarMessages.threeColumns,
-  icon: LayoutThreeColumnsIcon
-}, {
-  id: 'editor.layout.threeWithSidebars',
-  type: 'three_with_sidebars',
-  title: toolbarMessages.threeColumnsWithSidebars,
-  icon: LayoutThreeColumnsSidebarsIcon
-}, {
-  id: 'editor.layout.threeRightSidebars',
-  type: 'three_right_sidebars',
-  title: toolbarMessages.threeColumnsWithRightSidebars,
-  icon: LayoutThreeWithRightSidebarsIcon,
-  iconFallback: LayoutThreeWithRightSidebarsIcon
-}, {
-  id: 'editor.layout.threeLeftSidebars',
-  type: 'three_left_sidebars',
-  title: toolbarMessages.threeColumnsWithLeftSidebars,
-  icon: LayoutThreeWithLeftSidebarsIcon,
-  iconFallback: LayoutThreeWithLeftSidebarsIcon
-}];
 var LAYOUT_WITH_TWO_COL_DISTRIBUTION = [{
   id: 'editor.layout.twoRightSidebar',
   type: 'two_right_sidebar',
@@ -186,8 +144,7 @@ var getAdvancedLayoutItems = function getAdvancedLayoutItems(_ref) {
     currentLayout = _ref.currentLayout,
     allowAdvancedSingleColumnLayout = _ref.allowAdvancedSingleColumnLayout;
   var numberOfColumns = node.content.childCount || 2;
-  var isLayoutColumnMenuEnabled = 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(layoutMessages.columnOption, {
       count: 2
@@ -230,7 +187,7 @@ var getAdvancedLayoutItems = function getAdvancedLayoutItems(_ref) {
     onClick: setPresetLayout(editorAnalyticsAPI)('single'),
     selected: numberOfColumns === 1
   }] : []), columnOptions);
-  var distributeColumnsButton = isLayoutColumnMenuEnabled && numberOfColumns > 1 ? {
+  var distributeColumnsButton = numberOfColumns > 1 ? {
     disabled: isDistributedUniformly(getLayoutColumnWidths(node)),
     icon: TableColumnsDistributeIcon,
     onClick: function onClick(editorState, dispatch) {

package/dist/types/pm-plugins/utils/index.d.ts

@@ -18,11 +18,9 @@ export type GapCursorTarget = {
 /**
  * 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 declare const getGapCursorTargetForBlankSpaceClick: (view: EditorView, event: MouseEvent) => GapCursorTarget | undefined;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-layout",
-	"version": "23.0.3",
+	"version": "23.0.5",
 	"description": "Layout plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -40,17 +40,17 @@
 		"@atlaskit/editor-toolbar": "^2.8.0",
 		"@atlaskit/editor-ui-control-model": "^2.10.0",
 		"@atlaskit/icon": "^38.0.0",
-		"@atlaskit/icon-lab": "^7.10.0",
+		"@atlaskit/icon-lab": "^7.11.0",
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
-		"@atlaskit/tmp-editor-statsig": "^212.0.0",
+		"@atlaskit/tmp-editor-statsig": "^214.0.0",
 		"@atlaskit/tokens": "^20.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"bind-event-listener": "^3.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^126.1.0",
+		"@atlaskit/editor-common": "^126.2.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},
@@ -61,9 +61,6 @@
 		"platform_editor_adf_with_localid": {
 			"type": "boolean"
 		},
-		"platform_editor_layout_column_menu_kill_switch_1": {
-			"type": "boolean"
-		},
 		"platform_editor_vanilla_node_views_patch_1": {
 			"type": "boolean"
 		}

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

@@ -1,69 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.shouldOpenLayoutColumnMenuBelow = exports.getLayoutColumnMenuPositioningProps = exports.calculateFallbackBottomPosition = exports.LAYOUT_COLUMN_MENU_POPUP_OFFSET_BELOW = exports.LAYOUT_COLUMN_MENU_POPUP_OFFSET = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _ui = require("@atlaskit/editor-common/ui");
-var _fg = require("@atlaskit/platform-feature-flags/fg");
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var LAYOUT_COLUMN_MENU_POPUP_OFFSET = exports.LAYOUT_COLUMN_MENU_POPUP_OFFSET = [0, 4];
-
-// Gate OFF: small gap below the handle; Popup handles invert/nudge fallbacks.
-var LAYOUT_COLUMN_MENU_POPUP_OFFSET_BELOW = exports.LAYOUT_COLUMN_MENU_POPUP_OFFSET_BELOW = [0, 2];
-// Gate OFF: left-aligned, below the handle. Gate ON (legacy): centred, prefer above with manual flip.
-var getLayoutColumnMenuPositioningProps = exports.getLayoutColumnMenuPositioningProps = function getLayoutColumnMenuPositioningProps() {
-  if (!(0, _fg.fg)('platform_editor_layout_column_menu_kill_switch_1')) {
-    return {
-      alignX: undefined,
-      alignY: undefined,
-      offset: LAYOUT_COLUMN_MENU_POPUP_OFFSET_BELOW,
-      useManualBelowFlip: false
-    };
-  }
-  return {
-    alignX: 'center',
-    alignY: 'top',
-    offset: LAYOUT_COLUMN_MENU_POPUP_OFFSET,
-    useManualBelowFlip: true
-  };
-};
-var getVisibleEditorAreaTop = function getVisibleEditorAreaTop(editorView, scrollableElement) {
-  var visibleEditorArea = scrollableElement || (0, _ui.findOverflowScrollParent)(editorView.dom);
-  return Math.max(visibleEditorArea ? visibleEditorArea.getBoundingClientRect().top : 0, 0);
-};
-
-// Prefer opening above the column drag handle, but fall back below when the visible editor
-// area does not have enough space above (for example near the top toolbar).
-var shouldOpenLayoutColumnMenuBelow = exports.shouldOpenLayoutColumnMenuBelow = function shouldOpenLayoutColumnMenuBelow(_ref) {
-  var editorView = _ref.editorView,
-    popup = _ref.popup,
-    scrollableElement = _ref.scrollableElement,
-    target = _ref.target;
-  var offsetY = LAYOUT_COLUMN_MENU_POPUP_OFFSET[1];
-  var spaceAbove = target.getBoundingClientRect().top - getVisibleEditorAreaTop(editorView, scrollableElement);
-  var popupHeight = popup.getBoundingClientRect().height || popup.clientHeight;
-  return spaceAbove <= popupHeight + offsetY;
-};
-var calculateFallbackBottomPosition = exports.calculateFallbackBottomPosition = function calculateFallbackBottomPosition(position, target, popup) {
-  if (!(popup.offsetParent instanceof HTMLElement)) {
-    return position;
-  }
-  var offsetParent = popup.offsetParent;
-  var borderBottomWidth = parseInt(window.getComputedStyle(offsetParent).borderBottomWidth, 10) || 0;
-  var _offsetParent$getBoun = offsetParent.getBoundingClientRect(),
-    offsetParentTop = _offsetParent$getBoun.top;
-  var _target$getBoundingCl = target.getBoundingClientRect(),
-    targetTop = _target$getBoundingCl.top,
-    targetHeight = _target$getBoundingCl.height;
-  var offsetY = LAYOUT_COLUMN_MENU_POPUP_OFFSET[1];
-  var top = Math.ceil(targetTop - offsetParentTop + targetHeight + (offsetParent === offsetParent.ownerDocument.body ? 0 : offsetParent.scrollTop) - borderBottomWidth + offsetY);
-  var positionWithoutBottom = _objectSpread({}, position);
-  delete positionWithoutBottom.bottom;
-  return _objectSpread(_objectSpread({}, positionWithoutBottom), {}, {
-    top: top
-  });
-};