@atlaskit/editor-plugin-table 7.25.10 → 7.25.12

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atlaskit/editor-plugin-table
 
+## 7.25.12
+
+### Patch Changes
+
+- [#133347](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/133347)
+  [`cb1658fdac261`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/cb1658fdac261) -
+  Create a new tr, instead of letting previous one in append transaction for analytics
+- Updated dependencies
+
+## 7.25.11
+
+### Patch Changes
+
+- [`638f18de80136`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/638f18de80136) -
+  Remove unused exports
+- [`638f18de80136`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/638f18de80136) -
+  Remove unused code and imports
+- [`638f18de80136`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/638f18de80136) -
+  Remove unused imports and code
+- [#133717](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/133717)
+  [`a51c7a76fc031`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a51c7a76fc031) -
+  [ux] When isTableScaling is enabled in commment editor and table doesn't have width, use editor
+  width and apply infinite scaling instead of standard PTW40.
+
 ## 7.25.10
 
 ### Patch Changes

package/dist/cjs/commands/clear.js

@@ -3,14 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.clearSelection = exports.clearMultipleCells = void 0;
+exports.clearMultipleCells = void 0;
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-tables/utils");
-// #region Imports
-
-// #endregion
-
-// #region Commands
 var clearMultipleCells = exports.clearMultipleCells = function clearMultipleCells(targetCellPosition) {
   return function (state, dispatch) {
     var cursorPos;
@@ -40,11 +35,4 @@ var clearMultipleCells = exports.clearMultipleCells = function clearMultipleCell
     }
     return false;
   };
-};
-var clearSelection = exports.clearSelection = function clearSelection(state, dispatch) {
-  if (dispatch) {
-    dispatch(state.tr.setSelection(_state.Selection.near(state.selection.$from)).setMeta('addToHistory', false));
-  }
-  return true;
-};
-// #endregion
+};

package/dist/cjs/commands/column-resize.js

@@ -15,6 +15,7 @@ var _pluginFactory = require("../pm-plugins/plugin-factory");
 var _pluginFactory2 = require("../pm-plugins/table-resizing/plugin-factory");
 var _pluginKey = require("../pm-plugins/table-resizing/plugin-key");
 var _utils3 = require("../pm-plugins/table-resizing/utils");
+var _misc = require("../pm-plugins/table-resizing/utils/misc");
 var _transforms = require("../transforms");
 var _types = require("../types");
 var _utils4 = require("../utils");
@@ -160,6 +161,7 @@ var changeColumnWidthByStep = exports.changeColumnWidthByStep = function changeC
     api = _ref4.api,
     getIntl = _ref4.getIntl;
   return function (state, dispatch, view) {
+    var _originalTable$attrs;
     var customTr = state.tr;
     var fakeDispatch = function fakeDispatch(tr) {
       customTr = tr;
@@ -205,9 +207,11 @@ var changeColumnWidthByStep = exports.changeColumnWidthByStep = function changeC
     if (isTableScalingWithFixedColumnWidthsOptionEnabled) {
       isTableScalingEnabledOnCurrentTable = originalTable.attrs.displayMode !== 'fixed';
     }
-    var shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.fg)('platform.editor.table.use-increased-scaling-percent') ||
-    // When in comment editor, we need the scaling percent to be 40% while tableWithFixedColumnWidthsOption is not visible
-    isTableScalingEnabled && isCommentEditor;
+    var shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.fg)('platform.editor.table.use-increased-scaling-percent');
+    if (isTableScalingEnabled && isCommentEditor) {
+      isTableScalingEnabledOnCurrentTable = true;
+      shouldUseIncreasedScalingPercent = true;
+    }
     var initialResizeState = (0, _utils3.getResizeState)({
       minWidth: _styles.tableCellMinWidth,
       maxSize: maxSize,
@@ -216,14 +220,16 @@ var changeColumnWidthByStep = exports.changeColumnWidthByStep = function changeC
       start: tableStartPosition,
       domAtPos: domAtPos,
       isTableScalingEnabled: isTableScalingEnabledOnCurrentTable,
-      shouldUseIncreasedScalingPercent: shouldUseIncreasedScalingPercent
+      shouldUseIncreasedScalingPercent: shouldUseIncreasedScalingPercent,
+      isCommentEditor: isCommentEditor
     });
     (0, _utils3.updateControls)()(state);
     var selectionRect = (0, _utils.getSelectionRect)(state.selection);
     var selectedColumns = selectionRect ? (0, _utils4.getSelectedColumnIndexes)(selectionRect) : [];
     // only selected (or selected - 1) columns should be distributed
     var resizingSelectedColumns = selectedColumns.indexOf(colIndex) > -1 || selectedColumns.indexOf(colIndex + 1) > -1;
