@atlaskit/editor-plugin-table 38.0.4 → 38.0.6

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

@@ -4,12 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.shiftArrowUpFromTable = exports.selectRows = exports.selectColumns = exports.modASelectTable = exports.arrowRightFromTable = exports.arrowLeftFromTable = void 0;
-var _messages = require("@atlaskit/editor-common/messages");
+var _table = require("@atlaskit/editor-common/messages/table");
 var _selection = require("@atlaskit/editor-common/selection");
+var _selection2 = require("@atlaskit/editor-common/selection/gap-cursor/selection");
+var _types = require("@atlaskit/editor-common/selection/types");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _tableMap = require("@atlaskit/editor-tables/table-map");
 var _utils = require("@atlaskit/editor-tables/utils");
+var _selectionRect = require("@atlaskit/editor-tables/utils/selection-rect");
 var _toolbar = require("../../ui/toolbar");
 var _pluginFactory = require("../plugin-factory");
 var _misc = require("./misc");
@@ -24,7 +27,7 @@ var arrowLeftFromTable = exports.arrowLeftFromTable = function arrowLeftFromTabl
       var selection = state.selection;
       if (selection instanceof _cellSelection.CellSelection) {
         return arrowLeftFromCellSelection(editorSelectionAPI)(selection)(state, dispatch);
-      } else if (selection instanceof _selection.GapCursorSelection) {
+      } else if (selection instanceof _selection2.GapCursorSelection) {
         return arrowLeftFromGapCursor(editorSelectionAPI)(selection)(state, dispatch);
       } else if (selection instanceof _state.TextSelection) {
         return arrowLeftFromText(editorSelectionAPI)(selection)(state, dispatch);
@@ -39,7 +42,7 @@ var arrowRightFromTable = exports.arrowRightFromTable = function arrowRightFromT
       var selection = state.selection;
       if (selection instanceof _cellSelection.CellSelection) {
         return arrowRightFromCellSelection(editorSelectionAPI)(selection)(state, dispatch);
-      } else if (selection instanceof _selection.GapCursorSelection) {
+      } else if (selection instanceof _selection2.GapCursorSelection) {
         return arrowRightFromGapCursor(editorSelectionAPI)(selection)(state, dispatch);
       } else if (selection instanceof _state.TextSelection) {
         return arrowRightFromText(editorSelectionAPI)(selection)(state, dispatch);
@@ -53,15 +56,15 @@ var arrowLeftFromCellSelection = function arrowLeftFromCellSelection(editorSelec
     return function (state, dispatch) {
       if ((0, _utils.isTableSelected)(state.selection) && editorSelectionAPI) {
         var selectionState = editorSelectionAPI.sharedState.currentState() || {};
-        if ((selectionState === null || selectionState === void 0 ? void 0 : selectionState.selectionRelativeToNode) === _selection.RelativeSelectionPos.Start) {
+        if ((selectionState === null || selectionState === void 0 ? void 0 : selectionState.selectionRelativeToNode) === _types.RelativeSelectionPos.Start) {
           // we have full table cell selection and want to set gap cursor selection before table
           return setGapCursorBeforeTable(editorSelectionAPI)()(state, dispatch);
-        } else if ((selectionState === null || selectionState === void 0 ? void 0 : selectionState.selectionRelativeToNode) === _selection.RelativeSelectionPos.End) {
+        } else if ((selectionState === null || selectionState === void 0 ? void 0 : selectionState.selectionRelativeToNode) === _types.RelativeSelectionPos.End) {
           // we have full table cell selection and want to set selection at end of last cell
           return setSelectionAtEndOfLastCell(editorSelectionAPI)(selection)(state, dispatch);
         } else if ((selectionState === null || selectionState === void 0 ? void 0 : selectionState.selectionRelativeToNode) === undefined) {
           // we have full table cell selection and want to set selection at start of first cell
-          return setSelectionAtStartOfFirstCell(editorSelectionAPI)(selection, _selection.RelativeSelectionPos.Before)(state, dispatch);
+          return setSelectionAtStartOfFirstCell(editorSelectionAPI)(selection, _types.RelativeSelectionPos.Before)(state, dispatch);
         }
       }
       return false;
@@ -74,10 +77,10 @@ var arrowRightFromCellSelection = function arrowRightFromCellSelection(editorSel
       if ((0, _utils.isTableSelected)(state.selection) && editorSelectionAPI) {
         var _ref = editorSelectionAPI.sharedState.currentState() || {},
           selectionRelativeToNode = _ref.selectionRelativeToNode;
-        if (selectionRelativeToNode === _selection.RelativeSelectionPos.Start) {
+        if (selectionRelativeToNode === _types.RelativeSelectionPos.Start) {
           // we have full table cell selection and want to set selection at start of first cell
           return setSelectionAtStartOfFirstCell(editorSelectionAPI)(selection)(state, dispatch);
-        } else if (selectionRelativeToNode === _selection.RelativeSelectionPos.End || selectionRelativeToNode === undefined) {
+        } else if (selectionRelativeToNode === _types.RelativeSelectionPos.End || selectionRelativeToNode === undefined) {
           // we have full table cell selection and want to set gap cursor selection after table
           return setGapCursorAfterTable(editorSelectionAPI)()(state, dispatch);
         }
@@ -92,7 +95,7 @@ var selectColumns = exports.selectColumns = function selectColumns(editorSelecti
     return function (state, dispatch) {
       var selection = state.selection;
       var table = (0, _utils.findTable)(selection);
-      var rect = (0, _utils.selectedRect)(state);
+      var rect = (0, _selectionRect.selectedRect)(state);
       if (table && (0, _utils.isRowSelected)(rect.top)(selection)) {
         return selectFullTable(editorSelectionAPI)({
           node: table.node,
@@ -104,7 +107,7 @@ var selectColumns = exports.selectColumns = function selectColumns(editorSelecti
         var selectColumnCommand = (0, _misc.selectColumn)(rect.left, undefined, triggeredByKeyboard)(state, dispatch);
         var map = _tableMap.TableMap.get(table.node);
         if (ariaNotify && getIntl) {
-          ariaNotify(getIntl().formatMessage(_messages.tableMessages.columnSelected, {
+          ariaNotify(getIntl().formatMessage(_table.messages.columnSelected, {
             index: rect.left + 1,
             total: map.width
           }), {
@@ -123,7 +126,7 @@ var selectRows = exports.selectRows = function selectRows(editorSelectionAPI, ar
     return function (state, dispatch) {
       var selection = state.selection;
       var table = (0, _utils.findTable)(selection);
-      var rect = (0, _utils.selectedRect)(state);
+      var rect = (0, _selectionRect.selectedRect)(state);
       if (table && (0, _utils.isColumnSelected)(rect.left)(selection)) {
         return selectFullTable(editorSelectionAPI)({
           node: table.node,
@@ -135,7 +138,7 @@ var selectRows = exports.selectRows = function selectRows(editorSelectionAPI, ar
         var selectRowCommand = (0, _misc.selectRow)(rect.top, undefined, triggeredByKeyboard)(state, dispatch);
         var map = _tableMap.TableMap.get(table.node);
         if (ariaNotify && getIntl) {
-          ariaNotify(getIntl().formatMessage(_messages.tableMessages.rowSelected, {
+          ariaNotify(getIntl().formatMessage(_table.messages.rowSelected, {
             index: rect.top + 1,
             total: map.height
           }), {
@@ -168,7 +171,7 @@ var arrowLeftFromGapCursor = function arrowLeftFromGapCursor(editorSelectionAPI)
         var table = (0, _utils.findTable)(selection);
         if (table && isSelectionAtStartOfTable($from, selection) && editorSelectionAPI) {
           var selectionState = editorSelectionAPI.sharedState.currentState() || {};
-          if ((selectionState === null || selectionState === void 0 ? void 0 : selectionState.selectionRelativeToNode) === _selection.RelativeSelectionPos.Before) {
+          if ((selectionState === null || selectionState === void 0 ? void 0 : selectionState.selectionRelativeToNode) === _types.RelativeSelectionPos.Before) {
             // we have a gap cursor at start of first table cell and want to set a gap cursor selection before table
             return setGapCursorBeforeTable(editorSelectionAPI)()(state, dispatch);
           } else {
@@ -228,7 +231,7 @@ var arrowLeftFromText = function arrowLeftFromText(editorSelectionAPI) {
         // + 3 for: row, cell & paragraph nodes
         editorSelectionAPI && !isColumnResizing) {
           var selectionState = editorSelectionAPI.sharedState.currentState() || {};
-          if ((selectionState === null || selectionState === void 0 ? void 0 : selectionState.selectionRelativeToNode) === _selection.RelativeSelectionPos.Before) {
+          if ((selectionState === null || selectionState === void 0 ? void 0 : selectionState.selectionRelativeToNode) === _types.RelativeSelectionPos.Before) {
             // we have a text selection at start of first table cell, directly inside a top level paragraph,
             // and want to set gap cursor selection before table
             return setGapCursorBeforeTable(editorSelectionAPI)()(state, dispatch);
@@ -310,12 +313,12 @@ var selectFullTable = function selectFullTable(editorSelectionAPI) {
         // Ignored via go/ees005
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         fullTableSelection = new _cellSelection.CellSelection($firstCell, $lastCell);
-        selectionRelativeToNode = _selection.RelativeSelectionPos.End;
+        selectionRelativeToNode = _types.RelativeSelectionPos.End;
       } else {
         // Ignored via go/ees005
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         fullTableSelection = new _cellSelection.CellSelection($lastCell, $firstCell);
-        selectionRelativeToNode = _selection.RelativeSelectionPos.Start;
+        selectionRelativeToNode = _types.RelativeSelectionPos.Start;
       }
       if (editorSelectionAPI) {
         var tr = editorSelectionAPI.actions.selectNearNode({
@@ -340,7 +343,7 @@ var setSelectionAtStartOfFirstCell = function setSelectionAtStartOfFirstCell(edi
       var $firstPosInsideCell = state.doc.resolve($firstCell.pos + 1);
 
       // check if first pos should have a gap cursor, otherwise find closest text selection
-      var selectionAtStartOfCell = _selection.GapCursorSelection.valid($firstPosInsideCell) ? new _selection.GapCursorSelection($firstPosInsideCell, _selection.Side.LEFT) : _state.Selection.findFrom($firstPosInsideCell, 1);
+      var selectionAtStartOfCell = _selection2.GapCursorSelection.valid($firstPosInsideCell) ? new _selection2.GapCursorSelection($firstPosInsideCell, _selection.Side.LEFT) : _state.Selection.findFrom($firstPosInsideCell, 1);
       if (editorSelectionAPI) {
         var tr = editorSelectionAPI.actions.selectNearNode({
           selectionRelativeToNode: selectionRelativeToNode,
@@ -365,7 +368,7 @@ var setSelectionAtEndOfLastCell = function setSelectionAtEndOfLastCell(editorSel
       var $lastPosInsideCell = state.doc.resolve(lastPosInsideCell);
 
       // check if last pos should have a gap cursor, otherwise find closest text selection
-      var selectionAtEndOfCell = _selection.GapCursorSelection.valid($lastPosInsideCell) ? new _selection.GapCursorSelection($lastPosInsideCell, _selection.Side.RIGHT) : _state.Selection.findFrom($lastPosInsideCell, -1);
+      var selectionAtEndOfCell = _selection2.GapCursorSelection.valid($lastPosInsideCell) ? new _selection2.GapCursorSelection($lastPosInsideCell, _selection.Side.RIGHT) : _state.Selection.findFrom($lastPosInsideCell, -1);
       if (editorSelectionAPI) {
         var tr = editorSelectionAPI.actions.selectNearNode({
           selectionRelativeToNode: selectionRelativeToNode,
@@ -386,8 +389,8 @@ var setGapCursorBeforeTable = function setGapCursorBeforeTable(editorSelectionAP
       var table = (0, _utils.findTable)(state.selection);
       if (table) {
         var $beforeTablePos = state.doc.resolve(table.pos);
-        if (_selection.GapCursorSelection.valid($beforeTablePos)) {
-          var selectionBeforeTable = new _selection.GapCursorSelection($beforeTablePos, _selection.Side.LEFT);
+        if (_selection2.GapCursorSelection.valid($beforeTablePos)) {
+          var selectionBeforeTable = new _selection2.GapCursorSelection($beforeTablePos, _selection.Side.LEFT);
           if (editorSelectionAPI) {
             var tr = editorSelectionAPI.actions.selectNearNode({
               selectionRelativeToNode: undefined,
@@ -410,8 +413,8 @@ var setGapCursorAfterTable = function setGapCursorAfterTable(editorSelectionAPI)
       var table = (0, _utils.findTable)(state.selection);
       if (table) {
         var $afterTablePos = state.doc.resolve(table.pos + table.node.nodeSize);
-        if (_selection.GapCursorSelection.valid($afterTablePos)) {
-          var selectionAfterTable = new _selection.GapCursorSelection($afterTablePos, _selection.Side.RIGHT);
+        if (_selection2.GapCursorSelection.valid($afterTablePos)) {
+          var selectionAfterTable = new _selection2.GapCursorSelection($afterTablePos, _selection.Side.RIGHT);
           if (editorSelectionAPI) {
             var tr = editorSelectionAPI.actions.selectNearNode({
               selectionRelativeToNode: undefined,

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

@@ -4,11 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.sortByColumn = void 0;
-var _customSteps = require("@atlaskit/custom-steps");
-var _utils = require("@atlaskit/editor-common/utils");
+var _constants = require("@atlaskit/custom-steps/constants");
+var _sortColumn = require("@atlaskit/custom-steps/sort-column");
+var _compareNodes = require("@atlaskit/editor-common/utils/compareNodes");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _tableMap = require("@atlaskit/editor-tables/table-map");
-var _utils2 = require("@atlaskit/editor-tables/utils");
+var _utils = require("@atlaskit/editor-tables/utils");
+var _getSelectionRect = require("@atlaskit/editor-tables/utils/get-selection-rect");
+var _isSelectionType = require("@atlaskit/editor-tables/utils/is-selection-type");
 var _pluginFactory = require("../plugin-factory");
 var createGetInlineCardTextFromStore = function createGetInlineCardTextFromStore(attrs) {
   var _ref = attrs,
@@ -25,7 +28,7 @@ var createGetInlineCardTextFromStore = function createGetInlineCardTextFromStore
   return cardUrl;
 };
 var sortByColumn = exports.sortByColumn = function sortByColumn(columnIndex) {
-  var order = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _customSteps.TableSortOrder.DESC;
+  var order = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _constants.TableSortOrder.DESC;
   return (0, _pluginFactory.createCommand)(function () {
     return {
       type: 'SORT_TABLE',
@@ -39,24 +42,24 @@ var sortByColumn = exports.sortByColumn = function sortByColumn(columnIndex) {
   }, function (tr, state) {
     // Ignored via go/ees005
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    var table = (0, _utils2.findTable)(tr.selection);
+    var table = (0, _utils.findTable)(tr.selection);
     if (!table || !table.node) {
       return tr;
     }
-    var selectionRect = (0, _utils2.isSelectionType)(tr.selection, 'cell') ?
+    var selectionRect = (0, _isSelectionType.isSelectionType)(tr.selection, 'cell') ?
     // Ignored via go/ees005
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    (0, _utils2.getSelectionRect)(tr.selection) : (0, _utils2.findCellRectClosestToPos)(tr.selection.$from);
+    (0, _getSelectionRect.getSelectionRect)(tr.selection) : (0, _utils.findCellRectClosestToPos)(tr.selection.$from);
     if (!selectionRect) {
       return tr;
     }
     var tablePluginState = (0, _pluginFactory.getPluginState)(state);
-    var tableArray = (0, _utils2.convertTableNodeToArrayOfRows)(table.node);
+    var tableArray = (0, _utils.convertTableNodeToArrayOfRows)(table.node);
     var headerRow;
     if (tablePluginState.isHeaderRowEnabled) {
       headerRow = tableArray.shift();
     }
-    var compareNodesInOrder = (0, _utils.createCompareNodes)({
+    var compareNodesInOrder = (0, _compareNodes.createCompareNodes)({
       getInlineCardTextFromStore: createGetInlineCardTextFromStore
     }, order);
     var sortedTable = tableArray.sort(function (rowA, rowB) {
@@ -65,7 +68,7 @@ var sortByColumn = exports.sortByColumn = function sortByColumn(columnIndex) {
     if (headerRow) {
       sortedTable.unshift(headerRow);
     }
-    var newTableNode = (0, _utils2.convertArrayOfRowsToTableNode)(table.node, sortedTable);
+    var newTableNode = (0, _utils.convertArrayOfRowsToTableNode)(table.node, sortedTable);
     tr.replaceWith(table.pos, table.pos + table.node.nodeSize, newTableNode);
     var pos = _tableMap.TableMap.get(table.node).positionAt(selectionRect.top, columnIndex, table.node);
     var prev = tablePluginState.ordering;
@@ -73,7 +76,7 @@ var sortByColumn = exports.sortByColumn = function sortByColumn(columnIndex) {
       columnIndex: columnIndex,
       order: order
     };
-    tr.step(new _customSteps.TableSortStep(table.pos, prev, next));
+    tr.step(new _sortColumn.TableSortStep(table.pos, prev, next));
     return tr.setSelection(_state.Selection.near(tr.doc.resolve(table.start + pos)));
   });
 };

package/dist/cjs/pm-plugins/commands/split-cell.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.splitCell = exports.canSplitCellSelection = void 0;
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _utils = require("@atlaskit/editor-tables/utils");
+var _splitCellWithType = require("@atlaskit/editor-tables/utils/split-cell-with-type");
 var _pluginFactory = require("../plugin-factory");
 var canSplitCellSelection = exports.canSplitCellSelection = function canSplitCellSelection(selection) {
   var cellNode;
@@ -33,7 +34,7 @@ var splitCell = exports.splitCell = function splitCell(state, dispatch) {
     tableHeader = _state$schema$nodes.tableHeader,
     tableCell = _state$schema$nodes.tableCell;
   if (dispatch) {
-    return (0, _utils.splitCellWithType)(function (_ref) {
+    return (0, _splitCellWithType.splitCellWithType)(function (_ref) {
       var row = _ref.row,
         col = _ref.col;
       if (row === 0 && tableState.isHeaderRowEnabled || col === 0 && tableState.isHeaderColumnEnabled) {

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

@@ -6,8 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.toggleTableLayout = exports.toggleNumberColumn = exports.toggleHeaderRow = exports.toggleHeaderColumn = exports.toggleContextualMenu = exports.getNextLayout = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _tableEvents = require("@atlaskit/editor-common/analytics/types/table-events");
 var _utils = require("@atlaskit/editor-tables/utils");
+var _toggleHeader = require("@atlaskit/editor-tables/utils/toggle-header");
 var _pluginFactory = require("../plugin-factory");
 var _tableAnalytics = require("../table-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; }
@@ -35,7 +36,7 @@ var getNextLayout = exports.getNextLayout = function getNextLayout(currentLayout
 
 // #region Actions
 var toggleHeaderRow = exports.toggleHeaderRow = function toggleHeaderRow(state, dispatch) {
-  return (0, _utils.toggleHeader)('row')(state, function (tr) {
+  return (0, _toggleHeader.toggleHeader)('row')(state, function (tr) {
     return (0, _pluginFactory.createCommand)({
       type: 'TOGGLE_HEADER_ROW'
     }, function () {
@@ -44,7 +45,7 @@ var toggleHeaderRow = exports.toggleHeaderRow = function toggleHeaderRow(state,
   });
 };
 var toggleHeaderColumn = exports.toggleHeaderColumn = function toggleHeaderColumn(state, dispatch) {
-  return (0, _utils.toggleHeader)('column')(state, function (tr) {
+  return (0, _toggleHeader.toggleHeader)('column')(state, function (tr) {
     return (0, _pluginFactory.createCommand)({
       type: 'TOGGLE_HEADER_COLUMN'
     }, function () {
@@ -64,7 +65,7 @@ var toggleNumberColumn = exports.toggleNumberColumn = function toggleNumberColum
     isNumberColumnEnabled: !isNumberedColumnEnabled
   }));
   tr.setMeta('scrollIntoView', false);
-  var tableOverflowChangeTriggerName = isNumberedColumnEnabled ? _analytics.TABLE_OVERFLOW_CHANGE_TRIGGER.DISABLED_NUMBERED_COLUMN : _analytics.TABLE_OVERFLOW_CHANGE_TRIGGER.ENABLED_NUMBERED_COLUMN;
+  var tableOverflowChangeTriggerName = isNumberedColumnEnabled ? _tableEvents.TABLE_OVERFLOW_CHANGE_TRIGGER.DISABLED_NUMBERED_COLUMN : _tableEvents.TABLE_OVERFLOW_CHANGE_TRIGGER.ENABLED_NUMBERED_COLUMN;
   tr.setMeta(_tableAnalytics.META_KEYS.OVERFLOW_TRIGGER, {
     name: tableOverflowChangeTriggerName
   });
@@ -89,7 +90,7 @@ var toggleTableLayout = exports.toggleTableLayout = function toggleTableLayout(s
       layout: layout
     }));
     tr.setMeta(_tableAnalytics.META_KEYS.OVERFLOW_TRIGGER, {
-      name: _analytics.TABLE_OVERFLOW_CHANGE_TRIGGER.RESIZED
+      name: _tableEvents.TABLE_OVERFLOW_CHANGE_TRIGGER.RESIZED
     });
     return tr.setMeta('scrollIntoView', false);
   })(state, dispatch);

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.pluginKey = exports.handleDocOrSelectionChanged = exports.getDecorations = exports.createPlugin = void 0;
-var _coreUtils = require("@atlaskit/editor-common/core-utils");
+var _inside = require("@atlaskit/editor-common/inside");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
@@ -44,7 +44,7 @@ var handleDocOrSelectionChanged = exports.handleDocOrSelectionChanged = function
       });
     }
     // We're exiting a table with an existing decorations so we should clean it up
-    if ((isInDanger || isTableHovered) && (!(0, _coreUtils.insideTable)(newState) || ((_findTable = (0, _utils.findTable)(newState.selection)) === null || _findTable === void 0 ? void 0 : _findTable.node) !== ((_findTable2 = (0, _utils.findTable)(oldState.selection)) === null || _findTable2 === void 0 ? void 0 : _findTable2.node))) {
+    if ((isInDanger || isTableHovered) && (!(0, _inside.insideTable)(newState) || ((_findTable = (0, _utils.findTable)(newState.selection)) === null || _findTable === void 0 ? void 0 : _findTable.node) !== ((_findTable2 = (0, _utils.findTable)(oldState.selection)) === null || _findTable2 === void 0 ? void 0 : _findTable2.node))) {
       return (0, _columnControls.buildColumnControlsDecorations)({
         decorationSet: decorationSet,
         tr: tr

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

@@ -6,26 +6,28 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.toggleDragMenuWithAnalytics = exports.moveSourceWithAnalyticsViaShortcut = exports.moveSourceWithAnalytics = exports.cloneSourceWithAnalytics = exports.clearDropTargetWithAnalytics = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _messages = require("@atlaskit/editor-common/messages");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _tableEvents = require("@atlaskit/editor-common/analytics/types/table-events");
+var _table = require("@atlaskit/editor-common/messages/table");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _utils = require("@atlaskit/editor-tables/utils");
-var _analytics2 = require("../utils/analytics");
+var _getSelectionRect = require("@atlaskit/editor-tables/utils/get-selection-rect");
+var _analytics = require("../utils/analytics");
 var _dragMenu = require("../utils/drag-menu");
 var _selection = require("../utils/selection");
 var _commands = require("./commands");
 var _pluginFactory = require("./plugin-factory");
 var clearDropTargetWithAnalytics = exports.clearDropTargetWithAnalytics = function clearDropTargetWithAnalytics(editorAnalyticsAPI) {
   return function (inputMethod, sourceType, sourceIndexes, status, tr) {
-    return (0, _analytics2.withEditorAnalyticsAPI)(function (_ref) {
+    return (0, _analytics.withEditorAnalyticsAPI)(function (_ref) {
       var _sourceIndexes$length;
       var selection = _ref.selection;
-      var _getSelectedTableInfo = (0, _analytics2.getSelectedTableInfo)(selection),
+      var _getSelectedTableInfo = (0, _analytics.getSelectedTableInfo)(selection),
         totalRowCount = _getSelectedTableInfo.totalRowCount,
         totalColumnCount = _getSelectedTableInfo.totalColumnCount;
       return {
-        action: sourceType === 'table-row' ? _analytics.TABLE_ACTION.MOVED_ROW : _analytics.TABLE_ACTION.MOVED_COLUMN,
-        actionSubject: _analytics.ACTION_SUBJECT.TABLE,
+        action: sourceType === 'table-row' ? _tableEvents.TABLE_ACTION.MOVED_ROW : _tableEvents.TABLE_ACTION.MOVED_COLUMN,
+        actionSubject: _enums.ACTION_SUBJECT.TABLE,
         actionSubjectId: null,
         attributes: {
           inputMethod: inputMethod,
@@ -35,7 +37,7 @@ var clearDropTargetWithAnalytics = exports.clearDropTargetWithAnalytics = functi
           totalRowCount: totalRowCount,
           totalColumnCount: totalColumnCount
         },
-        eventType: _analytics.EVENT_TYPE.TRACK
+        eventType: _enums.EVENT_TYPE.TRACK
       };
     })(editorAnalyticsAPI)(function (state, dispatch) {
       if (dispatch) {
@@ -47,15 +49,15 @@ var clearDropTargetWithAnalytics = exports.clearDropTargetWithAnalytics = functi
 };
 var moveSourceWithAnalytics = exports.moveSourceWithAnalytics = function moveSourceWithAnalytics(editorAnalyticsAPI, ariaNotify, getIntl) {
   return function (inputMethod, sourceType, sourceIndexes, targetIndex, tr) {
-    return (0, _analytics2.withEditorAnalyticsAPI)(function (_ref2) {
+    return (0, _analytics.withEditorAnalyticsAPI)(function (_ref2) {
       var selection = _ref2.selection;
       var direction = sourceIndexes[0] > targetIndex ? -1 : 1;
-      var _getSelectedTableInfo2 = (0, _analytics2.getSelectedTableInfo)(selection),
+      var _getSelectedTableInfo2 = (0, _analytics.getSelectedTableInfo)(selection),
         totalRowCount = _getSelectedTableInfo2.totalRowCount,
         totalColumnCount = _getSelectedTableInfo2.totalColumnCount;
       return {
-        action: sourceType === 'table-row' ? _analytics.TABLE_ACTION.MOVED_ROW : _analytics.TABLE_ACTION.MOVED_COLUMN,
-        actionSubject: _analytics.ACTION_SUBJECT.TABLE,
+        action: sourceType === 'table-row' ? _tableEvents.TABLE_ACTION.MOVED_ROW : _tableEvents.TABLE_ACTION.MOVED_COLUMN,
+        actionSubject: _enums.ACTION_SUBJECT.TABLE,
         actionSubjectId: null,
         attributes: {
           inputMethod: inputMethod,
@@ -66,22 +68,22 @@ var moveSourceWithAnalytics = exports.moveSourceWithAnalytics = function moveSou
             return Math.abs(targetIndex - v);
           }))) * direction,
           // If a drop doesn't actually change anything then we're going to mark the event as cancelled.
-          status: sourceIndexes.includes(targetIndex) ? _analytics.TABLE_STATUS.CANCELLED : _analytics.TABLE_STATUS.SUCCESS,
+          status: sourceIndexes.includes(targetIndex) ? _tableEvents.TABLE_STATUS.CANCELLED : _tableEvents.TABLE_STATUS.SUCCESS,
           totalRowCount: totalRowCount,
           totalColumnCount: totalColumnCount
         },
-        eventType: _analytics.EVENT_TYPE.TRACK
+        eventType: _enums.EVENT_TYPE.TRACK
       };
     })(editorAnalyticsAPI)(function (state, dispatch) {
       if (dispatch) {
         (0, _commands.moveSource)(sourceType, sourceIndexes, targetIndex, tr)(state, dispatch);
         // Only considering single row/column movement for screen reader as only single row/column selection is supported via keyboard atm.
-        if ((inputMethod === _analytics.INPUT_METHOD.TABLE_CONTEXT_MENU || _analytics.INPUT_METHOD.SHORTCUT) && sourceIndexes.length === 1 && ariaNotify && getIntl) {
+        if ((inputMethod === _enums.INPUT_METHOD.TABLE_CONTEXT_MENU || _enums.INPUT_METHOD.SHORTCUT) && sourceIndexes.length === 1 && ariaNotify && getIntl) {
           var direction = sourceIndexes[0] > targetIndex ? -1 : 1; // -1 for left/up , 1 for right/down
-          var _getSelectedTableInfo3 = (0, _analytics2.getSelectedTableInfo)(state.selection),
+          var _getSelectedTableInfo3 = (0, _analytics.getSelectedTableInfo)(state.selection),
             totalRowCount = _getSelectedTableInfo3.totalRowCount,
             totalColumnCount = _getSelectedTableInfo3.totalColumnCount;
-          ariaNotify(getIntl().formatMessage(sourceType === 'table-row' ? direction > 0 ? _messages.tableMessages.rowMovedDown : _messages.tableMessages.rowMovedUp : direction > 0 ? _messages.tableMessages.columnMovedRight : _messages.tableMessages.columnMovedLeft, {
+          ariaNotify(getIntl().formatMessage(sourceType === 'table-row' ? direction > 0 ? _table.messages.rowMovedDown : _table.messages.rowMovedUp : direction > 0 ? _table.messages.columnMovedRight : _table.messages.columnMovedLeft, {
             index: targetIndex + 1,
             total: sourceType === 'table-row' ? totalRowCount : totalColumnCount
           }), {
@@ -98,7 +100,7 @@ var moveSourceWithAnalyticsViaShortcut = exports.moveSourceWithAnalyticsViaShort
     return function (state, dispatch) {
       var selection = state.selection;
       var isCellSelection = selection instanceof _cellSelection.CellSelection;
-      var selectionRect = isCellSelection ? (0, _utils.getSelectionRect)(selection) : (0, _utils.findCellRectClosestToPos)(selection.$from);
+      var selectionRect = isCellSelection ? (0, _getSelectionRect.getSelectionRect)(selection) : (0, _utils.findCellRectClosestToPos)(selection.$from);
       if (!selectionRect) {
         return false;
       }
@@ -107,28 +109,28 @@ var moveSourceWithAnalyticsViaShortcut = exports.moveSourceWithAnalyticsViaShort
       if (selectedIndexes.length === 0) {
         return false;
       }
-      var _getSelectedTableInfo4 = (0, _analytics2.getSelectedTableInfo)(selection),
+      var _getSelectedTableInfo4 = (0, _analytics.getSelectedTableInfo)(selection),
         totalRowCount = _getSelectedTableInfo4.totalRowCount,
         totalColumnCount = _getSelectedTableInfo4.totalColumnCount;
       if (!(0, _dragMenu.canMove)(sourceType, direction, isRow ? totalRowCount : totalColumnCount, selection, selectionRect)) {
         return false;
       }
       var targetIndex = (0, _dragMenu.getTargetIndex)(selectedIndexes, direction);
-      return moveSourceWithAnalytics(editorAnalyticsAPI, ariaNotify, getIntl)(_analytics.INPUT_METHOD.SHORTCUT, sourceType, selectedIndexes, targetIndex)(state, dispatch);
+      return moveSourceWithAnalytics(editorAnalyticsAPI, ariaNotify, getIntl)(_enums.INPUT_METHOD.SHORTCUT, sourceType, selectedIndexes, targetIndex)(state, dispatch);
     };
   };
 };
 var cloneSourceWithAnalytics = exports.cloneSourceWithAnalytics = function cloneSourceWithAnalytics(editorAnalyticsAPI) {
   return function (inputMethod, sourceType, sourceIndexes, targetIndex, targetDirection, tr) {
-    return (0, _analytics2.withEditorAnalyticsAPI)(function (_ref3) {
+    return (0, _analytics.withEditorAnalyticsAPI)(function (_ref3) {
       var selection = _ref3.selection;
       var direction = sourceIndexes[0] > targetIndex ? -1 : 1;
-      var _getSelectedTableInfo5 = (0, _analytics2.getSelectedTableInfo)(selection),
+      var _getSelectedTableInfo5 = (0, _analytics.getSelectedTableInfo)(selection),
         totalRowCount = _getSelectedTableInfo5.totalRowCount,
         totalColumnCount = _getSelectedTableInfo5.totalColumnCount;
       return {
-        action: sourceType === 'table-row' ? _analytics.TABLE_ACTION.CLONED_ROW : _analytics.TABLE_ACTION.CLONED_COLUMN,
-        actionSubject: _analytics.ACTION_SUBJECT.TABLE,
+        action: sourceType === 'table-row' ? _tableEvents.TABLE_ACTION.CLONED_ROW : _tableEvents.TABLE_ACTION.CLONED_COLUMN,
+        actionSubject: _enums.ACTION_SUBJECT.TABLE,
         actionSubjectId: null,
         attributes: {
           inputMethod: inputMethod,
@@ -139,11 +141,11 @@ var cloneSourceWithAnalytics = exports.cloneSourceWithAnalytics = function clone
             return Math.abs(targetIndex - v);
           }))) * direction,
           // If a drop doesn't actually change anything then we're going to mark the event as cancelled.
-          status: sourceIndexes.includes(targetIndex) ? _analytics.TABLE_STATUS.CANCELLED : _analytics.TABLE_STATUS.SUCCESS,
+          status: sourceIndexes.includes(targetIndex) ? _tableEvents.TABLE_STATUS.CANCELLED : _tableEvents.TABLE_STATUS.SUCCESS,
           totalRowCount: totalRowCount,
           totalColumnCount: totalColumnCount
         },
-        eventType: _analytics.EVENT_TYPE.TRACK
+        eventType: _enums.EVENT_TYPE.TRACK
       };
     })(editorAnalyticsAPI)(function (state, dispatch) {
       if (dispatch) {
@@ -158,7 +160,7 @@ var cloneSourceWithAnalytics = exports.cloneSourceWithAnalytics = function clone
 var toggleDragMenuWithAnalytics = exports.toggleDragMenuWithAnalytics = function toggleDragMenuWithAnalytics(editorAnalyticsAPI) {
   return function (isDragMenuOpen, direction, index) {
     var trigger = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'mouse';
-    return (0, _analytics2.withEditorAnalyticsAPI)(function (state) {
+    return (0, _analytics.withEditorAnalyticsAPI)(function (state) {
       var _getPluginState = (0, _pluginFactory.getPluginState)(state),
         previousOpenState = _getPluginState.isDragMenuOpen,
         previousDragMenuDirection = _getPluginState.dragMenuDirection,
@@ -183,12 +185,12 @@ var toggleDragMenuWithAnalytics = exports.toggleDragMenuWithAnalytics = function
         var _ref4;
         // We only want to fire analytics when the menu is opened
         return {
-          action: _analytics.TABLE_ACTION.DRAG_MENU_OPENED,
-          actionSubject: _analytics.ACTION_SUBJECT.TABLE,
+          action: _tableEvents.TABLE_ACTION.DRAG_MENU_OPENED,
+          actionSubject: _enums.ACTION_SUBJECT.TABLE,
           actionSubjectId: null,
-          eventType: _analytics.EVENT_TYPE.TRACK,
+          eventType: _enums.EVENT_TYPE.TRACK,
           attributes: {
-            inputMethod: trigger === 'keyboard' ? _analytics.INPUT_METHOD.KEYBOARD : _analytics.INPUT_METHOD.MOUSE,
+            inputMethod: trigger === 'keyboard' ? _enums.INPUT_METHOD.KEYBOARD : _enums.INPUT_METHOD.MOUSE,
             direction: (_ref4 = direction !== null && direction !== void 0 ? direction : previousDragMenuDirection) !== null && _ref4 !== void 0 ? _ref4 : 'column'
           }
         };

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

@@ -5,7 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 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 _cloneColumn = require("@atlaskit/editor-tables/utils/clone-column");
+var _cloneRow = require("@atlaskit/editor-tables/utils/clone-row");
+var _moveColumn = require("@atlaskit/editor-tables/utils/move-column");
+var _moveRow = require("@atlaskit/editor-tables/utils/move-row");
 var _types = require("../../types");
 var _decoration = require("../utils/decoration");
 var _actions = require("./actions");
@@ -81,7 +84,7 @@ var moveSource = exports.moveSource = function moveSource(sourceType, sourceInde
     if (sourceIndexes.includes(targetIndex)) {
       return nextTr.setMeta('addToHistory', false);
     }
-    var move = sourceType === 'table-row' ? _utils.moveRow : _utils.moveColumn;
+    var move = sourceType === 'table-row' ? _moveRow.moveRow : _moveColumn.moveColumn;
     return move(state, sourceIndexes, targetIndex, {
       selectAfterMove: true
     })(nextTr);
@@ -133,7 +136,7 @@ var cloneSource = exports.cloneSource = function cloneSource(sourceType, sourceI
     };
   }, function (originalTr, state) {
     var nextTr = tr || originalTr;
-    var clone = sourceType === 'table-row' ? _utils.cloneRow : _utils.cloneColumn;
+    var clone = sourceType === 'table-row' ? _cloneRow.cloneRow : _cloneColumn.cloneColumn;
     return clone(state, sourceIndexes, targetIndex, targetDirection, {
       selectAfterClone: true
     })(nextTr);

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

@@ -6,13 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getPluginState = exports.createPluginState = exports.createCommand = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _utils = require("@atlaskit/editor-common/utils");
+var _pluginStateFactory = require("@atlaskit/editor-common/utils/plugin-state-factory");
 var _pluginKey = require("../plugin-key");
 var _pluginKey2 = require("./plugin-key");
 var _reducer = _interopRequireDefault(require("./reducer"));
 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 dest = (0, _utils.pluginFactory)(_pluginKey2.pluginKey, _reducer.default, {
+var dest = (0, _pluginStateFactory.pluginFactory)(_pluginKey2.pluginKey, _reducer.default, {
   mapping: function mapping(tr, pluginState) {
     if (tr.docChanged) {
       var decorationSet = pluginState.decorationSet;