@atlaskit/editor-tables 2.3.16 → 2.3.18

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-tables
 
+## 2.3.18
+
+### Patch Changes
+
+- [#60278](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/60278) [`bc2785a02329`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/bc2785a02329) - Selection of multiple rows / column should remain when clicking the drag handle
+
+## 2.3.17
+
+### Patch Changes
+
+- [#59009](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/59009) [`f7e9d874ff37`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f7e9d874ff37) - Fix table expand selection when `platform.editor.table-shift-click-selection-backward` FF is enabled
+
 ## 2.3.16
 
 ### Patch Changes

package/afm-cc/tsconfig.json

@@ -0,0 +1,25 @@
+{
+    "extends": "../../../../tsconfig.entry-points.confluence.json",
+    "compilerOptions": {
+        "declaration": true,
+        "target": "es5",
+        "composite": true,
+        "outDir": "../dist",
+        "rootDir": "../",
+        "baseUrl": "../"
+    },
+    "include": [
+        "../src/**/*.ts",
+        "../src/**/*.tsx"
+    ],
+    "exclude": [
+        "../src/**/__tests__/*",
+        "../src/**/*.test.*",
+        "../src/**/test.*"
+    ],
+    "references": [
+        {
+            "path": "../../../platform/feature-flags/afm-cc/tsconfig.json"
+        }
+    ]
+}

package/dist/cjs/utils/select-nodes.js

@@ -1,9 +1,11 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.selectTableClosestToPos = exports.selectTable = exports.selectRow = exports.selectColumn = void 0;
+exports.selectTableClosestToPos = exports.selectTable = exports.selectRows = exports.selectRow = exports.selectColumns = exports.selectColumn = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _cellSelection = require("../cell-selection");
 var _tableMap = require("../table-map");
@@ -48,7 +50,7 @@ var select = function select(type) {
                   right: right,
                   bottom: index + 1
                 });
-                var isBackwardSelection = targetRowCells[0] < prevSelection.$head.pos;
+                var isBackwardSelection = targetRowCells[0] < prevSelection.$head.pos - table.start;
                 if (isBackwardSelection && isPrevRowSelection) {
                   var _head = table.start + cellsInFirstRow[0];
                   var _anchor = prevSelection.$anchorCell.pos;
@@ -73,7 +75,7 @@ var select = function select(type) {
                   right: index + 1,
                   bottom: bottom
                 });
-                var _isBackwardSelection = _targetRowCells[0] < prevSelection.$head.pos;
+                var _isBackwardSelection = _targetRowCells[0] < prevSelection.$head.pos - table.start;
                 if (_isBackwardSelection && isPrevRowSelection) {
                   var _head2 = table.start + cellsInFirstRow[0];
                   var _anchor2 = prevSelection.$anchorCell.pos;
@@ -115,6 +117,43 @@ var selectColumn = exports.selectColumn = select('column');
 // Returns a new transaction that selects a row at index `rowIndex`.
 // Use the optional `expand` param to extend from current selection.
 var selectRow = exports.selectRow = select('row');
+var selectRowsOrColumns = function selectRowsOrColumns(type) {
+  return function (indexes) {
+    return function (tr) {
+      var table = (0, _find.findTable)(tr.selection);
+      if (!table) {
+        return tr;
+      }
+      var map = _tableMap.TableMap.get(table.node);
+      if (!indexes || indexes.length <= 0 || type === 'rows' && Math.max.apply(Math, (0, _toConsumableArray2.default)(indexes)) > map.height || type === 'columns' && Math.max.apply(Math, (0, _toConsumableArray2.default)(indexes)) > map.width || Math.min.apply(Math, (0, _toConsumableArray2.default)(indexes)) < 0) {
+        return tr;
+      }
+      var startCellRect = map.cellsInRect({
+        left: type === 'rows' ? 0 : Math.min.apply(Math, (0, _toConsumableArray2.default)(indexes)),
+        top: type === 'rows' ? Math.min.apply(Math, (0, _toConsumableArray2.default)(indexes)) : 0,
+        right: type === 'rows' ? map.width : Math.min.apply(Math, (0, _toConsumableArray2.default)(indexes)) + 1,
+        bottom: type === 'rows' ? Math.min.apply(Math, (0, _toConsumableArray2.default)(indexes)) + 1 : 1
+      });
+      var endCellRect = map.cellsInRect({
+        left: type === 'rows' ? map.width - 1 : Math.max.apply(Math, (0, _toConsumableArray2.default)(indexes)),
+        top: type === 'rows' ? Math.max.apply(Math, (0, _toConsumableArray2.default)(indexes)) : map.height - 1,
+        right: type === 'rows' ? map.width : Math.max.apply(Math, (0, _toConsumableArray2.default)(indexes)) + 1,
+        bottom: type === 'rows' ? Math.max.apply(Math, (0, _toConsumableArray2.default)(indexes)) + 1 : map.height
+      });
+      var head = table.start + startCellRect[0];
+      var anchor = table.start + endCellRect[endCellRect.length - 1];
+      var $head = tr.doc.resolve(head);
+      var $anchor = tr.doc.resolve(anchor);
+      return (0, _cloneTr.cloneTr)(tr.setSelection(new _cellSelection.CellSelection($anchor, $head)));
+    };
+  };
+};
+
+// Returns a new transaction that selects all rows at `indexes`.
+var selectRows = exports.selectRows = selectRowsOrColumns('rows');
+
+// Returns a new transaction that selects all columns at `indexes`.
+var selectColumns = exports.selectColumns = selectRowsOrColumns('columns');
 
 // Returns a new transaction that selects a table.
 var selectTable = exports.selectTable = function selectTable(tr) {

package/dist/cjs/utils.js

@@ -333,12 +333,24 @@ Object.defineProperty(exports, "selectColumn", {
     return _selectNodes.selectColumn;
   }
 });
+Object.defineProperty(exports, "selectColumns", {
+  enumerable: true,
+  get: function get() {
+    return _selectNodes.selectColumns;
+  }
+});
 Object.defineProperty(exports, "selectRow", {
   enumerable: true,
   get: function get() {
     return _selectNodes.selectRow;
   }
 });
+Object.defineProperty(exports, "selectRows", {
+  enumerable: true,
+  get: function get() {
+    return _selectNodes.selectRows;
+  }
+});
 Object.defineProperty(exports, "selectTable", {
   enumerable: true,
   get: function get() {

package/dist/es2019/utils/select-nodes.js

@@ -40,7 +40,7 @@ const select = type => (index, expand) => tr => {
               right,
               bottom: index + 1
             });
-            const isBackwardSelection = targetRowCells[0] < prevSelection.$head.pos;
+            const isBackwardSelection = targetRowCells[0] < prevSelection.$head.pos - table.start;
             if (isBackwardSelection && isPrevRowSelection) {
               const head = table.start + cellsInFirstRow[0];
               const anchor = prevSelection.$anchorCell.pos;
@@ -65,7 +65,7 @@ const select = type => (index, expand) => tr => {
               right: index + 1,
               bottom
             });
-            const isBackwardSelection = targetRowCells[0] < prevSelection.$head.pos;
+            const isBackwardSelection = targetRowCells[0] < prevSelection.$head.pos - table.start;
             if (isBackwardSelection && isPrevRowSelection) {
               const head = table.start + cellsInFirstRow[0];
               const anchor = prevSelection.$anchorCell.pos;
@@ -105,6 +105,39 @@ export const selectColumn = select('column');
 // Returns a new transaction that selects a row at index `rowIndex`.
 // Use the optional `expand` param to extend from current selection.
 export const selectRow = select('row');
+const selectRowsOrColumns = type => indexes => tr => {
+  const table = findTable(tr.selection);
+  if (!table) {
+    return tr;
+  }
+  const map = TableMap.get(table.node);
+  if (!indexes || indexes.length <= 0 || type === 'rows' && Math.max(...indexes) > map.height || type === 'columns' && Math.max(...indexes) > map.width || Math.min(...indexes) < 0) {
+    return tr;
+  }
+  const startCellRect = map.cellsInRect({
+    left: type === 'rows' ? 0 : Math.min(...indexes),
+    top: type === 'rows' ? Math.min(...indexes) : 0,
+    right: type === 'rows' ? map.width : Math.min(...indexes) + 1,
+    bottom: type === 'rows' ? Math.min(...indexes) + 1 : 1
+  });
+  const endCellRect = map.cellsInRect({
+    left: type === 'rows' ? map.width - 1 : Math.max(...indexes),
+    top: type === 'rows' ? Math.max(...indexes) : map.height - 1,
+    right: type === 'rows' ? map.width : Math.max(...indexes) + 1,
+    bottom: type === 'rows' ? Math.max(...indexes) + 1 : map.height
+  });
+  const head = table.start + startCellRect[0];
+  const anchor = table.start + endCellRect[endCellRect.length - 1];
+  const $head = tr.doc.resolve(head);
+  const $anchor = tr.doc.resolve(anchor);
+  return cloneTr(tr.setSelection(new CellSelection($anchor, $head)));
+};
+
+// Returns a new transaction that selects all rows at `indexes`.
+export const selectRows = selectRowsOrColumns('rows');
+
+// Returns a new transaction that selects all columns at `indexes`.
+export const selectColumns = selectRowsOrColumns('columns');
 
 // Returns a new transaction that selects a table.
 export const selectTable = tr => {

package/dist/es2019/utils.js

@@ -27,7 +27,7 @@ export { normalizeSelection } from './utils/normalize-selection';
 export { removeColumnAt, removeSelectedColumns, removeColumnClosestToPos } from './utils/remove-column';
 export { removeRowAt, removeSelectedRows, removeRowClosestToPos } from './utils/remove-row';
 export { removeTable } from './utils/remove-table';
-export { selectColumn, selectRow, selectTable } from './utils/select-nodes';
+export { selectColumn, selectColumns, selectRow, selectRows, selectTable } from './utils/select-nodes';
 export { selectionCell } from './utils/selection-cell';
 export { selectedRect } from './utils/selection-rect';
 export { setCellAttrs } from './utils/set-cell-attrs';

package/dist/esm/utils/select-nodes.js

@@ -1,3 +1,4 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { CellSelection } from '../cell-selection';
 import { TableMap } from '../table-map';
@@ -42,7 +43,7 @@ var select = function select(type) {
                   right: right,
                   bottom: index + 1
                 });
-                var isBackwardSelection = targetRowCells[0] < prevSelection.$head.pos;
+                var isBackwardSelection = targetRowCells[0] < prevSelection.$head.pos - table.start;
                 if (isBackwardSelection && isPrevRowSelection) {
                   var _head = table.start + cellsInFirstRow[0];
                   var _anchor = prevSelection.$anchorCell.pos;
@@ -67,7 +68,7 @@ var select = function select(type) {
                   right: index + 1,
                   bottom: bottom
                 });
-                var _isBackwardSelection = _targetRowCells[0] < prevSelection.$head.pos;
+                var _isBackwardSelection = _targetRowCells[0] < prevSelection.$head.pos - table.start;
                 if (_isBackwardSelection && isPrevRowSelection) {
                   var _head2 = table.start + cellsInFirstRow[0];
                   var _anchor2 = prevSelection.$anchorCell.pos;
@@ -109,6 +110,43 @@ export var selectColumn = select('column');
 // Returns a new transaction that selects a row at index `rowIndex`.
 // Use the optional `expand` param to extend from current selection.
 export var selectRow = select('row');
+var selectRowsOrColumns = function selectRowsOrColumns(type) {
+  return function (indexes) {
+    return function (tr) {
+      var table = findTable(tr.selection);
+      if (!table) {
+        return tr;
+      }
+      var map = TableMap.get(table.node);
+      if (!indexes || indexes.length <= 0 || type === 'rows' && Math.max.apply(Math, _toConsumableArray(indexes)) > map.height || type === 'columns' && Math.max.apply(Math, _toConsumableArray(indexes)) > map.width || Math.min.apply(Math, _toConsumableArray(indexes)) < 0) {
+        return tr;
+      }
+      var startCellRect = map.cellsInRect({
+        left: type === 'rows' ? 0 : Math.min.apply(Math, _toConsumableArray(indexes)),
+        top: type === 'rows' ? Math.min.apply(Math, _toConsumableArray(indexes)) : 0,
+        right: type === 'rows' ? map.width : Math.min.apply(Math, _toConsumableArray(indexes)) + 1,
+        bottom: type === 'rows' ? Math.min.apply(Math, _toConsumableArray(indexes)) + 1 : 1
+      });
+      var endCellRect = map.cellsInRect({
+        left: type === 'rows' ? map.width - 1 : Math.max.apply(Math, _toConsumableArray(indexes)),
+        top: type === 'rows' ? Math.max.apply(Math, _toConsumableArray(indexes)) : map.height - 1,
+        right: type === 'rows' ? map.width : Math.max.apply(Math, _toConsumableArray(indexes)) + 1,
+        bottom: type === 'rows' ? Math.max.apply(Math, _toConsumableArray(indexes)) + 1 : map.height
+      });
+      var head = table.start + startCellRect[0];
+      var anchor = table.start + endCellRect[endCellRect.length - 1];
+      var $head = tr.doc.resolve(head);
+      var $anchor = tr.doc.resolve(anchor);
+      return cloneTr(tr.setSelection(new CellSelection($anchor, $head)));
+    };
+  };
+};
+
+// Returns a new transaction that selects all rows at `indexes`.
+export var selectRows = selectRowsOrColumns('rows');
+
+// Returns a new transaction that selects all columns at `indexes`.
+export var selectColumns = selectRowsOrColumns('columns');
 
 // Returns a new transaction that selects a table.
 export var selectTable = function selectTable(tr) {

package/dist/esm/utils.js

@@ -27,7 +27,7 @@ export { normalizeSelection } from './utils/normalize-selection';
 export { removeColumnAt, removeSelectedColumns, removeColumnClosestToPos } from './utils/remove-column';
 export { removeRowAt, removeSelectedRows, removeRowClosestToPos } from './utils/remove-row';
 export { removeTable } from './utils/remove-table';
-export { selectColumn, selectRow, selectTable } from './utils/select-nodes';
+export { selectColumn, selectColumns, selectRow, selectRows, selectTable } from './utils/select-nodes';
 export { selectionCell } from './utils/selection-cell';
 export { selectedRect } from './utils/selection-rect';
 export { setCellAttrs } from './utils/set-cell-attrs';

package/dist/types/utils/select-nodes.d.ts

@@ -2,5 +2,7 @@ import type { ResolvedPos } from '@atlaskit/editor-prosemirror/model';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 export declare const selectColumn: (index: number, expand?: boolean) => (tr: Transaction) => Transaction;
 export declare const selectRow: (index: number, expand?: boolean) => (tr: Transaction) => Transaction;
+export declare const selectRows: (indexes: number[]) => (tr: Transaction) => Transaction;
+export declare const selectColumns: (indexes: number[]) => (tr: Transaction) => Transaction;
 export declare const selectTable: (tr: Transaction) => Transaction;
 export declare const selectTableClosestToPos: (tr: Transaction, $pos: ResolvedPos) => Transaction;

package/dist/types/utils.d.ts

@@ -27,7 +27,7 @@ export { normalizeSelection } from './utils/normalize-selection';
 export { removeColumnAt, removeSelectedColumns, removeColumnClosestToPos, } from './utils/remove-column';
 export { removeRowAt, removeSelectedRows, removeRowClosestToPos, } from './utils/remove-row';
 export { removeTable } from './utils/remove-table';
-export { selectColumn, selectRow, selectTable } from './utils/select-nodes';
+export { selectColumn, selectColumns, selectRow, selectRows, selectTable, } from './utils/select-nodes';
 export { selectionCell } from './utils/selection-cell';
 export { selectedRect } from './utils/selection-rect';
 export type { SelectionRect } from './utils/selection-rect';

package/dist/types-ts4.5/utils/select-nodes.d.ts

@@ -2,5 +2,7 @@ import type { ResolvedPos } from '@atlaskit/editor-prosemirror/model';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 export declare const selectColumn: (index: number, expand?: boolean) => (tr: Transaction) => Transaction;
 export declare const selectRow: (index: number, expand?: boolean) => (tr: Transaction) => Transaction;
+export declare const selectRows: (indexes: number[]) => (tr: Transaction) => Transaction;
+export declare const selectColumns: (indexes: number[]) => (tr: Transaction) => Transaction;
 export declare const selectTable: (tr: Transaction) => Transaction;
 export declare const selectTableClosestToPos: (tr: Transaction, $pos: ResolvedPos) => Transaction;

package/dist/types-ts4.5/utils.d.ts

@@ -27,7 +27,7 @@ export { normalizeSelection } from './utils/normalize-selection';
 export { removeColumnAt, removeSelectedColumns, removeColumnClosestToPos, } from './utils/remove-column';
 export { removeRowAt, removeSelectedRows, removeRowClosestToPos, } from './utils/remove-row';
 export { removeTable } from './utils/remove-table';
-export { selectColumn, selectRow, selectTable } from './utils/select-nodes';
+export { selectColumn, selectColumns, selectRow, selectRows, selectTable, } from './utils/select-nodes';
 export { selectionCell } from './utils/selection-cell';
 export { selectedRect } from './utils/selection-rect';
 export type { SelectionRect } from './utils/selection-rect';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-tables",
-  "version": "2.3.16",
+  "version": "2.3.18",
   "description": "A package that contains common classes and utility functions for editor tables",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"