@atlaskit/editor-plugin-layout 10.3.3 → 10.3.5

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

@@ -0,0 +1,10 @@
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { getLayoutColumnAtSelection, getLayoutSectionAtSelection } from './layoutColumnSelection';
+export const useCurrentLayoutColumn = api => useSharedPluginStateWithSelector(api, ['selection'], states => {
+  var _states$selectionStat;
+  return getLayoutColumnAtSelection((_states$selectionStat = states.selectionState) === null || _states$selectionStat === void 0 ? void 0 : _states$selectionStat.selection);
+});
+export const useCurrentLayoutSection = api => useSharedPluginStateWithSelector(api, ['selection'], states => {
+  var _states$selectionStat2;
+  return getLayoutSectionAtSelection((_states$selectionStat2 = states.selectionState) === null || _states$selectionStat2 === void 0 ? void 0 : _states$selectionStat2.selection);
+});

package/dist/esm/layoutPlugin.js

@@ -10,7 +10,7 @@ import { findParentNode } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { createDefaultLayoutSection, createMultiColumnLayoutSection, insertLayoutColumnsWithAnalytics, setLayoutColumnValign, toggleLayoutColumnMenu } from './pm-plugins/actions';
+import { createDefaultLayoutSection, createMultiColumnLayoutSection, insertLayoutColumn as _insertLayoutColumn, insertLayoutColumnsWithAnalytics, setLayoutColumnValign, toggleLayoutColumnMenu } from './pm-plugins/actions';
 import { default as createLayoutPlugin } from './pm-plugins/main';
 import { pluginKey } from './pm-plugins/plugin-key';
 import { default as createLayoutResizingPlugin } from './pm-plugins/resizing';
@@ -302,6 +302,10 @@ export var layoutPlugin = function layoutPlugin(_ref) {
       return pluginKey.getState(editorState);
     },
     commands: {
+      insertLayoutColumn: function insertLayoutColumn(side) {
+        var _api$analytics4;
+        return _insertLayoutColumn(side, api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions);
+      },
       setLayoutColumnValign: setLayoutColumnValign,
       toggleLayoutColumnMenu: toggleLayoutColumnMenu
     }

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

@@ -10,8 +10,9 @@ import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { EVEN_DISTRIBUTED_COL_WIDTHS } from './consts';
+import { EVEN_DISTRIBUTED_COL_WIDTHS, MAX_LAYOUT_COLUMNS, MAX_STANDARD_LAYOUT_COLUMNS, MIN_LAYOUT_COLUMN_WIDTH_PERCENT } from './consts';
 import { pluginKey } from './plugin-key';
+import { redistributeProportionally } from './utils/redistribute-proportionally';
 export var ONE_COL_LAYOUTS = ['single'];
 export var TWO_COL_LAYOUTS = ['two_equal', 'two_left_sidebar', 'two_right_sidebar'];
 export var THREE_COL_LAYOUTS = ['three_equal', 'three_with_sidebars'];
@@ -540,9 +541,102 @@ var formatLayoutName = function formatLayoutName(layout) {
       return LAYOUT_TYPE.THREE_WITH_SIDEBARS;
   }
 };
