@atlaskit/editor-plugin-table 22.4.14 → 22.4.16

package/dist/cjs/pm-plugins/utils/tableMode/measure-table-with-auto-layout.js

@@ -0,0 +1,113 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.measureTableWithAutoLayout = void 0;
+var _styles = require("@atlaskit/editor-common/styles");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _contentMode = require("../../transforms/content-mode");
+var _runSmartAdjust = require("./smart-adjust/run-smart-adjust");
+var measureTableWithAutoLayout = exports.measureTableWithAutoLayout = function measureTableWithAutoLayout(tableRef, editorContainerWidth) {
+  var cols = Array.from(tableRef.querySelectorAll(':scope > colgroup > col'));
+  var contentWrap = tableRef.closest(".".concat(_styles.TableSharedCssClassName.TABLE_VIEW_CONTENT_WRAP));
+  var resizerContainer = contentWrap === null || contentWrap === void 0 ? void 0 : contentWrap.querySelector(".".concat(_styles.TableSharedCssClassName.TABLE_RESIZER_CONTAINER));
+  var resizerItem = resizerContainer === null || resizerContainer === void 0 ? void 0 : resizerContainer.querySelector('.resizer-item.display-handle');
+  var prevTableWidth = tableRef.style.width;
+  var prevTableLayout = tableRef.style.tableLayout;
+  var prevColWidths = cols.map(function (col) {
+    return col.style.width;
+  });
+  var prevResizerItemWidth = resizerItem === null || resizerItem === void 0 ? void 0 : resizerItem.style.width;
+  tableRef.style.width = '';
+  tableRef.style.tableLayout = 'auto';
+  cols.forEach(function (col) {
+    return col.style.width = '';
+  });
+  if ((0, _platformFeatureFlags.fg)('platform_editor_table_fit_to_content_smart_adjust')) {
+    var hadTableSticky = tableRef.classList.contains(_styles.TableSharedCssClassName.TABLE_STICKY);
+    var prevTableMarginTop = tableRef.style.marginTop;
+    if (hadTableSticky) {
+      tableRef.classList.remove(_styles.TableSharedCssClassName.TABLE_NATIVE_STICKY);
+    }
+    if (prevTableMarginTop) {
+      tableRef.style.marginTop = '';
+    }
+    var stickyRows = Array.from(tableRef.querySelectorAll("tr.sticky, tr.".concat(_styles.TableSharedCssClassName.TABLE_NATIVE_STICKY)));
+    var prevStickyRowState = stickyRows.map(function (row) {
+      return {
+        row: row,
+        hadSticky: row.classList.contains('sticky'),
+        hadNative: row.classList.contains(_styles.TableSharedCssClassName.TABLE_NATIVE_STICKY),
+        width: row.style.width,
+        top: row.style.top,
+        position: row.style.position,
+        gridTemplateColumns: row.style.gridTemplateColumns
+      };
+    });
+    stickyRows.forEach(function (row) {
+      row.classList.remove('sticky');
+      row.classList.remove(_styles.TableSharedCssClassName.TABLE_NATIVE_STICKY);
+      row.style.width = '';
+      row.style.top = '';
+      row.style.position = '';
+      row.style.gridTemplateColumns = '';
+    });
+    try {
+      return (0, _runSmartAdjust.runSmartAdjust)(tableRef, resizerContainer, resizerItem, editorContainerWidth);
+    } finally {
+      tableRef.style.width = prevTableWidth;
+      tableRef.style.tableLayout = prevTableLayout;
+      cols.forEach(function (col, i) {
+        return col.style.width = prevColWidths[i];
+      });
+      if (hadTableSticky) {
+        tableRef.classList.add(_styles.TableSharedCssClassName.TABLE_STICKY);
+      }
+      if (prevTableMarginTop) {
+        tableRef.style.marginTop = prevTableMarginTop;
+      }
+      prevStickyRowState.forEach(function (state) {
+        if (state.hadSticky) {
+          state.row.classList.add('sticky');
+        }
+        if (state.hadNative) {
+          state.row.classList.add(_styles.TableSharedCssClassName.TABLE_NATIVE_STICKY);
+        }
+        if (state.width) {
+          state.row.style.width = state.width;
+        }
+        if (state.top) {
+          state.row.style.top = state.top;
+        }
+        if (state.position) {
+          state.row.style.position = state.position;
+        }
+        if (state.gridTemplateColumns) {
+          state.row.style.gridTemplateColumns = state.gridTemplateColumns;
+        }
+      });
+      (0, _runSmartAdjust.restoreResizerContainer)(resizerContainer);
+      if (resizerItem) {
+        resizerItem.style.width = prevResizerItemWidth !== null && prevResizerItemWidth !== void 0 ? prevResizerItemWidth : '';
+      }
+    }
+  }
+  if (resizerContainer) {
+    resizerContainer.style.width = 'var(--ak-editor-table-width)';
+    resizerContainer.style.setProperty('--ak-editor-table-width', 'max-content');
+  }
+  if (resizerItem) {
+    resizerItem.style.width = 'max-content';
+  }
+  var measurement = (0, _contentMode.getTableMeasurement)(tableRef);
+  tableRef.style.width = prevTableWidth;
+  tableRef.style.tableLayout = prevTableLayout;
+  cols.forEach(function (col, i) {
+    return col.style.width = prevColWidths[i];
+  });
+  if (resizerItem) {
+    resizerItem.style.width = prevResizerItemWidth !== null && prevResizerItemWidth !== void 0 ? prevResizerItemWidth : '';
+  }
+  return measurement;
+};

