@atlaskit/editor-tables 2.3.15 → 2.3.17

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-tables
 
+## 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
+
+- [#58433](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/58433) [`4d8e164d7760`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/4d8e164d7760) - fix shift + click to expand column / row selection bug when `platform.editor.table.drag-and-drop` is enabled
+
 ## 2.3.15
 
 ### 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/pm-plugins/input.js

@@ -131,7 +131,7 @@ function handleTripleClick(view, pos) {
   view.dispatch(view.state.tr.setSelection(new _cellSelection.CellSelection($cell)));
   return true;
 }
-function handleMouseDown(view, event) {
+function handleMouseDown(view, event, dragAndDropEnabled) {
   var startEvent = event;
   // Prevent right clicks from making a cell selection https://product-fabric.atlassian.net/browse/ED-12527
   if (startEvent.ctrlKey || startEvent.metaKey || startEvent.button === 2 // right mouse click
@@ -142,6 +142,9 @@ function handleMouseDown(view, event) {
   var $anchor = (0, _cells.cellAround)(view.state.selection.$anchor);
   if (startEvent.shiftKey && view.state.selection instanceof _cellSelection.CellSelection) {
     // Adding to an existing cell selection
+    if (dragAndDropEnabled) {
+      return false;
+    }
     setCellSelection(view.state.selection.$anchorCell, startEvent);
     startEvent.preventDefault();
   } else if (startEvent.shiftKey && startDOMCell && $anchor !== null && cellUnderMouse(view, startEvent).pos !== $anchor.pos) {

package/dist/cjs/pm-plugins/table-editing.js

@@ -28,6 +28,8 @@ function tableEditing() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     _ref$allowTableNodeSe = _ref.allowTableNodeSelection,
     allowTableNodeSelection = _ref$allowTableNodeSe === void 0 ? false : _ref$allowTableNodeSe,
+    _ref$dragAndDropEnabl = _ref.dragAndDropEnabled,
+    dragAndDropEnabled = _ref$dragAndDropEnabl === void 0 ? false : _ref$dragAndDropEnabl,
     reportFixedTable = _ref.reportFixedTable;
   return new _state.Plugin({
     key: _pluginKey.tableEditingKey,
@@ -56,7 +58,9 @@ function tableEditing() {
     props: {
       decorations: _drawCellSelection.drawCellSelection,
       handleDOMEvents: {
-        mousedown: _input.handleMouseDown
+        mousedown: function mousedown(view, event) {
+          (0, _input.handleMouseDown)(view, event, dragAndDropEnabled);
+        }
       },
       createSelectionBetween: function createSelectionBetween(view) {
         if (_pluginKey.tableEditingKey.getState(view.state) != null) {

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

@@ -48,7 +48,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 +73,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;

package/dist/es2019/pm-plugins/input.js

@@ -130,7 +130,7 @@ export function handleTripleClick(view, pos) {
   view.dispatch(view.state.tr.setSelection(new CellSelection($cell)));
   return true;
 }
-export function handleMouseDown(view, event) {
+export function handleMouseDown(view, event, dragAndDropEnabled) {
   const startEvent = event;
   // Prevent right clicks from making a cell selection https://product-fabric.atlassian.net/browse/ED-12527
   if (startEvent.ctrlKey || startEvent.metaKey || startEvent.button === 2 // right mouse click
@@ -141,6 +141,9 @@ export function handleMouseDown(view, event) {
   const $anchor = cellAround(view.state.selection.$anchor);
   if (startEvent.shiftKey && view.state.selection instanceof CellSelection) {
     // Adding to an existing cell selection
+    if (dragAndDropEnabled) {
+      return false;
+    }
     setCellSelection(view.state.selection.$anchorCell, startEvent);
     startEvent.preventDefault();
   } else if (startEvent.shiftKey && startDOMCell && $anchor !== null && cellUnderMouse(view, startEvent).pos !== $anchor.pos) {

package/dist/es2019/pm-plugins/table-editing.js

@@ -20,6 +20,7 @@ import { tableEditingKey } from './plugin-key';
 // perform more specific behavior.
 export function tableEditing({
   allowTableNodeSelection = false,
+  dragAndDropEnabled = false,
   reportFixedTable
 } = {}) {
   return new Plugin({
@@ -50,7 +51,9 @@ export function tableEditing({
     props: {
       decorations: drawCellSelection,
       handleDOMEvents: {
-        mousedown: handleMouseDown
+        mousedown: (view, event) => {
+          handleMouseDown(view, event, dragAndDropEnabled);
+        }
       },
       createSelectionBetween(view) {
         if (tableEditingKey.getState(view.state) != null) {

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;

package/dist/esm/pm-plugins/input.js

@@ -123,7 +123,7 @@ export function handleTripleClick(view, pos) {
   view.dispatch(view.state.tr.setSelection(new CellSelection($cell)));
   return true;
 }
-export function handleMouseDown(view, event) {
+export function handleMouseDown(view, event, dragAndDropEnabled) {
   var startEvent = event;
   // Prevent right clicks from making a cell selection https://product-fabric.atlassian.net/browse/ED-12527
   if (startEvent.ctrlKey || startEvent.metaKey || startEvent.button === 2 // right mouse click
@@ -134,6 +134,9 @@ export function handleMouseDown(view, event) {
   var $anchor = cellAround(view.state.selection.$anchor);
   if (startEvent.shiftKey && view.state.selection instanceof CellSelection) {
     // Adding to an existing cell selection
+    if (dragAndDropEnabled) {
+      return false;
+    }
     setCellSelection(view.state.selection.$anchorCell, startEvent);
     startEvent.preventDefault();
   } else if (startEvent.shiftKey && startDOMCell && $anchor !== null && cellUnderMouse(view, startEvent).pos !== $anchor.pos) {

package/dist/esm/pm-plugins/table-editing.js

@@ -22,6 +22,8 @@ export function tableEditing() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     _ref$allowTableNodeSe = _ref.allowTableNodeSelection,
     allowTableNodeSelection = _ref$allowTableNodeSe === void 0 ? false : _ref$allowTableNodeSe,
+    _ref$dragAndDropEnabl = _ref.dragAndDropEnabled,
+    dragAndDropEnabled = _ref$dragAndDropEnabl === void 0 ? false : _ref$dragAndDropEnabl,
     reportFixedTable = _ref.reportFixedTable;
   return new Plugin({
     key: tableEditingKey,
@@ -50,7 +52,9 @@ export function tableEditing() {
     props: {
       decorations: drawCellSelection,
       handleDOMEvents: {
-        mousedown: handleMouseDown
+        mousedown: function mousedown(view, event) {
+          handleMouseDown(view, event, dragAndDropEnabled);
+        }
       },
       createSelectionBetween: function createSelectionBetween(view) {
         if (tableEditingKey.getState(view.state) != null) {

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

@@ -42,7 +42,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 +67,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;

package/dist/types/pm-plugins/input.d.ts

@@ -1,4 +1,4 @@
-import { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 export declare const handleKeyDown: (view: EditorView, event: KeyboardEvent) => boolean;
 export declare function handleTripleClick(view: EditorView, pos: number): boolean;
-export declare function handleMouseDown(view: EditorView, event: Event): boolean;
+export declare function handleMouseDown(view: EditorView, event: Event, dragAndDropEnabled: boolean): boolean;

package/dist/types/pm-plugins/table-editing.d.ts

@@ -1,8 +1,9 @@
 import { Plugin } from '@atlaskit/editor-prosemirror/state';
-import { ReportFixedTable } from '../utils/fix-tables';
+import type { ReportFixedTable } from '../utils/fix-tables';
 type PluginState = number | null;
-export declare function tableEditing({ allowTableNodeSelection, reportFixedTable, }?: {
+export declare function tableEditing({ allowTableNodeSelection, dragAndDropEnabled, reportFixedTable, }?: {
     allowTableNodeSelection?: boolean;
+    dragAndDropEnabled?: boolean;
     reportFixedTable?: ReportFixedTable;
 }): Plugin<PluginState>;
 export {};

package/dist/types-ts4.5/pm-plugins/input.d.ts

@@ -1,4 +1,4 @@
-import { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 export declare const handleKeyDown: (view: EditorView, event: KeyboardEvent) => boolean;
 export declare function handleTripleClick(view: EditorView, pos: number): boolean;
-export declare function handleMouseDown(view: EditorView, event: Event): boolean;
+export declare function handleMouseDown(view: EditorView, event: Event, dragAndDropEnabled: boolean): boolean;

package/dist/types-ts4.5/pm-plugins/table-editing.d.ts

@@ -1,8 +1,9 @@
 import { Plugin } from '@atlaskit/editor-prosemirror/state';
-import { ReportFixedTable } from '../utils/fix-tables';
+import type { ReportFixedTable } from '../utils/fix-tables';
 type PluginState = number | null;
-export declare function tableEditing({ allowTableNodeSelection, reportFixedTable, }?: {
+export declare function tableEditing({ allowTableNodeSelection, dragAndDropEnabled, reportFixedTable, }?: {
     allowTableNodeSelection?: boolean;
+    dragAndDropEnabled?: boolean;
     reportFixedTable?: ReportFixedTable;
 }): Plugin<PluginState>;
 export {};

package/package.json

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

package/tmp/api-report-tmp.d.ts

@@ -1,183 +0,0 @@
-## API Report File for "@atlaskit/editor-tables"
-
-> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
-
-```ts
-
-import { ContentNodeWithPos } from '@atlaskit/editor-prosemirror/utils';
-import { Mappable } from '@atlaskit/editor-prosemirror/transform';
-import { Mapping } from '@atlaskit/editor-prosemirror/transform';
-import { Node as Node_2 } from '@atlaskit/editor-prosemirror/model';
-import { ResolvedPos } from '@atlaskit/editor-prosemirror/model';
-import { Selection as Selection_2 } from '@atlaskit/editor-prosemirror/state';
-import { SelectionBookmark } from '@atlaskit/editor-prosemirror/state';
-import { Slice } from '@atlaskit/editor-prosemirror/model';
-import { Transaction } from '@atlaskit/editor-prosemirror/state';
-
-// @public (undocumented)
-type Axis = 'horiz' | 'vert';
-
-// @public (undocumented)
-class CellBookmark implements SelectionBookmark {
-    constructor(anchor: number, head: number);
-    // (undocumented)
-    readonly anchor: number;
-    // (undocumented)
-    readonly head: number;
-    // (undocumented)
-    map(mapping: Mappable): SelectionBookmark;
-    // (undocumented)
-    resolve(doc: Node_2): Selection_2;
-}
-
-// @public (undocumented)
-export class CellSelection extends Selection_2 {
-    // (undocumented)
-    readonly $anchorCell: ResolvedPos;
-    // (undocumented)
-    readonly $headCell: ResolvedPos;
-    constructor($anchorCell: ResolvedPos, $headCell?: ResolvedPos);
-    // (undocumented)
-    static colSelection($anchorCell: ResolvedPos, $headCell?: ResolvedPos): CellSelection;
-    // (undocumented)
-    content(): Slice;
-    // (undocumented)
-    static create(doc: Node_2, anchorCell: number, headCell?: number): CellSelection;
-    // (undocumented)
-    eq(other: CellSelection): boolean;
-    // (undocumented)
-    forEachCell(f: (node: Node_2, pos: number) => void): void;
-    // (undocumented)
-    static fromJSON(doc: Node_2, json: SerializedCellSelection): CellSelection;
-    // (undocumented)
-    getBookmark(): CellBookmark;
-    // (undocumented)
-    isColSelection(): boolean;
-    // (undocumented)
-    isRowSelection(): boolean;
-    // (undocumented)
-    map(doc: Node_2, mapping: Mapping): Selection_2;
-    // (undocumented)
-    replace(tr: Transaction, content?: Slice): void;
-    // (undocumented)
-    replaceWith(tr: Transaction, node: Node_2): void;
-    // (undocumented)
-    static rowSelection($anchorCell: ResolvedPos, $headCell?: ResolvedPos): CellSelection;
-    // (undocumented)
-    toJSON(): SerializedCellSelection;
-    // (undocumented)
-    readonly visible: boolean;
-}
-
-// @public (undocumented)
-export const findTable: (selection: Selection_2) => ContentNodeWithPos | undefined;
-
-// @public (undocumented)
-export class Rect {
-    constructor(left: number, top: number, right: number, bottom: number);
-    // (undocumented)
-    bottom: number;
-    // (undocumented)
-    left: number;
-    // (undocumented)
-    right: number;
-    // (undocumented)
-    top: number;
-}
-
-// @public (undocumented)
-interface SerializedCellSelection {
-    // (undocumented)
-    anchor: number;
-    // (undocumented)
-    head: number;
-    // (undocumented)
-    type: 'cell';
-}
-
-// @public (undocumented)
-export class TableMap {
-    constructor(width: number, height: number, map: number[], problems?: TableProblem[] | null);
-    // (undocumented)
-    cellsInRect(rect: Rect): number[];
-    // (undocumented)
-    colCount(pos: number): number;
-    // (undocumented)
-    findCell(pos: number): Rect;
-    // (undocumented)
-    static get(table: Node_2): TableMap;
-    // (undocumented)
-    getMaxColInRow(pos: ResolvedPos): number | undefined;
-    // (undocumented)
-    height: number;
-    // (undocumented)
-    isPosMerged(pos: number): boolean;
-    // (undocumented)
-    map: number[];
-    // (undocumented)
-    nextCell(pos: number, axis: Axis, dir: number): null | number;
-    // (undocumented)
-    positionAt(row: number, col: number, table: Node_2): number;
-    // (undocumented)
-    problems?: TableProblem[] | null;
-    // (undocumented)
-    rectBetween(a: number, b: number): Rect;
-    // (undocumented)
-    rowCount(pos: number): number;
-    // (undocumented)
-    width: number;
-}
-
-// @public (undocumented)
-type TableProblem = TableProblemColWidthMismatch | TableProblemCollision | TableProblemLongRowspan | TableProblemMissing;
-
-// @public (undocumented)
-type TableProblemCollision = {
-    type: TableProblemTypes.COLLISION;
-    row: number;
-    pos: number;
-    n: number;
-};
-
-// @public (undocumented)
-type TableProblemColWidthMismatch = {
-    type: TableProblemTypes;
-    pos: number;
-    colwidth: number;
-};
-
-// @public (undocumented)
-type TableProblemLongRowspan = {
-    type: TableProblemTypes.OVERLONG_ROWSPAN;
-    pos: number;
-    n: number;
-};
-
-// @public (undocumented)
-type TableProblemMissing = {
-    type: TableProblemTypes.MISSING;
-    row: number;
-    n: number;
-};
-
-// @public (undocumented)
-enum TableProblemTypes {
-    // (undocumented)
-    COLLISION = "collision",
-    // (undocumented)
-    COLWIDTH_MISMATCH = "colwidth mismatch",
-    // (undocumented)
-    MISSING = "missing",
-    // (undocumented)
-    OVERLONG_ROWSPAN = "overlong_rowspan"
-}
-
-// @public (undocumented)
-export const uuid: {
-    setStatic(value: false | string): void;
-    generate(): string;
-};
-
-// (No @packageDocumentation comment for this package)
-
-```