-    var newResizeState = (0, _utils3.resizeColumn)(initialResizeState, colIndex, stepSize, dom, originalTable, resizingSelectedColumns ? selectedColumns : undefined, isTableScalingEnabled, shouldUseIncreasedScalingPercent);
+    var scalePercent = isTableScalingEnabled && isCommentEditor && !((_originalTable$attrs = originalTable.attrs) !== null && _originalTable$attrs !== void 0 && _originalTable$attrs.width) ? (0, _misc.getScalingPercentForTableWithoutWidth)(originalTable, dom) : (0, _misc.getTableScalingPercent)(originalTable, dom, shouldUseIncreasedScalingPercent);
+    var newResizeState = (0, _utils3.resizeColumn)(initialResizeState, colIndex, stepSize, dom, originalTable, resizingSelectedColumns ? selectedColumns : undefined, isTableScalingEnabled, scalePercent);
     customTr = (0, _transforms.updateColumnWidths)(newResizeState, originalTable, tableStartPosition, api)(customTr);
     if (dispatch) {
       dispatch(customTr);

package/dist/cjs/commands/delete.js

@@ -10,8 +10,9 @@ var deleteColumnsCommand = exports.deleteColumnsCommand = function deleteColumns
   var isTableScalingEnabled = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   var isTableFixedColumnWidthsOptionEnabled = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   var shouldUseIncreasedScalingPercent = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
+  var isCommentEditor = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
   return function (state, dispatch, view) {
-    var tr = (0, _deleteColumns.deleteColumns)(rect, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state), api, view, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(state.tr);
+    var tr = (0, _deleteColumns.deleteColumns)(rect, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state), api, view, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor)(state.tr);
     if (dispatch) {
       dispatch(tr);
       return true;

package/dist/cjs/commands/insert.js

@@ -33,6 +33,7 @@ function addColumnAt(api) {
   var isCellBackgroundDuplicated = arguments.length > 2 ? arguments[2] : undefined;
   var isTableFixedColumnWidthsOptionEnabled = arguments.length > 3 ? arguments[3] : undefined;
   var shouldUseIncreasedScalingPercent = arguments.length > 4 ? arguments[4] : undefined;
+  var isCommentEditor = arguments.length > 5 ? arguments[5] : undefined;
   return function (column) {
     var allowAddColumnCustomStep = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     var view = arguments.length > 2 ? arguments[2] : undefined;
@@ -46,7 +47,7 @@ function addColumnAt(api) {
       var table = (0, _utils2.findTable)(updatedTr.selection);
       if (table) {
         // [ED-8288] Update colwidths manually to avoid multiple dispatch in TableComponent
-        updatedTr = (0, _columnWidth.rescaleColumns)(isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, api)(table, view)(updatedTr);
+        updatedTr = (0, _columnWidth.rescaleColumns)(isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, api, isCommentEditor)(table, view)(updatedTr);
       }
       if (view) {
         updatedTr = (0, _commands.updateRowOrColumnMovedTransform)({
@@ -68,6 +69,7 @@ var addColumnBefore = exports.addColumnBefore = function addColumnBefore(api) {
   var isCellBackgroundDuplicated = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   var isTableFixedColumnWidthsOptionEnabled = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   var shouldUseIncreasedScalingPercent = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
+  var isCommentEditor = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
   return function (state, dispatch, view) {
     var table = (0, _utils2.findTable)(state.selection);
     if (!table) {
@@ -75,7 +77,7 @@ var addColumnBefore = exports.addColumnBefore = function addColumnBefore(api) {
     }
     if (dispatch) {
       var rect = (0, _utils2.selectedRect)(state);
-      dispatch(addColumnAt(api, isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(rect.left, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state), view)(state.tr));
+      dispatch(addColumnAt(api, isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor)(rect.left, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state), view)(state.tr));
     }
     return true;
   };
@@ -83,7 +85,7 @@ var addColumnBefore = exports.addColumnBefore = function addColumnBefore(api) {
 
 // :: (EditorState, dispatch: ?(tr: Transaction)) → bool
 // Command to add a column after the column with the selection.
-var addColumnAfter = exports.addColumnAfter = function addColumnAfter(api, isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent) {
+var addColumnAfter = exports.addColumnAfter = function addColumnAfter(api, isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor) {
   return function (state, dispatch, view) {
     var table = (0, _utils2.findTable)(state.selection);
     if (!table) {
@@ -91,7 +93,7 @@ var addColumnAfter = exports.addColumnAfter = function addColumnAfter(api, isTab
     }
     if (dispatch) {
       var rect = (0, _utils2.selectedRect)(state);
-      dispatch(addColumnAt(api, isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(rect.right, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state), view)(state.tr));
+      dispatch(addColumnAt(api, isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor)(rect.right, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state), view)(state.tr));
     }
     return true;
   };
@@ -101,9 +103,10 @@ var insertColumn = exports.insertColumn = function insertColumn(api) {
   var isCellBackgroundDuplicated = arguments.length > 2 ? arguments[2] : undefined;
   var isTableFixedColumnWidthsOptionEnabled = arguments.length > 3 ? arguments[3] : undefined;
   var shouldUseIncreasedScalingPercent = arguments.length > 4 ? arguments[4] : undefined;
+  var isCommentEditor = arguments.length > 5 ? arguments[5] : undefined;
   return function (column) {
     return function (state, dispatch, view) {
-      var tr = addColumnAt(api, isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(column, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state), view)(state.tr);
+      var tr = addColumnAt(api, isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor)(column, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state), view)(state.tr);
       var table = (0, _utils2.findTable)(tr.selection);
       if (!table) {
         return false;

package/dist/cjs/commands/selection.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.shiftArrowUpFromTable = exports.selectRows = exports.selectColumns = exports.modASelectTable = exports.arrowRightFromTable = exports.arrowLeftFromTable = exports.TableSelectionDirection = void 0;
+exports.shiftArrowUpFromTable = exports.selectRows = exports.selectColumns = exports.modASelectTable = exports.arrowRightFromTable = exports.arrowLeftFromTable = void 0;
 var _messages = require("@atlaskit/editor-common/messages");
 var _selection = require("@atlaskit/editor-common/selection");
 var _state = require("@atlaskit/editor-prosemirror/state");
@@ -13,11 +13,11 @@ var _utils = require("@atlaskit/editor-tables/utils");
 var _misc = require("../commands/misc");
 var _pluginFactory = require("../pm-plugins/plugin-factory");
 var _toolbar = require("../toolbar");
-var TableSelectionDirection = exports.TableSelectionDirection = /*#__PURE__*/function (TableSelectionDirection) {
+var TableSelectionDirection = /*#__PURE__*/function (TableSelectionDirection) {
   TableSelectionDirection["TopToBottom"] = "TopToBottom";
   TableSelectionDirection["BottomToTop"] = "BottomToTop";
   return TableSelectionDirection;
-}({});
+}(TableSelectionDirection || {});
 var arrowLeftFromTable = exports.arrowLeftFromTable = function arrowLeftFromTable(editorSelectionAPI) {
   return function () {
     return function (state, dispatch) {

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.wrapTableInExpandWithAnalytics = exports.toggleTableLayoutWithAnalytics = exports.toggleNumberColumnWithAnalytics = exports.toggleHeaderRowWithAnalytics = exports.toggleHeaderColumnWithAnalytics = exports.toggleFixedColumnWidthsOptionAnalytics = exports.splitCellWithAnalytics = exports.sortColumnWithAnalytics = exports.setTableAlignmentWithTableContentWithPosWithAnalytics = exports.setTableAlignmentWithAnalytics = exports.setColorWithAnalytics = exports.mergeCellsWithAnalytics = exports.insertRowWithAnalytics = exports.insertColumnWithAnalytics = exports.emptyMultipleCellsWithAnalytics = exports.distributeColumnsWidthsWithAnalytics = exports.deleteTableWithAnalytics = exports.deleteTableIfSelectedWithAnalytics = exports.deleteSelectedRowsOrColumnsWithAnalyticsViaShortcut = exports.deleteRowsWithAnalytics = exports.deleteColumnsWithAnalytics = exports.changeColumnWidthByStepWithAnalytics = exports.addRowAroundSelection = void 0;
+exports.wrapTableInExpandWithAnalytics = exports.toggleNumberColumnWithAnalytics = exports.toggleHeaderRowWithAnalytics = exports.toggleHeaderColumnWithAnalytics = exports.toggleFixedColumnWidthsOptionAnalytics = exports.splitCellWithAnalytics = exports.sortColumnWithAnalytics = exports.setTableAlignmentWithTableContentWithPosWithAnalytics = exports.setTableAlignmentWithAnalytics = exports.setColorWithAnalytics = exports.mergeCellsWithAnalytics = exports.insertRowWithAnalytics = exports.insertColumnWithAnalytics = exports.emptyMultipleCellsWithAnalytics = exports.distributeColumnsWidthsWithAnalytics = exports.deleteTableWithAnalytics = exports.deleteTableIfSelectedWithAnalytics = exports.deleteSelectedRowsOrColumnsWithAnalyticsViaShortcut = exports.deleteRowsWithAnalytics = exports.deleteColumnsWithAnalytics = exports.changeColumnWidthByStepWithAnalytics = exports.addRowAroundSelection = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
@@ -29,12 +29,6 @@ var _utils2 = require("./utils");
 var _analytics2 = require("./utils/analytics");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var TABLE_BREAKOUT_NAME_MAPPING = {
-  default: _analytics.TABLE_BREAKOUT.NORMAL,
-  wide: _analytics.TABLE_BREAKOUT.WIDE,
-  'full-width': _analytics.TABLE_BREAKOUT.FULL_WIDTH
-};
-
 // #region Analytics wrappers
 var emptyMultipleCellsWithAnalytics = exports.emptyMultipleCellsWithAnalytics = function emptyMultipleCellsWithAnalytics(editorAnalyticsAPI) {
   return function (inputMethod, targetCellPosition) {
@@ -234,6 +228,7 @@ var insertColumnWithAnalytics = exports.insertColumnWithAnalytics = function ins
   var isCellbackgroundDuplicated = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   var isTableFixedColumnWidthsOptionEnabled = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
   var shouldUseIncreasedScalingPercent = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
+  var isCommentEditor = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
   return function (inputMethod, position) {
     return (0, _analytics2.withEditorAnalyticsAPI)(function (state) {
       var _getSelectedTableInfo3 = (0, _utils2.getSelectedTableInfo)(state.selection),
@@ -251,7 +246,7 @@ var insertColumnWithAnalytics = exports.insertColumnWithAnalytics = function ins
         },
         eventType: _analytics.EVENT_TYPE.TRACK
       };
-    })(editorAnalyticsAPI)((0, _insert.insertColumn)(api, isTableScalingEnabled, isCellbackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(position));
+    })(editorAnalyticsAPI)((0, _insert.insertColumn)(api, isTableScalingEnabled, isCellbackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor)(position));
   };
 };
 var deleteRowsWithAnalytics = exports.deleteRowsWithAnalytics = function deleteRowsWithAnalytics(editorAnalyticsAPI) {
@@ -286,6 +281,7 @@ var deleteColumnsWithAnalytics = exports.deleteColumnsWithAnalytics = function d
   var isTableScalingEnabled = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   var isTableFixedColumnWidthsOptionEnabled = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   var shouldUseIncreasedScalingPercent = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
+  var isCommentEditor = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
   return function (inputMethod, rect) {
     return (0, _analytics2.withEditorAnalyticsAPI)(function (_ref6) {
       var selection = _ref6.selection;
@@ -305,7 +301,7 @@ var deleteColumnsWithAnalytics = exports.deleteColumnsWithAnalytics = function d
         },
         eventType: _analytics.EVENT_TYPE.TRACK
       };
-    })(editorAnalyticsAPI)((0, _delete.deleteColumnsCommand)(rect, api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent));
+    })(editorAnalyticsAPI)((0, _delete.deleteColumnsCommand)(rect, api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor));
   };
 };
 var deleteSelectedRowsOrColumnsWithAnalyticsViaShortcut = exports.deleteSelectedRowsOrColumnsWithAnalyticsViaShortcut = function deleteSelectedRowsOrColumnsWithAnalyticsViaShortcut(editorAnalyticsAPI, api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent) {
@@ -419,37 +415,12 @@ var toggleNumberColumnWithAnalytics = exports.toggleNumberColumnWithAnalytics =
     };
   })(editorAnalyticsAPI)(_toggle.toggleNumberColumn);
 };
-var toggleTableLayoutWithAnalytics = exports.toggleTableLayoutWithAnalytics = function toggleTableLayoutWithAnalytics(editorAnalyticsAPI) {
-  return (0, _analytics2.withEditorAnalyticsAPI)(function (state) {
-    var _getSelectedTableInfo10 = (0, _utils2.getSelectedTableInfo)(state.selection),
-      table = _getSelectedTableInfo10.table,
-      totalRowCount = _getSelectedTableInfo10.totalRowCount,
-      totalColumnCount = _getSelectedTableInfo10.totalColumnCount;
-    if (table) {
-      var _ref9 = table.node.attrs,
-        layout = _ref9.layout;
-      return {
-        action: _analytics.TABLE_ACTION.CHANGED_BREAKOUT_MODE,
-        actionSubject: _analytics.ACTION_SUBJECT.TABLE,
-        actionSubjectId: null,
-        attributes: {
-          newBreakoutMode: TABLE_BREAKOUT_NAME_MAPPING[(0, _toggle.getNextLayout)(layout)],
-          previousBreakoutMode: TABLE_BREAKOUT_NAME_MAPPING[layout],
-          totalRowCount: totalRowCount,
-          totalColumnCount: totalColumnCount
-        },
-        eventType: _analytics.EVENT_TYPE.TRACK
-      };
-    }
-    return;
-  })(editorAnalyticsAPI)(_toggle.toggleTableLayout);
-};
 var sortColumnWithAnalytics = exports.sortColumnWithAnalytics = function sortColumnWithAnalytics(editorAnalyticsAPI) {
   return function (inputMethod, columnIndex, sortOrder) {
     return (0, _analytics2.withEditorAnalyticsAPI)(function (state) {
-      var _getSelectedTableInfo11 = (0, _utils2.getSelectedTableInfo)(state.selection),
-        totalRowCount = _getSelectedTableInfo11.totalRowCount,
-        totalColumnCount = _getSelectedTableInfo11.totalColumnCount;
+      var _getSelectedTableInfo10 = (0, _utils2.getSelectedTableInfo)(state.selection),
+        totalRowCount = _getSelectedTableInfo10.totalRowCount,
+        totalColumnCount = _getSelectedTableInfo10.totalColumnCount;
       return {
         action: _analytics.TABLE_ACTION.SORTED_COLUMN,
         actionSubject: _analytics.ACTION_SUBJECT.TABLE,
@@ -467,10 +438,10 @@ var sortColumnWithAnalytics = exports.sortColumnWithAnalytics = function sortCol
   };
 };
 var distributeColumnsWidthsWithAnalytics = exports.distributeColumnsWidthsWithAnalytics = function distributeColumnsWidthsWithAnalytics(editorAnalyticsAPI, api) {
-  return function (inputMethod, _ref10) {
-    var resizeState = _ref10.resizeState,
-      table = _ref10.table,
-      attributes = _ref10.attributes;
+  return function (inputMethod, _ref9) {
+    var resizeState = _ref9.resizeState,
+      table = _ref9.table,
+      attributes = _ref9.attributes;
     return (0, _analytics2.withEditorAnalyticsAPI)(function () {
       return {
         action: _analytics.TABLE_ACTION.DISTRIBUTED_COLUMNS_WIDTHS,
@@ -491,9 +462,9 @@ var distributeColumnsWidthsWithAnalytics = exports.distributeColumnsWidthsWithAn
 };
 var wrapTableInExpandWithAnalytics = exports.wrapTableInExpandWithAnalytics = function wrapTableInExpandWithAnalytics(editorAnalyticsAPI) {
   return (0, _analytics2.withEditorAnalyticsAPI)(function (state) {
-    var _getSelectedTableInfo12 = (0, _utils2.getSelectedTableInfo)(state.selection),
-      totalRowCount = _getSelectedTableInfo12.totalRowCount,
-      totalColumnCount = _getSelectedTableInfo12.totalColumnCount;
+    var _getSelectedTableInfo11 = (0, _utils2.getSelectedTableInfo)(state.selection),
+      totalRowCount = _getSelectedTableInfo11.totalRowCount,
+      totalColumnCount = _getSelectedTableInfo11.totalColumnCount;
     return {
       action: _analytics.TABLE_ACTION.COLLAPSED,
       actionSubject: _analytics.ACTION_SUBJECT.TABLE,
@@ -508,10 +479,10 @@ var wrapTableInExpandWithAnalytics = exports.wrapTableInExpandWithAnalytics = fu
 };
 var toggleFixedColumnWidthsOptionAnalytics = exports.toggleFixedColumnWidthsOptionAnalytics = function toggleFixedColumnWidthsOptionAnalytics(editorAnalyticsAPI, inputMethod) {
   return (0, _analytics2.withEditorAnalyticsAPI)(function (state) {
-    var _getSelectedTableInfo13 = (0, _utils2.getSelectedTableInfo)(state.selection),
-      table = _getSelectedTableInfo13.table,
-      totalRowCount = _getSelectedTableInfo13.totalRowCount,
-      totalColumnCount = _getSelectedTableInfo13.totalColumnCount;
+    var _getSelectedTableInfo12 = (0, _utils2.getSelectedTableInfo)(state.selection),
+      table = _getSelectedTableInfo12.table,
+      totalRowCount = _getSelectedTableInfo12.totalRowCount,
+      totalColumnCount = _getSelectedTableInfo12.totalColumnCount;
     var previousDisplayMode;
     var newDisplayMode;
     switch (table === null || table === void 0 ? void 0 : table.node.attrs.displayMode) {
@@ -546,10 +517,10 @@ var toggleFixedColumnWidthsOptionAnalytics = exports.toggleFixedColumnWidthsOpti
 var setTableAlignmentWithAnalytics = exports.setTableAlignmentWithAnalytics = function setTableAlignmentWithAnalytics(editorAnalyticsAPI, isCommentEditor) {
   return function (newAlignment, previousAlignment, inputMethod, reason) {
     return (0, _analytics2.withEditorAnalyticsAPI)(function (state) {
-      var _getSelectedTableInfo14 = (0, _utils2.getSelectedTableInfo)(state.selection),
-        table = _getSelectedTableInfo14.table,
-        totalRowCount = _getSelectedTableInfo14.totalRowCount,
-        totalColumnCount = _getSelectedTableInfo14.totalColumnCount;
+      var _getSelectedTableInfo13 = (0, _utils2.getSelectedTableInfo)(state.selection),
+        table = _getSelectedTableInfo13.table,
+        totalRowCount = _getSelectedTableInfo13.totalRowCount,
+        totalColumnCount = _getSelectedTableInfo13.totalColumnCount;
       return {
         action: _analytics.TABLE_ACTION.CHANGED_ALIGNMENT,
         actionSubject: _analytics.ACTION_SUBJECT.TABLE,

package/dist/cjs/nodeviews/TableComponent.js

@@ -37,6 +37,7 @@ var _utils4 = require("../pm-plugins/table-resizing/utils");
 var _colgroup = require("../pm-plugins/table-resizing/utils/colgroup");
 var _consts = require("../pm-plugins/table-resizing/utils/consts");
 var _dom = require("../pm-plugins/table-resizing/utils/dom");
+var _misc = require("../pm-plugins/table-resizing/utils/misc");
 var _types = require("../types");
 var _TableFloatingColumnControls = _interopRequireDefault(require("../ui/TableFloatingColumnControls"));
 var _TableFloatingControls = _interopRequireDefault(require("../ui/TableFloatingControls"));
@@ -504,14 +505,14 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         isResizing = _this$props10.isResizing,
         view = _this$props10.view,
         getPos = _this$props10.getPos,
-        getEditorFeatureFlags = _this$props10.getEditorFeatureFlags;
+        getEditorFeatureFlags = _this$props10.getEditorFeatureFlags,
+        options = _this$props10.options;
       if (!this.table) {
         return;
       }
 
       // Remove any widths styles after resizing preview is completed
       this.table.style.width = '';
-      var tableRenderWidth = containerWidth.width - _consts.TABLE_EDITOR_MARGIN;
       var tableNode = getNode();
       var start = getPos() || 0;
       var depth = view.state.doc.resolve(start).depth;
@@ -520,12 +521,16 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
       }
       var tableNodeWidth = (0, _nodeWidth.getTableContainerWidth)(tableNode);
       var isTableResizedFullWidth = tableNodeWidth === 1800 && this.wasResizing && !isResizing;
+
       // Needed for undo / redo
       var isTableWidthChanged = tableNodeWidth !== this.tableNodeWidth;
+      var tableRenderWidth = options !== null && options !== void 0 && options.isCommentEditor ? containerWidth.width - (_consts.TABLE_OFFSET_IN_COMMENT_EDITOR + 1) // should be the same as this.table.parentElement?.clientWidth - 1, subtract 1 to avoid overflow
+      : containerWidth.width - _consts.TABLE_EDITOR_MARGIN;
+      tableNodeWidth = options !== null && options !== void 0 && options.isCommentEditor && !tableNode.attrs.width ? tableRenderWidth : tableNodeWidth;
       var isTableSquashed = tableRenderWidth < tableNodeWidth;
       var isNumberColumnChanged = tableNode.attrs.isNumberColumnEnabled !== this.node.attrs.isNumberColumnEnabled;
       var isNumberOfColumnsChanged = (0, _utils5.tablesHaveDifferentNoOfColumns)(tableNode, this.node);
-      var maybeScale = isTableSquashed || isTableWidthChanged || isTableResizedFullWidth || isNumberColumnChanged || isNumberOfColumnsChanged;
+      var maybeScale = isTableSquashed || isTableWidthChanged || isTableResizedFullWidth && !(options !== null && options !== void 0 && options.isCommentEditor) || isNumberColumnChanged || isNumberOfColumnsChanged;
       if (force || maybeScale) {
         var _this$containerWidth, _this$props$options, _this$props$options2, _this$props$options3;
         var containerWidthValue = containerWidth.width;
@@ -543,7 +548,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         // When in comment editor, we need the scaling percent to be 40% while tableWithFixedColumnWidthsOption is not visible
         !!((_this$props$options2 = this.props.options) !== null && _this$props$options2 !== void 0 && _this$props$options2.isTableScalingEnabled) && !!((_this$props$options3 = this.props.options) !== null && _this$props$options3 !== void 0 && _this$props$options3.isCommentEditor);
         if (force || !isResizing && shouldUpdateColgroup) {
-          var _this$props$options4;
+          var _this$props$options4, _this$props$options5, _this$props$options6, _this$props$options7, _this$props$options8, _this$props$options9;
           var resizeState = (0, _utils4.getResizeState)({
             minWidth: _utils4.COLUMN_MIN_WIDTH,
             maxSize: tableRenderWidth,
@@ -552,19 +557,29 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
             start: start,
             domAtPos: view.domAtPos.bind(view),
             isTableScalingEnabled: true,
-            shouldUseIncreasedScalingPercent: shouldUseIncreasedScalingPercent
+            shouldUseIncreasedScalingPercent: shouldUseIncreasedScalingPercent,
+            isCommentEditor: !!((_this$props$options4 = this.props.options) !== null && _this$props$options4 !== void 0 && _this$props$options4.isCommentEditor)
           });
           var shouldScaleOnColgroupUpdate = false;
-          if ((_this$props$options4 = this.props.options) !== null && _this$props$options4 !== void 0 && _this$props$options4.isTableScalingEnabled && !tableWithFixedColumnWidthsOption) {
+          if ((_this$props$options5 = this.props.options) !== null && _this$props$options5 !== void 0 && _this$props$options5.isTableScalingEnabled && !tableWithFixedColumnWidthsOption) {
             shouldScaleOnColgroupUpdate = true;
           }
           if (isTableScalingWithFixedColumnWidthsOptionEnabled && tableNode.attrs.displayMode !== 'fixed') {
             shouldScaleOnColgroupUpdate = true;
           }
+          if ((_this$props$options6 = this.props.options) !== null && _this$props$options6 !== void 0 && _this$props$options6.isTableScalingEnabled && (_this$props$options7 = this.props.options) !== null && _this$props$options7 !== void 0 && _this$props$options7.isCommentEditor) {
+            shouldScaleOnColgroupUpdate = true;
+          }
+          var scalePercent = 1;
+          if (!((_this$props$options8 = this.props.options) !== null && _this$props$options8 !== void 0 && _this$props$options8.isCommentEditor) || (_this$props$options9 = this.props.options) !== null && _this$props$options9 !== void 0 && _this$props$options9.isCommentEditor && tableNode.attrs.width) {
+            scalePercent = (0, _misc.getTableScalingPercent)(tableNode, this.table, shouldUseIncreasedScalingPercent);
+          } else {
+            scalePercent = (0, _misc.getScalingPercentForTableWithoutWidth)(tableNode, this.table);
+          }
 
           // Request animation frame required for Firefox
           requestAnimationFrame(function () {
-            (0, _utils4.updateColgroup)(resizeState, _this2.table, tableNode, shouldScaleOnColgroupUpdate, shouldUseIncreasedScalingPercent);
+            (0, _utils4.updateColgroup)(resizeState, _this2.table, tableNode, shouldScaleOnColgroupUpdate, scalePercent);
           });
         }
       }
@@ -575,8 +590,8 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(_, prevState) {
-      var _this$props$options5,
-        _this$props$options6,
+      var _this$props$options10,
+        _this$props$options11,
         _this$wrapper,
         _this3 = this;
       var _this$props11 = this.props,
@@ -605,7 +620,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         shouldHandleColgroupUpdates = true;
       }
       var isTableScalingWithFixedColumnWidthsOptionEnabled = !!isTableScalingEnabled && tableWithFixedColumnWidthsOption;
-      var shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.fg)('platform.editor.table.use-increased-scaling-percent') || !!isTableScalingEnabled && !!((_this$props$options5 = this.props.options) !== null && _this$props$options5 !== void 0 && _this$props$options5.isCommentEditor);
+      var shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.fg)('platform.editor.table.use-increased-scaling-percent') || !!isTableScalingEnabled && !!((_this$props$options10 = this.props.options) !== null && _this$props$options10 !== void 0 && _this$props$options10.isCommentEditor);
       if (isTableScalingWithFixedColumnWidthsOptionEnabled && getNode().attrs.displayMode !== 'fixed') {
         shouldScale = true;
         shouldHandleColgroupUpdates = true;
@@ -616,7 +631,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
       if (isInDanger && !table) {
         (0, _commands.clearHoverSelection)()(view.state, view.dispatch);
       }
-      if ((_this$props$options6 = this.props.options) !== null && _this$props$options6 !== void 0 && _this$props$options6.isCommentEditor && options !== null && options !== void 0 && options.isTableResizingEnabled) {
+      if ((_this$props$options11 = this.props.options) !== null && _this$props$options11 !== void 0 && _this$props$options11.isCommentEditor && options !== null && options !== void 0 && options.isTableResizingEnabled) {
         this.removeInlineTableWidth();
       }
       if ((_this$wrapper = this.wrapper) !== null && _this$wrapper !== void 0 && _this$wrapper.parentElement && this.table && !this.overflowShadowsObserver) {
@@ -661,7 +676,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
             var start = getPos() || 0;
             var depth = _view.state.doc.resolve(start).depth;
             shouldScale = depth === 0 && shouldScale;
-            (0, _utils4.insertColgroupFromNode)(this.table, currentTable, shouldScale, undefined, shouldUseIncreasedScalingPercent);
+            (0, _utils4.insertColgroupFromNode)(this.table, currentTable, shouldScale, undefined, shouldUseIncreasedScalingPercent, options === null || options === void 0 ? void 0 : options.isCommentEditor);
           }
           (0, _dom.updateControls)()(_view.state);
         }
@@ -703,7 +718,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
     key: "render",
     value: function render() {
       var _this4 = this,
-        _this$props$options7,
+        _this$props$options12,
         _classnames;
       var _this$props12 = this.props,
         view = _this$props12.view,
@@ -822,7 +837,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         stickyScrollbar = _getEditorFeatureFlag8.stickyScrollbar,
         _getEditorFeatureFlag9 = _getEditorFeatureFlag8.tableWithFixedColumnWidthsOption,
         tableWithFixedColumnWidthsOption = _getEditorFeatureFlag9 === void 0 ? false : _getEditorFeatureFlag9;
-      var shouldUseIncreasedScalingPercent = !!isTableScalingEnabled && (tableWithFixedColumnWidthsOption && (0, _platformFeatureFlags.fg)('platform.editor.table.use-increased-scaling-percent') || !!((_this$props$options7 = this.props.options) !== null && _this$props$options7 !== void 0 && _this$props$options7.isCommentEditor));
+      var shouldUseIncreasedScalingPercent = !!isTableScalingEnabled && (tableWithFixedColumnWidthsOption && (0, _platformFeatureFlags.fg)('platform.editor.table.use-increased-scaling-percent') || !!((_this$props$options12 = this.props.options) !== null && _this$props$options12 !== void 0 && _this$props$options12.isCommentEditor));
       return /*#__PURE__*/_react.default.createElement(_TableContainer.TableContainer
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
       , {

package/dist/cjs/nodeviews/TableContainer.js

@@ -5,7 +5,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.TableContainer = exports.ResizableTableContainer = exports.InnerContainer = void 0;
+exports.TableContainer = exports.ResizableTableContainer = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -22,7 +22,7 @@ var _tableContainerStyles = require("./table-container-styles");
 var _TableResizer = require("./TableResizer");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-var InnerContainer = exports.InnerContainer = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
+var InnerContainer = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var className = _ref.className,
     style = _ref.style,
     node = _ref.node,

package/dist/cjs/nodeviews/TableResizer.js

@@ -329,7 +329,7 @@ var TableResizer = exports.TableResizer = function TableResizer(_ref) {
         prevNode: node,
         start: pos + 1,
         parentWidth: newWidth
-      }, editorView.domAtPos.bind(editorView), pluginInjectionApi, isTableScalingEnabled, shouldUseIncreasedScalingPercent || false)(tr);
+      }, editorView.domAtPos.bind(editorView), pluginInjectionApi, isTableScalingEnabled, shouldUseIncreasedScalingPercent || false, isCommentEditor)(tr);
       var scaledNode = tr.doc.nodeAt(pos);
       (_attachAnalyticsEvent2 = attachAnalyticsEvent((0, _analytics2.generateResizedPayload)({
         originalNode: node,

package/dist/cjs/plugin.js

@@ -409,7 +409,8 @@ var tablesPlugin = function tablesPlugin(_ref) {
             getEditorContainerWidth: defaultGetEditorContainerWidth,
             getEditorFeatureFlags: (options === null || options === void 0 ? void 0 : options.getEditorFeatureFlags) || defaultGetEditorFeatureFlags,
             isChromelessEditor: options === null || options === void 0 ? void 0 : options.isChromelessEditor,
-            api: api
+            api: api,
+            isCommentEditor: options === null || options === void 0 ? void 0 : options.isCommentEditor
           }), (options === null || options === void 0 ? void 0 : options.allowContextualMenu) && /*#__PURE__*/_react.default.createElement(_FloatingContextualMenu.default, {
             editorView: editorView,
             mountPoint: popupsMountPoint,
@@ -440,7 +441,8 @@ var tablesPlugin = function tablesPlugin(_ref) {
             isTableScalingEnabled: options === null || options === void 0 ? void 0 : options.isTableScalingEnabled,
             getEditorFeatureFlags: (options === null || options === void 0 ? void 0 : options.getEditorFeatureFlags) || defaultGetEditorFeatureFlags,
             ariaNotifyPlugin: ariaNotifyPlugin,
-            api: api
+            api: api,
+            isCommentEditor: options === null || options === void 0 ? void 0 : options.isCommentEditor
           }), allowControls && !isDragAndDropEnabled && !isResizing && /*#__PURE__*/_react.default.createElement(_FloatingDeleteButton.default, {
             editorView: editorView,
             selection: editorView.state.selection,

package/dist/cjs/pm-plugins/analytics/plugin.js

@@ -22,6 +22,7 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, dispat
       });
       if (tr) {
         var _tr$getMeta2;
+        var newTr = newState.tr;
         dispatchAnalyticsEvent({
           action: _analytics.TABLE_ACTION.ROW_OR_COLUMN_MOVED,
           actionSubject: _analytics.ACTION_SUBJECT.TABLE,
@@ -31,7 +32,7 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, dispat
             type: (_tr$getMeta2 = tr.getMeta(_pluginKey.pluginKey)) === null || _tr$getMeta2 === void 0 || (_tr$getMeta2 = _tr$getMeta2.data) === null || _tr$getMeta2 === void 0 ? void 0 : _tr$getMeta2.type
           }
         });
-        return (0, _commands.resetRowOrColumnMovedTransform)()(tr);
+        return (0, _commands.resetRowOrColumnMovedTransform)()(newTr);
       }
       return undefined;
     },

package/dist/cjs/pm-plugins/decorations/utils/index.js

@@ -21,12 +21,6 @@ Object.defineProperty(exports, "clearColumnResizingDecorations", {
     return _columnResizing.clearColumnResizingDecorations;
   }
 });
-Object.defineProperty(exports, "composeDecorations", {
-  enumerable: true,
-  get: function get() {
-    return _composeDecorations.composeDecorations;
-  }
-});
 Object.defineProperty(exports, "maybeUpdateColumnControlsSelectedDecoration", {
   enumerable: true,
   get: function get() {
@@ -34,5 +28,4 @@ Object.defineProperty(exports, "maybeUpdateColumnControlsSelectedDecoration", {
   }
 });
 var _columnControls = require("./column-controls");
-var _columnResizing = require("./column-resizing");
-var _composeDecorations = require("./compose-decorations");
+var _columnResizing = require("./column-resizing");

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updatePluginStateDecorations = exports.toggleDragMenu = exports.setDropTarget = exports.moveSource = exports.getDecorations = exports.cloneSource = exports.clearDropTarget = void 0;
+exports.toggleDragMenu = exports.setDropTarget = exports.moveSource = exports.cloneSource = exports.clearDropTarget = void 0;
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _utils = require("@atlaskit/editor-tables/utils");
 var _types = require("../../types");
@@ -13,11 +13,11 @@ var _consts = require("./consts");
 var _pluginFactory = require("./plugin-factory");
 var _pluginKey = require("./plugin-key");
 // TODO: This command is a placeholder example. Please replace this if required.
-var getDecorations = exports.getDecorations = function getDecorations(state) {
+var getDecorations = function getDecorations(state) {
   var _pluginKey$getState;
   return ((_pluginKey$getState = _pluginKey.pluginKey.getState(state)) === null || _pluginKey$getState === void 0 ? void 0 : _pluginKey$getState.decorationSet) || _view.DecorationSet.empty;
 };
-var updatePluginStateDecorations = exports.updatePluginStateDecorations = function updatePluginStateDecorations(state, decorations, key) {
+var updatePluginStateDecorations = function updatePluginStateDecorations(state, decorations, key) {
   return (0, _utils2.updateDecorations)(state.doc, getDecorations(state), decorations, key);
 };
 var setDropTarget = exports.setDropTarget = function setDropTarget(type, index, hasMergedCells, tr) {