@atlaskit/editor-plugin-table 5.4.9 → 5.4.10

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-plugin-table
 
+## 5.4.10
+
+### Patch Changes
+
+- [#58174](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/58174) [`b409282ab2b8`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/b409282ab2b8) - Check pasted slice is a table element before trying to access table map
+
 ## 5.4.9
 
 ### Patch Changes

package/dist/cjs/plugins/table/commands/misc.js

@@ -181,17 +181,21 @@ var getTableSelectionType = exports.getTableSelectionType = function getTableSel
   }
 };
 var getTableElementMoveTypeBySlice = exports.getTableElementMoveTypeBySlice = function getTableElementMoveTypeBySlice(slice, state) {
-  if (!slice.content.firstChild) {
+  var _state$schema$nodes = state.schema.nodes,
+    tableRow = _state$schema$nodes.tableRow,
+    table = _state$schema$nodes.table;
+
+  // check if copied slice is a table or table row
+  if (!slice.content.firstChild || slice.content.firstChild.type !== table && slice.content.firstChild.type !== tableRow) {
     return;
   }
-  var schema = state.schema;
 
   // if the slice only contains one table row, assume it's a row
-  if (slice.content.childCount === 1 && slice.content.firstChild.type === schema.nodes.tableRow) {
+  if (slice.content.childCount === 1 && slice.content.firstChild.type === tableRow) {
     return 'row';
   }
-  var table = (0, _utils2.findTable)(state.tr.selection);
-  var map = _tableMap.TableMap.get(table.node);
+  var currentTable = (0, _utils2.findTable)(state.tr.selection);
+  var map = _tableMap.TableMap.get(currentTable.node);
   var slicedMap = _tableMap.TableMap.get(slice.content.firstChild);
   return map.width === slicedMap.width ? 'row' : map.height === slicedMap.height ? 'column' : undefined;
 };

package/dist/es2019/plugins/table/commands/misc.js

@@ -183,19 +183,26 @@ export const getTableSelectionType = selection => {
   }
 };
 export const getTableElementMoveTypeBySlice = (slice, state) => {
-  if (!slice.content.firstChild) {
-    return;
-  }
   const {
-    schema
+    schema: {
+      nodes: {
+        tableRow,
+        table
+      }
+    }
   } = state;
 
+  // check if copied slice is a table or table row
+  if (!slice.content.firstChild || slice.content.firstChild.type !== table && slice.content.firstChild.type !== tableRow) {
+    return;
+  }
+
   // if the slice only contains one table row, assume it's a row
-  if (slice.content.childCount === 1 && slice.content.firstChild.type === schema.nodes.tableRow) {
+  if (slice.content.childCount === 1 && slice.content.firstChild.type === tableRow) {
     return 'row';
   }
-  const table = findTable(state.tr.selection);
-  const map = TableMap.get(table.node);
+  const currentTable = findTable(state.tr.selection);
+  const map = TableMap.get(currentTable.node);
   const slicedMap = TableMap.get(slice.content.firstChild);
   return map.width === slicedMap.width ? 'row' : map.height === slicedMap.height ? 'column' : undefined;
 };

package/dist/esm/plugins/table/commands/misc.js

@@ -174,17 +174,21 @@ export var getTableSelectionType = function getTableSelectionType(selection) {
   }
 };
 export var getTableElementMoveTypeBySlice = function getTableElementMoveTypeBySlice(slice, state) {
-  if (!slice.content.firstChild) {
+  var _state$schema$nodes = state.schema.nodes,
+    tableRow = _state$schema$nodes.tableRow,
+    table = _state$schema$nodes.table;
+
+  // check if copied slice is a table or table row
+  if (!slice.content.firstChild || slice.content.firstChild.type !== table && slice.content.firstChild.type !== tableRow) {
     return;
   }
-  var schema = state.schema;
 
   // if the slice only contains one table row, assume it's a row
-  if (slice.content.childCount === 1 && slice.content.firstChild.type === schema.nodes.tableRow) {
+  if (slice.content.childCount === 1 && slice.content.firstChild.type === tableRow) {
     return 'row';
   }
-  var table = findTable(state.tr.selection);
-  var map = TableMap.get(table.node);
+  var currentTable = findTable(state.tr.selection);
+  var map = TableMap.get(currentTable.node);
   var slicedMap = TableMap.get(slice.content.firstChild);
   return map.width === slicedMap.width ? 'row' : map.height === slicedMap.height ? 'column' : undefined;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-table",
-  "version": "5.4.9",
+  "version": "5.4.10",
   "description": "Table plugin for the @atlaskit/editor",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/src/plugins/table/commands/misc.ts

@@ -276,22 +276,31 @@ export const getTableElementMoveTypeBySlice = (
   slice: Slice,
   state: EditorState,
 ) => {
-  if (!slice.content.firstChild) {
+  const {
+    schema: {
+      nodes: { tableRow, table },
+    },
+  } = state;
+
+  // check if copied slice is a table or table row
+  if (
+    !slice.content.firstChild ||
+    (slice.content.firstChild.type !== table &&
+      slice.content.firstChild.type !== tableRow)
+  ) {
     return;
   }
 
-  const { schema } = state;
-
   // if the slice only contains one table row, assume it's a row
   if (
     slice.content.childCount === 1 &&
-    slice.content.firstChild.type === schema.nodes.tableRow
+    slice.content.firstChild.type === tableRow
   ) {
     return 'row';
   }
 
-  const table = findTable(state.tr.selection)!;
-  const map = TableMap.get(table.node);
+  const currentTable = findTable(state.tr.selection)!;
+  const map = TableMap.get(currentTable.node);
   const slicedMap = TableMap.get(slice.content.firstChild);
 
   return map.width === slicedMap.width