package/dist/cjs/pm-plugins/utils/tableMode/smart-adjust/constants.js

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.EVEN_SHARE_RATIO = void 0;
+/** Each column's max width is `MAX × (usableWidth / numCols)`. */
+var EVEN_SHARE_RATIO = exports.EVEN_SHARE_RATIO = {
+  MAX: 2
+};

package/dist/cjs/pm-plugins/utils/tableMode/smart-adjust/distribute-column-widths.js

@@ -0,0 +1,83 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.sumWidths = exports.distributeByEvenShareRatio = void 0;
+var _styles = require("@atlaskit/editor-common/styles");
+var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _constants = require("./constants");
+var sumWidths = exports.sumWidths = function sumWidths(widths) {
+  return widths.reduce(function (sum, width) {
+    return sum + width;
+  }, 0);
+};
+
+// 2px absorbs sub-pixel rounding in `getRenderedColgroupColumnWidths`.
+var SUB_PIXEL_ROUNDING_ALLOWANCE = 2;
+
+/**
+ * Clamps each desired width to `[tableCellMinWidth, MAX × evenShare]`. Greedy
+ * columns (paragraphs) hit the ceiling and wrap; small columns stay at their
+ * natural width. Leftover canvas budget grows ceiling-hitters up to their
+ * desired; overflow reclaims from ceiling-hitters only.
+ */
+var distributeByEvenShareRatio = exports.distributeByEvenShareRatio = function distributeByEvenShareRatio(desiredWidths, editorContainerWidth) {
+  if (desiredWidths.length === 0 || !isFinite(editorContainerWidth) || editorContainerWidth <= 0) {
+    return desiredWidths;
+  }
+  var usableWidth = Math.max(editorContainerWidth - (0, _editorSharedStyles.akEditorGutterPaddingDynamic)() * 2, _styles.tableCellMinWidth * desiredWidths.length);
+  var evenShare = usableWidth / desiredWidths.length;
+  var ceiling = _constants.EVEN_SHARE_RATIO.MAX * evenShare;
+  var isCompactColumn = function isCompactColumn(width) {
+    return width <= ceiling;
+  };
+  var desiredCeil = desiredWidths.map(function (desired) {
+    return Math.max(_styles.tableCellMinWidth, Math.ceil(desired) + SUB_PIXEL_ROUNDING_ALLOWANCE);
+  });
+  var capped = desiredCeil.map(function (desired) {
+    return isCompactColumn(desired) ? desired : Math.min(ceiling, desired);
+  });
+  var sum = sumWidths(capped);
+
+  // Underflow: grow non-protected ceiling-hitters into the leftover, up to their desired.
+  if (sum < usableWidth) {
+    var leftover = usableWidth - sum;
+    var growthHeadroom = capped.map(function (width, index) {
+      return !isCompactColumn(desiredCeil[index]) && width >= ceiling ? Math.max(desiredCeil[index] - width, 0) : 0;
+    });
+    var totalHeadroom = sumWidths(growthHeadroom);
+    if (totalHeadroom > 0) {
+      var totalGrowth = Math.min(leftover, totalHeadroom);
+      return capped.map(function (width, index) {
+        var headroom = growthHeadroom[index];
+        if (headroom <= 0) {
+          return width;
+        }
+        return width + headroom / totalHeadroom * totalGrowth;
+      });
+    }
+    return capped;
+  }
+  if (sum === usableWidth) {
+    return capped;
+  }
+
+  // Overflow: reclaim from non-protected ceiling-hitters only.
+  var overage = sum - usableWidth;
+  var slacks = capped.map(function (width, index) {
+    return !isCompactColumn(desiredCeil[index]) && width >= ceiling ? Math.max(width - _styles.tableCellMinWidth, 0) : 0;
+  });
+  var totalSlack = sumWidths(slacks);
+  if (totalSlack <= 0) {
+    return capped;
+  }
+  return capped.map(function (width, index) {
+    var slack = slacks[index];
+    if (slack <= 0) {
+      return width;
+    }
+    var share = slack / totalSlack * Math.min(overage, totalSlack);
+    return Math.max(width - share, _styles.tableCellMinWidth);
+  });
+};

