@atlaskit/editor-plugin-table 17.3.20 → 17.3.22

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-table
 
+## 17.3.22
+
+### Patch Changes
+
+- [`a040c03082274`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a040c03082274) -
+  [ux] EDITOR-507 Clean up main nested tables experiment `platform_editor_nested_tables`
+- Updated dependencies
+
+## 17.3.21
+
+### Patch Changes
+
+- [`dece098c3ab1f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/dece098c3ab1f) -
+  [ux] ENGHEALTH-46818 Add focus and blur handlers to table buttons to fix a11y
+- Updated dependencies
+
 ## 17.3.20
 
 ### Patch Changes

package/dist/cjs/pm-plugins/commands/insert.js

@@ -15,7 +15,6 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _tableMap = require("@atlaskit/editor-tables/table-map");
 var _utils2 = require("@atlaskit/editor-tables/utils");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _commands = require("../analytics/commands");
 var _tableAnalytics = require("../table-analytics");
 var _columnWidth = require("../transforms/column-width");
@@ -274,10 +273,8 @@ var insertTableWithNestingSupport = exports.insertTableWithNestingSupport = func
     var insertAt;
     var isNestedTable = false;
     if ((0, _utils.hasParentNodeOfType)(schema.nodes.table)(tr.selection) && (0, _nesting.isNestedTablesSupported)(schema)) {
-      // If the experiment is disabled, or we're trying to nest deeper than one level, we insert the table after the top table
-      if ((0, _experiments.editorExperiment)('nested-tables-in-tables', false, {
-        exposure: true
-      }) || (0, _nesting.getParentOfTypeCount)(schema.nodes.table)(tr.selection.$from) > 1) {
+      // If trying to nest deeper than one level, we insert the table after the top table
+      if ((0, _nesting.getParentOfTypeCount)(schema.nodes.table)(tr.selection.$from) > 1) {
         var positionAfterTopTable = (0, _nesting.getPositionAfterTopParentNodeOfType)(schema.nodes.table)(tr.selection.$from);
         if (!positionAfterTopTable) {
           return tr;

package/dist/cjs/pm-plugins/utils/paste.js

@@ -14,7 +14,6 @@ var _model = require("@atlaskit/editor-prosemirror/model");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _editorTables = require("@atlaskit/editor-tables");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _pluginFactory = require("../plugin-factory");
 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; }
@@ -75,17 +74,16 @@ var removeTableFromLastChild = exports.removeTableFromLastChild = function remov
   return i === fragment.childCount - 1 ? unwrapContentFromTable(node) : node;
 };
 var transformSliceToRemoveNestedTables = exports.transformSliceToRemoveNestedTables = function transformSliceToRemoveNestedTables(slice, schema, selection) {
-  var isNestingAllowed = (0, _experiments.editorExperiment)('nested-tables-in-tables', true);
   var _schema$nodes2 = schema.nodes,
     table = _schema$nodes2.table,
     tableCell = _schema$nodes2.tableCell,
     tableHeader = _schema$nodes2.tableHeader;
   var openEnd = slice.openEnd;
   var newFragment = (0, _utils.flatmap)(slice.content, function (node, i, fragment) {
-    var _slice$content$firstC;
-    // if pasted content is a node that supports nesting a table
-    // such as layoutSection or expand allow 1 level by default
-    var allowedTableNesting = 1;
+    var _slice$content$firstC, _slice$content$lastCh;
+    // We allow default nesting of 2 to support
+    // two levels of nesting in nodes that support table nesting already such as layoutSection and expands
+    var allowedTableNesting = 2;
     var isCellSelection = selection instanceof _editorTables.CellSelection;
     var isPasteInTable = (0, _utils2.hasParentNodeOfType)([table, tableCell, tableHeader])(selection);
     var isPasteInNestedTable = (0, _nesting.getParentOfTypeCount)(schema.nodes.table)(selection.$from) > 1;
@@ -93,55 +91,42 @@ var transformSliceToRemoveNestedTables = exports.transformSliceToRemoveNestedTab
 
     // Pasted content only contains a table and no other content
     var isCellPaste = isPasteInTable && slice.content.childCount === 1 && ((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.type) === table && (!isPasteFullTableInsideEmptyCellEnabled || slice.openStart !== 0 && slice.openEnd !== 0);
-    if (isNestingAllowed) {
-      var _slice$content$lastCh;
-      // if nesting is allowed we bump up the default nesting allowance to 2 to support
-      // two levels of nesting in nodes that support table nesting already such as layoutSection and expands
-      allowedTableNesting = 2;
 
-      // however if pasted content is a table, allow just one level
-      if (node.type === schema.nodes.table) {
-        allowedTableNesting = 1;
-
-        // if paste is inside a table, allow no further nesting
-        if (isPasteInTable) {
-          allowedTableNesting = 0;
-        }
-
-        // unless we are pasting inside a nested table, then bounce back to 1 level
-        // because editor-plugin-paste will lift the table to the parent table (just below it)
-        if (isPasteInNestedTable) {
-          allowedTableNesting = 1;
-        }
+    // however if pasted content is a table, allow just one level
+    if (node.type === schema.nodes.table) {
+      allowedTableNesting = 1;
 
-        // paste of table cells into a table cell - content is spread across multiple cells
-        // by editor-tables so needs to be treated a little differently
-        if (isCellPaste || isCellSelection) {
-          allowedTableNesting = 1;
-          if (isPasteInNestedTable) {
-            allowedTableNesting = 0;
-          }
-        }
+      // if paste is inside a table, allow no further nesting
+      if (isPasteInTable) {
+        allowedTableNesting = 0;
       }
 
-      // Prevent invalid openEnd after pasting tables with a selection that ends inside a nested table cell.
-      // If the slice ends with a selection that ends inside a nested table, and we paste inside a table we
-      // need to adjust the openEnd because it is no longer correct. If we don't, Prosemirror fires an exception
-      // because it iterates to a non-existent depth and the transform will not be applied
-      if (slice.openEnd >= 7 &&
-      // depth of a nested table cell
-      slice.content.childCount > 1 && ((_slice$content$lastCh = slice.content.lastChild) === null || _slice$content$lastCh === void 0 ? void 0 : _slice$content$lastCh.type) === table && isPasteInTable) {
-        // re-point the slice's openEnd to non-nested table cell depth
-        openEnd = 4;
+      // unless we are pasting inside a nested table, then bounce back to 1 level
+      // because editor-plugin-paste will lift the table to the parent table (just below it)
+      if (isPasteInNestedTable) {
+        allowedTableNesting = 1;
       }
-    } else {
-      // for layouts and expands, we start with 1 level of nesting as set above
 
-      // if pasted content is a table, don't allow further nesting
-      if (node.type === schema.nodes.table) {
-        allowedTableNesting = 0;
+      // paste of table cells into a table cell - content is spread across multiple cells
+      // by editor-tables so needs to be treated a little differently
+      if (isCellPaste || isCellSelection) {
+        allowedTableNesting = 1;
+        if (isPasteInNestedTable) {
+          allowedTableNesting = 0;
+        }
       }
     }
+
+    // Prevent invalid openEnd after pasting tables with a selection that ends inside a nested table cell.
+    // If the slice ends with a selection that ends inside a nested table, and we paste inside a table we
+    // need to adjust the openEnd because it is no longer correct. If we don't, Prosemirror fires an exception
+    // because it iterates to a non-existent depth and the transform will not be applied
+    if (slice.openEnd >= 7 &&
+    // depth of a nested table cell
+    slice.content.childCount > 1 && ((_slice$content$lastCh = slice.content.lastChild) === null || _slice$content$lastCh === void 0 ? void 0 : _slice$content$lastCh.type) === table && isPasteInTable) {
+      // re-point the slice's openEnd to non-nested table cell depth
+      openEnd = 4;
+    }
     if (isCellSelection && !isCellPaste) {
       // if pasting into a cell selection, we need to flatten the parent table as well
       return _unwrapNestedTables(_model.Fragment.fromArray([node]), schema, allowedTableNesting);

package/dist/cjs/tablePlugin.js

@@ -574,10 +574,8 @@ var tablePlugin = function tablePlugin(_ref) {
             var tr = state.tr;
             // If the cursor is inside a table
             if ((0, _utils.hasParentNodeOfType)(state.schema.nodes.table)(state.selection) && options !== null && options !== void 0 && (_options$tableOptions6 = options.tableOptions) !== null && _options$tableOptions6 !== void 0 && _options$tableOptions6.allowNestedTables) {
-              // If the experiment is disabled, or we're trying to nest deeper than one level, we insert the table after the top table
-              if ((0, _experiments.editorExperiment)('nested-tables-in-tables', false, {
-                exposure: true
-              }) || (0, _nesting.getParentOfTypeCount)(state.schema.nodes.table)(state.selection.$from) > 1) {
+              // If trying to nest deeper than one level, we insert the table after the top table
+              if ((0, _nesting.getParentOfTypeCount)(state.schema.nodes.table)(state.selection.$from) > 1) {
                 // Nesting is too deep insert table after the top parent table
                 var positionAfterTopTable = (0, _nesting.getPositionAfterTopParentNodeOfType)(state.schema.nodes.table)(state.selection.$from);
                 tr = (0, _utils.safeInsert)(tableNode, positionAfterTopTable)(tr);

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

@@ -42,6 +42,8 @@ var DragHandleComponent = function DragHandleComponent(_ref) {
     previewHeight = _ref.previewHeight,
     _onMouseOver = _ref.onMouseOver,
     _onMouseOut = _ref.onMouseOut,
+    onFocus = _ref.onFocus,
+    onBlur = _ref.onBlur,
     toggleDragMenu = _ref.toggleDragMenu,
     hoveredCell = _ref.hoveredCell,
     onClick = _ref.onClick,
@@ -203,19 +205,21 @@ var DragHandleComponent = function DragHandleComponent(_ref) {
     "data-testid": "table-drag-handle-button",
     "aria-label": formatMessage(isRow ? _messages.tableMessages.rowDragHandle : _messages.tableMessages.columnDragHandle),
     "aria-expanded": isDragMenuOpen && isDragMenuTarget ? 'true' : 'false',
-    "aria-haspopup": "menu"
-    // eslint-disable-next-line @atlassian/a11y/mouse-events-have-key-events
-    ,
+    "aria-haspopup": "menu",
     onMouseOver: function onMouseOver(e) {
       setIsHovered(true);
       _onMouseOver && _onMouseOver(e);
-    }
-    // eslint-disable-next-line @atlassian/a11y/mouse-events-have-key-events
-    ,
+    },
     onMouseOut: function onMouseOut(e) {
       setIsHovered(false);
       _onMouseOut && _onMouseOut(e);
     },
+    onFocus: (0, _expValEquals.expValEquals)('platform_editor_table_a11y_eslint_fix', 'isEnabled', true) ? function (e) {
+      onFocus && onFocus(e);
+    } : undefined,
+    onBlur: (0, _expValEquals.expValEquals)('platform_editor_table_a11y_eslint_fix', 'isEnabled', true) ? function (e) {
+      onBlur && onBlur(e);
+    } : undefined,
     onMouseUp: function onMouseUp(e) {
       // return focus to editor so copying table selections whilst still works, i cannot call e.preventDefault in a mousemove event as this stops dragstart events from firing
       // -> this is bad for a11y but is the current standard new copy/paste keyboard shortcuts should be introduced instead

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

@@ -38,6 +38,7 @@ var _tableColumnsDistribute = _interopRequireDefault(require("@atlaskit/icon/cor
 var _tableRowAddBelow = _interopRequireDefault(require("@atlaskit/icon/core/table-row-add-below"));
 var _tableRowDelete = _interopRequireDefault(require("@atlaskit/icon/core/table-row-delete"));
 var _primitives = require("@atlaskit/primitives");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _commands = require("../../pm-plugins/commands");
 var _commandsWithAnalytics = require("../../pm-plugins/commands/commands-with-analytics");
@@ -749,10 +750,9 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
         userIntent: "tableContextualMenuPopupOpen",
         api: api
       }, (0, _react2.jsx)("div", {
-        "data-testid": "table-cell-contextual-menu"
-        // eslint-disable-next-line @atlassian/a11y/mouse-events-have-key-events
-        ,
+        "data-testid": "table-cell-contextual-menu",
         onMouseLeave: this.closeSubmenu,
+        onBlur: (0, _expValEquals.expValEquals)('platform_editor_table_a11y_eslint_fix', 'isEnabled', true) ? this.closeSubmenu : undefined,
         ref: this.dropdownMenuRef
       }, (0, _react2.jsx)(_uiMenu.DropdownMenu
       //This needs be removed when the a11y is completely handled

package/dist/cjs/ui/FloatingDeleteButton/DeleteButton.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntlNext = require("react-intl-next");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _types = require("../../types");
 var DeleteButton = function DeleteButton(_ref) {
   var style = _ref.style,
@@ -20,13 +21,11 @@ var DeleteButton = function DeleteButton(_ref) {
     className: _types.TableCssClassName.CONTROLS_DELETE_BUTTON_WRAP
     // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
     ,
-    style: style
-    // eslint-disable-next-line @atlassian/a11y/mouse-events-have-key-events
-    ,
-    onMouseEnter: onMouseEnter
-    // eslint-disable-next-line @atlassian/a11y/mouse-events-have-key-events
-    ,
-    onMouseLeave: onMouseLeave
+    style: style,
+    onMouseEnter: onMouseEnter,
+    onMouseLeave: onMouseLeave,
+    onFocus: (0, _expValEquals.expValEquals)('platform_editor_table_a11y_eslint_fix', 'isEnabled', true) ? onMouseEnter : undefined,
+    onBlur: (0, _expValEquals.expValEquals)('platform_editor_table_a11y_eslint_fix', 'isEnabled', true) ? onMouseLeave : undefined
   }, /*#__PURE__*/_react.default.createElement("button", {
     type: "button",
     "aria-label": formatMessage(removeLabel, {

package/dist/cjs/ui/TableFloatingColumnControls/ColumnControls/index.js

@@ -11,6 +11,7 @@ var _styles = require("@atlaskit/editor-common/styles");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _editorTables = require("@atlaskit/editor-tables");
 var _utils = require("@atlaskit/editor-tables/utils");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _commands = require("../../../pm-plugins/commands");
 var _commandsWithAnalytics = require("../../../pm-plugins/drag-and-drop/commands-with-analytics");
 var _rowControls = require("../../../pm-plugins/utils/row-controls");
@@ -189,6 +190,8 @@ var ColumnControls = exports.ColumnControls = function ColumnControls(_ref) {
       onClick: handleClick,
       onMouseOver: handleMouseOver,
       onMouseOut: handleMouseOut,
+      onBlur: (0, _expValEquals.expValEquals)('platform_editor_table_a11y_eslint_fix', 'isEnabled', true) ? handleMouseOut : undefined,
+      onFocus: (0, _expValEquals.expValEquals)('platform_editor_table_a11y_eslint_fix', 'isEnabled', true) ? handleMouseOver : undefined,
       toggleDragMenu: toggleDragMenuHandler,
       editorView: editorView
     }));

package/dist/cjs/ui/TableFloatingControls/CornerControls/ClassicCornerControls.js

@@ -18,6 +18,7 @@ var _reactIntlNext = require("react-intl-next");
 var _messages = require("@atlaskit/editor-common/messages");
 var _tableMap = require("@atlaskit/editor-tables/table-map");
 var _utils = require("@atlaskit/editor-tables/utils");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _commands = require("../../../pm-plugins/commands");
 var _types = require("../../../types");
 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); }
@@ -98,13 +99,11 @@ var CornerControlComponent = /*#__PURE__*/function (_Component) {
         className: (0, _classnames.default)(_types.TableCssClassName.CONTROLS_CORNER_BUTTON, {
           danger: isActive && isInDanger
         }),
-        onClick: this.selectTable
-        // eslint-disable-next-line @atlassian/a11y/mouse-events-have-key-events
-        ,
-        onMouseOver: this.hoverTable
-        // eslint-disable-next-line @atlassian/a11y/mouse-events-have-key-events
-        ,
-        onMouseOut: this.clearHoverSelection
+        onClick: this.selectTable,
+        onMouseOver: this.hoverTable,
+        onMouseOut: this.clearHoverSelection,
+        onFocus: (0, _expValEquals.expValEquals)('platform_editor_table_a11y_eslint_fix', 'isEnabled', true) ? this.hoverTable : undefined,
+        onBlur: (0, _expValEquals.expValEquals)('platform_editor_table_a11y_eslint_fix', 'isEnabled', true) ? this.clearHoverSelection : undefined
       }), !isHeaderRowEnabled &&
       /*#__PURE__*/
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766

package/dist/cjs/ui/TableFloatingControls/CornerControls/DragCornerControls.js

@@ -12,6 +12,7 @@ var _reactIntlNext = require("react-intl-next");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _messages = require("@atlaskit/editor-common/messages");
 var _utils = require("@atlaskit/editor-tables/utils");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _commands = require("../../../pm-plugins/commands");
 var _types = require("../../../types");
 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); }
@@ -49,10 +50,9 @@ var DragCornerControlsComponent = function DragCornerControlsComponent(_ref) {
     }),
     "aria-label": formatMessage(_messages.tableMessages.cornerControl),
     type: "button",
-    onClick: handleOnClick
-    // eslint-disable-next-line @atlassian/a11y/mouse-events-have-key-events
-    ,
+    onClick: handleOnClick,
     onMouseOut: handleMouseOut,
+    onBlur: (0, _expValEquals.expValEquals)('platform_editor_table_a11y_eslint_fix', 'isEnabled', true) ? handleMouseOut : undefined,
     contentEditable: false
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: _types.TableCssClassName.DRAG_CORNER_BUTTON_INNER
@@ -102,10 +102,9 @@ var DragCornerControlsComponentWithSelection = function DragCornerControlsCompon
     }),
     "aria-label": formatMessage(_messages.tableMessages.cornerControl),
     type: "button",
-    onClick: handleOnClick
-    // eslint-disable-next-line @atlassian/a11y/mouse-events-have-key-events
-    ,
+    onClick: handleOnClick,
     onMouseOut: handleMouseOut,
+    onBlur: (0, _expValEquals.expValEquals)('platform_editor_table_a11y_eslint_fix', 'isEnabled', true) ? handleMouseOut : undefined,
     contentEditable: false
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: _types.TableCssClassName.DRAG_CORNER_BUTTON_INNER

package/dist/cjs/ui/TableFloatingControls/NumberColumn/index.js

@@ -17,6 +17,7 @@ var _classnames2 = _interopRequireDefault(require("classnames"));
 var _coreUtils = require("@atlaskit/editor-common/core-utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-tables/utils");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _commands = require("../../../pm-plugins/commands");
 var _rowControls = require("../../../pm-plugins/utils/row-controls");
 var _types = require("../../../types");
@@ -150,18 +151,18 @@ var NumberColumn = exports.default = /*#__PURE__*/function (_Component) {
           "data-index": index
           // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
           ,
-          style: _this2.getCellStyles(index, rowHeight)
-          // eslint-disable-next-line @atlassian/a11y/mouse-events-have-key-events
-          ,
+          style: _this2.getCellStyles(index, rowHeight),
+          onFocus: (0, _expValEquals.expValEquals)('platform_editor_table_a11y_eslint_fix', 'isEnabled', true) ? function () {
+            return updateCellHoverLocation(index);
+          } : undefined,
           onMouseOver: function onMouseOver() {
             return updateCellHoverLocation(index);
           }
-        }, hasHeaderRow ? index > 0 ? index : null : index + 1) :
-        /*#__PURE__*/
-        // eslint-disable-next-line @atlassian/a11y/click-events-have-key-events, @atlassian/a11y/interactive-element-not-keyboard-focusable, @atlassian/a11y/no-static-element-interactions
-        _react.default.createElement("div", {
+        }, hasHeaderRow ? index > 0 ? index : null : index + 1) : /*#__PURE__*/_react.default.createElement("div", {
           // Ignored via go/ees005
+          role: (0, _expValEquals.expValEquals)('platform_editor_table_a11y_eslint_fix', 'isEnabled', true) ? 'button' : undefined
           // eslint-disable-next-line react/no-array-index-key
+          ,
           key: "wrapper-".concat(index)
           // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
           ,
@@ -172,15 +173,22 @@ var NumberColumn = exports.default = /*#__PURE__*/function (_Component) {
           style: _this2.getCellStyles(index, rowHeight),
           onClick: function onClick(event) {
             return _this2.selectRow(index, event);
-          }
-          // eslint-disable-next-line @atlassian/a11y/mouse-events-have-key-events
-          ,
+          },
+          onFocus: (0, _expValEquals.expValEquals)('platform_editor_table_a11y_eslint_fix', 'isEnabled', true) ? function () {
+            return _this2.hoverRows(index);
+          } : undefined,
           onMouseOver: function onMouseOver() {
             return _this2.hoverRows(index);
-          }
-          // eslint-disable-next-line @atlassian/a11y/mouse-events-have-key-events
-          ,
-          onMouseOut: _this2.clearHoverSelection
+          },
+          tabIndex: (0, _expValEquals.expValEquals)('platform_editor_table_a11y_eslint_fix', 'isEnabled', true) ? 0 : undefined,
+          onKeyDown: (0, _expValEquals.expValEquals)('platform_editor_table_a11y_eslint_fix', 'isEnabled', true) ? function (event) {
+            if (event.key === 'Enter' || event.key === ' ') {
+              event.preventDefault();
+              _this2.selectRow(index, event);
+            }
+          } : undefined,
+          onMouseOut: _this2.clearHoverSelection,
+          onBlur: (0, _expValEquals.expValEquals)('platform_editor_table_a11y_eslint_fix', 'isEnabled', true) ? _this2.clearHoverSelection : undefined
         }, hasHeaderRow ? index > 0 ? index : null : index + 1);
       }));
     }

package/dist/cjs/ui/TableFloatingControls/RowControls/ClassicControls.js

@@ -15,6 +15,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _messages = require("@atlaskit/editor-common/messages");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _commands = require("../../../pm-plugins/commands");
 var _rowControls = require("../../../pm-plugins/utils/row-controls");
 var _types = require("../../../types");
@@ -102,15 +103,15 @@ var RowControlsComponent = /*#__PURE__*/function (_Component) {
             className: "".concat(_types.TableCssClassName.ROW_CONTROLS_BUTTON, " ").concat(_types.TableCssClassName.CONTROLS_BUTTON),
             onClick: function onClick(event) {
               return _this2.props.selectRow(startIndex, event.shiftKey);
-            }
-            // eslint-disable-next-line @atlassian/a11y/mouse-events-have-key-events
-            ,
+            },
             onMouseOver: function onMouseOver() {
               return _this2.props.hoverRows([startIndex]);
-            }
-            // eslint-disable-next-line @atlassian/a11y/mouse-events-have-key-events
-            ,
+            },
+            onFocus: (0, _expValEquals.expValEquals)('platform_editor_table_a11y_eslint_fix', 'isEnabled', true) ? function () {
+              return _this2.props.hoverRows([startIndex]);
+            } : undefined,
             onMouseOut: _this2.clearHoverSelection,
+            onBlur: (0, _expValEquals.expValEquals)('platform_editor_table_a11y_eslint_fix', 'isEnabled', true) ? _this2.clearHoverSelection : undefined,
             "data-start-index": startIndex,
             "data-end-index": endIndex
           }), /*#__PURE__*/_react.default.createElement("div", {

package/dist/cjs/ui/TableFloatingControls/RowControls/DragControls.js

@@ -186,6 +186,8 @@ var DragControls = exports.DragControls = function DragControls(_ref) {
       onClick: handleClick,
       onMouseOver: handleMouseOver,
       onMouseOut: handleMouseOut,
+      onBlur: (0, _expValEquals.expValEquals)('platform_editor_table_a11y_eslint_fix', 'isEnabled', true) ? handleMouseOut : undefined,
+      onFocus: (0, _expValEquals.expValEquals)('platform_editor_table_a11y_eslint_fix', 'isEnabled', true) ? handleMouseOver : undefined,
       toggleDragMenu: toggleDragMenuHandler,
       editorView: editorView
     }));

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

@@ -108,6 +108,7 @@ var TableFloatingControls = exports.TableFloatingControls = function TableFloati
     className: wrapperClassName,
     css: [(0, _expValEquals.expValEquals)('platform_editor_table_sticky_header_improvements', 'cohort', 'test_with_overflow') && !(0, _platformFeatureFlags.fg)('platform_editor_table_sticky_header_patch_7') && styles]
   }, (0, _react2.jsx)("div", {
+    role: "none",
     onMouseDown: function onMouseDown(e) {
       return !isDragAndDropEnabled && e.preventDefault();
     }

package/dist/es2019/pm-plugins/commands/insert.js

@@ -6,7 +6,6 @@ import { Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { hasParentNodeOfType, safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { addColumnAt as addColumnAtPMUtils, addRowAt, findTable, selectedRect } from '@atlaskit/editor-tables/utils';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { updateRowOrColumnMovedTransform } from '../analytics/commands';
 import { META_KEYS } from '../table-analytics';
 import { rescaleColumns } from '../transforms/column-width';
@@ -233,10 +232,8 @@ export const insertTableWithNestingSupport = ({
   let insertAt;
   let isNestedTable = false;
   if (hasParentNodeOfType(schema.nodes.table)(tr.selection) && isNestedTablesSupported(schema)) {
-    // If the experiment is disabled, or we're trying to nest deeper than one level, we insert the table after the top table
-    if (editorExperiment('nested-tables-in-tables', false, {
-      exposure: true
-    }) || getParentOfTypeCount(schema.nodes.table)(tr.selection.$from) > 1) {
+    // If trying to nest deeper than one level, we insert the table after the top table
+    if (getParentOfTypeCount(schema.nodes.table)(tr.selection.$from) > 1) {
       const positionAfterTopTable = getPositionAfterTopParentNodeOfType(schema.nodes.table)(tr.selection.$from);
       if (!positionAfterTopTable) {
         return tr;

package/dist/es2019/pm-plugins/utils/paste.js

@@ -4,7 +4,6 @@ import { Slice, Fragment } from '@atlaskit/editor-prosemirror/model';
 import { flatten, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { CellSelection } from '@atlaskit/editor-tables';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getPluginState } from '../plugin-factory';
 
 // lifts up the content of each cell, returning an array of nodes
@@ -64,7 +63,6 @@ export const removeTableFromLastChild = (node, i, fragment) => {
   return i === fragment.childCount - 1 ? unwrapContentFromTable(node) : node;
 };
 export const transformSliceToRemoveNestedTables = (slice, schema, selection) => {
-  const isNestingAllowed = editorExperiment('nested-tables-in-tables', true);
   const {
     table,
     tableCell,
@@ -72,10 +70,10 @@ export const transformSliceToRemoveNestedTables = (slice, schema, selection) =>
   } = schema.nodes;
   let openEnd = slice.openEnd;
   const newFragment = flatmap(slice.content, (node, i, fragment) => {
-    var _slice$content$firstC;
-    // if pasted content is a node that supports nesting a table
-    // such as layoutSection or expand allow 1 level by default
-    let allowedTableNesting = 1;
+    var _slice$content$firstC, _slice$content$lastCh;
+    // We allow default nesting of 2 to support
+    // two levels of nesting in nodes that support table nesting already such as layoutSection and expands
+    let allowedTableNesting = 2;
     const isCellSelection = selection instanceof CellSelection;
     const isPasteInTable = hasParentNodeOfType([table, tableCell, tableHeader])(selection);
     const isPasteInNestedTable = getParentOfTypeCount(schema.nodes.table)(selection.$from) > 1;
@@ -83,55 +81,42 @@ export const transformSliceToRemoveNestedTables = (slice, schema, selection) =>
 
     // Pasted content only contains a table and no other content
     const isCellPaste = isPasteInTable && slice.content.childCount === 1 && ((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.type) === table && (!isPasteFullTableInsideEmptyCellEnabled || slice.openStart !== 0 && slice.openEnd !== 0);
-    if (isNestingAllowed) {
-      var _slice$content$lastCh;
-      // if nesting is allowed we bump up the default nesting allowance to 2 to support
-      // two levels of nesting in nodes that support table nesting already such as layoutSection and expands
-      allowedTableNesting = 2;
 
-      // however if pasted content is a table, allow just one level
-      if (node.type === schema.nodes.table) {
-        allowedTableNesting = 1;
-
-        // if paste is inside a table, allow no further nesting
-        if (isPasteInTable) {
-          allowedTableNesting = 0;
-        }
-
-        // unless we are pasting inside a nested table, then bounce back to 1 level
-        // because editor-plugin-paste will lift the table to the parent table (just below it)
-        if (isPasteInNestedTable) {
-          allowedTableNesting = 1;
-        }
+    // however if pasted content is a table, allow just one level
+    if (node.type === schema.nodes.table) {
+      allowedTableNesting = 1;
 
-        // paste of table cells into a table cell - content is spread across multiple cells
-        // by editor-tables so needs to be treated a little differently
-        if (isCellPaste || isCellSelection) {
-          allowedTableNesting = 1;
-          if (isPasteInNestedTable) {
-            allowedTableNesting = 0;
-          }
-        }
+      // if paste is inside a table, allow no further nesting
+      if (isPasteInTable) {
+        allowedTableNesting = 0;
       }
 
-      // Prevent invalid openEnd after pasting tables with a selection that ends inside a nested table cell.
-      // If the slice ends with a selection that ends inside a nested table, and we paste inside a table we
-      // need to adjust the openEnd because it is no longer correct. If we don't, Prosemirror fires an exception
-      // because it iterates to a non-existent depth and the transform will not be applied
-      if (slice.openEnd >= 7 &&
-      // depth of a nested table cell
-      slice.content.childCount > 1 && ((_slice$content$lastCh = slice.content.lastChild) === null || _slice$content$lastCh === void 0 ? void 0 : _slice$content$lastCh.type) === table && isPasteInTable) {
-        // re-point the slice's openEnd to non-nested table cell depth
-        openEnd = 4;
+      // unless we are pasting inside a nested table, then bounce back to 1 level
+      // because editor-plugin-paste will lift the table to the parent table (just below it)
+      if (isPasteInNestedTable) {
+        allowedTableNesting = 1;
       }
-    } else {
-      // for layouts and expands, we start with 1 level of nesting as set above
 
-      // if pasted content is a table, don't allow further nesting
-      if (node.type === schema.nodes.table) {
-        allowedTableNesting = 0;
+      // paste of table cells into a table cell - content is spread across multiple cells
+      // by editor-tables so needs to be treated a little differently
+      if (isCellPaste || isCellSelection) {
+        allowedTableNesting = 1;
+        if (isPasteInNestedTable) {
+          allowedTableNesting = 0;
+        }
       }
     }
+
+    // Prevent invalid openEnd after pasting tables with a selection that ends inside a nested table cell.
+    // If the slice ends with a selection that ends inside a nested table, and we paste inside a table we
+    // need to adjust the openEnd because it is no longer correct. If we don't, Prosemirror fires an exception
+    // because it iterates to a non-existent depth and the transform will not be applied
+    if (slice.openEnd >= 7 &&
+    // depth of a nested table cell
+    slice.content.childCount > 1 && ((_slice$content$lastCh = slice.content.lastChild) === null || _slice$content$lastCh === void 0 ? void 0 : _slice$content$lastCh.type) === table && isPasteInTable) {
+      // re-point the slice's openEnd to non-nested table cell depth
+      openEnd = 4;
+    }
     if (isCellSelection && !isCellPaste) {
       // if pasting into a cell selection, we need to flatten the parent table as well
       return unwrapNestedTables(Fragment.fromArray([node]), schema, allowedTableNesting);

package/dist/es2019/tablePlugin.js

@@ -560,10 +560,8 @@ const tablePlugin = ({
           } = state;
           // If the cursor is inside a table
           if (hasParentNodeOfType(state.schema.nodes.table)(state.selection) && options !== null && options !== void 0 && (_options$tableOptions6 = options.tableOptions) !== null && _options$tableOptions6 !== void 0 && _options$tableOptions6.allowNestedTables) {
-            // If the experiment is disabled, or we're trying to nest deeper than one level, we insert the table after the top table
-            if (editorExperiment('nested-tables-in-tables', false, {
-              exposure: true
-            }) || getParentOfTypeCount(state.schema.nodes.table)(state.selection.$from) > 1) {
+            // If trying to nest deeper than one level, we insert the table after the top table
+            if (getParentOfTypeCount(state.schema.nodes.table)(state.selection.$from) > 1) {
               // Nesting is too deep insert table after the top parent table
               const positionAfterTopTable = getPositionAfterTopParentNodeOfType(state.schema.nodes.table)(state.selection.$from);
               tr = safeInsert(tableNode, positionAfterTopTable)(tr);