@atlaskit/editor-plugin-layout 10.3.3 → 10.3.5

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.VERTICAL_ALIGN_TOP_MENU_ITEM = exports.VERTICAL_ALIGN_MIDDLE_MENU_ITEM = exports.VERTICAL_ALIGN_MENU_SECTION_RANK = exports.VERTICAL_ALIGN_MENU_RANK = exports.VERTICAL_ALIGN_MENU = exports.VERTICAL_ALIGN_BOTTOM_MENU_ITEM = exports.LAYOUT_COLUMN_VERTICAL_ALIGN_MENU_SECTION = exports.LAYOUT_COLUMN_MENU_SECTION_RANK = exports.LAYOUT_COLUMN_MENU_SECTION = exports.LAYOUT_COLUMN_MENU_RANK = exports.LAYOUT_COLUMN_MENU = exports.DISTRIBUTE_COLUMNS_MENU_ITEM = void 0;
+exports.VERTICAL_ALIGN_TOP_MENU_ITEM = exports.VERTICAL_ALIGN_MIDDLE_MENU_ITEM = exports.VERTICAL_ALIGN_MENU_SECTION_RANK = exports.VERTICAL_ALIGN_MENU_RANK = exports.VERTICAL_ALIGN_MENU = exports.VERTICAL_ALIGN_BOTTOM_MENU_ITEM = exports.LAYOUT_COLUMN_VERTICAL_ALIGN_MENU_SECTION = exports.LAYOUT_COLUMN_MENU_SECTION_RANK = exports.LAYOUT_COLUMN_MENU_SECTION = exports.LAYOUT_COLUMN_MENU_RANK = exports.LAYOUT_COLUMN_MENU = exports.INSERT_COLUMN_RIGHT_MENU_ITEM = exports.INSERT_COLUMN_LEFT_MENU_ITEM = exports.DISTRIBUTE_COLUMNS_MENU_ITEM = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 // --- Menu surface ---
 
@@ -34,6 +34,14 @@ var VERTICAL_ALIGN_MENU = exports.VERTICAL_ALIGN_MENU = {
 
 // --- Items ---
 
+var INSERT_COLUMN_LEFT_MENU_ITEM = exports.INSERT_COLUMN_LEFT_MENU_ITEM = {
+  type: 'menu-item',
+  key: 'layout-column-menu-insert-left-item'
+};
+var INSERT_COLUMN_RIGHT_MENU_ITEM = exports.INSERT_COLUMN_RIGHT_MENU_ITEM = {
+  type: 'menu-item',
+  key: 'layout-column-menu-insert-right-item'
+};
 var DISTRIBUTE_COLUMNS_MENU_ITEM = exports.DISTRIBUTE_COLUMNS_MENU_ITEM = {
   type: 'menu-item',
   key: 'layout-column-menu-distribute-columns-item'
@@ -53,6 +61,6 @@ var VERTICAL_ALIGN_BOTTOM_MENU_ITEM = exports.VERTICAL_ALIGN_BOTTOM_MENU_ITEM =
 
 // --- Item ranks within sections ---
 
-var LAYOUT_COLUMN_MENU_SECTION_RANK = exports.LAYOUT_COLUMN_MENU_SECTION_RANK = (0, _defineProperty2.default)((0, _defineProperty2.default)({}, DISTRIBUTE_COLUMNS_MENU_ITEM.key, 100), VERTICAL_ALIGN_MENU.key, 200);
+var LAYOUT_COLUMN_MENU_SECTION_RANK = exports.LAYOUT_COLUMN_MENU_SECTION_RANK = (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, 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);
 var VERTICAL_ALIGN_MENU_RANK = exports.VERTICAL_ALIGN_MENU_RANK = (0, _defineProperty2.default)({}, LAYOUT_COLUMN_VERTICAL_ALIGN_MENU_SECTION.key, 100);
 var VERTICAL_ALIGN_MENU_SECTION_RANK = exports.VERTICAL_ALIGN_MENU_SECTION_RANK = (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, VERTICAL_ALIGN_TOP_MENU_ITEM.key, 100), VERTICAL_ALIGN_MIDDLE_MENU_ITEM.key, 200), VERTICAL_ALIGN_BOTTOM_MENU_ITEM.key, 300);

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