package/dist/cjs/pm-plugins/utils/tableMode/smart-adjust/run-smart-adjust.js

@@ -0,0 +1,56 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.runSmartAdjust = exports.restoreResizerContainer = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _contentMode = require("../../../transforms/content-mode");
+var _distributeColumnWidths = require("./distribute-column-widths");
+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 measureWithIntrinsicWidth = function measureWithIntrinsicWidth(tableRef, resizerContainer, resizerItem) {
+  if (resizerContainer) {
+    resizerContainer.style.width = 'var(--ak-editor-table-width)';
+    resizerContainer.style.setProperty('--ak-editor-table-width', 'max-content');
+  }
+  if (resizerItem) {
+    resizerItem.style.width = 'max-content';
+  }
+  var prevTableWidth = tableRef.style.width;
+  var prevTableMaxWidth = tableRef.style.maxWidth;
+  var prevTableMinWidth = tableRef.style.minWidth;
+  tableRef.style.setProperty('width', 'max-content', 'important');
+  tableRef.style.setProperty('max-width', 'none', 'important');
+  tableRef.style.setProperty('min-width', '0', 'important');
+  try {
+    return (0, _contentMode.getTableMeasurement)(tableRef);
+  } finally {
+    tableRef.style.width = prevTableWidth;
+    tableRef.style.maxWidth = prevTableMaxWidth;
+    tableRef.style.minWidth = prevTableMinWidth;
+  }
+};
+var restoreResizerContainer = exports.restoreResizerContainer = function restoreResizerContainer(resizerContainer) {
+  if (!resizerContainer) {
+    return;
+  }
+  resizerContainer.style.width = 'var(--ak-editor-table-width)';
+  resizerContainer.style.removeProperty('--ak-editor-table-width');
+};
+
+/**
+ * Smart-adjust: measure unconstrained max-content per column, then clamp via
+ * `distributeByEvenShareRatio`.
+ */
+var runSmartAdjust = exports.runSmartAdjust = function runSmartAdjust(tableRef, resizerContainer, resizerItem, editorContainerWidthFromApi) {
+  var preferredMeasurement = measureWithIntrinsicWidth(tableRef, resizerContainer, resizerItem);
+  var desiredWidths = preferredMeasurement.colWidths;
+  var editorContainerWidth = editorContainerWidthFromApi !== null && editorContainerWidthFromApi !== void 0 ? editorContainerWidthFromApi : (0, _distributeColumnWidths.sumWidths)(desiredWidths);
+  var colWidths = (0, _distributeColumnWidths.distributeByEvenShareRatio)(desiredWidths, editorContainerWidth);
+  return _objectSpread(_objectSpread({}, preferredMeasurement), {}, {
+    colWidths: colWidths,
+    tableWidth: (0, _distributeColumnWidths.sumWidths)(colWidths)
+  });
+};