+/**
+ * Returns the active maximum layout column count for the current advanced layouts experiment state.
+ */
+export function getEffectiveMaxLayoutColumns() {
+  return editorExperiment('advanced_layouts', true) ? MAX_LAYOUT_COLUMNS : MAX_STANDARD_LAYOUT_COLUMNS;
+}
+var getSelectedLayoutColumnInSection = function getSelectedLayoutColumnInSection(_ref4) {
+  var doc = _ref4.doc,
+    selection = _ref4.selection;
+  var _doc$type$schema$node = doc.type.schema.nodes,
+    layoutColumn = _doc$type$schema$node.layoutColumn,
+    layoutSection = _doc$type$schema$node.layoutSection;
+  if (!(selection instanceof NodeSelection) || selection.node.type !== layoutColumn) {
+    return;
+  }
+  var $from = selection.$from;
+  if ($from.parent.type !== layoutSection) {
+    return;
+  }
+  var selectedColumnIndex = $from.index($from.depth);
+  var selectedColumnNode = selection.node;
+  var selectedColumnPos = selection.from;
+  var layoutSectionPos = $from.before($from.depth);
+  return {
+    layoutSectionNode: $from.parent,
+    layoutSectionPos: layoutSectionPos,
+    selectedColumnIndex: selectedColumnIndex,
+    selectedColumnNode: selectedColumnNode,
+    selectedColumnPos: selectedColumnPos
+  };
+};
+var insertLayoutColumnAt = function insertLayoutColumnAt(side, editorAnalyticsAPI) {
+  return function (_ref5) {
+    var tr = _ref5.tr;
+    if (!expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
+      return null;
+    }
+    var selectedColumn = getSelectedLayoutColumnInSection(tr);
+    if (!selectedColumn) {
+      return null;
+    }
+    var layoutSectionNode = selectedColumn.layoutSectionNode,
+      layoutSectionPos = selectedColumn.layoutSectionPos,
+      selectedColumnIndex = selectedColumn.selectedColumnIndex;
+    if (layoutSectionNode.childCount >= getEffectiveMaxLayoutColumns()) {
+      return null;
+    }
+    var insertIndex = side === 'left' ? selectedColumnIndex : selectedColumnIndex + 1;
+    var existingWidths = mapChildren(layoutSectionNode, function (column) {
+      return column.attrs.width;
+    });
+    var redistributedWidths = redistributeProportionally(existingWidths, insertIndex, getEffectiveMaxLayoutColumns(), MIN_LAYOUT_COLUMN_WIDTH_PERCENT);
+    if (redistributedWidths === existingWidths) {
+      return null;
+    }
+    var layoutColumn = tr.doc.type.schema.nodes.layoutColumn;
+    var newColumn = layoutColumn.createAndFill({
+      width: redistributedWidths[insertIndex]
+    });
+    if (!newColumn) {
+      return null;
+    }
+    var updatedColumns = [];
+    layoutSectionNode.forEach(function (column, _offset, index) {
+      if (index === insertIndex) {
+        updatedColumns.push(newColumn);
+      }
+      updatedColumns.push(column);
+    });
+    if (insertIndex === layoutSectionNode.childCount) {
+      updatedColumns.push(newColumn);
+    }
+    var updatedLayoutSectionNode = layoutSectionNode.copy(Fragment.fromArray(updatedColumns));
+    tr.replaceWith(layoutSectionPos + 1, layoutSectionPos + layoutSectionNode.nodeSize - 1, columnWidth(updatedLayoutSectionNode, tr.doc.type.schema, redistributedWidths));
+    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
+      action: ACTION.INSERTED,
+      actionSubject: ACTION_SUBJECT.DOCUMENT,
+      actionSubjectId: ACTION_SUBJECT_ID.LAYOUT_COLUMN,
+      attributes: {
+        columnCount: redistributedWidths.length,
+        inputMethod: INPUT_METHOD.LAYOUT_COLUMN_MENU,
+        selectedIndex: selectedColumnIndex,
+        side: side
+      },
+      eventType: EVENT_TYPE.TRACK
+    })(tr);
+    tr.setMeta('scrollIntoView', false);
+    return tr;
+  };
+};
+export var insertLayoutColumn = function insertLayoutColumn(side, editorAnalyticsAPI) {
+  return insertLayoutColumnAt(side, editorAnalyticsAPI);
+};
 export var setLayoutColumnValign = function setLayoutColumnValign(valign) {
-  return function (_ref4) {
-    var tr = _ref4.tr;
+  return function (_ref6) {
+    var tr = _ref6.tr;
     if (!expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
       return null;
     }
@@ -564,10 +658,10 @@ export var setLayoutColumnValign = function setLayoutColumnValign(valign) {
     return tr;
   };
 };
-export var toggleLayoutColumnMenu = function toggleLayoutColumnMenu(_ref5) {
-  var isOpen = _ref5.isOpen;
-  return function (_ref6) {
-    var tr = _ref6.tr;
+export var toggleLayoutColumnMenu = function toggleLayoutColumnMenu(_ref7) {
+  var isOpen = _ref7.isOpen;
+  return function (_ref8) {
+    var tr = _ref8.tr;
     tr.setMeta('toggleLayoutColumnMenu', {
       isOpen: isOpen
     });

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

@@ -4,14 +4,13 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { bind } from 'bind-event-listener';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
+import { MIN_LAYOUT_COLUMN_WIDTH_PERCENT } from './consts';
+
 // Class names for the column resize divider widget — must stay in sync with layout.ts in editor-core
 var layoutColumnDividerClassName = 'layout-column-divider';
 var layoutColumnDividerRailClassName = 'layout-column-divider-rail';
 var layoutColumnDividerThumbClassName = 'layout-column-divider-thumb';
 
-// Minimum column width percentage to prevent columns from collapsing
-var MIN_COLUMN_WIDTH_PERCENT = 5;
-
 // Module-level drag state so it survives widget DOM recreation during transactions.
 var dragState = null;
 
@@ -72,12 +71,12 @@ var calcDragWidths = function calcDragWidths(clientX) {
   var deltaPercent = deltaX / columnsWidth * 100;
   var leftWidth = dragState.startLeftWidth + deltaPercent;
   var rightWidth = dragState.startRightWidth - deltaPercent;
-  if (leftWidth < MIN_COLUMN_WIDTH_PERCENT) {
-    leftWidth = MIN_COLUMN_WIDTH_PERCENT;
-    rightWidth = combinedWidth - MIN_COLUMN_WIDTH_PERCENT;
-  } else if (rightWidth < MIN_COLUMN_WIDTH_PERCENT) {
-    rightWidth = MIN_COLUMN_WIDTH_PERCENT;
-    leftWidth = combinedWidth - MIN_COLUMN_WIDTH_PERCENT;
+  if (leftWidth < MIN_LAYOUT_COLUMN_WIDTH_PERCENT) {
+    leftWidth = MIN_LAYOUT_COLUMN_WIDTH_PERCENT;
+    rightWidth = combinedWidth - MIN_LAYOUT_COLUMN_WIDTH_PERCENT;
+  } else if (rightWidth < MIN_LAYOUT_COLUMN_WIDTH_PERCENT) {
+    rightWidth = MIN_LAYOUT_COLUMN_WIDTH_PERCENT;
+    leftWidth = combinedWidth - MIN_LAYOUT_COLUMN_WIDTH_PERCENT;
   }
   return {
     leftWidth: leftWidth,

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

@@ -1,3 +1,6 @@
+export var MAX_STANDARD_LAYOUT_COLUMNS = 3;
+export var MAX_LAYOUT_COLUMNS = 5;
+export var MIN_LAYOUT_COLUMN_WIDTH_PERCENT = 5;
 export var EVEN_DISTRIBUTED_COL_WIDTHS = {
   1: 100,
   2: 50,

package/dist/esm/pm-plugins/utils/redistribute-proportionally.js

@@ -0,0 +1,104 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+var roundLayoutColumnWidth = function roundLayoutColumnWidth(width) {
+  return Number(width.toFixed(2));
+};
+var sumWidths = function sumWidths(widths) {
+  return widths.reduce(function (sum, width) {
+    return sum + width;
+  }, 0);
+};
+var isValidWidth = function isValidWidth(width) {
+  return Number.isFinite(width) && width > 0;
+};
+var normaliseWidthsTotal = function normaliseWidthsTotal(widths, totalWidth, minWidth) {
+  var roundedWidths = widths.map(roundLayoutColumnWidth);
+  var remainder = roundLayoutColumnWidth(totalWidth - sumWidths(roundedWidths));
+  if (remainder === 0 || roundedWidths.length === 0) {
+    return roundedWidths;
+  }
+  var adjustmentIndex = 0;
+  roundedWidths.forEach(function (width, index) {
+    if (width > roundedWidths[adjustmentIndex]) {
+      adjustmentIndex = index;
+    }
+  });
+  var adjustedWidth = roundLayoutColumnWidth(roundedWidths[adjustmentIndex] + remainder);
+  if (adjustedWidth < minWidth) {
+    return roundedWidths;
+  }
+  return roundedWidths.map(function (width, index) {
+    return index === adjustmentIndex ? adjustedWidth : width;
+  });
+};
+var redistributeWithMinimumWidth = function redistributeWithMinimumWidth(_ref) {
+  var minWidth = _ref.minWidth,
+    totalWidth = _ref.totalWidth,
+    weights = _ref.weights;
+  if (weights.length * minWidth > totalWidth) {
+    return;
+  }
+  var widths = Array(weights.length).fill(0);
+  var clampedIndexes = new Set();
+  var remainingWidth = totalWidth;
+  var remainingWeight = sumWidths(weights);
+  var _loop = function _loop() {
+    var remainingWidthForPass = remainingWidth;
+    var remainingWeightForPass = remainingWeight;
+    var indexesToClamp = [];
+    weights.forEach(function (weight, index) {
+      if (clampedIndexes.has(index)) {
+        return;
+      }
+      var proportionalWidth = remainingWeightForPass > 0 ? weight / remainingWeightForPass * remainingWidthForPass : 0;
+      if (proportionalWidth < minWidth) {
+        indexesToClamp.push(index);
+      }
+    });
+    if (indexesToClamp.length === 0) {
+      return 1; // break
+    }
+    indexesToClamp.forEach(function (index) {
+      widths[index] = minWidth;
+      clampedIndexes.add(index);
+      remainingWidth -= minWidth;
+      remainingWeight -= weights[index];
+    });
+  };
+  while (clampedIndexes.size < weights.length) {
+    if (_loop()) break;
+  }
+  weights.forEach(function (weight, index) {
+    if (!clampedIndexes.has(index)) {
+      widths[index] = remainingWeight > 0 ? weight / remainingWeight * remainingWidth : minWidth;
+    }
+  });
+  return widths;
+};
+export var redistributeProportionally = function redistributeProportionally(currentWidths, insertIndex, maxColumns, minWidth) {
+  if (currentWidths.length === 0 || !Number.isInteger(maxColumns) || maxColumns <= 0 || currentWidths.length >= maxColumns || insertIndex < 0 || insertIndex > currentWidths.length || !isValidWidth(minWidth) || currentWidths.some(function (width) {
+    return !isValidWidth(width);
+  })) {
+    return currentWidths;
+  }
+  var currentTotalWidth = sumWidths(currentWidths);
+  if (!isValidWidth(currentTotalWidth)) {
+    return currentWidths;
+  }
+  var targetTotalWidth = Math.round(currentTotalWidth) === 100 ? 100 : currentTotalWidth;
+  var newColumnWidth = Math.max(minWidth, roundLayoutColumnWidth(targetTotalWidth / (currentWidths.length + 1)));
+  var existingColumnsTotalWidth = targetTotalWidth - newColumnWidth;
+  if (existingColumnsTotalWidth < currentWidths.length * minWidth) {
+    return currentWidths;
+  }
+  var redistributedExistingWidths = redistributeWithMinimumWidth({
+    weights: currentWidths,
+    totalWidth: existingColumnsTotalWidth,
+    minWidth: minWidth
+  });
+  if (!redistributedExistingWidths) {
+    return currentWidths;
+  }
+  var nextWidths = _toConsumableArray(redistributedExistingWidths);
+  nextWidths.splice(insertIndex, 0, newColumnWidth);
+  return normaliseWidthsTotal(nextWidths, targetTotalWidth, minWidth);
+};

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

@@ -0,0 +1,61 @@
+import React, { useCallback } from 'react';
+import { useIntl } from 'react-intl';
+import { layoutMessages } from '@atlaskit/editor-common/messages';
+import { TableColumnAddLeftIcon, TableColumnAddRightIcon, ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
+import { getEffectiveMaxLayoutColumns } from '../../pm-plugins/actions';
+import { getLayoutSectionColumnCount } from './layoutColumnSelection';
+import { useCurrentLayoutColumn, useCurrentLayoutSection } from './useCurrentLayoutColumn';
+var INSERT_COLUMN_OPTIONS = {
+  left: {
+    Icon: TableColumnAddLeftIcon,
+    label: layoutMessages.insertColumnLeft,
+    side: 'left'
+  },
+  right: {
+    Icon: TableColumnAddRightIcon,
+    label: layoutMessages.insertColumnRight,
+    side: 'right'
+  }
+};
+export var InsertColumnDropdownItem = function InsertColumnDropdownItem(_ref) {
+  var api = _ref.api,
+    side = _ref.side;
+  var _useIntl = useIntl(),
+    formatMessage = _useIntl.formatMessage;
+  var _INSERT_COLUMN_OPTION = INSERT_COLUMN_OPTIONS[side],
+    Icon = _INSERT_COLUMN_OPTION.Icon,
+    label = _INSERT_COLUMN_OPTION.label;
+  var currentColumn = useCurrentLayoutColumn(api);
+  var currentLayoutSection = useCurrentLayoutSection(api);
+  var columnCount = getLayoutSectionColumnCount(currentLayoutSection);
+  var maxColumnCount = getEffectiveMaxLayoutColumns();
+  var canInsertColumn = currentColumn !== undefined && columnCount < maxColumnCount;
+  var onClick = useCallback(function () {
+    var _api$layout, _api$core;
+    var insertCommand = api === null || api === void 0 || (_api$layout = api.layout) === null || _api$layout === void 0 ? void 0 : _api$layout.commands.insertLayoutColumn(side);
+    api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function (props) {
+      var _api$layout2;
+      var tr = insertCommand === null || insertCommand === void 0 ? void 0 : insertCommand(props);
+      if (!tr) {
+        return tr !== null && tr !== void 0 ? tr : null;
+      }
+      api === null || api === void 0 || (_api$layout2 = api.layout) === null || _api$layout2 === void 0 || _api$layout2.commands.toggleLayoutColumnMenu({
+        isOpen: false
+      })({
+        tr: tr
+      });
+      return tr;
+    });
+  }, [api, side]);
+  if (!canInsertColumn) {
+    return null;
+  }
+  return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
+    elemBefore: /*#__PURE__*/React.createElement(Icon, {
+      color: "currentColor",
+      label: "",
+      size: "small"
+    }),
+    onClick: onClick
+  }, formatMessage(label));
+};

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

@@ -1,7 +1,8 @@
-import React, { useCallback } from 'react';
+import React, { useCallback, useMemo } from 'react';
 import { useIntl } from 'react-intl';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
-import { useCurrentLayoutColumnValign } from './useCurrentLayoutColumnValign';
+import { getLayoutColumnValign } from './layoutColumnSelection';
+import { useCurrentLayoutColumn } from './useCurrentLayoutColumn';
 import { VERTICAL_ALIGN_ICONS } from './verticalAlignIcons';
 export var VerticalAlignDropdownItem = function VerticalAlignDropdownItem(_ref) {
   var api = _ref.api,
@@ -9,24 +10,21 @@ export var VerticalAlignDropdownItem = function VerticalAlignDropdownItem(_ref)
     value = _ref.value;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
-  var _useCurrentLayoutColu = useCurrentLayoutColumnValign(api),
-    currentValign = _useCurrentLayoutColu.currentValign,
-    selectedColumn = _useCurrentLayoutColu.selectedColumn;
+  var currentColumn = useCurrentLayoutColumn(api);
+  var currentValign = useMemo(function () {
+    return getLayoutColumnValign(currentColumn);
+  }, [currentColumn]);
   var Icon = VERTICAL_ALIGN_ICONS[value];
   var onClick = useCallback(function () {
     var _api$core, _api$layout;
     api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$layout = api.layout) === null || _api$layout === void 0 ? void 0 : _api$layout.commands.setLayoutColumnValign(value));
   }, [api, value]);
-  if (!selectedColumn) {
-    return null;
-  }
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     elemBefore: /*#__PURE__*/React.createElement(Icon, {
       label: "",
       size: "small"
     }),
     isSelected: currentValign === value,
-    onClick: onClick,
-    testId: "layout-column-align-".concat(value)
+    onClick: onClick
   }, formatMessage(label));
 };

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

@@ -1,19 +1,21 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import { useIntl } from 'react-intl';
 import { layoutMessages } from '@atlaskit/editor-common/messages';
 import { LayoutIcon, NestedDropdownRightIcon, ToolbarNestedDropdownMenu } from '@atlaskit/editor-toolbar';
-import { useCurrentLayoutColumnValign } from './useCurrentLayoutColumnValign';
+import { getLayoutColumnValign } from './layoutColumnSelection';
+import { useCurrentLayoutColumn } from './useCurrentLayoutColumn';
 import { VERTICAL_ALIGN_ICONS } from './verticalAlignIcons';
 export var VerticalAlignNestedMenu = function VerticalAlignNestedMenu(_ref) {
   var api = _ref.api,
     children = _ref.children;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
-  var _useCurrentLayoutColu = useCurrentLayoutColumnValign(api),
-    currentValign = _useCurrentLayoutColu.currentValign,
-    selectedColumn = _useCurrentLayoutColu.selectedColumn;
+  var currentColumn = useCurrentLayoutColumn(api);
+  var currentValign = useMemo(function () {
+    return getLayoutColumnValign(currentColumn);
+  }, [currentColumn]);
   var TriggerIcon = currentValign ? VERTICAL_ALIGN_ICONS[currentValign] : LayoutIcon;
-  if (!selectedColumn) {
+  if (!currentColumn) {
     return null;
   }
   return /*#__PURE__*/React.createElement(ToolbarNestedDropdownMenu, {
@@ -25,8 +27,6 @@ export var VerticalAlignNestedMenu = function VerticalAlignNestedMenu(_ref) {
       label: "",
       size: "small"
     }),
-    text: formatMessage(layoutMessages.alignColumn),
-    testId: "layout-column-align-menu",
-    dropdownTestId: "layout-column-align-dropdown"
+    text: formatMessage(layoutMessages.alignColumn)
   }, children);
 };

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

@@ -6,7 +6,8 @@ import { layoutMessages } from '@atlaskit/editor-common/messages';
 import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
 import { ToolbarMenuContainer } from '@atlaskit/editor-toolbar/toolbar-menu-container';
 import { createDistributeColumnsDropdownItem } from './DistributeColumnsDropdownItem';
-import { DISTRIBUTE_COLUMNS_MENU_ITEM, LAYOUT_COLUMN_MENU, LAYOUT_COLUMN_MENU_RANK, LAYOUT_COLUMN_MENU_SECTION, LAYOUT_COLUMN_MENU_SECTION_RANK, LAYOUT_COLUMN_VERTICAL_ALIGN_MENU_SECTION, VERTICAL_ALIGN_BOTTOM_MENU_ITEM, VERTICAL_ALIGN_MENU, VERTICAL_ALIGN_MENU_RANK, VERTICAL_ALIGN_MENU_SECTION_RANK, VERTICAL_ALIGN_MIDDLE_MENU_ITEM, VERTICAL_ALIGN_TOP_MENU_ITEM } from './keys';
+import { InsertColumnDropdownItem } from './InsertColumnDropdownItem';
+import { DISTRIBUTE_COLUMNS_MENU_ITEM, INSERT_COLUMN_LEFT_MENU_ITEM, INSERT_COLUMN_RIGHT_MENU_ITEM, LAYOUT_COLUMN_MENU, LAYOUT_COLUMN_MENU_RANK, LAYOUT_COLUMN_MENU_SECTION, LAYOUT_COLUMN_MENU_SECTION_RANK, LAYOUT_COLUMN_VERTICAL_ALIGN_MENU_SECTION, VERTICAL_ALIGN_BOTTOM_MENU_ITEM, VERTICAL_ALIGN_MENU, VERTICAL_ALIGN_MENU_RANK, VERTICAL_ALIGN_MENU_SECTION_RANK, VERTICAL_ALIGN_MIDDLE_MENU_ITEM, VERTICAL_ALIGN_TOP_MENU_ITEM } from './keys';
 import { VerticalAlignDropdownItem } from './VerticalAlignDropdownItem';
 import { VerticalAlignNestedMenu } from './VerticalAlignNestedMenu';
 export var LAYOUT_COLUMN_MENU_FALLBACKS = {
@@ -23,6 +24,26 @@ export var getLayoutColumnMenuComponents = function getLayoutColumnMenuComponent
     parents: [_objectSpread(_objectSpread({}, LAYOUT_COLUMN_MENU), {}, {
       rank: LAYOUT_COLUMN_MENU_RANK[LAYOUT_COLUMN_MENU_SECTION.key]
     })]
+  }), _objectSpread(_objectSpread({}, INSERT_COLUMN_LEFT_MENU_ITEM), {}, {
+    component: function component() {
+      return /*#__PURE__*/React.createElement(InsertColumnDropdownItem, {
+        api: api,
+        side: "left"
+      });
+    },
+    parents: [_objectSpread(_objectSpread({}, LAYOUT_COLUMN_MENU_SECTION), {}, {
+      rank: LAYOUT_COLUMN_MENU_SECTION_RANK[INSERT_COLUMN_LEFT_MENU_ITEM.key]
+    })]
+  }), _objectSpread(_objectSpread({}, INSERT_COLUMN_RIGHT_MENU_ITEM), {}, {
+    component: function component() {
+      return /*#__PURE__*/React.createElement(InsertColumnDropdownItem, {
+        api: api,
+        side: "right"
+      });
+    },
+    parents: [_objectSpread(_objectSpread({}, LAYOUT_COLUMN_MENU_SECTION), {}, {
+      rank: LAYOUT_COLUMN_MENU_SECTION_RANK[INSERT_COLUMN_RIGHT_MENU_ITEM.key]
+    })]
   }), _objectSpread(_objectSpread({}, DISTRIBUTE_COLUMNS_MENU_ITEM), {}, {
     component: createDistributeColumnsDropdownItem(api),
     parents: [_objectSpread(_objectSpread({}, LAYOUT_COLUMN_MENU_SECTION), {}, {

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

@@ -1,25 +1,34 @@
-import React, { useCallback, useContext, useEffect, useRef } from 'react';
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import React, { useCallback, useContext, useEffect, useLayoutEffect, useMemo, useRef } from 'react';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { DRAG_HANDLE_SELECTOR } from '@atlaskit/editor-common/styles';
 import { EditorToolbarProvider } from '@atlaskit/editor-common/toolbar';
 import { Popup } from '@atlaskit/editor-common/ui';
 import { OutsideClickTargetRefContext, withReactEditorViewOuterListeners } from '@atlaskit/editor-common/ui-react';
-import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
-import { akEditorFloatingPanelZIndex } from '@atlaskit/editor-shared-styles';
+import { akEditorFloatingOverlapPanelZIndex } from '@atlaskit/editor-shared-styles';
 import { ToolbarDropdownMenuProvider } from '@atlaskit/editor-toolbar';
 import { SurfaceRenderer } from '@atlaskit/editor-ui-control-model';
 import { LAYOUT_COLUMN_MENU_FALLBACKS } from './components';
 import { LAYOUT_COLUMN_MENU } from './keys';
+import { getLayoutColumnAtSelection } from './layoutColumnSelection';
 var PopupWithListeners = withReactEditorViewOuterListeners(Popup);
-var LAYOUT_COLUMN_MENU_POPUP_OFFSET = [0, 10];
-var getLayoutColumnMenuTarget = function getLayoutColumnMenuTarget(editorView, selectionAnchorPos) {
-  if (selectionAnchorPos === undefined) {
+var FALLBACK_MENU_HEIGHT = 300;
+var LAYOUT_COLUMN_MENU_POPUP_OFFSET = [0, 4];
+
+/**
+ * Returns the drag handle button for the selected layout column.
+ */
+var getLayoutColumnMenuTarget = function getLayoutColumnMenuTarget(editorView, selection) {
+  var _columnDomRef$parentE;
+  if (!getLayoutColumnAtSelection(selection) || (selection === null || selection === void 0 ? void 0 : selection.from) === undefined) {
     return null;
   }
-  var selectionNode = editorView.state.doc.nodeAt(selectionAnchorPos);
-  if ((selectionNode === null || selectionNode === void 0 ? void 0 : selectionNode.type.name) !== 'layoutColumn') {
+  var columnDomRef = editorView.nodeDOM(selection.from);
+  if (!(columnDomRef instanceof HTMLElement)) {
     return null;
   }
-  return findDomRefAtPos(selectionAnchorPos, editorView.domAtPos.bind(editorView));
+  var dragHandleContainer = (_columnDomRef$parentE = columnDomRef.parentElement) === null || _columnDomRef$parentE === void 0 ? void 0 : _columnDomRef$parentE.querySelector(':scope > [data-blocks-drag-handle-container]');
+  return dragHandleContainer === null || dragHandleContainer === void 0 ? void 0 : dragHandleContainer.querySelector(DRAG_HANDLE_SELECTOR);
 };
 export var LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMenu(_ref) {
   var _api$uiControlRegistr, _api$uiControlRegistr2;
@@ -39,6 +48,18 @@ export var LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMenu(
     selection = _useSharedPluginState.selection;
   var setOutsideClickTargetRef = useContext(OutsideClickTargetRefContext);
   var menuRef = useRef(null);
+  var popupRef = useRef(undefined);
+  var _React$useState = React.useState(FALLBACK_MENU_HEIGHT),
+    _React$useState2 = _slicedToArray(_React$useState, 2),
+    menuHeight = _React$useState2[0],
+    setMenuHeight = _React$useState2[1];
+  useLayoutEffect(function () {
+    var _popupRef$current;
+    if (!isLayoutColumnMenuOpen) {
+      return;
+    }
+    setMenuHeight(((_popupRef$current = popupRef.current) === null || _popupRef$current === void 0 ? void 0 : _popupRef$current.clientHeight) || FALLBACK_MENU_HEIGHT);
+  }, [isLayoutColumnMenuOpen]);
   var closeLayoutColumnMenu = useCallback(function () {
     var _api$core, _api$layout;
     api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$layout = api.layout) === null || _api$layout === void 0 ? void 0 : _api$layout.commands.toggleLayoutColumnMenu({
@@ -63,9 +84,14 @@ export var LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMenu(
   var handleMenuRef = useCallback(function (el) {
     setOutsideClickTargetRef === null || setOutsideClickTargetRef === void 0 || setOutsideClickTargetRef(el);
     menuRef.current = el;
+    if (el) {
+      popupRef.current = el;
+    }
   }, [setOutsideClickTargetRef]);
   var components = (_api$uiControlRegistr = api === null || api === 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 : [];
-  var target = isLayoutColumnMenuOpen ? getLayoutColumnMenuTarget(editorView, selection === null || selection === void 0 ? void 0 : selection.from) : null;
+  var target = useMemo(function () {
+    return isLayoutColumnMenuOpen ? getLayoutColumnMenuTarget(editorView, selection) : null;
+  }, [editorView, isLayoutColumnMenuOpen, selection]);
   var hasValidTarget = target instanceof HTMLElement;
   useEffect(function () {
     if (isLayoutColumnMenuOpen && (!hasValidTarget || components.length === 0)) {
@@ -80,10 +106,11 @@ export var LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMenu(
     mountTo: mountTo,
     boundariesElement: boundariesElement,
     scrollableElement: scrollableElement,
-    zIndex: akEditorFloatingPanelZIndex,
+    zIndex: akEditorFloatingOverlapPanelZIndex,
     alignX: "center",
-    alignY: "top",
-    forcePlacement: true,
+    fitHeight: menuHeight,
+    preventOverflow: true,
+    stick: true,
     offset: LAYOUT_COLUMN_MENU_POPUP_OFFSET,
     handleClickOutside: handleClickOutside,
     handleEscapeKeydown: closeLayoutColumnMenu

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

@@ -27,6 +27,14 @@ export var VERTICAL_ALIGN_MENU = {
 
 // --- Items ---
 
+export var INSERT_COLUMN_LEFT_MENU_ITEM = {
+  type: 'menu-item',
+  key: 'layout-column-menu-insert-left-item'
+};
+export var INSERT_COLUMN_RIGHT_MENU_ITEM = {
+  type: 'menu-item',
+  key: 'layout-column-menu-insert-right-item'
+};
 export var DISTRIBUTE_COLUMNS_MENU_ITEM = {
   type: 'menu-item',
   key: 'layout-column-menu-distribute-columns-item'
@@ -46,6 +54,6 @@ export var VERTICAL_ALIGN_BOTTOM_MENU_ITEM = {
 
 // --- Item ranks within sections ---
 
-export var LAYOUT_COLUMN_MENU_SECTION_RANK = _defineProperty(_defineProperty({}, DISTRIBUTE_COLUMNS_MENU_ITEM.key, 100), VERTICAL_ALIGN_MENU.key, 200);
+export var LAYOUT_COLUMN_MENU_SECTION_RANK = _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, VERTICAL_ALIGN_MENU.key, 100), INSERT_COLUMN_LEFT_MENU_ITEM.key, 200), INSERT_COLUMN_RIGHT_MENU_ITEM.key, 300), DISTRIBUTE_COLUMNS_MENU_ITEM.key, 400);
 export var VERTICAL_ALIGN_MENU_RANK = _defineProperty({}, LAYOUT_COLUMN_VERTICAL_ALIGN_MENU_SECTION.key, 100);
 export var VERTICAL_ALIGN_MENU_SECTION_RANK = _defineProperty(_defineProperty(_defineProperty({}, VERTICAL_ALIGN_TOP_MENU_ITEM.key, 100), VERTICAL_ALIGN_MIDDLE_MENU_ITEM.key, 200), VERTICAL_ALIGN_BOTTOM_MENU_ITEM.key, 300);

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

@@ -0,0 +1,15 @@
+import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
+export var getLayoutColumnAtSelection = function getLayoutColumnAtSelection(selection) {
+  return selection instanceof NodeSelection && selection.node.type.name === 'layoutColumn' ? selection.node : undefined;
+};
+export var getLayoutSectionAtSelection = function getLayoutSectionAtSelection(selection) {
+  var selectedColumn = getLayoutColumnAtSelection(selection);
+  var parent = selectedColumn ? selection === null || selection === void 0 ? void 0 : selection.$from.parent : undefined;
+  return (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'layoutSection' ? parent : undefined;
+};
+export var getLayoutSectionColumnCount = function getLayoutSectionColumnCount(layoutSection) {
+  return (layoutSection === null || layoutSection === void 0 ? void 0 : layoutSection.type.name) === 'layoutSection' ? layoutSection.childCount : 0;
+};
+export var getLayoutColumnValign = function getLayoutColumnValign(layoutColumn) {
+  return layoutColumn === null || layoutColumn === void 0 ? void 0 : layoutColumn.attrs.valign;
+};

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

@@ -0,0 +1,14 @@
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { getLayoutColumnAtSelection, getLayoutSectionAtSelection } from './layoutColumnSelection';
+export var useCurrentLayoutColumn = function useCurrentLayoutColumn(api) {
+  return useSharedPluginStateWithSelector(api, ['selection'], function (states) {
+    var _states$selectionStat;
+    return getLayoutColumnAtSelection((_states$selectionStat = states.selectionState) === null || _states$selectionStat === void 0 ? void 0 : _states$selectionStat.selection);
+  });
+};
+export var useCurrentLayoutSection = function useCurrentLayoutSection(api) {
+  return useSharedPluginStateWithSelector(api, ['selection'], function (states) {
+    var _states$selectionStat2;
+    return getLayoutSectionAtSelection((_states$selectionStat2 = states.selectionState) === null || _states$selectionStat2 === void 0 ? void 0 : _states$selectionStat2.selection);
+  });
+};