@@ -0,0 +1,21 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getLayoutSectionColumnCount = exports.getLayoutSectionAtSelection = exports.getLayoutColumnValign = exports.getLayoutColumnAtSelection = void 0;
+var _state = require("@atlaskit/editor-prosemirror/state");
+var getLayoutColumnAtSelection = exports.getLayoutColumnAtSelection = function getLayoutColumnAtSelection(selection) {
+  return selection instanceof _state.NodeSelection && selection.node.type.name === 'layoutColumn' ? selection.node : undefined;
+};
+var getLayoutSectionAtSelection = exports.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;
+};
+var getLayoutSectionColumnCount = exports.getLayoutSectionColumnCount = function getLayoutSectionColumnCount(layoutSection) {
+  return (layoutSection === null || layoutSection === void 0 ? void 0 : layoutSection.type.name) === 'layoutSection' ? layoutSection.childCount : 0;
+};
+var getLayoutColumnValign = exports.getLayoutColumnValign = function getLayoutColumnValign(layoutColumn) {
+  return layoutColumn === null || layoutColumn === void 0 ? void 0 : layoutColumn.attrs.valign;
+};

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

@@ -0,0 +1,20 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useCurrentLayoutSection = exports.useCurrentLayoutColumn = void 0;
+var _hooks = require("@atlaskit/editor-common/hooks");
+var _layoutColumnSelection = require("./layoutColumnSelection");
+var useCurrentLayoutColumn = exports.useCurrentLayoutColumn = function useCurrentLayoutColumn(api) {
+  return (0, _hooks.useSharedPluginStateWithSelector)(api, ['selection'], function (states) {
+    var _states$selectionStat;
+    return (0, _layoutColumnSelection.getLayoutColumnAtSelection)((_states$selectionStat = states.selectionState) === null || _states$selectionStat === void 0 ? void 0 : _states$selectionStat.selection);
+  });
+};
+var useCurrentLayoutSection = exports.useCurrentLayoutSection = function useCurrentLayoutSection(api) {
+  return (0, _hooks.useSharedPluginStateWithSelector)(api, ['selection'], function (states) {
+    var _states$selectionStat2;
+    return (0, _layoutColumnSelection.getLayoutSectionAtSelection)((_states$selectionStat2 = states.selectionState) === null || _states$selectionStat2 === void 0 ? void 0 : _states$selectionStat2.selection);
+  });
+};