package/dist/cjs/tablePlugin.js

@@ -152,6 +152,7 @@ var tablePlugin = function tablePlugin(_ref) {
         insertRowButtonIndex: tablePluginState.insertRowButtonIndex,
         tableWrapperTarget: tablePluginState.tableWrapperTarget,
         isCellMenuOpenByKeyboard: tablePluginState.isCellMenuOpenByKeyboard,
+        activeTableMenu: tablePluginState.activeTableMenu,
         stickyHeader: stickyHeader,
         dragMenuDirection: dragAndDropState === null || dragAndDropState === void 0 ? void 0 : dragAndDropState.dragMenuDirection,
         dragMenuIndex: dragAndDropState === null || dragAndDropState === void 0 ? void 0 : dragAndDropState.dragMenuIndex,

package/dist/cjs/ui/ContentComponent.js

@@ -98,6 +98,7 @@ var ContentComponentInternal = function ContentComponentInternal(_ref) {
     return null;
   }
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, targetCellPosition && (tableRef || isCellMenuOpenByKeyboard) && !isResizing && options && options.allowContextualMenu && /*#__PURE__*/_react.default.createElement(_FloatingContextualButton.default, {
+    api: api,
     isNumberColumnEnabled: tableNode && tableNode.attrs.isNumberColumnEnabled,
     editorView: editorView,
     tableNode: tableNode,
@@ -133,7 +134,6 @@ var ContentComponentInternal = function ContentComponentInternal(_ref) {
     editorView: editorView,
     mountPoint: popupsMountPoint,
     boundariesElement: popupsBoundariesElement,
-    targetCellPosition: targetCellPosition,
     isOpen: Boolean(isContextualMenuOpen) && !isResizing,
     pluginConfig: pluginConfig,
     editorAnalyticsAPI: editorAnalyticsAPI,

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

@@ -11,6 +11,7 @@ var _react2 = require("@emotion/react");
 var _reactIntl = require("react-intl");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _errorBoundary = require("@atlaskit/editor-common/error-boundary");
+var _hooks = require("@atlaskit/editor-common/hooks");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _messages = require("@atlaskit/editor-common/messages");
 var _ui = require("@atlaskit/editor-common/ui");
@@ -44,7 +45,8 @@ var anchorStyles = (0, _react2.css)({
   zIndex: CONTEXTUAL_MENU_BUTTON_Z_INDEX
 });
 var FloatingContextualButtonInner = /*#__PURE__*/_react.default.memo(function (props) {
-  var editorView = props.editorView,
+  var api = props.api,
+    editorView = props.editorView,
     isContextualMenuOpen = props.isContextualMenuOpen,
     mountPoint = props.mountPoint,
     scrollableElement = props.scrollableElement,
@@ -53,12 +55,22 @@ var FloatingContextualButtonInner = /*#__PURE__*/_react.default.memo(function (p
     targetCellPosition = props.targetCellPosition,
     isCellMenuOpenByKeyboard = props.isCellMenuOpenByKeyboard,
     formatMessage = props.intl.formatMessage; //  : Props & WrappedComponentProps
-
+  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['table'], function (states) {
+      var _states$tableState;
+      return {
+        activeTableMenu: (_states$tableState = states.tableState) === null || _states$tableState === void 0 ? void 0 : _states$tableState.activeTableMenu
+      };
+    }),
+    activeTableMenu = _useSharedPluginState.activeTableMenu;
+  var isCellMenuOpen = (0, _expValEquals.expValEquals)('platform_editor_table_menu_updates', 'isEnabled', true) ? (activeTableMenu === null || activeTableMenu === void 0 ? void 0 : activeTableMenu.type) === 'cell' : isContextualMenuOpen;
   var handleClick = function handleClick() {
     var state = editorView.state,
       dispatch = editorView.dispatch;
     if ((0, _expValEquals.expValEquals)('platform_editor_table_menu_updates', 'isEnabled', true)) {
-      (0, _commands.toggleContextualMenu)()(state, dispatch);
+      (0, _commands.toggleActiveTableMenu)({
+        type: 'cell',
+        openedBy: 'mouse'
+      })(state, dispatch);
       return;
     }
 
@@ -74,13 +86,20 @@ var FloatingContextualButtonInner = /*#__PURE__*/_react.default.memo(function (p
   var domAtPos = editorView.domAtPos.bind(editorView);
   var targetCellRef = (0, _utils.findDomRefAtPos)(targetCellPosition, domAtPos);
   (0, _react.useEffect)(function () {
-    if (isCellMenuOpenByKeyboard && !isContextualMenuOpen) {
+    if (isCellMenuOpenByKeyboard && !isCellMenuOpen) {
       var state = editorView.state,
         dispatch = editorView.dispatch;
       // open the menu when the keyboard shortcut is pressed
+      if ((0, _expValEquals.expValEquals)('platform_editor_table_menu_updates', 'isEnabled', true)) {
+        (0, _commands.toggleActiveTableMenu)({
+          type: 'cell',
+          openedBy: 'keyboard'
+        })(state, dispatch);
+        return;
+      }
       (0, _commands.toggleContextualMenu)()(state, dispatch);
     }
-  }, [isCellMenuOpenByKeyboard, isContextualMenuOpen, editorView]);
+  }, [isCellMenuOpenByKeyboard, isCellMenuOpen, editorView]);
   if (!targetCellRef || !(targetCellRef instanceof HTMLElement)) {
     return null;
   }
@@ -90,12 +109,12 @@ var FloatingContextualButtonInner = /*#__PURE__*/_react.default.memo(function (p
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
     (0, _styles.tableFloatingCellButtonStyles)(),
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
-    isContextualMenuOpen && (0, _styles.tableFloatingCellButtonSelectedStyles)()]
+    isCellMenuOpen && (0, _styles.tableFloatingCellButtonSelectedStyles)()]
   }, (0, _react2.jsx)(_uiMenu.ToolbarButton
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
   , {
     className: _types.TableCssClassName.CONTEXTUAL_MENU_BUTTON,
-    selected: isContextualMenuOpen,
+    selected: isCellMenuOpen,
     title: labelCellOptions,
     keymap: _keymaps.focusToContextMenuTrigger,
     onClick: handleClick,
@@ -105,7 +124,7 @@ var FloatingContextualButtonInner = /*#__PURE__*/_react.default.memo(function (p
       size: "small"
     }),
     "aria-label": labelCellOptions,
-    "aria-expanded": isContextualMenuOpen
+    "aria-expanded": isCellMenuOpen
   }));
   var parentSticky = targetCellRef.parentElement && targetCellRef.parentElement.className.indexOf('sticky') > -1;
   var parentStickyNative = targetCellRef.parentElement && ((0, _platformFeatureFlags.fg)('platform_editor_table_sticky_header_patch_4') ? tableWrapper === null || tableWrapper === void 0 ? void 0 : tableWrapper.classList.contains(_types.TableCssClassName.TABLE_NODE_WRAPPER_NO_OVERFLOW) : targetCellRef.parentElement.classList.contains(_types.TableCssClassName.NATIVE_STICKY));
@@ -160,7 +179,7 @@ var FloatingContextualButtonInner = /*#__PURE__*/_react.default.memo(function (p
       targetCellPosition: targetCellPosition,
       targetCellRef: targetCellRef,
       mountTo: tableWrapper,
-      isContextualMenuOpen: isContextualMenuOpen
+      isContextualMenuOpen: isCellMenuOpen
     }, button);
   }
   return (0, _react2.jsx)(_ui.Popup, {

package/dist/cjs/ui/FloatingContextualMenu/CellMenuPopup.js

@@ -6,99 +6,84 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.CellMenuPopup = void 0;
 var _react = _interopRequireWildcard(require("react"));
-var _bindEventListener = require("bind-event-listener");
-var _hooks = require("@atlaskit/editor-common/hooks");
+var _ui = require("@atlaskit/editor-common/ui");
+var _uiReact = require("@atlaskit/editor-common/ui-react");
 var _userIntent = require("@atlaskit/editor-common/user-intent");
 var _commands = require("../../pm-plugins/commands");
+var _pluginFactory = require("../../pm-plugins/plugin-factory");
 var _types = require("../../types");
+var _consts = require("../consts");
 var _keys = require("../TableMenu/cell/keys");
+var _consts2 = require("../TableMenu/shared/consts");
 var _TableMenu = require("../TableMenu/shared/TableMenu");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+var PopupWithListeners = (0, _uiReact.withReactEditorViewOuterListeners)(_ui.Popup);
+var NESTED_DROPDOWN_SELECTOR = '[data-toolbar-nested-dropdown-menu]';
+var CELL_MENU_TRIGGER_SELECTOR = ".".concat(_types.TableCssClassName.CONTEXTUAL_MENU_BUTTON);
 var CellMenuPopup = exports.CellMenuPopup = function CellMenuPopup(_ref) {
   var api = _ref.api,
+    boundariesElement = _ref.boundariesElement,
     editorView = _ref.editorView,
-    isCellMenuOpenByKeyboard = _ref.isCellMenuOpenByKeyboard,
-    isOpen = _ref.isOpen,
-    targetCellRef = _ref.targetCellRef;
-  var tableMenuRef = (0, _react.useRef)(null);
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['userIntent'], function (states) {
-      var _states$userIntentSta;
-      return {
-        currentUserIntent: (_states$userIntentSta = states.userIntentState) === null || _states$userIntentSta === void 0 ? void 0 : _states$userIntentSta.currentUserIntent
-      };
-    }),
-    currentUserIntent = _useSharedPluginState.currentUserIntent;
+    mountPoint = _ref.mountPoint,
+    scrollableElement = _ref.scrollableElement,
+    targetCellRef = _ref.targetCellRef,
+    zIndex = _ref.zIndex;
+  var popupContentRef = (0, _react.useRef)(null);
+  var setOutsideClickTargetRef = (0, _react.useContext)(_uiReact.OutsideClickTargetRefContext);
+  var handlePopupRef = (0, _react.useCallback)(function (el) {
+    popupContentRef.current = el;
+    setOutsideClickTargetRef === null || setOutsideClickTargetRef === void 0 || setOutsideClickTargetRef(el);
+  }, [setOutsideClickTargetRef]);
   var closeCellMenu = (0, _react.useCallback)(function () {
-    var state = editorView.state,
-      dispatch = editorView.dispatch,
-      dom = editorView.dom;
-    (0, _commands.toggleContextualMenu)()(state, dispatch);
+    var _getPluginState = (0, _pluginFactory.getPluginState)(editorView.state),
+      isCellMenuOpenByKeyboard = _getPluginState.isCellMenuOpenByKeyboard;
+    (0, _commands.closeActiveTableMenu)()(editorView.state, editorView.dispatch);
     if (isCellMenuOpenByKeyboard) {
-      (0, _commands.setFocusToCellMenu)(false)(state, dispatch);
-      dom.focus();
+      (0, _commands.setFocusToCellMenu)(false)(editorView.state, editorView.dispatch);
     }
-  }, [editorView, isCellMenuOpenByKeyboard]);
-  (0, _react.useEffect)(function () {
-    if (!isOpen || currentUserIntent !== 'tableDragMenuPopupOpen') {
-      return;
+  }, [editorView]);
+  var isEventInsideCellMenu = (0, _react.useCallback)(function (event) {
+    var _popupContentRef$curr;
+    var target = event.target;
+    if (!(target instanceof Node)) {
+      return false;
     }
-    closeCellMenu();
-  }, [closeCellMenu, currentUserIntent, isOpen]);
-  (0, _react.useEffect)(function () {
-    if (!isOpen) {
-      return;
+    if ((_popupContentRef$curr = popupContentRef.current) !== null && _popupContentRef$curr !== void 0 && _popupContentRef$curr.contains(target)) {
+      return true;
     }
-    if (!(targetCellRef instanceof HTMLElement)) {
+    return target instanceof Element && Boolean(target.closest(NESTED_DROPDOWN_SELECTOR) || target.closest(CELL_MENU_TRIGGER_SELECTOR));
+  }, []);
+  var handleCellMenuClickOutside = (0, _react.useCallback)(function (event) {
+    if (isEventInsideCellMenu(event)) {
       return;
     }
-    var ownerDocument = targetCellRef.ownerDocument;
-    var handlePointerDown = function handlePointerDown(event) {
-      var _tableMenuRef$current;
-      var target = event.target;
-      if (!(target instanceof Node)) {
-        return;
-      }
-      if ((_tableMenuRef$current = tableMenuRef.current) !== null && _tableMenuRef$current !== void 0 && _tableMenuRef$current.contains(target)) {
-        return;
-      }
-      var cellMenuButton = ownerDocument.querySelector(".".concat(_types.TableCssClassName.CONTEXTUAL_MENU_BUTTON));
-      if (cellMenuButton !== null && cellMenuButton !== void 0 && cellMenuButton.contains(target)) {
-        return;
-      }
-      closeCellMenu();
-    };
-    var handleKeyDown = function handleKeyDown(event) {
-      if (event.key === 'Escape') {
-        closeCellMenu();
-      }
-    };
-    var unbindPointerDown = (0, _bindEventListener.bind)(ownerDocument, {
-      type: 'pointerdown',
-      listener: handlePointerDown,
-      options: {
-        capture: true
-      }
-    });
-    var unbindKeyDown = (0, _bindEventListener.bind)(ownerDocument, {
-      type: 'keydown',
-      listener: handleKeyDown,
-      options: {
-        capture: true
-      }
-    });
-    return function () {
-      unbindPointerDown();
-      unbindKeyDown();
-    };
-  }, [closeCellMenu, isOpen, targetCellRef]);
-  return /*#__PURE__*/_react.default.createElement(_userIntent.UserIntentPopupWrapper, {
+    closeCellMenu();
+  }, [closeCellMenu, isEventInsideCellMenu]);
+  return /*#__PURE__*/_react.default.createElement(PopupWithListeners, {
+    alignX: "right",
+    alignY: "top",
+    target: targetCellRef,
+    mountTo: mountPoint,
+    boundariesElement: boundariesElement,
+    scrollableElement: scrollableElement,
+    fitHeight: _consts.tablePopupMenuFitHeight,
+    fitWidth: _consts2.TABLE_MENU_WIDTH,
+    zIndex: zIndex,
+    forcePlacement: true
+    // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
+    ,
+    offset: [-7, 0],
+    stick: true,
+    handleClickOutside: handleCellMenuClickOutside,
+    handleEscapeKeydown: closeCellMenu
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    ref: handlePopupRef
+  }, /*#__PURE__*/_react.default.createElement(_userIntent.UserIntentPopupWrapper, {
     api: api,
     userIntent: "tableContextualMenuPopupOpen"
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    ref: tableMenuRef
   }, /*#__PURE__*/_react.default.createElement(_TableMenu.TableMenu, {
     api: api,
     editorView: editorView,
     surface: _keys.CELL_MENU
-  })));
+  }))));
 };

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = require("@emotion/react");
+var _hooks = require("@atlaskit/editor-common/hooks");
 var _ui = require("@atlaskit/editor-common/ui");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
@@ -13,7 +14,6 @@ var _utils2 = require("@atlaskit/editor-tables/utils");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _pluginFactory = require("../../pm-plugins/plugin-factory");
 var _consts = require("../consts");
-var _consts2 = require("../TableMenu/shared/consts");
 var _CellMenuPopup = require("./CellMenuPopup");
 var _ContextualMenu = _interopRequireDefault(require("./ContextualMenu"));
 var _styles = require("./styles");
@@ -40,6 +40,14 @@ var FloatingContextualMenu = function FloatingContextualMenu(_ref) {
     isCommentEditor = _ref.isCommentEditor,
     api = _ref.api,
     isDragMenuOpen = _ref.isDragMenuOpen;
+  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['table'], function (states) {
+      var _states$tableState;
+      return {
+        activeTableMenu: (_states$tableState = states.tableState) === null || _states$tableState === void 0 ? void 0 : _states$tableState.activeTableMenu
+      };
+    }),
+    activeTableMenu = _useSharedPluginState.activeTableMenu;
+  var isCellMenuOpen = (0, _expValEquals.expValEquals)('platform_editor_table_menu_updates', 'isEnabled', true) ? (activeTableMenu === null || activeTableMenu === void 0 ? void 0 : activeTableMenu.type) === 'cell' : isOpen;
   if (!editorView) {
     return null;
   }
@@ -47,7 +55,7 @@ var FloatingContextualMenu = function FloatingContextualMenu(_ref) {
   // TargetCellPosition could be outdated: https://product-fabric.atlassian.net/browse/ED-8129
   var _getPluginState = (0, _pluginFactory.getPluginState)(editorView.state),
     targetCellPosition = _getPluginState.targetCellPosition;
-  if (!isOpen || !targetCellPosition || editorView.state.doc.nodeSize <= targetCellPosition) {
+  if (!isCellMenuOpen || !targetCellPosition || editorView.state.doc.nodeSize <= targetCellPosition) {
     return null;
   }
   var selection = editorView.state.selection;
@@ -64,6 +72,20 @@ var FloatingContextualMenu = function FloatingContextualMenu(_ref) {
     return null;
   }
   var parentSticky = targetCellRef.parentElement && targetCellRef.parentElement.className.indexOf('sticky') > -1;
+  if ((0, _expValEquals.expValEquals)('platform_editor_table_menu_updates', 'isEnabled', true)) {
+    return (0, _react.jsx)(_CellMenuPopup.CellMenuPopup, {
+      api: api,
+      boundariesElement: boundariesElement,
+      editorView: editorView,
+      mountPoint: mountPoint,
+      scrollableElement: scrollableElement
+      // Ignored via go/ees005
+      // eslint-disable-next-line @atlaskit/editor/no-as-casting
+      ,
+      targetCellRef: targetCellRef,
+      zIndex: parentSticky ? _editorSharedStyles.akEditorFloatingDialogZIndex : _editorSharedStyles.akEditorFloatingOverlapPanelZIndex
+    });
+  }
   return (0, _react.jsx)(_ui.Popup, {
     alignX: "right",
     alignY: "top"
@@ -75,7 +97,7 @@ var FloatingContextualMenu = function FloatingContextualMenu(_ref) {
     boundariesElement: boundariesElement,
     scrollableElement: scrollableElement,
     fitHeight: _consts.tablePopupMenuFitHeight,
-    fitWidth: (0, _expValEquals.expValEquals)('platform_editor_table_menu_updates', 'isEnabled', true) ? _consts2.TABLE_MENU_WIDTH : _consts.contextualMenuDropdownWidthDnD
+    fitWidth: _consts.contextualMenuDropdownWidthDnD
     // z-index value below is to ensure that this menu is above other floating menu
     // in table, but below floating dialogs like typeaheads, pickers, etc.
     ,
@@ -85,15 +107,7 @@ var FloatingContextualMenu = function FloatingContextualMenu(_ref) {
     ,
     offset: [-7, 0],
     stick: true
-  }, (0, _expValEquals.expValEquals)('platform_editor_table_menu_updates', 'isEnabled', true) ? (0, _react.jsx)(_CellMenuPopup.CellMenuPopup, {
-    api: api,
-    editorView: editorView,
-    isCellMenuOpenByKeyboard: isCellMenuOpenByKeyboard,
-    isOpen: isOpen,
-    targetCellRef: targetCellRef
-  }) :
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
-  (0, _react.jsx)("div", {
+  }, (0, _react.jsx)("div", {
     css: (0, _styles.tablePopupStyles)()
   }, (0, _react.jsx)(_ContextualMenu.default, {
     editorView: editorView