@atlaskit/editor-tables 2.5.2 → 2.5.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-tables
 
+## 2.5.4
+
+### Patch Changes
+
+- [#68572](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/68572) [`15d407fe5143`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/15d407fe5143) - Upgrading @atlaskit/editor-prosemirror dependency
+
+## 2.5.3
+
+### Patch Changes
+
+- [#70718](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/70718) [`e5d2832002bb`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e5d2832002bb) - Patched a bug in the table paste logic which was throwing an error during the selection phase of the paste event when the pasted data contained a table row ending with a merged cell. The error from the selection is causing the table data to be injected as plain text inline.
+
 ## 2.5.2
 
 ### Patch Changes

package/dist/cjs/utils/copy-paste.js

@@ -399,6 +399,6 @@ function insertCells(state, dispatch, tableStart, rect, cells) {
   }
   recomp();
   applyHeaderCells(tr, map, state, tableStart, table, headerRowEnabled, headerColumnEnabled);
-  tr.setSelection(new _cellSelection.CellSelection(tr.doc.resolve(tableStart + map.positionAt(top, left, table)), tr.doc.resolve(tableStart + map.positionAt(bottom - 1, right - 1, table))));
+  tr.setSelection(new _cellSelection.CellSelection(tr.doc.resolve(tableStart + map.map[top * map.width + left]), tr.doc.resolve(tableStart + map.map[(bottom - 1) * map.width + right - 1])));
   dispatch(tr);
 }

package/dist/es2019/utils/copy-paste.js

@@ -406,6 +406,6 @@ export function insertCells(state, dispatch, tableStart, rect, cells) {
   }
   recomp();
   applyHeaderCells(tr, map, state, tableStart, table, headerRowEnabled, headerColumnEnabled);
-  tr.setSelection(new CellSelection(tr.doc.resolve(tableStart + map.positionAt(top, left, table)), tr.doc.resolve(tableStart + map.positionAt(bottom - 1, right - 1, table))));
+  tr.setSelection(new CellSelection(tr.doc.resolve(tableStart + map.map[top * map.width + left]), tr.doc.resolve(tableStart + map.map[(bottom - 1) * map.width + right - 1])));
   dispatch(tr);
 }

package/dist/esm/utils/copy-paste.js

@@ -393,6 +393,6 @@ export function insertCells(state, dispatch, tableStart, rect, cells) {
   }
   recomp();
   applyHeaderCells(tr, map, state, tableStart, table, headerRowEnabled, headerColumnEnabled);
-  tr.setSelection(new CellSelection(tr.doc.resolve(tableStart + map.positionAt(top, left, table)), tr.doc.resolve(tableStart + map.positionAt(bottom - 1, right - 1, table))));
+  tr.setSelection(new CellSelection(tr.doc.resolve(tableStart + map.map[top * map.width + left]), tr.doc.resolve(tableStart + map.map[(bottom - 1) * map.width + right - 1])));
   dispatch(tr);
 }

package/dist/types/utils/copy-paste.d.ts

@@ -1,7 +1,8 @@
-import { NodeType, Node as PMNode, Slice } from '@atlaskit/editor-prosemirror/model';
-import { EditorState } from '@atlaskit/editor-prosemirror/state';
-import { Rect } from '../table-map';
-import { CellSelectionRect, Dispatch } from '../types';
+import type { NodeType, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { Slice } from '@atlaskit/editor-prosemirror/model';
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+import type { Rect } from '../table-map';
+import type { CellSelectionRect, Dispatch } from '../types';
 export declare function pastedCells(slice: Slice): CellSelectionRect | null;
 export declare function fitSlice(nodeType: NodeType, slice: Slice): PMNode;
 export declare function clipCells({ width: currentWidth, height: currentHeight, rows: currentRows, }: CellSelectionRect, newWidth: number, newHeight: number): CellSelectionRect;

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

@@ -1,7 +1,8 @@
-import { NodeType, Node as PMNode, Slice } from '@atlaskit/editor-prosemirror/model';
-import { EditorState } from '@atlaskit/editor-prosemirror/state';
-import { Rect } from '../table-map';
-import { CellSelectionRect, Dispatch } from '../types';
+import type { NodeType, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { Slice } from '@atlaskit/editor-prosemirror/model';
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+import type { Rect } from '../table-map';
+import type { CellSelectionRect, Dispatch } from '../types';
 export declare function pastedCells(slice: Slice): CellSelectionRect | null;
 export declare function fitSlice(nodeType: NodeType, slice: Slice): PMNode;
 export declare function clipCells({ width: currentWidth, height: currentHeight, rows: currentRows, }: CellSelectionRect, newWidth: number, newHeight: number): CellSelectionRect;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-tables",
-  "version": "2.5.2",
+  "version": "2.5.4",
   "description": "A package that contains common classes and utility functions for editor tables",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -28,13 +28,13 @@
     "releaseModel": "continuous"
   },
   "dependencies": {
-    "@atlaskit/editor-prosemirror": "1.1.0",
+    "@atlaskit/editor-prosemirror": "3.0.0",
     "@atlaskit/platform-feature-flags": "^0.2.4",
     "@babel/runtime": "^7.0.0"
   },
   "devDependencies": {
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
-    "@atlassian/feature-flags-test-utils": "^0.1.2"
+    "@atlassian/feature-flags-test-utils": "^0.2.0"
   },
   "techstack": {
     "@atlassian/frontend": {

package/tsconfig.json

@@ -1,36 +1,7 @@
 {
   "extends": "../../../tsconfig.json",
   "compilerOptions": {
-    "baseUrl": "./",
-    "paths": {
-      "@atlaskit/platform-feature-flags": [
-        "../../platform/feature-flags/src/index.ts"
-      ],
-      "@atlassian/feature-flags-test-utils": [
-        "../../platform/feature-flags-test-utils/src/index.ts"
-      ],
-      "@atlaskit/editor-tables/cell-bookmark": [
-        "src/cell-bookmark.ts"
-      ],
-      "@atlaskit/editor-tables/cell-selection": [
-        "src/cell-selection.ts"
-      ],
-      "@atlaskit/editor-tables/pm-plugins": [
-        "src/pm-plugins.ts"
-      ],
-      "@atlaskit/editor-tables/table-map": [
-        "src/table-map.ts"
-      ],
-      "@atlaskit/editor-tables/types": [
-        "src/types.ts"
-      ],
-      "@atlaskit/editor-tables/utils": [
-        "src/utils.ts"
-      ],
-      "@atlaskit/editor-tables": [
-        "./src"
-      ]
-    }
+    "baseUrl": "./"
   },
   "include": [
     "src/**/*.ts",