package/dist/es2019/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, 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';
@@ -290,6 +290,10 @@ export const layoutPlugin = ({
       return pluginKey.getState(editorState);
     },
     commands: {
+      insertLayoutColumn: side => {
+        var _api$analytics4;
+        return insertLayoutColumn(side, api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions);
+      },
       setLayoutColumnValign,
       toggleLayoutColumnMenu
     }

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

@@ -7,8 +7,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 const ONE_COL_LAYOUTS = ['single'];
 export const TWO_COL_LAYOUTS = ['two_equal', 'two_left_sidebar', 'two_right_sidebar'];
 export const THREE_COL_LAYOUTS = ['three_equal', 'three_with_sidebars'];
@@ -526,6 +527,102 @@ const 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;
+}
+const getSelectedLayoutColumnInSection = ({
+  doc,
+  selection
+}) => {
+  const {
+    layoutColumn,
+    layoutSection
+  } = doc.type.schema.nodes;
+  if (!(selection instanceof NodeSelection) || selection.node.type !== layoutColumn) {
+    return;
+  }
+  const {
+    $from
+  } = selection;
+  if ($from.parent.type !== layoutSection) {
+    return;
+  }
+  const selectedColumnIndex = $from.index($from.depth);
+  const selectedColumnNode = selection.node;
+  const selectedColumnPos = selection.from;
+  const layoutSectionPos = $from.before($from.depth);
+  return {
+    layoutSectionNode: $from.parent,
+    layoutSectionPos,
+    selectedColumnIndex,
+    selectedColumnNode,
+    selectedColumnPos
+  };
+};
+const insertLayoutColumnAt = (side, editorAnalyticsAPI) => ({
+  tr
+}) => {
+  if (!expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
+    return null;
+  }
+  const selectedColumn = getSelectedLayoutColumnInSection(tr);
+  if (!selectedColumn) {
+    return null;
+  }
+  const {
+    layoutSectionNode,
+    layoutSectionPos,
+    selectedColumnIndex
+  } = selectedColumn;
+  if (layoutSectionNode.childCount >= getEffectiveMaxLayoutColumns()) {
+    return null;
+  }
+  const insertIndex = side === 'left' ? selectedColumnIndex : selectedColumnIndex + 1;
+  const existingWidths = mapChildren(layoutSectionNode, column => column.attrs.width);
+  const redistributedWidths = redistributeProportionally(existingWidths, insertIndex, getEffectiveMaxLayoutColumns(), MIN_LAYOUT_COLUMN_WIDTH_PERCENT);
+  if (redistributedWidths === existingWidths) {
+    return null;
+  }
+  const {
+    layoutColumn
+  } = tr.doc.type.schema.nodes;
+  const newColumn = layoutColumn.createAndFill({
+    width: redistributedWidths[insertIndex]
+  });
+  if (!newColumn) {
+    return null;
+  }
+  const updatedColumns = [];
+  layoutSectionNode.forEach((column, _offset, index) => {
+    if (index === insertIndex) {
+      updatedColumns.push(newColumn);
+    }
+    updatedColumns.push(column);
+  });
+  if (insertIndex === layoutSectionNode.childCount) {
+    updatedColumns.push(newColumn);
+  }
+  const 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 ? 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
+    },
+    eventType: EVENT_TYPE.TRACK
+  })(tr);
+  tr.setMeta('scrollIntoView', false);
+  return tr;
+};
+export const insertLayoutColumn = (side, editorAnalyticsAPI) => insertLayoutColumnAt(side, editorAnalyticsAPI);
 export const setLayoutColumnValign = valign => ({
   tr
 }) => {

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

@@ -1,14 +1,13 @@
 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
 const layoutColumnDividerClassName = 'layout-column-divider';
 const layoutColumnDividerRailClassName = 'layout-column-divider-rail';
 const layoutColumnDividerThumbClassName = 'layout-column-divider-thumb';
 
-// Minimum column width percentage to prevent columns from collapsing
-const MIN_COLUMN_WIDTH_PERCENT = 5;
-
 // Module-level drag state so it survives widget DOM recreation during transactions.
 let dragState = null;
 
@@ -75,12 +74,12 @@ const calcDragWidths = clientX => {
   const deltaPercent = deltaX / columnsWidth * 100;
   let leftWidth = dragState.startLeftWidth + deltaPercent;
   let 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,

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

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

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

@@ -0,0 +1,89 @@
+const roundLayoutColumnWidth = width => Number(width.toFixed(2));
+const sumWidths = widths => widths.reduce((sum, width) => sum + width, 0);
+const isValidWidth = width => Number.isFinite(width) && width > 0;
+const normaliseWidthsTotal = (widths, totalWidth, minWidth) => {
+  const roundedWidths = widths.map(roundLayoutColumnWidth);
+  const remainder = roundLayoutColumnWidth(totalWidth - sumWidths(roundedWidths));
+  if (remainder === 0 || roundedWidths.length === 0) {
+    return roundedWidths;
+  }
+  let adjustmentIndex = 0;
+  roundedWidths.forEach((width, index) => {
+    if (width > roundedWidths[adjustmentIndex]) {
+      adjustmentIndex = index;
+    }
+  });
+  const adjustedWidth = roundLayoutColumnWidth(roundedWidths[adjustmentIndex] + remainder);
+  if (adjustedWidth < minWidth) {
+    return roundedWidths;
+  }
+  return roundedWidths.map((width, index) => index === adjustmentIndex ? adjustedWidth : width);
+};
+const redistributeWithMinimumWidth = ({
+  minWidth,
+  totalWidth,
+  weights
+}) => {
+  if (weights.length * minWidth > totalWidth) {
+    return;
+  }
+  const widths = Array(weights.length).fill(0);
+  const clampedIndexes = new Set();
+  let remainingWidth = totalWidth;
+  let remainingWeight = sumWidths(weights);
+  while (clampedIndexes.size < weights.length) {
+    const remainingWidthForPass = remainingWidth;
+    const remainingWeightForPass = remainingWeight;
+    const indexesToClamp = [];
+    weights.forEach((weight, index) => {
+      if (clampedIndexes.has(index)) {
+        return;
+      }
+      const proportionalWidth = remainingWeightForPass > 0 ? weight / remainingWeightForPass * remainingWidthForPass : 0;
+      if (proportionalWidth < minWidth) {
+        indexesToClamp.push(index);
+      }
+    });
+    if (indexesToClamp.length === 0) {
+      break;
+    }
+    indexesToClamp.forEach(index => {
+      widths[index] = minWidth;
+      clampedIndexes.add(index);
+      remainingWidth -= minWidth;
+      remainingWeight -= weights[index];
+    });
+  }
+  weights.forEach((weight, index) => {
+    if (!clampedIndexes.has(index)) {
+      widths[index] = remainingWeight > 0 ? weight / remainingWeight * remainingWidth : minWidth;
+    }
+  });
+  return widths;
+};
+export const 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(width => !isValidWidth(width))) {
+    return currentWidths;
+  }
+  const currentTotalWidth = sumWidths(currentWidths);
+  if (!isValidWidth(currentTotalWidth)) {
+    return currentWidths;
+  }
+  const targetTotalWidth = Math.round(currentTotalWidth) === 100 ? 100 : currentTotalWidth;
+  const newColumnWidth = Math.max(minWidth, roundLayoutColumnWidth(targetTotalWidth / (currentWidths.length + 1)));
+  const existingColumnsTotalWidth = targetTotalWidth - newColumnWidth;
+  if (existingColumnsTotalWidth < currentWidths.length * minWidth) {
+    return currentWidths;
+  }
+  const redistributedExistingWidths = redistributeWithMinimumWidth({
+    weights: currentWidths,
+    totalWidth: existingColumnsTotalWidth,
+    minWidth
+  });
+  if (!redistributedExistingWidths) {
+    return currentWidths;
+  }
+  const nextWidths = [...redistributedExistingWidths];
+  nextWidths.splice(insertIndex, 0, newColumnWidth);
+  return normaliseWidthsTotal(nextWidths, targetTotalWidth, minWidth);
+};

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

