@atlaskit/editor-plugin-table 7.4.3 → 7.4.5

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-table
 
+## 7.4.5
+
+### Patch Changes
+
+- [#77616](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/77616) [`fbf65d3a22d9`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/fbf65d3a22d9) - clean up work for merged cell.
+- Updated dependencies
+
+## 7.4.4
+
+### Patch Changes
+
+- [#75436](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/75436) [`bfcf32bb4fa3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/bfcf32bb4fa3) - [ux] ED-21941 Disable resize/layout options for table, media and extension when added to MBE. Table rendering fixed for Confluence editor
+
 ## 7.4.3
 
 ### Patch Changes

package/dist/cjs/utils/merged-cells.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.hasMergedCellsWithRowNextToRowIndex = exports.hasMergedCellsWithColumnNextToColumnIndex = exports.hasMergedCellsInSelection = exports.hasMergedCellsInRow = exports.hasMergedCellsInColumn = exports.hasMergedCellsInBetween = exports.getTableMapByRowOrColumn = exports.findDuplicatePosition = exports.checkEdgeHasMergedCells = void 0;
+exports.hasMergedCellsWithRowNextToRowIndex = exports.hasMergedCellsWithColumnNextToColumnIndex = exports.hasMergedCellsInSelection = exports.hasMergedCellsInRow = exports.hasMergedCellsInColumn = exports.hasMergedCellsInBetween = exports.findDuplicatePosition = exports.checkEdgeHasMergedCells = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _editorTables = require("@atlaskit/editor-tables");
 var hasMergedCells = function hasMergedCells(indexes, normalizeRect) {
@@ -217,29 +217,6 @@ var hasMergedCellsInSelection = exports.hasMergedCellsInSelection = function has
   };
 };
 
-/**
- * handle table map by preprocess table's map row or column.
- *
- * @param map TableMap
- * @returns object including mapByRow and mapByColumn
- */
-var getTableMapByRowOrColumn = exports.getTableMapByRowOrColumn = function getTableMapByRowOrColumn(map) {
-  var mapByRow = Array(map.height);
-  var mapByColumn = Array(map.width);
-  var mapCopy = (0, _toConsumableArray2.default)(map.map);
-  for (var i = 0; i < mapCopy.length; i++) {
-    var _mapByColumn$columnIn, _mapByRow$rowIndex;
-    var columnIndex = i % map.width;
-    mapByColumn[columnIndex] = [].concat((0, _toConsumableArray2.default)((_mapByColumn$columnIn = mapByColumn[columnIndex]) !== null && _mapByColumn$columnIn !== void 0 ? _mapByColumn$columnIn : []), [mapCopy[i]]);
-    var rowIndex = Math.trunc(i / map.width);
-    mapByRow[rowIndex] = [].concat((0, _toConsumableArray2.default)((_mapByRow$rowIndex = mapByRow[rowIndex]) !== null && _mapByRow$rowIndex !== void 0 ? _mapByRow$rowIndex : []), [mapCopy[i]]);
-  }
-  return {
-    mapByRow: mapByRow,
-    mapByColumn: mapByColumn
-  };
-};
-
 /**
  * this check the selection has merged cells with previous/next col or row.
  *
@@ -249,9 +226,8 @@ var getTableMapByRowOrColumn = exports.getTableMapByRowOrColumn = function getTa
  * @returns boolean
  */
 var checkEdgeHasMergedCells = exports.checkEdgeHasMergedCells = function checkEdgeHasMergedCells(indexes, tableMap, direction) {
-  var _getTableMapByRowOrCo = getTableMapByRowOrColumn(tableMap),
-    mapByRow = _getTableMapByRowOrCo.mapByRow,
-    mapByColumn = _getTableMapByRowOrCo.mapByColumn;
+  var mapByRow = tableMap.mapByRow,
+    mapByColumn = tableMap.mapByColumn;
   var map = 'row' === direction ? mapByRow : mapByColumn;
   var lengthLimiter = direction === 'row' ? tableMap.width : tableMap.height;
   var minIndex = Math.min.apply(Math, (0, _toConsumableArray2.default)(indexes));

package/dist/cjs/utils/nodes.js

@@ -63,8 +63,9 @@ var isLayoutSupported = exports.isLayoutSupported = function isLayoutSupported(s
   var _state$schema$nodes = state.schema.nodes,
     bodiedExtension = _state$schema$nodes.bodiedExtension,
     layoutSection = _state$schema$nodes.layoutSection,
-    expand = _state$schema$nodes.expand;
-  return !(0, _utils2.hasParentNodeOfType)([expand, layoutSection, bodiedExtension])(state.selection) && !!permittedLayouts && (permittedLayouts === 'all' || permittedLayouts.indexOf('default') > -1 && permittedLayouts.indexOf('wide') > -1 && permittedLayouts.indexOf('full-width') > -1);
+    expand = _state$schema$nodes.expand,
+    extensionFrame = _state$schema$nodes.extensionFrame;
+  return !(0, _utils2.hasParentNodeOfType)([expand, layoutSection, bodiedExtension, extensionFrame])(state.selection) && !!permittedLayouts && (permittedLayouts === 'all' || permittedLayouts.indexOf('default') > -1 && permittedLayouts.indexOf('wide') > -1 && permittedLayouts.indexOf('full-width') > -1);
 };
 var getTableWidth = exports.getTableWidth = function getTableWidth(node) {
   return getTableWidths(node).reduce(function (acc, current) {
@@ -111,7 +112,7 @@ var isTableNested = exports.isTableNested = function isTableNested(state) {
   var tablePos = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
   var parent = state.doc.resolve(tablePos).parent;
   var nodeTypes = state.schema.nodes;
-  return parent.type === nodeTypes.layoutColumn || parent.type === nodeTypes.expand || parent.type === nodeTypes.bodiedExtension;
+  return parent.type === nodeTypes.layoutColumn || parent.type === nodeTypes.expand || parent.type === nodeTypes.bodiedExtension || parent.type === nodeTypes.extensionFrame;
 };
 var anyChildCellMergedAcrossRow = exports.anyChildCellMergedAcrossRow = function anyChildCellMergedAcrossRow(node) {
   return (0, _utils.mapChildren)(node, function (child) {

package/dist/es2019/utils/merged-cells.js

@@ -193,29 +193,6 @@ export const hasMergedCellsInSelection = (indexes, type) => selection => {
   return checkEdgeHasMergedCells(indexes, map, type);
 };
 
-/**
- * handle table map by preprocess table's map row or column.
- *
- * @param map TableMap
- * @returns object including mapByRow and mapByColumn
- */
-export const getTableMapByRowOrColumn = map => {
-  let mapByRow = Array(map.height);
-  let mapByColumn = Array(map.width);
-  const mapCopy = [...map.map];
-  for (let i = 0; i < mapCopy.length; i++) {
-    var _mapByColumn$columnIn, _mapByRow$rowIndex;
-    const columnIndex = i % map.width;
-    mapByColumn[columnIndex] = [...((_mapByColumn$columnIn = mapByColumn[columnIndex]) !== null && _mapByColumn$columnIn !== void 0 ? _mapByColumn$columnIn : []), mapCopy[i]];
-    const rowIndex = Math.trunc(i / map.width);
-    mapByRow[rowIndex] = [...((_mapByRow$rowIndex = mapByRow[rowIndex]) !== null && _mapByRow$rowIndex !== void 0 ? _mapByRow$rowIndex : []), mapCopy[i]];
-  }
-  return {
-    mapByRow,
-    mapByColumn
-  };
-};
-
 /**
  * this check the selection has merged cells with previous/next col or row.
  *
@@ -228,7 +205,7 @@ export const checkEdgeHasMergedCells = (indexes, tableMap, direction) => {
   const {
     mapByRow,
     mapByColumn
-  } = getTableMapByRowOrColumn(tableMap);
+  } = tableMap;
   const map = 'row' === direction ? mapByRow : mapByColumn;
   const lengthLimiter = direction === 'row' ? tableMap.width : tableMap.height;
   let minIndex = Math.min(...indexes);

package/dist/es2019/utils/nodes.js

@@ -48,9 +48,10 @@ export const isLayoutSupported = state => {
   const {
     bodiedExtension,
     layoutSection,
-    expand
+    expand,
+    extensionFrame
   } = state.schema.nodes;
-  return !hasParentNodeOfType([expand, layoutSection, bodiedExtension])(state.selection) && !!permittedLayouts && (permittedLayouts === 'all' || permittedLayouts.indexOf('default') > -1 && permittedLayouts.indexOf('wide') > -1 && permittedLayouts.indexOf('full-width') > -1);
+  return !hasParentNodeOfType([expand, layoutSection, bodiedExtension, extensionFrame])(state.selection) && !!permittedLayouts && (permittedLayouts === 'all' || permittedLayouts.indexOf('default') > -1 && permittedLayouts.indexOf('wide') > -1 && permittedLayouts.indexOf('full-width') > -1);
 };
 export const getTableWidth = node => {
   return getTableWidths(node).reduce((acc, current) => acc + current, 0);
@@ -94,7 +95,7 @@ function getTableWidths(node) {
 export const isTableNested = (state, tablePos = 0) => {
   const parent = state.doc.resolve(tablePos).parent;
   const nodeTypes = state.schema.nodes;
-  return parent.type === nodeTypes.layoutColumn || parent.type === nodeTypes.expand || parent.type === nodeTypes.bodiedExtension;
+  return parent.type === nodeTypes.layoutColumn || parent.type === nodeTypes.expand || parent.type === nodeTypes.bodiedExtension || parent.type === nodeTypes.extensionFrame;
 };
 export const anyChildCellMergedAcrossRow = node => mapChildren(node, child => child.attrs.rowspan || 0).some(rowspan => rowspan > 1);
 

package/dist/esm/utils/merged-cells.js

@@ -210,29 +210,6 @@ export var hasMergedCellsInSelection = function hasMergedCellsInSelection(indexe
   };
 };
 
-/**
- * handle table map by preprocess table's map row or column.
- *
- * @param map TableMap
- * @returns object including mapByRow and mapByColumn
- */
-export var getTableMapByRowOrColumn = function getTableMapByRowOrColumn(map) {
-  var mapByRow = Array(map.height);
-  var mapByColumn = Array(map.width);
-  var mapCopy = _toConsumableArray(map.map);
-  for (var i = 0; i < mapCopy.length; i++) {
-    var _mapByColumn$columnIn, _mapByRow$rowIndex;
-    var columnIndex = i % map.width;
-    mapByColumn[columnIndex] = [].concat(_toConsumableArray((_mapByColumn$columnIn = mapByColumn[columnIndex]) !== null && _mapByColumn$columnIn !== void 0 ? _mapByColumn$columnIn : []), [mapCopy[i]]);
-    var rowIndex = Math.trunc(i / map.width);
-    mapByRow[rowIndex] = [].concat(_toConsumableArray((_mapByRow$rowIndex = mapByRow[rowIndex]) !== null && _mapByRow$rowIndex !== void 0 ? _mapByRow$rowIndex : []), [mapCopy[i]]);
-  }
-  return {
-    mapByRow: mapByRow,
-    mapByColumn: mapByColumn
-  };
-};
-
 /**
  * this check the selection has merged cells with previous/next col or row.
  *
@@ -242,9 +219,8 @@ export var getTableMapByRowOrColumn = function getTableMapByRowOrColumn(map) {
  * @returns boolean
  */
 export var checkEdgeHasMergedCells = function checkEdgeHasMergedCells(indexes, tableMap, direction) {
-  var _getTableMapByRowOrCo = getTableMapByRowOrColumn(tableMap),
-    mapByRow = _getTableMapByRowOrCo.mapByRow,
-    mapByColumn = _getTableMapByRowOrCo.mapByColumn;
+  var mapByRow = tableMap.mapByRow,
+    mapByColumn = tableMap.mapByColumn;
   var map = 'row' === direction ? mapByRow : mapByColumn;
   var lengthLimiter = direction === 'row' ? tableMap.width : tableMap.height;
   var minIndex = Math.min.apply(Math, _toConsumableArray(indexes));

package/dist/esm/utils/nodes.js

@@ -56,8 +56,9 @@ export var isLayoutSupported = function isLayoutSupported(state) {
   var _state$schema$nodes = state.schema.nodes,
     bodiedExtension = _state$schema$nodes.bodiedExtension,
     layoutSection = _state$schema$nodes.layoutSection,
-    expand = _state$schema$nodes.expand;
-  return !hasParentNodeOfType([expand, layoutSection, bodiedExtension])(state.selection) && !!permittedLayouts && (permittedLayouts === 'all' || permittedLayouts.indexOf('default') > -1 && permittedLayouts.indexOf('wide') > -1 && permittedLayouts.indexOf('full-width') > -1);
+    expand = _state$schema$nodes.expand,
+    extensionFrame = _state$schema$nodes.extensionFrame;
+  return !hasParentNodeOfType([expand, layoutSection, bodiedExtension, extensionFrame])(state.selection) && !!permittedLayouts && (permittedLayouts === 'all' || permittedLayouts.indexOf('default') > -1 && permittedLayouts.indexOf('wide') > -1 && permittedLayouts.indexOf('full-width') > -1);
 };
 export var getTableWidth = function getTableWidth(node) {
   return getTableWidths(node).reduce(function (acc, current) {
@@ -104,7 +105,7 @@ export var isTableNested = function isTableNested(state) {
   var tablePos = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
   var parent = state.doc.resolve(tablePos).parent;
   var nodeTypes = state.schema.nodes;
-  return parent.type === nodeTypes.layoutColumn || parent.type === nodeTypes.expand || parent.type === nodeTypes.bodiedExtension;
+  return parent.type === nodeTypes.layoutColumn || parent.type === nodeTypes.expand || parent.type === nodeTypes.bodiedExtension || parent.type === nodeTypes.extensionFrame;
 };
 export var anyChildCellMergedAcrossRow = function anyChildCellMergedAcrossRow(node) {
   return mapChildren(node, function (child) {

package/dist/types/utils/merged-cells.d.ts

@@ -7,16 +7,6 @@ export declare const hasMergedCellsInBetween: (indexes: number[], type: MergeTyp
 export declare const hasMergedCellsWithColumnNextToColumnIndex: (colIndex: number, selection: Selection) => boolean;
 export declare const hasMergedCellsWithRowNextToRowIndex: (rowIndex: number, selection: Selection) => boolean;
 export declare const hasMergedCellsInSelection: (indexes: number[], type: MergeType) => (selection: Selection) => boolean;
-/**
- * handle table map by preprocess table's map row or column.
- *
- * @param map TableMap
- * @returns object including mapByRow and mapByColumn
- */
-export declare const getTableMapByRowOrColumn: (map: TableMap) => {
-    mapByRow: any[];
-    mapByColumn: any[];
-};
 /**
  * this check the selection has merged cells with previous/next col or row.
  *

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

@@ -7,16 +7,6 @@ export declare const hasMergedCellsInBetween: (indexes: number[], type: MergeTyp
 export declare const hasMergedCellsWithColumnNextToColumnIndex: (colIndex: number, selection: Selection) => boolean;
 export declare const hasMergedCellsWithRowNextToRowIndex: (rowIndex: number, selection: Selection) => boolean;
 export declare const hasMergedCellsInSelection: (indexes: number[], type: MergeType) => (selection: Selection) => boolean;
-/**
- * handle table map by preprocess table's map row or column.
- *
- * @param map TableMap
- * @returns object including mapByRow and mapByColumn
- */
-export declare const getTableMapByRowOrColumn: (map: TableMap) => {
-    mapByRow: any[];
-    mapByColumn: any[];
-};
 /**
  * this check the selection has merged cells with previous/next col or row.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-table",
-  "version": "7.4.3",
+  "version": "7.4.5",
   "description": "Table plugin for the @atlaskit/editor",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -30,7 +30,7 @@
   "dependencies": {
     "@atlaskit/adf-schema": "^35.5.1",
     "@atlaskit/custom-steps": "^0.0.13",
-    "@atlaskit/editor-common": "^78.8.0",
+    "@atlaskit/editor-common": "^78.9.0",
     "@atlaskit/editor-palette": "1.5.2",
     "@atlaskit/editor-plugin-analytics": "^1.0.0",
     "@atlaskit/editor-plugin-content-insertion": "^1.0.0",
@@ -46,7 +46,7 @@
     "@atlaskit/pragmatic-drag-and-drop": "^1.0.0",
     "@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^1.0.0",
     "@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.0",
-    "@atlaskit/primitives": "^3.1.0",
+    "@atlaskit/primitives": "^3.2.0",
     "@atlaskit/theme": "^12.6.0",
     "@atlaskit/toggle": "^13.0.0",
     "@atlaskit/tokens": "^1.38.0",

package/src/utils/merged-cells.ts

@@ -243,31 +243,6 @@ export const hasMergedCellsInSelection =
     return checkEdgeHasMergedCells(indexes, map, type);
   };
 
-/**
- * handle table map by preprocess table's map row or column.
- *
- * @param map TableMap
- * @returns object including mapByRow and mapByColumn
- */
-export const getTableMapByRowOrColumn = (map: TableMap) => {
-  let mapByRow = Array(map.height);
-  let mapByColumn = Array(map.width);
-
-  const mapCopy = [...map.map];
-
-  for (let i = 0; i < mapCopy.length; i++) {
-    const columnIndex = i % map.width;
-    mapByColumn[columnIndex] = [
-      ...(mapByColumn[columnIndex] ?? []),
-      mapCopy[i],
-    ];
-    const rowIndex = Math.trunc(i / map.width);
-    mapByRow[rowIndex] = [...(mapByRow[rowIndex] ?? []), mapCopy[i]];
-  }
-
-  return { mapByRow, mapByColumn };
-};
-
 /**
  * this check the selection has merged cells with previous/next col or row.
  *
@@ -281,7 +256,7 @@ export const checkEdgeHasMergedCells = (
   tableMap: TableMap,
   direction: 'row' | 'column',
 ): boolean => {
-  const { mapByRow, mapByColumn } = getTableMapByRowOrColumn(tableMap);
+  const { mapByRow, mapByColumn } = tableMap;
   const map = 'row' === direction ? mapByRow : mapByColumn;
   const lengthLimiter = direction === 'row' ? tableMap.width : tableMap.height;
 

package/src/utils/nodes.ts

@@ -65,12 +65,16 @@ export const checkIfNumberColumnEnabled = (selection: Selection): boolean =>
 
 export const isLayoutSupported = (state: EditorState): boolean => {
   const { permittedLayouts } = pluginKey.getState(state)?.pluginConfig || {};
-  const { bodiedExtension, layoutSection, expand } = state.schema.nodes;
+  const { bodiedExtension, layoutSection, expand, extensionFrame } =
+    state.schema.nodes;
 
   return (
-    !hasParentNodeOfType([expand, layoutSection, bodiedExtension])(
-      state.selection,
-    ) &&
+    !hasParentNodeOfType([
+      expand,
+      layoutSection,
+      bodiedExtension,
+      extensionFrame,
+    ])(state.selection) &&
     !!permittedLayouts &&
     (permittedLayouts === 'all' ||
       (permittedLayouts.indexOf('default') > -1 &&
@@ -150,7 +154,8 @@ export const isTableNested = (state: EditorState, tablePos = 0): boolean => {
   return (
     parent.type === nodeTypes.layoutColumn ||
     parent.type === nodeTypes.expand ||
-    parent.type === nodeTypes.bodiedExtension
+    parent.type === nodeTypes.bodiedExtension ||
+    parent.type === nodeTypes.extensionFrame
   );
 };