@atlaskit/editor-plugin-table 7.19.5 → 7.19.6

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-table
 
+## 7.19.6
+
+### Patch Changes
+
+- [#113441](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/113441)
+  [`8b819018560ea`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8b819018560ea) -
+  [ux] Fixed a bug where when cell background color is updated via floating toolbar, the calor is
+  set on a wrong cell.
+- [#114548](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/114548)
+  [`8b2d47bffb50e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8b2d47bffb50e) -
+  bump adf-schema version
+- Updated dependencies
+
 ## 7.19.5
 
 ### Patch Changes

package/dist/cjs/commands/misc.js

@@ -309,10 +309,12 @@ var moveCursorBackward = exports.moveCursorBackward = function moveCursorBackwar
   }
   return true;
 };
-var setMultipleCellAttrs = exports.setMultipleCellAttrs = function setMultipleCellAttrs(attrs, targetCellPosition, editorView) {
+var setMultipleCellAttrs = exports.setMultipleCellAttrs = function setMultipleCellAttrs(attrs, editorView) {
   return function (state, dispatch) {
     var cursorPos;
     var tr = state.tr;
+    var _getPluginState2 = (0, _pluginFactory.getPluginState)(state),
+      targetCellPosition = _getPluginState2.targetCellPosition;
     if ((0, _utils2.isSelectionType)(tr.selection, 'cell')) {
       var selection = tr.selection;
       selection.forEachCell(function (_cell, pos) {
@@ -470,9 +472,9 @@ var hideInsertColumnOrRowButton = exports.hideInsertColumnOrRowButton = function
 var addResizeHandleDecorations = exports.addResizeHandleDecorations = function addResizeHandleDecorations(rowIndex, columnIndex, includeTooltip, isKeyboardResize) {
   return (0, _pluginFactory.createCommand)(function (state) {
     var tableNode = (0, _utils2.findTable)(state.selection);
-    var _getPluginState2 = (0, _pluginFactory.getPluginState)(state),
-      allowColumnResizing = _getPluginState2.pluginConfig.allowColumnResizing,
-      getIntl = _getPluginState2.getIntl;
+    var _getPluginState3 = (0, _pluginFactory.getPluginState)(state),
+      allowColumnResizing = _getPluginState3.pluginConfig.allowColumnResizing,
+      getIntl = _getPluginState3.getIntl;
     if (!tableNode || !allowColumnResizing) {
       return false;
     }
@@ -496,12 +498,12 @@ var addResizeHandleDecorations = exports.addResizeHandleDecorations = function a
 var updateResizeHandleDecorations = exports.updateResizeHandleDecorations = function updateResizeHandleDecorations(rowIndex, columnIndex, includeTooltip) {
   return (0, _pluginFactory.createCommand)(function (state) {
     var tableNode = (0, _utils2.findTable)(state.selection);
-    var _getPluginState3 = (0, _pluginFactory.getPluginState)(state),
-      resizeHandleRowIndex = _getPluginState3.resizeHandleRowIndex,
-      resizeHandleColumnIndex = _getPluginState3.resizeHandleColumnIndex,
-      resizeHandleIncludeTooltip = _getPluginState3.resizeHandleIncludeTooltip,
-      allowColumnResizing = _getPluginState3.pluginConfig.allowColumnResizing,
-      getIntl = _getPluginState3.getIntl;
+    var _getPluginState4 = (0, _pluginFactory.getPluginState)(state),
+      resizeHandleRowIndex = _getPluginState4.resizeHandleRowIndex,
+      resizeHandleColumnIndex = _getPluginState4.resizeHandleColumnIndex,
+      resizeHandleIncludeTooltip = _getPluginState4.resizeHandleIncludeTooltip,
+      allowColumnResizing = _getPluginState4.pluginConfig.allowColumnResizing,
+      getIntl = _getPluginState4.getIntl;
     if (!tableNode || !allowColumnResizing) {
       return false;
     }
@@ -575,8 +577,8 @@ var addBoldInEmptyHeaderCells = exports.addBoldInEmptyHeaderCells = function add
 };
 var updateWidthToWidest = exports.updateWidthToWidest = function updateWidthToWidest(widthToWidest) {
   return (0, _pluginFactory.createCommand)(function (state) {
-    var _getPluginState4 = (0, _pluginFactory.getPluginState)(state),
-      prevWidthToWidest = _getPluginState4.widthToWidest;
+    var _getPluginState5 = (0, _pluginFactory.getPluginState)(state),
+      prevWidthToWidest = _getPluginState5.widthToWidest;
     if ((0, _isEqual.default)(widthToWidest, prevWidthToWidest)) {
       return false;
     }

package/dist/cjs/commands-with-analytics.js

@@ -125,7 +125,7 @@ var splitCellWithAnalytics = exports.splitCellWithAnalytics = function splitCell
   };
 };
 var setColorWithAnalytics = exports.setColorWithAnalytics = function setColorWithAnalytics(editorAnalyticsAPI) {
-  return function (inputMethod, cellColor, targetCellPosition, editorView) {
+  return function (inputMethod, cellColor, editorView) {
     return (0, _analytics2.withEditorAnalyticsAPI)(function (_ref4) {
       var selection = _ref4.selection;
       var _getSelectedCellInfo4 = (0, _utils2.getSelectedCellInfo)(selection),
@@ -151,7 +151,7 @@ var setColorWithAnalytics = exports.setColorWithAnalytics = function setColorWit
       };
     })(editorAnalyticsAPI)((0, _misc.setMultipleCellAttrs)({
       background: cellColor
-    }, targetCellPosition, editorView));
+    }, editorView));
   };
 };
 var addRowAroundSelection = exports.addRowAroundSelection = function addRowAroundSelection(editorAnalyticsAPI) {

package/dist/cjs/pm-plugins/drag-and-drop/plugin.js

@@ -165,7 +165,7 @@ var destroyFn = function destroyFn(editorView, editorAnalyticsAPI, isTableScalin
             if (isTableScalingWithFixedColumnWidthsOptionEnabled) {
               isTableScalingEnabledOnCurrentTable = tableNode.attrs.displayMode !== 'fixed';
             }
-            var shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.use-increased-scaling-percent');
+            var shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.fg)('platform.editor.table.use-increased-scaling-percent');
             (0, _utils3.insertColgroupFromNode)(tableRef, tableNode, isTableScalingEnabledOnCurrentTable, undefined, shouldUseIncreasedScalingPercent);
           }
         }

package/dist/cjs/toolbar.js

@@ -555,7 +555,7 @@ var getColorPicker = function getColorPicker(state, menu, _ref5, editorAnalytics
     options: _uiColor.cellBackgroundColorPalette,
     returnEscToButton: true,
     onChange: function onChange(option) {
-      return (0, _commandsWithAnalytics.setColorWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.FLOATING_TB, option.value, targetCellPosition, getEditorView());
+      return (0, _commandsWithAnalytics.setColorWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.FLOATING_TB, option.value, getEditorView());
     }
   }, separator(menu.hidden)];
 };

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

@@ -94,7 +94,7 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
         var background = (0, _editorPalette.hexToEditorBackgroundPaletteColor)((node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.background) || '#ffffff');
         var selectedRowIndex;
         var selectedColumnIndex;
-        if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-table-context-menu_y4c9c')) {
+        if ((0, _platformFeatureFlags.fg)('platform.editor.a11y-table-context-menu_y4c9c')) {
           var selectedRowAndColumnFromPalette = (0, _uiColor.getSelectedRowAndColumnFromPalette)(_uiColor.cellBackgroundColorPalette, background, _consts.colorPalletteColumns);
           selectedRowIndex = selectedRowAndColumnFromPalette.selectedRowIndex;
           selectedColumnIndex = selectedRowAndColumnFromPalette.selectedColumnIndex;
@@ -122,7 +122,7 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
             // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
             ,
             className: isDragAndDropEnabled ? _types.TableCssClassName.CONTEXTUAL_MENU_ICON_SMALL : _types.TableCssClassName.CONTEXTUAL_MENU_ICON
-          }), (0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-table-context-menu_y4c9c') ? isSubmenuOpen && (0, _react2.jsx)("div", {
+          }), (0, _platformFeatureFlags.fg)('platform.editor.a11y-table-context-menu_y4c9c') ? isSubmenuOpen && (0, _react2.jsx)("div", {
             // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
             className: _types.TableCssClassName.CONTEXTUAL_SUBMENU,
             ref: _this.handleSubMenuRef
@@ -167,7 +167,7 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
               hexToPaletteColor: _editorPalette.hexToEditorBackgroundPaletteColor
             }
           }))),
-          'aria-expanded': (0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-table-context-menu_y4c9c') ? isSubmenuOpen : undefined
+          'aria-expanded': (0, _platformFeatureFlags.fg)('platform.editor.a11y-table-context-menu_y4c9c') ? isSubmenuOpen : undefined
         };
       }
     });
@@ -469,7 +469,7 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
         tableWithFixedColumnWidthsOption = _ref4$tableWithFixedC === void 0 ? false : _ref4$tableWithFixedC;
       // context menu opened by keyboard and any item except 'background' activated
       // or color has been chosen from color palette
-      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-table-context-menu_y4c9c') && isCellMenuOpenByKeyboard && (item.value.name !== 'background' || item.value.name === 'background' && _this.state.isSubmenuOpen)) {
+      if (isCellMenuOpenByKeyboard && (item.value.name !== 'background' || item.value.name === 'background' && _this.state.isSubmenuOpen) && (0, _platformFeatureFlags.fg)('platform.editor.a11y-table-context-menu_y4c9c')) {
         var tr = state.tr;
         tr.setMeta(_pluginKey.pluginKey, {
           type: 'SET_CELL_MENU_OPEN',
@@ -480,7 +480,7 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
         dispatch(tr);
         editorView.dom.focus(); // otherwise cursor disappears from cell
       }
-      var shouldUseIncreasedScalingPercent = isTableScalingEnabled && tableWithFixedColumnWidthsOption && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.use-increased-scaling-percent');
+      var shouldUseIncreasedScalingPercent = isTableScalingEnabled && tableWithFixedColumnWidthsOption && (0, _platformFeatureFlags.fg)('platform.editor.table.use-increased-scaling-percent');
       switch (item.value.name) {
         case 'sort_column_desc':
           (0, _commandsWithAnalytics.sortColumnWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.CONTEXT_MENU, selectionRect.left, _customSteps.TableSortOrder.DESC)(state, dispatch);
@@ -536,7 +536,7 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
             // 1st time when user chooses the background color item.
             // 2nd when color has been chosen from color palette.
             // here we are handling the 1st call relying on the isSubmenuOpen state value
-            if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-table-context-menu_y4c9c') && isCellMenuOpenByKeyboard && !_this.state.isSubmenuOpen) {
+            if (isCellMenuOpenByKeyboard && !_this.state.isSubmenuOpen && (0, _platformFeatureFlags.fg)('platform.editor.a11y-table-context-menu_y4c9c')) {
               _this.setState({
                 isSubmenuOpen: true
               });
@@ -565,7 +565,7 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
         dispatch = _this$props12$editorV.dispatch,
         dom = _this$props12$editorV.dom,
         isCellMenuOpenByKeyboard = _this$props12.isCellMenuOpenByKeyboard;
-      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-table-context-menu_y4c9c')) {
+      if ((0, _platformFeatureFlags.fg)('platform.editor.a11y-table-context-menu_y4c9c')) {
         if (payload) {
           var event = payload.event;
           if (event && event instanceof KeyboardEvent) {
@@ -647,12 +647,9 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
       var _this$props14 = _this.props,
         editorView = _this$props14.editorView,
         editorAnalyticsAPI = _this$props14.editorAnalyticsAPI;
-      // TargetCellPosition could be outdated: https://product-fabric.atlassian.net/browse/ED-8129
-      var _getPluginState13 = (0, _pluginFactory.getPluginState)(editorView.state),
-        targetCellPosition = _getPluginState13.targetCellPosition;
       var state = editorView.state,
         dispatch = editorView.dispatch;
-      (0, _commandsWithAnalytics.setColorWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.CONTEXT_MENU, color, targetCellPosition)(state, dispatch);
+      (0, _commandsWithAnalytics.setColorWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.CONTEXT_MENU, color)(state, dispatch);
       _this.toggleOpen();
     });
     return _this;
@@ -660,7 +657,7 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
   (0, _createClass2.default)(ContextualMenu, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-table-context-menu_y4c9c')) {
+      if ((0, _platformFeatureFlags.fg)('platform.editor.a11y-table-context-menu_y4c9c')) {
         // ArrowKeyNavigationProvider in DropdownMenu expects that menu handle will stay focused
         // until user pressed ArrowDown.
         // Behavior above fails the A11Y requirement about first item in menu should be focused immediately.
@@ -683,11 +680,11 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
         boundariesElement = _this$props15.boundariesElement,
         editorView = _this$props15.editorView,
         isCellMenuOpenByKeyboard = _this$props15.isCellMenuOpenByKeyboard;
-      var _getPluginState14 = (0, _pluginFactory.getPluginState)(editorView.state),
-        isDragAndDropEnabled = _getPluginState14.isDragAndDropEnabled;
+      var _getPluginState13 = (0, _pluginFactory.getPluginState)(editorView.state),
+        isDragAndDropEnabled = _getPluginState13.isDragAndDropEnabled;
       var items = isDragAndDropEnabled ? this.createNewContextMenuItems() : this.createOriginalContextMenuItems();
       var isOpenAllowed = false;
-      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-table-context-menu_y4c9c')) {
+      if ((0, _platformFeatureFlags.fg)('platform.editor.a11y-table-context-menu_y4c9c')) {
         isOpenAllowed = isCellMenuOpenByKeyboard ? this.state.isOpenAllowed : isOpen;
       } else {
         isOpenAllowed = isOpen;
@@ -703,7 +700,7 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
         ,
         arrowKeyNavigationProviderOptions: {
           type: _uiMenu.ArrowKeyNavigationType.MENU,
-          disableArrowKeyNavigation: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-table-context-menu_y4c9c') && isCellMenuOpenByKeyboard && !this.state.isSubmenuOpen ? false : true
+          disableArrowKeyNavigation: isCellMenuOpenByKeyboard && !this.state.isSubmenuOpen && (0, _platformFeatureFlags.fg)('platform.editor.a11y-table-context-menu_y4c9c') ? false : true
         },
         items: items,
         isOpen: isOpenAllowed,
@@ -713,7 +710,7 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
         onMouseLeave: this.handleItemMouseLeave,
         fitHeight: 188,
         fitWidth: isDragAndDropEnabled ? _consts.contextualMenuDropdownWidthDnD : _consts.contextualMenuDropdownWidth,
-        shouldFocusFirstItem: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-table-context-menu_y4c9c') ? function () {
+        shouldFocusFirstItem: (0, _platformFeatureFlags.fg)('platform.editor.a11y-table-context-menu_y4c9c') ? function () {
           return Boolean(isCellMenuOpenByKeyboard);
         } : undefined,
         boundariesElement: boundariesElement,
@@ -721,7 +718,7 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
         section: isDragAndDropEnabled ? {
           hasSeparator: true
         } : undefined,
-        isAllowEnterDefaultBehavior: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-table-context-menu_y4c9c') ? this.state.isSubmenuOpen : false
+        isAllowEnterDefaultBehavior: (0, _platformFeatureFlags.fg)('platform.editor.a11y-table-context-menu_y4c9c') ? this.state.isSubmenuOpen : false
       }));
     }
   }]);

package/dist/cjs/ui/FloatingDragMenu/DragMenu.js

@@ -222,7 +222,7 @@ var DragMenu = exports.DragMenu = /*#__PURE__*/_react.default.memo(function (_re
   var selectionRect = (0, _utils2.isSelectionType)(selection, 'cell') ? (0, _utils2.getSelectionRect)(selection) : (0, _utils2.findCellRectClosestToPos)(selection.$from);
   var shouldMoveDisabled;
   var hasMergedCellsInTable;
-  if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.drag-move-options-logic-update_fp7xw')) {
+  if ((0, _platformFeatureFlags.fg)('platform.editor.table.drag-move-options-logic-update_fp7xw')) {
     var _tableMap$hasMergedCe;
     shouldMoveDisabled = false;
     hasMergedCellsInTable = (_tableMap$hasMergedCe = tableMap === null || tableMap === void 0 ? void 0 : tableMap.hasMergedCells()) !== null && _tableMap$hasMergedCe !== void 0 ? _tableMap$hasMergedCe : false;
@@ -248,18 +248,16 @@ var DragMenu = exports.DragMenu = /*#__PURE__*/_react.default.memo(function (_re
     }
   };
   var setColor = function setColor(color) {
-    var _getTablePluginState = (0, _pluginFactory2.getPluginState)(editorView.state),
-      targetCellPosition = _getTablePluginState.targetCellPosition;
     var state = editorView.state,
       dispatch = editorView.dispatch;
-    (0, _commandsWithAnalytics.setColorWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.CONTEXT_MENU, color, targetCellPosition)(state, dispatch);
+    (0, _commandsWithAnalytics.setColorWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.CONTEXT_MENU, color)(state, dispatch);
     closeMenu();
     setIsSubmenuOpen(false);
   };
   var createBackgroundColorMenuItem = function createBackgroundColorMenuItem() {
     var _node$attrs;
-    var _getTablePluginState2 = (0, _pluginFactory2.getPluginState)(editorView.state),
-      targetCellPosition = _getTablePluginState2.targetCellPosition;
+    var _getTablePluginState = (0, _pluginFactory2.getPluginState)(editorView.state),
+      targetCellPosition = _getTablePluginState.targetCellPosition;
     var node = targetCellPosition ? state.doc.nodeAt(targetCellPosition) : null;
     var background = (0, _editorPalette.hexToEditorBackgroundPaletteColor)((node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.background) || '#ffffff');
     var _getSelectedRowAndCol = (0, _uiColor.getSelectedRowAndColumnFromPalette)(_uiColor.cellBackgroundColorPalette, background, _consts.colorPalletteColumns),

package/dist/es2019/commands/misc.js

@@ -316,11 +316,14 @@ export const moveCursorBackward = (state, dispatch) => {
   }
   return true;
 };
-export const setMultipleCellAttrs = (attrs, targetCellPosition, editorView) => (state, dispatch) => {
+export const setMultipleCellAttrs = (attrs, editorView) => (state, dispatch) => {
   let cursorPos;
   let {
     tr
   } = state;
+  const {
+    targetCellPosition
+  } = getPluginState(state);
   if (isSelectionType(tr.selection, 'cell')) {
     const selection = tr.selection;
     selection.forEachCell((_cell, pos) => {

package/dist/es2019/commands-with-analytics.js

@@ -109,7 +109,7 @@ export const splitCellWithAnalytics = editorAnalyticsAPI => inputMethod => withE
   }
   return;
 })(editorAnalyticsAPI)(splitCell);
-export const setColorWithAnalytics = editorAnalyticsAPI => (inputMethod, cellColor, targetCellPosition, editorView) => withEditorAnalyticsAPI(({
+export const setColorWithAnalytics = editorAnalyticsAPI => (inputMethod, cellColor, editorView) => withEditorAnalyticsAPI(({
   selection
 }) => {
   const {
@@ -136,7 +136,7 @@ export const setColorWithAnalytics = editorAnalyticsAPI => (inputMethod, cellCol
   };
 })(editorAnalyticsAPI)(setMultipleCellAttrs({
   background: cellColor
-}, targetCellPosition, editorView));
+}, editorView));
 export const addRowAroundSelection = editorAnalyticsAPI => side => (state, dispatch) => {
   const {
     selection

package/dist/es2019/pm-plugins/drag-and-drop/plugin.js

@@ -3,7 +3,7 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { getCellsInRow, getSelectedCellInfo } from '@atlaskit/editor-tables/utils';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { autoScrollForElements } from '@atlaskit/pragmatic-drag-and-drop-auto-scroll/element';
 import { combine } from '@atlaskit/pragmatic-drag-and-drop/combine';
 import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
@@ -173,7 +173,7 @@ const destroyFn = (editorView, editorAnalyticsAPI, isTableScalingEnabled, isTabl
             if (isTableScalingWithFixedColumnWidthsOptionEnabled) {
               isTableScalingEnabledOnCurrentTable = tableNode.attrs.displayMode !== 'fixed';
             }
-            const shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && getBooleanFF('platform.editor.table.use-increased-scaling-percent');
+            const shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && fg('platform.editor.table.use-increased-scaling-percent');
             insertColgroupFromNode(tableRef, tableNode, isTableScalingEnabledOnCurrentTable, undefined, shouldUseIncreasedScalingPercent);
           }
         }

package/dist/es2019/toolbar.js

@@ -515,7 +515,7 @@ const getColorPicker = (state, menu, {
     defaultValue: defaultPalette,
     options: cellBackgroundColorPalette,
     returnEscToButton: true,
-    onChange: option => setColorWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.FLOATING_TB, option.value, targetCellPosition, getEditorView())
+    onChange: option => setColorWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.FLOATING_TB, option.value, getEditorView())
   }, separator(menu.hidden)];
 };
 const clickWithCheckboxHandler = (isChecked, node, editorAnalyticsAPI) => (state, dispatch) => {

package/dist/es2019/ui/FloatingContextualMenu/ContextualMenu.js

@@ -19,7 +19,7 @@ import { splitCell } from '@atlaskit/editor-tables/utils';
 import CrossCircleIcon from '@atlaskit/icon/glyph/cross-circle';
 import EditorBackgroundColorIcon from '@atlaskit/icon/glyph/editor/background-color';
 import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { clearHoverSelection, hoverColumns, hoverMergedCells, hoverRows, setFocusToCellMenu, toggleContextualMenu } from '../../commands';
 import { deleteColumnsWithAnalytics, deleteRowsWithAnalytics, distributeColumnsWidthsWithAnalytics, emptyMultipleCellsWithAnalytics, insertColumnWithAnalytics, insertRowWithAnalytics, mergeCellsWithAnalytics, setColorWithAnalytics, sortColumnWithAnalytics, splitCellWithAnalytics } from '../../commands-with-analytics';
 import { getPluginState } from '../../pm-plugins/plugin-factory';
@@ -77,7 +77,7 @@ export class ContextualMenu extends Component {
         const background = hexToEditorBackgroundPaletteColor((node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.background) || '#ffffff');
         let selectedRowIndex;
         let selectedColumnIndex;
-        if (getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c')) {
+        if (fg('platform.editor.a11y-table-context-menu_y4c9c')) {
           const selectedRowAndColumnFromPalette = getSelectedRowAndColumnFromPalette(cellBackgroundColorPalette, background, colorPalletteColumns);
           selectedRowIndex = selectedRowAndColumnFromPalette.selectedRowIndex;
           selectedColumnIndex = selectedRowAndColumnFromPalette.selectedColumnIndex;
@@ -105,7 +105,7 @@ export class ContextualMenu extends Component {
             // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
             ,
             className: isDragAndDropEnabled ? ClassName.CONTEXTUAL_MENU_ICON_SMALL : ClassName.CONTEXTUAL_MENU_ICON
-          }), getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c') ? isSubmenuOpen && jsx("div", {
+          }), fg('platform.editor.a11y-table-context-menu_y4c9c') ? isSubmenuOpen && jsx("div", {
             // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
             className: ClassName.CONTEXTUAL_SUBMENU,
             ref: this.handleSubMenuRef
@@ -150,7 +150,7 @@ export class ContextualMenu extends Component {
               hexToPaletteColor: hexToEditorBackgroundPaletteColor
             }
           }))),
-          'aria-expanded': getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c') ? isSubmenuOpen : undefined
+          'aria-expanded': fg('platform.editor.a11y-table-context-menu_y4c9c') ? isSubmenuOpen : undefined
         };
       }
     });
@@ -500,7 +500,7 @@ export class ContextualMenu extends Component {
       } = getEditorFeatureFlags ? getEditorFeatureFlags() : {};
       // context menu opened by keyboard and any item except 'background' activated
       // or color has been chosen from color palette
-      if (getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c') && isCellMenuOpenByKeyboard && (item.value.name !== 'background' || item.value.name === 'background' && this.state.isSubmenuOpen)) {
+      if (isCellMenuOpenByKeyboard && (item.value.name !== 'background' || item.value.name === 'background' && this.state.isSubmenuOpen) && fg('platform.editor.a11y-table-context-menu_y4c9c')) {
         const {
           tr
         } = state;
@@ -513,7 +513,7 @@ export class ContextualMenu extends Component {
         dispatch(tr);
         editorView.dom.focus(); // otherwise cursor disappears from cell
       }
-      const shouldUseIncreasedScalingPercent = isTableScalingEnabled && tableWithFixedColumnWidthsOption && getBooleanFF('platform.editor.table.use-increased-scaling-percent');
+      const shouldUseIncreasedScalingPercent = isTableScalingEnabled && tableWithFixedColumnWidthsOption && fg('platform.editor.table.use-increased-scaling-percent');
       switch (item.value.name) {
         case 'sort_column_desc':
           sortColumnWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.CONTEXT_MENU, selectionRect.left, SortOrder.DESC)(state, dispatch);
@@ -572,7 +572,7 @@ export class ContextualMenu extends Component {
             // 1st time when user chooses the background color item.
             // 2nd when color has been chosen from color palette.
             // here we are handling the 1st call relying on the isSubmenuOpen state value
-            if (getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c') && isCellMenuOpenByKeyboard && !this.state.isSubmenuOpen) {
+            if (isCellMenuOpenByKeyboard && !this.state.isSubmenuOpen && fg('platform.editor.a11y-table-context-menu_y4c9c')) {
               this.setState({
                 isSubmenuOpen: true
               });
@@ -605,7 +605,7 @@ export class ContextualMenu extends Component {
         },
         isCellMenuOpenByKeyboard
       } = this.props;
-      if (getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c')) {
+      if (fg('platform.editor.a11y-table-context-menu_y4c9c')) {
         if (payload) {
           const {
             event
@@ -695,20 +695,16 @@ export class ContextualMenu extends Component {
         editorView,
         editorAnalyticsAPI
       } = this.props;
-      // TargetCellPosition could be outdated: https://product-fabric.atlassian.net/browse/ED-8129
-      const {
-        targetCellPosition
-      } = getPluginState(editorView.state);
       const {
         state,
         dispatch
       } = editorView;
-      setColorWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.CONTEXT_MENU, color, targetCellPosition)(state, dispatch);
+      setColorWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.CONTEXT_MENU, color)(state, dispatch);
       this.toggleOpen();
     });
   }
   componentDidMount() {
-    if (getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c')) {
+    if (fg('platform.editor.a11y-table-context-menu_y4c9c')) {
       // ArrowKeyNavigationProvider in DropdownMenu expects that menu handle will stay focused
       // until user pressed ArrowDown.
       // Behavior above fails the A11Y requirement about first item in menu should be focused immediately.
@@ -738,7 +734,7 @@ export class ContextualMenu extends Component {
     } = getPluginState(editorView.state);
     const items = isDragAndDropEnabled ? this.createNewContextMenuItems() : this.createOriginalContextMenuItems();
     let isOpenAllowed = false;
-    if (getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c')) {
+    if (fg('platform.editor.a11y-table-context-menu_y4c9c')) {
       isOpenAllowed = isCellMenuOpenByKeyboard ? this.state.isOpenAllowed : isOpen;
     } else {
       isOpenAllowed = isOpen;
@@ -754,7 +750,7 @@ export class ContextualMenu extends Component {
       ,
       arrowKeyNavigationProviderOptions: {
         type: ArrowKeyNavigationType.MENU,
-        disableArrowKeyNavigation: getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c') && isCellMenuOpenByKeyboard && !this.state.isSubmenuOpen ? false : true
+        disableArrowKeyNavigation: isCellMenuOpenByKeyboard && !this.state.isSubmenuOpen && fg('platform.editor.a11y-table-context-menu_y4c9c') ? false : true
       },
       items: items,
       isOpen: isOpenAllowed,
@@ -764,7 +760,7 @@ export class ContextualMenu extends Component {
       onMouseLeave: this.handleItemMouseLeave,
       fitHeight: 188,
       fitWidth: isDragAndDropEnabled ? contextualMenuDropdownWidthDnD : contextualMenuDropdownWidth,
-      shouldFocusFirstItem: getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c') ? () => {
+      shouldFocusFirstItem: fg('platform.editor.a11y-table-context-menu_y4c9c') ? () => {
         return Boolean(isCellMenuOpenByKeyboard);
       } : undefined,
       boundariesElement: boundariesElement,
@@ -772,7 +768,7 @@ export class ContextualMenu extends Component {
       section: isDragAndDropEnabled ? {
         hasSeparator: true
       } : undefined,
-      isAllowEnterDefaultBehavior: getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c') ? this.state.isSubmenuOpen : false
+      isAllowEnterDefaultBehavior: fg('platform.editor.a11y-table-context-menu_y4c9c') ? this.state.isSubmenuOpen : false
     }));
   }
 }

package/dist/es2019/ui/FloatingDragMenu/DragMenu.js

@@ -18,7 +18,7 @@ import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findCellRectClosestToPos, getSelectionRect, isSelectionType } from '@atlaskit/editor-tables/utils';
 import EditorBackgroundColorIcon from '@atlaskit/icon/glyph/editor/background-color';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import Toggle from '@atlaskit/toggle';
 import { clearHoverSelection, hoverColumns, hoverRows } from '../../commands';
 import { setColorWithAnalytics, toggleHeaderColumnWithAnalytics, toggleHeaderRowWithAnalytics, toggleNumberColumnWithAnalytics } from '../../commands-with-analytics';
@@ -209,7 +209,7 @@ export const DragMenu = /*#__PURE__*/React.memo(({
   const selectionRect = isSelectionType(selection, 'cell') ? getSelectionRect(selection) : findCellRectClosestToPos(selection.$from);
   let shouldMoveDisabled;
   let hasMergedCellsInTable;
-  if (getBooleanFF('platform.editor.table.drag-move-options-logic-update_fp7xw')) {
+  if (fg('platform.editor.table.drag-move-options-logic-update_fp7xw')) {
     var _tableMap$hasMergedCe;
     shouldMoveDisabled = false;
     hasMergedCellsInTable = (_tableMap$hasMergedCe = tableMap === null || tableMap === void 0 ? void 0 : tableMap.hasMergedCells()) !== null && _tableMap$hasMergedCe !== void 0 ? _tableMap$hasMergedCe : false;
@@ -236,14 +236,11 @@ export const DragMenu = /*#__PURE__*/React.memo(({
     }
   };
   const setColor = color => {
-    const {
-      targetCellPosition
-    } = getTablePluginState(editorView.state);
     const {
       state,
       dispatch
     } = editorView;
-    setColorWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.CONTEXT_MENU, color, targetCellPosition)(state, dispatch);
+    setColorWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.CONTEXT_MENU, color)(state, dispatch);
     closeMenu();
     setIsSubmenuOpen(false);
   };

package/dist/esm/commands/misc.js

@@ -302,10 +302,12 @@ export var moveCursorBackward = function moveCursorBackward(state, dispatch) {
   }
   return true;
 };
-export var setMultipleCellAttrs = function setMultipleCellAttrs(attrs, targetCellPosition, editorView) {
+export var setMultipleCellAttrs = function setMultipleCellAttrs(attrs, editorView) {
   return function (state, dispatch) {
     var cursorPos;
     var tr = state.tr;
+    var _getPluginState2 = getPluginState(state),
+      targetCellPosition = _getPluginState2.targetCellPosition;
     if (isSelectionType(tr.selection, 'cell')) {
       var selection = tr.selection;
       selection.forEachCell(function (_cell, pos) {
@@ -463,9 +465,9 @@ export var hideInsertColumnOrRowButton = function hideInsertColumnOrRowButton()
 export var addResizeHandleDecorations = function addResizeHandleDecorations(rowIndex, columnIndex, includeTooltip, isKeyboardResize) {
   return createCommand(function (state) {
     var tableNode = findTable(state.selection);
-    var _getPluginState2 = getPluginState(state),
-      allowColumnResizing = _getPluginState2.pluginConfig.allowColumnResizing,
-      getIntl = _getPluginState2.getIntl;
+    var _getPluginState3 = getPluginState(state),
+      allowColumnResizing = _getPluginState3.pluginConfig.allowColumnResizing,
+      getIntl = _getPluginState3.getIntl;
     if (!tableNode || !allowColumnResizing) {
       return false;
     }
@@ -489,12 +491,12 @@ export var addResizeHandleDecorations = function addResizeHandleDecorations(rowI
 export var updateResizeHandleDecorations = function updateResizeHandleDecorations(rowIndex, columnIndex, includeTooltip) {
   return createCommand(function (state) {
     var tableNode = findTable(state.selection);
-    var _getPluginState3 = getPluginState(state),
-      resizeHandleRowIndex = _getPluginState3.resizeHandleRowIndex,
-      resizeHandleColumnIndex = _getPluginState3.resizeHandleColumnIndex,
-      resizeHandleIncludeTooltip = _getPluginState3.resizeHandleIncludeTooltip,
-      allowColumnResizing = _getPluginState3.pluginConfig.allowColumnResizing,
-      getIntl = _getPluginState3.getIntl;
+    var _getPluginState4 = getPluginState(state),
+      resizeHandleRowIndex = _getPluginState4.resizeHandleRowIndex,
+      resizeHandleColumnIndex = _getPluginState4.resizeHandleColumnIndex,
+      resizeHandleIncludeTooltip = _getPluginState4.resizeHandleIncludeTooltip,
+      allowColumnResizing = _getPluginState4.pluginConfig.allowColumnResizing,
+      getIntl = _getPluginState4.getIntl;
     if (!tableNode || !allowColumnResizing) {
       return false;
     }
@@ -568,8 +570,8 @@ export var addBoldInEmptyHeaderCells = function addBoldInEmptyHeaderCells(tableC
 };
 export var updateWidthToWidest = function updateWidthToWidest(widthToWidest) {
   return createCommand(function (state) {
-    var _getPluginState4 = getPluginState(state),
-      prevWidthToWidest = _getPluginState4.widthToWidest;
+    var _getPluginState5 = getPluginState(state),
+      prevWidthToWidest = _getPluginState5.widthToWidest;
     if (isEqual(widthToWidest, prevWidthToWidest)) {
       return false;
     }

package/dist/esm/commands-with-analytics.js

@@ -118,7 +118,7 @@ export var splitCellWithAnalytics = function splitCellWithAnalytics(editorAnalyt
   };
 };
 export var setColorWithAnalytics = function setColorWithAnalytics(editorAnalyticsAPI) {
-  return function (inputMethod, cellColor, targetCellPosition, editorView) {
+  return function (inputMethod, cellColor, editorView) {
     return withEditorAnalyticsAPI(function (_ref4) {
       var selection = _ref4.selection;
       var _getSelectedCellInfo4 = getSelectedCellInfo(selection),
@@ -144,7 +144,7 @@ export var setColorWithAnalytics = function setColorWithAnalytics(editorAnalytic
       };
     })(editorAnalyticsAPI)(setMultipleCellAttrs({
       background: cellColor
-    }, targetCellPosition, editorView));
+    }, editorView));
   };
 };
 export var addRowAroundSelection = function addRowAroundSelection(editorAnalyticsAPI) {

package/dist/esm/pm-plugins/drag-and-drop/plugin.js

@@ -3,7 +3,7 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { getCellsInRow, getSelectedCellInfo } from '@atlaskit/editor-tables/utils';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { autoScrollForElements } from '@atlaskit/pragmatic-drag-and-drop-auto-scroll/element';
 import { combine } from '@atlaskit/pragmatic-drag-and-drop/combine';
 import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
@@ -159,7 +159,7 @@ var destroyFn = function destroyFn(editorView, editorAnalyticsAPI, isTableScalin
             if (isTableScalingWithFixedColumnWidthsOptionEnabled) {
               isTableScalingEnabledOnCurrentTable = tableNode.attrs.displayMode !== 'fixed';
             }
-            var shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && getBooleanFF('platform.editor.table.use-increased-scaling-percent');
+            var shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && fg('platform.editor.table.use-increased-scaling-percent');
             insertColgroupFromNode(tableRef, tableNode, isTableScalingEnabledOnCurrentTable, undefined, shouldUseIncreasedScalingPercent);
           }
         }

package/dist/esm/toolbar.js

@@ -547,7 +547,7 @@ var getColorPicker = function getColorPicker(state, menu, _ref5, editorAnalytics
     options: cellBackgroundColorPalette,
     returnEscToButton: true,
     onChange: function onChange(option) {
-      return setColorWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.FLOATING_TB, option.value, targetCellPosition, getEditorView());
+      return setColorWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.FLOATING_TB, option.value, getEditorView());
     }
   }, separator(menu.hidden)];
 };

package/dist/esm/ui/FloatingContextualMenu/ContextualMenu.js

@@ -30,7 +30,7 @@ import { splitCell } from '@atlaskit/editor-tables/utils';
 import CrossCircleIcon from '@atlaskit/icon/glyph/cross-circle';
 import EditorBackgroundColorIcon from '@atlaskit/icon/glyph/editor/background-color';
 import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { clearHoverSelection, hoverColumns, hoverMergedCells, hoverRows, setFocusToCellMenu, toggleContextualMenu } from '../../commands';
 import { deleteColumnsWithAnalytics, deleteRowsWithAnalytics, distributeColumnsWidthsWithAnalytics, emptyMultipleCellsWithAnalytics, insertColumnWithAnalytics, insertRowWithAnalytics, mergeCellsWithAnalytics, setColorWithAnalytics, sortColumnWithAnalytics, splitCellWithAnalytics } from '../../commands-with-analytics';
 import { getPluginState } from '../../pm-plugins/plugin-factory';
@@ -87,7 +87,7 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
         var background = hexToEditorBackgroundPaletteColor((node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.background) || '#ffffff');
         var selectedRowIndex;
         var selectedColumnIndex;
-        if (getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c')) {
+        if (fg('platform.editor.a11y-table-context-menu_y4c9c')) {
           var selectedRowAndColumnFromPalette = getSelectedRowAndColumnFromPalette(cellBackgroundColorPalette, background, colorPalletteColumns);
           selectedRowIndex = selectedRowAndColumnFromPalette.selectedRowIndex;
           selectedColumnIndex = selectedRowAndColumnFromPalette.selectedColumnIndex;
@@ -115,7 +115,7 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
             // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
             ,
             className: isDragAndDropEnabled ? ClassName.CONTEXTUAL_MENU_ICON_SMALL : ClassName.CONTEXTUAL_MENU_ICON
-          }), getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c') ? isSubmenuOpen && jsx("div", {
+          }), fg('platform.editor.a11y-table-context-menu_y4c9c') ? isSubmenuOpen && jsx("div", {
             // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
             className: ClassName.CONTEXTUAL_SUBMENU,
             ref: _this.handleSubMenuRef
@@ -160,7 +160,7 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
               hexToPaletteColor: hexToEditorBackgroundPaletteColor
             }
           }))),
-          'aria-expanded': getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c') ? isSubmenuOpen : undefined
+          'aria-expanded': fg('platform.editor.a11y-table-context-menu_y4c9c') ? isSubmenuOpen : undefined
         };
       }
     });
@@ -462,7 +462,7 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
         tableWithFixedColumnWidthsOption = _ref4$tableWithFixedC === void 0 ? false : _ref4$tableWithFixedC;
       // context menu opened by keyboard and any item except 'background' activated
       // or color has been chosen from color palette
-      if (getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c') && isCellMenuOpenByKeyboard && (item.value.name !== 'background' || item.value.name === 'background' && _this.state.isSubmenuOpen)) {
+      if (isCellMenuOpenByKeyboard && (item.value.name !== 'background' || item.value.name === 'background' && _this.state.isSubmenuOpen) && fg('platform.editor.a11y-table-context-menu_y4c9c')) {
         var tr = state.tr;
         tr.setMeta(tablePluginKey, {
           type: 'SET_CELL_MENU_OPEN',
@@ -473,7 +473,7 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
         dispatch(tr);
         editorView.dom.focus(); // otherwise cursor disappears from cell
       }
-      var shouldUseIncreasedScalingPercent = isTableScalingEnabled && tableWithFixedColumnWidthsOption && getBooleanFF('platform.editor.table.use-increased-scaling-percent');
+      var shouldUseIncreasedScalingPercent = isTableScalingEnabled && tableWithFixedColumnWidthsOption && fg('platform.editor.table.use-increased-scaling-percent');
       switch (item.value.name) {
         case 'sort_column_desc':
           sortColumnWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.CONTEXT_MENU, selectionRect.left, SortOrder.DESC)(state, dispatch);
@@ -529,7 +529,7 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
             // 1st time when user chooses the background color item.
             // 2nd when color has been chosen from color palette.
             // here we are handling the 1st call relying on the isSubmenuOpen state value
-            if (getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c') && isCellMenuOpenByKeyboard && !_this.state.isSubmenuOpen) {
+            if (isCellMenuOpenByKeyboard && !_this.state.isSubmenuOpen && fg('platform.editor.a11y-table-context-menu_y4c9c')) {
               _this.setState({
                 isSubmenuOpen: true
               });
@@ -558,7 +558,7 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
         dispatch = _this$props12$editorV.dispatch,
         dom = _this$props12$editorV.dom,
         isCellMenuOpenByKeyboard = _this$props12.isCellMenuOpenByKeyboard;
-      if (getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c')) {
+      if (fg('platform.editor.a11y-table-context-menu_y4c9c')) {
         if (payload) {
           var event = payload.event;
           if (event && event instanceof KeyboardEvent) {
@@ -640,12 +640,9 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
       var _this$props14 = _this.props,
         editorView = _this$props14.editorView,
         editorAnalyticsAPI = _this$props14.editorAnalyticsAPI;
-      // TargetCellPosition could be outdated: https://product-fabric.atlassian.net/browse/ED-8129
-      var _getPluginState13 = getPluginState(editorView.state),
-        targetCellPosition = _getPluginState13.targetCellPosition;
       var state = editorView.state,
         dispatch = editorView.dispatch;
-      setColorWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.CONTEXT_MENU, color, targetCellPosition)(state, dispatch);
+      setColorWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.CONTEXT_MENU, color)(state, dispatch);
       _this.toggleOpen();
     });
     return _this;
@@ -653,7 +650,7 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
   _createClass(ContextualMenu, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      if (getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c')) {
+      if (fg('platform.editor.a11y-table-context-menu_y4c9c')) {
         // ArrowKeyNavigationProvider in DropdownMenu expects that menu handle will stay focused
         // until user pressed ArrowDown.
         // Behavior above fails the A11Y requirement about first item in menu should be focused immediately.
@@ -676,11 +673,11 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
         boundariesElement = _this$props15.boundariesElement,
         editorView = _this$props15.editorView,
         isCellMenuOpenByKeyboard = _this$props15.isCellMenuOpenByKeyboard;
-      var _getPluginState14 = getPluginState(editorView.state),
-        isDragAndDropEnabled = _getPluginState14.isDragAndDropEnabled;
+      var _getPluginState13 = getPluginState(editorView.state),
+        isDragAndDropEnabled = _getPluginState13.isDragAndDropEnabled;
       var items = isDragAndDropEnabled ? this.createNewContextMenuItems() : this.createOriginalContextMenuItems();
       var isOpenAllowed = false;
-      if (getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c')) {
+      if (fg('platform.editor.a11y-table-context-menu_y4c9c')) {
         isOpenAllowed = isCellMenuOpenByKeyboard ? this.state.isOpenAllowed : isOpen;
       } else {
         isOpenAllowed = isOpen;
@@ -696,7 +693,7 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
         ,
         arrowKeyNavigationProviderOptions: {
           type: ArrowKeyNavigationType.MENU,
-          disableArrowKeyNavigation: getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c') && isCellMenuOpenByKeyboard && !this.state.isSubmenuOpen ? false : true
+          disableArrowKeyNavigation: isCellMenuOpenByKeyboard && !this.state.isSubmenuOpen && fg('platform.editor.a11y-table-context-menu_y4c9c') ? false : true
         },
         items: items,
         isOpen: isOpenAllowed,
@@ -706,7 +703,7 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
         onMouseLeave: this.handleItemMouseLeave,
         fitHeight: 188,
         fitWidth: isDragAndDropEnabled ? contextualMenuDropdownWidthDnD : contextualMenuDropdownWidth,
-        shouldFocusFirstItem: getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c') ? function () {
+        shouldFocusFirstItem: fg('platform.editor.a11y-table-context-menu_y4c9c') ? function () {
           return Boolean(isCellMenuOpenByKeyboard);
         } : undefined,
         boundariesElement: boundariesElement,
@@ -714,7 +711,7 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
         section: isDragAndDropEnabled ? {
           hasSeparator: true
         } : undefined,
-        isAllowEnterDefaultBehavior: getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c') ? this.state.isSubmenuOpen : false
+        isAllowEnterDefaultBehavior: fg('platform.editor.a11y-table-context-menu_y4c9c') ? this.state.isSubmenuOpen : false
       }));
     }
   }]);

package/dist/esm/ui/FloatingDragMenu/DragMenu.js

@@ -20,7 +20,7 @@ import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findCellRectClosestToPos, getSelectionRect, isSelectionType } from '@atlaskit/editor-tables/utils';
 import EditorBackgroundColorIcon from '@atlaskit/icon/glyph/editor/background-color';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import Toggle from '@atlaskit/toggle';
 import { clearHoverSelection, hoverColumns, hoverRows } from '../../commands';
 import { setColorWithAnalytics, toggleHeaderColumnWithAnalytics, toggleHeaderRowWithAnalytics, toggleNumberColumnWithAnalytics } from '../../commands-with-analytics';
@@ -211,7 +211,7 @@ export var DragMenu = /*#__PURE__*/React.memo(function (_ref) {
   var selectionRect = isSelectionType(selection, 'cell') ? getSelectionRect(selection) : findCellRectClosestToPos(selection.$from);
   var shouldMoveDisabled;
   var hasMergedCellsInTable;
-  if (getBooleanFF('platform.editor.table.drag-move-options-logic-update_fp7xw')) {
+  if (fg('platform.editor.table.drag-move-options-logic-update_fp7xw')) {
     var _tableMap$hasMergedCe;
     shouldMoveDisabled = false;
     hasMergedCellsInTable = (_tableMap$hasMergedCe = tableMap === null || tableMap === void 0 ? void 0 : tableMap.hasMergedCells()) !== null && _tableMap$hasMergedCe !== void 0 ? _tableMap$hasMergedCe : false;
@@ -237,18 +237,16 @@ export var DragMenu = /*#__PURE__*/React.memo(function (_ref) {
     }
   };
   var setColor = function setColor(color) {
-    var _getTablePluginState = getTablePluginState(editorView.state),
-      targetCellPosition = _getTablePluginState.targetCellPosition;
     var state = editorView.state,
       dispatch = editorView.dispatch;
-    setColorWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.CONTEXT_MENU, color, targetCellPosition)(state, dispatch);
+    setColorWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.CONTEXT_MENU, color)(state, dispatch);
     closeMenu();
     setIsSubmenuOpen(false);
   };
   var createBackgroundColorMenuItem = function createBackgroundColorMenuItem() {
     var _node$attrs;
-    var _getTablePluginState2 = getTablePluginState(editorView.state),
-      targetCellPosition = _getTablePluginState2.targetCellPosition;
+    var _getTablePluginState = getTablePluginState(editorView.state),
+      targetCellPosition = _getTablePluginState.targetCellPosition;
     var node = targetCellPosition ? state.doc.nodeAt(targetCellPosition) : null;
     var background = hexToEditorBackgroundPaletteColor((node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.background) || '#ffffff');
     var _getSelectedRowAndCol = getSelectedRowAndColumnFromPalette(cellBackgroundColorPalette, background, colorPalletteColumns),

package/dist/types/commands/misc.d.ts

@@ -20,7 +20,7 @@ export declare const deleteTable: Command;
 export declare const deleteTableIfSelected: Command;
 export declare const convertFirstRowToHeader: (schema: Schema) => (tr: Transaction) => Transaction;
 export declare const moveCursorBackward: Command;
-export declare const setMultipleCellAttrs: (attrs: Object, targetCellPosition?: number, editorView?: EditorView | null) => Command;
+export declare const setMultipleCellAttrs: (attrs: Object, editorView?: EditorView | null) => Command;
 export declare const selectColumn: (column: number, expand?: boolean, triggeredByKeyboard?: boolean) => Command;
 export declare const selectColumns: (columnIndexes: number[]) => Command;
 export declare const selectRow: (row: number, expand?: boolean, triggeredByKeyboard?: boolean) => Command;

package/dist/types/commands-with-analytics.d.ts

@@ -13,7 +13,7 @@ import type { AlignmentOptions, InsertRowMethods, InsertRowOptions, RowInsertPos
 export declare const emptyMultipleCellsWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined | null) => (inputMethod: INPUT_METHOD.CONTEXT_MENU | INPUT_METHOD.KEYBOARD | INPUT_METHOD.FLOATING_TB | INPUT_METHOD.TABLE_CONTEXT_MENU, targetCellPosition?: number) => Command;
 export declare const mergeCellsWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | null | undefined) => (inputMethod: INPUT_METHOD.CONTEXT_MENU | INPUT_METHOD.FLOATING_TB) => Command;
 export declare const splitCellWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined | null) => (inputMethod: INPUT_METHOD.CONTEXT_MENU | INPUT_METHOD.FLOATING_TB) => Command;
-export declare const setColorWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined | null) => (inputMethod: INPUT_METHOD.CONTEXT_MENU | INPUT_METHOD.FLOATING_TB | INPUT_METHOD.TABLE_CONTEXT_MENU, cellColor: string, targetCellPosition?: number, editorView?: EditorView | null) => Command;
+export declare const setColorWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined | null) => (inputMethod: INPUT_METHOD.CONTEXT_MENU | INPUT_METHOD.FLOATING_TB | INPUT_METHOD.TABLE_CONTEXT_MENU, cellColor: string, editorView?: EditorView | null) => Command;
 export declare const addRowAroundSelection: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined | null) => (side: RowInsertPosition) => Command;
 export declare const insertRowWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined | null, isCellbackgroundDuplicated?: boolean) => (inputMethod: InsertRowMethods, options: InsertRowOptions) => Command;
 export declare const changeColumnWidthByStepWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined | null) => (stepSize: number, getEditorContainerWidth: GetEditorContainerWidth, isTableScalingEnabled: boolean, isTableFixedColumnWidthsOptionEnabled: boolean, inputMethod: INPUT_METHOD.SHORTCUT, ariaNotify?: ((message: string) => void) | undefined, getIntl?: () => IntlShape) => Command;

package/dist/types-ts4.5/commands/misc.d.ts

@@ -20,7 +20,7 @@ export declare const deleteTable: Command;
 export declare const deleteTableIfSelected: Command;
 export declare const convertFirstRowToHeader: (schema: Schema) => (tr: Transaction) => Transaction;
 export declare const moveCursorBackward: Command;
-export declare const setMultipleCellAttrs: (attrs: Object, targetCellPosition?: number, editorView?: EditorView | null) => Command;
+export declare const setMultipleCellAttrs: (attrs: Object, editorView?: EditorView | null) => Command;
 export declare const selectColumn: (column: number, expand?: boolean, triggeredByKeyboard?: boolean) => Command;
 export declare const selectColumns: (columnIndexes: number[]) => Command;
 export declare const selectRow: (row: number, expand?: boolean, triggeredByKeyboard?: boolean) => Command;

package/dist/types-ts4.5/commands-with-analytics.d.ts

@@ -13,7 +13,7 @@ import type { AlignmentOptions, InsertRowMethods, InsertRowOptions, RowInsertPos
 export declare const emptyMultipleCellsWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined | null) => (inputMethod: INPUT_METHOD.CONTEXT_MENU | INPUT_METHOD.KEYBOARD | INPUT_METHOD.FLOATING_TB | INPUT_METHOD.TABLE_CONTEXT_MENU, targetCellPosition?: number) => Command;
 export declare const mergeCellsWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | null | undefined) => (inputMethod: INPUT_METHOD.CONTEXT_MENU | INPUT_METHOD.FLOATING_TB) => Command;
 export declare const splitCellWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined | null) => (inputMethod: INPUT_METHOD.CONTEXT_MENU | INPUT_METHOD.FLOATING_TB) => Command;
-export declare const setColorWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined | null) => (inputMethod: INPUT_METHOD.CONTEXT_MENU | INPUT_METHOD.FLOATING_TB | INPUT_METHOD.TABLE_CONTEXT_MENU, cellColor: string, targetCellPosition?: number, editorView?: EditorView | null) => Command;
+export declare const setColorWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined | null) => (inputMethod: INPUT_METHOD.CONTEXT_MENU | INPUT_METHOD.FLOATING_TB | INPUT_METHOD.TABLE_CONTEXT_MENU, cellColor: string, editorView?: EditorView | null) => Command;
 export declare const addRowAroundSelection: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined | null) => (side: RowInsertPosition) => Command;
 export declare const insertRowWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined | null, isCellbackgroundDuplicated?: boolean) => (inputMethod: InsertRowMethods, options: InsertRowOptions) => Command;
 export declare const changeColumnWidthByStepWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined | null) => (stepSize: number, getEditorContainerWidth: GetEditorContainerWidth, isTableScalingEnabled: boolean, isTableFixedColumnWidthsOptionEnabled: boolean, inputMethod: INPUT_METHOD.SHORTCUT, ariaNotify?: ((message: string) => void) | undefined, getIntl?: () => IntlShape) => Command;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "7.19.5",
+	"version": "7.19.6",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -28,10 +28,10 @@
 		"runReact18": false
 	},
 	"dependencies": {
-		"@atlaskit/adf-schema": "^38.0.0",
+		"@atlaskit/adf-schema": "^39.0.3",
 		"@atlaskit/button": "^18.0.0",
 		"@atlaskit/custom-steps": "^0.4.0",
-		"@atlaskit/editor-common": "^83.4.0",
+		"@atlaskit/editor-common": "^83.5.0",
 		"@atlaskit/editor-palette": "1.6.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^1.1.0",
 		"@atlaskit/editor-plugin-analytics": "^1.4.0",

package/src/commands/misc.ts

@@ -387,10 +387,11 @@ export const moveCursorBackward: Command = (state, dispatch) => {
 };
 
 export const setMultipleCellAttrs =
-	(attrs: Object, targetCellPosition?: number, editorView?: EditorView | null): Command =>
+	(attrs: Object, editorView?: EditorView | null): Command =>
 	(state, dispatch) => {
 		let cursorPos: number | undefined;
 		let { tr } = state;
+		const { targetCellPosition } = getPluginState(state);
 
 		if (isSelectionType(tr.selection, 'cell')) {
 			const selection = tr.selection as any as CellSelection;

package/src/commands-with-analytics.ts

@@ -161,7 +161,6 @@ export const setColorWithAnalytics =
 			| INPUT_METHOD.FLOATING_TB
 			| INPUT_METHOD.TABLE_CONTEXT_MENU,
 		cellColor: string,
-		targetCellPosition?: number,
 		editorView?: EditorView | null,
 	) =>
 		withEditorAnalyticsAPI(({ selection }) => {
@@ -185,9 +184,7 @@ export const setColorWithAnalytics =
 				},
 				eventType: EVENT_TYPE.TRACK,
 			};
-		})(editorAnalyticsAPI)(
-			setMultipleCellAttrs({ background: cellColor }, targetCellPosition, editorView),
-		);
+		})(editorAnalyticsAPI)(setMultipleCellAttrs({ background: cellColor }, editorView));
 
 export const addRowAroundSelection =
 	(editorAnalyticsAPI: EditorAnalyticsAPI | undefined | null) =>

package/src/pm-plugins/drag-and-drop/plugin.ts

@@ -6,7 +6,7 @@ import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { getCellsInRow, getSelectedCellInfo } from '@atlaskit/editor-tables/utils';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { autoScrollForElements } from '@atlaskit/pragmatic-drag-and-drop-auto-scroll/element';
 import { combine } from '@atlaskit/pragmatic-drag-and-drop/combine';
 import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
@@ -225,7 +225,7 @@ const destroyFn = (
 
 							const shouldUseIncreasedScalingPercent =
 								isTableScalingWithFixedColumnWidthsOptionEnabled &&
-								getBooleanFF('platform.editor.table.use-increased-scaling-percent');
+								fg('platform.editor.table.use-increased-scaling-percent');
 
 							insertColgroupFromNode(
 								tableRef,

package/src/toolbar.tsx

@@ -630,6 +630,7 @@ export const getToolbarConfig =
 				scrollable: true,
 			};
 		}
+
 		return;
 	};
 
@@ -715,7 +716,6 @@ const getColumnSettingItems = (
 ): Array<FloatingToolbarItem<Command>> => {
 	const pluginState = getPluginState(editorState);
 	const selectionOrTableRect = getClosestSelectionOrTableRect(editorState);
-
 	if (!selectionOrTableRect || !editorView) {
 		return [];
 	}
@@ -794,7 +794,6 @@ const getColorPicker = (
 				setColorWithAnalytics(editorAnalyticsAPI)(
 					INPUT_METHOD.FLOATING_TB,
 					option.value,
-					targetCellPosition,
 					getEditorView(),
 				),
 		},

package/src/ui/FloatingContextualMenu/ContextualMenu.tsx

@@ -42,7 +42,7 @@ import { splitCell } from '@atlaskit/editor-tables/utils';
 import CrossCircleIcon from '@atlaskit/icon/glyph/cross-circle';
 import EditorBackgroundColorIcon from '@atlaskit/icon/glyph/editor/background-color';
 import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 
 import {
 	clearHoverSelection,
@@ -117,7 +117,7 @@ export class ContextualMenu extends Component<Props & WrappedComponentProps, Sta
 	private dropdownMenuRef = React.createRef<HTMLDivElement>();
 
 	componentDidMount() {
-		if (getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c')) {
+		if (fg('platform.editor.a11y-table-context-menu_y4c9c')) {
 			// ArrowKeyNavigationProvider in DropdownMenu expects that menu handle will stay focused
 			// until user pressed ArrowDown.
 			// Behavior above fails the A11Y requirement about first item in menu should be focused immediately.
@@ -141,7 +141,7 @@ export class ContextualMenu extends Component<Props & WrappedComponentProps, Sta
 			: this.createOriginalContextMenuItems();
 		let isOpenAllowed = false;
 
-		if (getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c')) {
+		if (fg('platform.editor.a11y-table-context-menu_y4c9c')) {
 			isOpenAllowed = isCellMenuOpenByKeyboard ? this.state.isOpenAllowed : isOpen;
 		} else {
 			isOpenAllowed = isOpen;
@@ -160,9 +160,9 @@ export class ContextualMenu extends Component<Props & WrappedComponentProps, Sta
 					arrowKeyNavigationProviderOptions={{
 						type: ArrowKeyNavigationType.MENU,
 						disableArrowKeyNavigation:
-							getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c') &&
 							isCellMenuOpenByKeyboard &&
-							!this.state.isSubmenuOpen
+							!this.state.isSubmenuOpen &&
+							fg('platform.editor.a11y-table-context-menu_y4c9c')
 								? false
 								: true,
 					}}
@@ -177,7 +177,7 @@ export class ContextualMenu extends Component<Props & WrappedComponentProps, Sta
 						isDragAndDropEnabled ? contextualMenuDropdownWidthDnD : contextualMenuDropdownWidth
 					}
 					shouldFocusFirstItem={
-						getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c')
+						fg('platform.editor.a11y-table-context-menu_y4c9c')
 							? () => {
 									return Boolean(isCellMenuOpenByKeyboard);
 								}
@@ -187,9 +187,7 @@ export class ContextualMenu extends Component<Props & WrappedComponentProps, Sta
 					offset={offset}
 					section={isDragAndDropEnabled ? { hasSeparator: true } : undefined}
 					isAllowEnterDefaultBehavior={
-						getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c')
-							? this.state.isSubmenuOpen
-							: false
+						fg('platform.editor.a11y-table-context-menu_y4c9c') ? this.state.isSubmenuOpen : false
 					}
 				/>
 			</div>
@@ -229,7 +227,7 @@ export class ContextualMenu extends Component<Props & WrappedComponentProps, Sta
 			let selectedRowIndex;
 			let selectedColumnIndex;
 
-			if (getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c')) {
+			if (fg('platform.editor.a11y-table-context-menu_y4c9c')) {
 				const selectedRowAndColumnFromPalette = getSelectedRowAndColumnFromPalette(
 					cellBackgroundColorPalette,
 					background!,
@@ -265,7 +263,7 @@ export class ContextualMenu extends Component<Props & WrappedComponentProps, Sta
 									: ClassName.CONTEXTUAL_MENU_ICON
 							}
 						/>
-						{getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c')
+						{fg('platform.editor.a11y-table-context-menu_y4c9c')
 							? isSubmenuOpen && (
 									<div
 										// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
@@ -320,7 +318,7 @@ export class ContextualMenu extends Component<Props & WrappedComponentProps, Sta
 								)}
 					</div>
 				),
-				'aria-expanded': getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c')
+				'aria-expanded': fg('platform.editor.a11y-table-context-menu_y4c9c')
 					? isSubmenuOpen
 					: undefined,
 			} as MenuItem;
@@ -649,10 +647,10 @@ export class ContextualMenu extends Component<Props & WrappedComponentProps, Sta
 		// context menu opened by keyboard and any item except 'background' activated
 		// or color has been chosen from color palette
 		if (
-			getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c') &&
 			isCellMenuOpenByKeyboard &&
 			(item.value.name !== 'background' ||
-				(item.value.name === 'background' && this.state.isSubmenuOpen))
+				(item.value.name === 'background' && this.state.isSubmenuOpen)) &&
+			fg('platform.editor.a11y-table-context-menu_y4c9c')
 		) {
 			const { tr } = state;
 			tr.setMeta(tablePluginKey, {
@@ -668,7 +666,7 @@ export class ContextualMenu extends Component<Props & WrappedComponentProps, Sta
 		const shouldUseIncreasedScalingPercent =
 			isTableScalingEnabled &&
 			tableWithFixedColumnWidthsOption &&
-			getBooleanFF('platform.editor.table.use-increased-scaling-percent');
+			fg('platform.editor.table.use-increased-scaling-percent');
 
 		switch (item.value.name) {
 			case 'sort_column_desc':
@@ -767,9 +765,9 @@ export class ContextualMenu extends Component<Props & WrappedComponentProps, Sta
 				// 2nd when color has been chosen from color palette.
 				// here we are handling the 1st call relying on the isSubmenuOpen state value
 				if (
-					getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c') &&
 					isCellMenuOpenByKeyboard &&
-					!this.state.isSubmenuOpen
+					!this.state.isSubmenuOpen &&
+					fg('platform.editor.a11y-table-context-menu_y4c9c')
 				) {
 					this.setState({ isSubmenuOpen: true });
 				}
@@ -800,7 +798,7 @@ export class ContextualMenu extends Component<Props & WrappedComponentProps, Sta
 			isCellMenuOpenByKeyboard,
 		} = this.props;
 
-		if (getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c')) {
+		if (fg('platform.editor.a11y-table-context-menu_y4c9c')) {
 			if (payload) {
 				const { event } = payload;
 				if (event && event instanceof KeyboardEvent) {
@@ -881,13 +879,8 @@ export class ContextualMenu extends Component<Props & WrappedComponentProps, Sta
 
 	private setColor = (color: string) => {
 		const { editorView, editorAnalyticsAPI } = this.props;
-		// TargetCellPosition could be outdated: https://product-fabric.atlassian.net/browse/ED-8129
-		const { targetCellPosition } = getPluginState(editorView.state);
 		const { state, dispatch } = editorView;
-		setColorWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.CONTEXT_MENU, color, targetCellPosition)(
-			state,
-			dispatch,
-		);
+		setColorWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.CONTEXT_MENU, color)(state, dispatch);
 		this.toggleOpen();
 	};
 }

package/src/ui/FloatingDragMenu/DragMenu.tsx

@@ -39,7 +39,7 @@ import {
 	isSelectionType,
 } from '@atlaskit/editor-tables/utils';
 import EditorBackgroundColorIcon from '@atlaskit/icon/glyph/editor/background-color';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import Toggle from '@atlaskit/toggle';
 
 import { clearHoverSelection, hoverColumns, hoverRows } from '../../commands';
@@ -292,7 +292,7 @@ export const DragMenu = React.memo(
 
 		let shouldMoveDisabled;
 		let hasMergedCellsInTable;
-		if (getBooleanFF('platform.editor.table.drag-move-options-logic-update_fp7xw')) {
+		if (fg('platform.editor.table.drag-move-options-logic-update_fp7xw')) {
 			shouldMoveDisabled = false;
 			hasMergedCellsInTable = tableMap?.hasMergedCells() ?? false;
 		} else {
@@ -347,13 +347,8 @@ export const DragMenu = React.memo(
 		};
 
 		const setColor = (color: string) => {
-			const { targetCellPosition } = getTablePluginState(editorView.state);
 			const { state, dispatch } = editorView;
-			setColorWithAnalytics(editorAnalyticsAPI)(
-				INPUT_METHOD.CONTEXT_MENU,
-				color,
-				targetCellPosition,
-			)(state, dispatch);
+			setColorWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.CONTEXT_MENU, color)(state, dispatch);
 			closeMenu();
 			setIsSubmenuOpen(false);
 		};