@@ -0,0 +1,64 @@
+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';
+const INSERT_COLUMN_OPTIONS = {
+  left: {
+    Icon: TableColumnAddLeftIcon,
+    label: layoutMessages.insertColumnLeft,
+    side: 'left'
+  },
+  right: {
+    Icon: TableColumnAddRightIcon,
+    label: layoutMessages.insertColumnRight,
+    side: 'right'
+  }
+};
+export const InsertColumnDropdownItem = ({
+  api,
+  side
+}) => {
+  const {
+    formatMessage
+  } = useIntl();
+  const {
+    Icon,
+    label
+  } = INSERT_COLUMN_OPTIONS[side];
+  const currentColumn = useCurrentLayoutColumn(api);
+  const currentLayoutSection = useCurrentLayoutSection(api);
+  const columnCount = getLayoutSectionColumnCount(currentLayoutSection);
+  const maxColumnCount = getEffectiveMaxLayoutColumns();
+  const canInsertColumn = currentColumn !== undefined && columnCount < maxColumnCount;
+  const onClick = useCallback(() => {
+    var _api$layout, _api$core;
+    const insertCommand = api === null || api === void 0 ? void 0 : (_api$layout = api.layout) === null || _api$layout === void 0 ? void 0 : _api$layout.commands.insertLayoutColumn(side);
+    api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(props => {
+      var _api$layout2;
+      const 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 ? void 0 : (_api$layout2 = api.layout) === null || _api$layout2 === void 0 ? void 0 : _api$layout2.commands.toggleLayoutColumnMenu({
+        isOpen: false
+      })({
+        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/es2019/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 const VerticalAlignDropdownItem = ({
   api,
@@ -11,25 +12,19 @@ export const VerticalAlignDropdownItem = ({
   const {
     formatMessage
   } = useIntl();
-  const {
-    currentValign,
-    selectedColumn
-  } = useCurrentLayoutColumnValign(api);
+  const currentColumn = useCurrentLayoutColumn(api);
+  const currentValign = useMemo(() => getLayoutColumnValign(currentColumn), [currentColumn]);
   const Icon = VERTICAL_ALIGN_ICONS[value];
   const onClick = useCallback(() => {
     var _api$core, _api$layout;
     api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(api === null || api === void 0 ? 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-${value}`
+    onClick: onClick
   }, formatMessage(label));
 };

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

@@ -1,8 +1,9 @@
-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 const VerticalAlignNestedMenu = ({
   api,
@@ -11,12 +12,10 @@ export const VerticalAlignNestedMenu = ({
   const {
     formatMessage
   } = useIntl();
-  const {
-    currentValign,
-    selectedColumn
-  } = useCurrentLayoutColumnValign(api);
+  const currentColumn = useCurrentLayoutColumn(api);
+  const currentValign = useMemo(() => getLayoutColumnValign(currentColumn), [currentColumn]);
   const TriggerIcon = currentValign ? VERTICAL_ALIGN_ICONS[currentValign] : LayoutIcon;
-  if (!selectedColumn) {
+  if (!currentColumn) {
     return null;
   }
   return /*#__PURE__*/React.createElement(ToolbarNestedDropdownMenu, {
@@ -28,8 +27,6 @@ export const VerticalAlignNestedMenu = ({
       label: "",
       size: "small"
     }),
-    text: formatMessage(layoutMessages.alignColumn),
-    testId: "layout-column-align-menu",
-    dropdownTestId: "layout-column-align-dropdown"
+    text: formatMessage(layoutMessages.alignColumn)
   }, children);
 };

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

@@ -3,7 +3,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 const LAYOUT_COLUMN_MENU_FALLBACKS = {
@@ -23,6 +24,26 @@ export const getLayoutColumnMenuComponents = ({
       ...LAYOUT_COLUMN_MENU,
       rank: LAYOUT_COLUMN_MENU_RANK[LAYOUT_COLUMN_MENU_SECTION.key]
     }]
+  }, {
+    ...INSERT_COLUMN_LEFT_MENU_ITEM,
+    component: () => /*#__PURE__*/React.createElement(InsertColumnDropdownItem, {
+      api: api,
+      side: "left"
+    }),
+    parents: [{
+      ...LAYOUT_COLUMN_MENU_SECTION,
+      rank: LAYOUT_COLUMN_MENU_SECTION_RANK[INSERT_COLUMN_LEFT_MENU_ITEM.key]
+    }]
+  }, {
+    ...INSERT_COLUMN_RIGHT_MENU_ITEM,
+    component: () => /*#__PURE__*/React.createElement(InsertColumnDropdownItem, {
+      api: api,
+      side: "right"
+    }),
+    parents: [{
+      ...LAYOUT_COLUMN_MENU_SECTION,
+      rank: LAYOUT_COLUMN_MENU_SECTION_RANK[INSERT_COLUMN_RIGHT_MENU_ITEM.key]
+    }]
   }, {
     ...DISTRIBUTE_COLUMNS_MENU_ITEM,
     component: createDistributeColumnsDropdownItem(api),

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

@@ -1,25 +1,33 @@
-import React, { useCallback, useContext, useEffect, useRef } from 'react';
+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';
 const PopupWithListeners = withReactEditorViewOuterListeners(Popup);
-const LAYOUT_COLUMN_MENU_POPUP_OFFSET = [0, 10];
-const getLayoutColumnMenuTarget = (editorView, selectionAnchorPos) => {
-  if (selectionAnchorPos === undefined) {
+const FALLBACK_MENU_HEIGHT = 300;
+const LAYOUT_COLUMN_MENU_POPUP_OFFSET = [0, 4];
+
+/**
+ * Returns the drag handle button for the selected layout column.
+ */
+const getLayoutColumnMenuTarget = (editorView, selection) => {
+  var _columnDomRef$parentE;
+  if (!getLayoutColumnAtSelection(selection) || (selection === null || selection === void 0 ? void 0 : selection.from) === undefined) {
     return null;
   }
-  const selectionNode = editorView.state.doc.nodeAt(selectionAnchorPos);
-  if ((selectionNode === null || selectionNode === void 0 ? void 0 : selectionNode.type.name) !== 'layoutColumn') {
+  const columnDomRef = editorView.nodeDOM(selection.from);
+  if (!(columnDomRef instanceof HTMLElement)) {
     return null;
   }
-  return findDomRefAtPos(selectionAnchorPos, editorView.domAtPos.bind(editorView));
+  const 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 const LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMenu({
   api,
@@ -41,6 +49,15 @@ export const LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMen
   });
   const setOutsideClickTargetRef = useContext(OutsideClickTargetRefContext);
   const menuRef = useRef(null);
+  const popupRef = useRef(undefined);
+  const [menuHeight, setMenuHeight] = React.useState(FALLBACK_MENU_HEIGHT);
+  useLayoutEffect(() => {
+    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]);
   const closeLayoutColumnMenu = useCallback(() => {
     var _api$core, _api$layout;
     api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(api === null || api === void 0 ? void 0 : (_api$layout = api.layout) === null || _api$layout === void 0 ? void 0 : _api$layout.commands.toggleLayoutColumnMenu({
@@ -65,9 +82,12 @@ export const LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMen
   const handleMenuRef = useCallback(el => {
     setOutsideClickTargetRef === null || setOutsideClickTargetRef === void 0 ? void 0 : setOutsideClickTargetRef(el);
     menuRef.current = el;
+    if (el) {
+      popupRef.current = el;
+    }
   }, [setOutsideClickTargetRef]);
   const components = (_api$uiControlRegistr = api === null || api === void 0 ? void 0 : (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 ? void 0 : _api$uiControlRegistr2.actions.getComponents(LAYOUT_COLUMN_MENU.key)) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : [];
-  const target = isLayoutColumnMenuOpen ? getLayoutColumnMenuTarget(editorView, selection === null || selection === void 0 ? void 0 : selection.from) : null;
+  const target = useMemo(() => isLayoutColumnMenuOpen ? getLayoutColumnMenuTarget(editorView, selection) : null, [editorView, isLayoutColumnMenuOpen, selection]);
   const hasValidTarget = target instanceof HTMLElement;
   useEffect(() => {
     if (isLayoutColumnMenuOpen && (!hasValidTarget || components.length === 0)) {
@@ -82,10 +102,11 @@ export const LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMen
     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/es2019/ui/LayoutColumnMenu/keys.js

@@ -28,6 +28,14 @@ export const VERTICAL_ALIGN_MENU = {
 
 // --- Items ---
 
+export const INSERT_COLUMN_LEFT_MENU_ITEM = {
+  type: 'menu-item',
+  key: 'layout-column-menu-insert-left-item'
+};
+export const INSERT_COLUMN_RIGHT_MENU_ITEM = {
+  type: 'menu-item',
+  key: 'layout-column-menu-insert-right-item'
+};
 export const DISTRIBUTE_COLUMNS_MENU_ITEM = {
   type: 'menu-item',
   key: 'layout-column-menu-distribute-columns-item'
@@ -48,8 +56,10 @@ export const VERTICAL_ALIGN_BOTTOM_MENU_ITEM = {
 // --- Item ranks within sections ---
 
 export const LAYOUT_COLUMN_MENU_SECTION_RANK = {
-  [DISTRIBUTE_COLUMNS_MENU_ITEM.key]: 100,
-  [VERTICAL_ALIGN_MENU.key]: 200
+  [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 const VERTICAL_ALIGN_MENU_RANK = {
   [LAYOUT_COLUMN_VERTICAL_ALIGN_MENU_SECTION.key]: 100

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

@@ -0,0 +1,9 @@
+import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
+export const getLayoutColumnAtSelection = selection => selection instanceof NodeSelection && selection.node.type.name === 'layoutColumn' ? selection.node : undefined;
+export const getLayoutSectionAtSelection = selection => {
+  const selectedColumn = getLayoutColumnAtSelection(selection);
+  const 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 const getLayoutSectionColumnCount = layoutSection => (layoutSection === null || layoutSection === void 0 ? void 0 : layoutSection.type.name) === 'layoutSection' ? layoutSection.childCount : 0;
+export const getLayoutColumnValign = layoutColumn => layoutColumn === null || layoutColumn === void 0 ? void 0 : layoutColumn.attrs.valign;