@atlaskit/editor-plugin-table 7.25.25 → 7.25.27

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-table
 
+## 7.25.27
+
+### Patch Changes
+
+- Updated dependencies
+
+## 7.25.26
+
+### Patch Changes
+
+- [#137474](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/137474)
+  [`53c1e842c98c7`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/53c1e842c98c7) -
+  ED-24840: Fix for pasting default table in comment losing width
+- [#139334](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/139334)
+  [`30793649657c0`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/30793649657c0) -
+  [HOT-111629] We had an incident where the last character disappears when hitting the enter key on
+  windows OS for Korean characters. Bumping to prosemirror-view@1.34.2 for the fix.
+- Updated dependencies
+
 ## 7.25.25
 
 ### Patch Changes

package/dist/cjs/pm-plugins/main.js

@@ -173,6 +173,12 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatchAnalytic
         if (!(0, _coreUtils.insideTable)(editorState) && (0, _paste.isHeaderRowRequired)(editorState)) {
           slice = (0, _misc.transformSliceToAddTableHeaders)(slice, schema);
         }
+
+        // fix for when pasting a table with default layout into comment editor
+        // table lose width and expand to full width
+        if (!(0, _coreUtils.insideTable)(editorState) && isCommentEditor && isTableAlignmentEnabled && isTableScalingEnabled) {
+          slice = (0, _paste.transformSliceTableLayoutDefaultToCenter)(slice, schema);
+        }
         slice = (0, _utils4.transformSliceToFixHardBreakProblemOnCopyFromCell)(slice, schema);
 
         // We do this separately, so it also applies to drag/drop events

package/dist/cjs/utils/paste.js

@@ -5,12 +5,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isHeaderRowRequired = isHeaderRowRequired;
-exports.unwrapContentFromTable = exports.transformSliceToRemoveOpenTable = exports.transformSliceToFixHardBreakProblemOnCopyFromCell = exports.transformSliceToCorrectEmptyTableCells = exports.removeTableFromLastChild = exports.removeTableFromFirstChild = void 0;
+exports.unwrapContentFromTable = exports.transformSliceToRemoveOpenTable = exports.transformSliceToFixHardBreakProblemOnCopyFromCell = exports.transformSliceToCorrectEmptyTableCells = exports.transformSliceTableLayoutDefaultToCenter = exports.removeTableFromLastChild = exports.removeTableFromFirstChild = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _utils = require("@atlaskit/editor-common/utils");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _pluginFactory = require("../pm-plugins/plugin-factory");
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 // lifts up the content of each cell, returning an array of nodes
 var unwrapContentFromTable = exports.unwrapContentFromTable = function unwrapContentFromTable(maybeTable) {
   var schema = maybeTable.type.schema;
@@ -113,4 +116,18 @@ var transformSliceToCorrectEmptyTableCells = exports.transformSliceToCorrectEmpt
 function isHeaderRowRequired(state) {
   var tableState = (0, _pluginFactory.getPluginState)(state);
   return tableState && tableState.pluginConfig.isHeaderRowRequired;
-}
+}
+var transformSliceTableLayoutDefaultToCenter = exports.transformSliceTableLayoutDefaultToCenter = function transformSliceTableLayoutDefaultToCenter(slice, schema) {
+  var table = schema.nodes.table;
+  var children = [];
+  (0, _utils.mapChildren)(slice.content, function (node) {
+    if (node.type === table && node.attrs.layout === 'default') {
+      children.push(table.createChecked(_objectSpread(_objectSpread({}, node.attrs), {}, {
+        layout: 'center'
+      }), node.content, node.marks));
+    } else {
+      children.push(node);
+    }
+  });
+  return new _model.Slice(_model.Fragment.fromArray(children), slice.openStart, slice.openEnd);
+};

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

@@ -15,7 +15,7 @@ import { pluginKey as decorationsPluginKey } from '../pm-plugins/decorations/plu
 import { fixTables, replaceSelectedTable } from '../transforms';
 import { TableCssClassName as ClassName } from '../types';
 import { findControlsHoverDecoration, transformSliceToCorrectEmptyTableCells, transformSliceToFixHardBreakProblemOnCopyFromCell, transformSliceToRemoveOpenTable } from '../utils';
-import { isHeaderRowRequired } from '../utils/paste';
+import { isHeaderRowRequired, transformSliceTableLayoutDefaultToCenter } from '../utils/paste';
 import { defaultHoveredCell, defaultTableSelection } from './default-table-selection';
 import { createPluginState, getPluginState } from './plugin-factory';
 import { pluginKey } from './plugin-key';
@@ -165,6 +165,12 @@ export const createPlugin = (dispatchAnalyticsEvent, dispatch, portalProviderAPI
         if (!insideTable(editorState) && isHeaderRowRequired(editorState)) {
           slice = transformSliceToAddTableHeaders(slice, schema);
         }
+
+        // fix for when pasting a table with default layout into comment editor
+        // table lose width and expand to full width
+        if (!insideTable(editorState) && isCommentEditor && isTableAlignmentEnabled && isTableScalingEnabled) {
+          slice = transformSliceTableLayoutDefaultToCenter(slice, schema);
+        }
         slice = transformSliceToFixHardBreakProblemOnCopyFromCell(slice, schema);
 
         // We do this separately, so it also applies to drag/drop events

package/dist/es2019/utils/paste.js

@@ -1,4 +1,4 @@
-import { flatmap, mapSlice } from '@atlaskit/editor-common/utils';
+import { flatmap, mapChildren, mapSlice } from '@atlaskit/editor-common/utils';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { flatten } from '@atlaskit/editor-prosemirror/utils';
 import { getPluginState } from '../pm-plugins/plugin-factory';
@@ -108,4 +108,21 @@ export const transformSliceToCorrectEmptyTableCells = (slice, schema) => {
 export function isHeaderRowRequired(state) {
   const tableState = getPluginState(state);
   return tableState && tableState.pluginConfig.isHeaderRowRequired;
-}
+}
+export const transformSliceTableLayoutDefaultToCenter = (slice, schema) => {
+  const {
+    table
+  } = schema.nodes;
+  const children = [];
+  mapChildren(slice.content, node => {
+    if (node.type === table && node.attrs.layout === 'default') {
+      children.push(table.createChecked({
+        ...node.attrs,
+        layout: 'center'
+      }, node.content, node.marks));
+    } else {
+      children.push(node);
+    }
+  });
+  return new Slice(Fragment.fromArray(children), slice.openStart, slice.openEnd);
+};

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

@@ -18,7 +18,7 @@ import { pluginKey as decorationsPluginKey } from '../pm-plugins/decorations/plu
 import { fixTables, replaceSelectedTable } from '../transforms';
 import { TableCssClassName as ClassName } from '../types';
 import { findControlsHoverDecoration, transformSliceToCorrectEmptyTableCells, transformSliceToFixHardBreakProblemOnCopyFromCell, transformSliceToRemoveOpenTable } from '../utils';
-import { isHeaderRowRequired } from '../utils/paste';
+import { isHeaderRowRequired, transformSliceTableLayoutDefaultToCenter } from '../utils/paste';
 import { defaultHoveredCell, defaultTableSelection } from './default-table-selection';
 import { createPluginState, getPluginState } from './plugin-factory';
 import { pluginKey } from './plugin-key';
@@ -166,6 +166,12 @@ export var createPlugin = function createPlugin(dispatchAnalyticsEvent, dispatch
         if (!insideTable(editorState) && isHeaderRowRequired(editorState)) {
           slice = transformSliceToAddTableHeaders(slice, schema);
         }
+
+        // fix for when pasting a table with default layout into comment editor
+        // table lose width and expand to full width
+        if (!insideTable(editorState) && isCommentEditor && isTableAlignmentEnabled && isTableScalingEnabled) {
+          slice = transformSliceTableLayoutDefaultToCenter(slice, schema);
+        }
         slice = transformSliceToFixHardBreakProblemOnCopyFromCell(slice, schema);
 
         // We do this separately, so it also applies to drag/drop events

package/dist/esm/utils/paste.js

@@ -1,5 +1,8 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import { flatmap, mapSlice } from '@atlaskit/editor-common/utils';
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+import { flatmap, mapChildren, mapSlice } from '@atlaskit/editor-common/utils';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { flatten } from '@atlaskit/editor-prosemirror/utils';
 import { getPluginState } from '../pm-plugins/plugin-factory';
@@ -106,4 +109,18 @@ export var transformSliceToCorrectEmptyTableCells = function transformSliceToCor
 export function isHeaderRowRequired(state) {
   var tableState = getPluginState(state);
   return tableState && tableState.pluginConfig.isHeaderRowRequired;
-}
+}
+export var transformSliceTableLayoutDefaultToCenter = function transformSliceTableLayoutDefaultToCenter(slice, schema) {
+  var table = schema.nodes.table;
+  var children = [];
+  mapChildren(slice.content, function (node) {
+    if (node.type === table && node.attrs.layout === 'default') {
+      children.push(table.createChecked(_objectSpread(_objectSpread({}, node.attrs), {}, {
+        layout: 'center'
+      }), node.content, node.marks));
+    } else {
+      children.push(node);
+    }
+  });
+  return new Slice(Fragment.fromArray(children), slice.openStart, slice.openEnd);
+};

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

@@ -13,3 +13,4 @@ export declare const transformSliceToFixHardBreakProblemOnCopyFromCell: (slice:
 export declare const transformSliceToRemoveOpenTable: (slice: Slice, schema: Schema) => Slice;
 export declare const transformSliceToCorrectEmptyTableCells: (slice: Slice, schema: Schema) => Slice;
 export declare function isHeaderRowRequired(state: EditorState): boolean | undefined;
+export declare const transformSliceTableLayoutDefaultToCenter: (slice: Slice, schema: Schema) => Slice;

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

@@ -13,3 +13,4 @@ export declare const transformSliceToFixHardBreakProblemOnCopyFromCell: (slice:
 export declare const transformSliceToRemoveOpenTable: (slice: Slice, schema: Schema) => Slice;
 export declare const transformSliceToCorrectEmptyTableCells: (slice: Slice, schema: Schema) => Slice;
 export declare function isHeaderRowRequired(state: EditorState): boolean | undefined;
+export declare const transformSliceTableLayoutDefaultToCenter: (slice: Slice, schema: Schema) => Slice;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "7.25.25",
+	"version": "7.25.27",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -30,20 +30,20 @@
 		"@atlaskit/adf-schema": "^40.9.0",
 		"@atlaskit/button": "^20.1.0",
 		"@atlaskit/custom-steps": "^0.7.0",
-		"@atlaskit/editor-common": "^89.0.0",
+		"@atlaskit/editor-common": "^89.2.0",
 		"@atlaskit/editor-palette": "1.6.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^1.2.0",
 		"@atlaskit/editor-plugin-analytics": "^1.8.0",
-		"@atlaskit/editor-plugin-batch-attribute-updates": "1.0.2",
+		"@atlaskit/editor-plugin-batch-attribute-updates": "1.0.4",
 		"@atlaskit/editor-plugin-content-insertion": "^1.8.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^2.1.0",
 		"@atlaskit/editor-plugin-guideline": "^1.2.0",
 		"@atlaskit/editor-plugin-selection": "^1.4.0",
 		"@atlaskit/editor-plugin-width": "^1.3.0",
-		"@atlaskit/editor-prosemirror": "5.0.1",
+		"@atlaskit/editor-prosemirror": "6.0.0",
 		"@atlaskit/editor-shared-styles": "^2.13.0",
 		"@atlaskit/editor-tables": "^2.8.0",
-		"@atlaskit/icon": "^22.16.0",
+		"@atlaskit/icon": "^22.18.0",
 		"@atlaskit/menu": "^2.12.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^1.3.0",
@@ -53,7 +53,7 @@
 		"@atlaskit/theme": "^13.0.0",
 		"@atlaskit/tmp-editor-statsig": "^2.1.8",
 		"@atlaskit/toggle": "^13.4.0",
-		"@atlaskit/tokens": "^1.59.0",
+		"@atlaskit/tokens": "^1.60.0",
 		"@atlaskit/tooltip": "^18.7.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",

package/src/pm-plugins/main.ts

@@ -69,7 +69,7 @@ import {
 	transformSliceToFixHardBreakProblemOnCopyFromCell,
 	transformSliceToRemoveOpenTable,
 } from '../utils';
-import { isHeaderRowRequired } from '../utils/paste';
+import { isHeaderRowRequired, transformSliceTableLayoutDefaultToCenter } from '../utils/paste';
 
 import { defaultHoveredCell, defaultTableSelection } from './default-table-selection';
 import { createPluginState, getPluginState } from './plugin-factory';
@@ -262,6 +262,17 @@ export const createPlugin = (
 					slice = transformSliceToAddTableHeaders(slice, schema);
 				}
 
+				// fix for when pasting a table with default layout into comment editor
+				// table lose width and expand to full width
+				if (
+					!insideTable(editorState) &&
+					isCommentEditor &&
+					isTableAlignmentEnabled &&
+					isTableScalingEnabled
+				) {
+					slice = transformSliceTableLayoutDefaultToCenter(slice, schema);
+				}
+
 				slice = transformSliceToFixHardBreakProblemOnCopyFromCell(slice, schema);
 
 				// We do this separately, so it also applies to drag/drop events

package/src/utils/paste.ts

@@ -1,4 +1,4 @@
-import { flatmap, mapSlice } from '@atlaskit/editor-common/utils';
+import { flatmap, mapChildren, mapSlice } from '@atlaskit/editor-common/utils';
 import type { Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
@@ -148,3 +148,19 @@ export function isHeaderRowRequired(state: EditorState) {
 	const tableState = getPluginState(state);
 	return tableState && tableState.pluginConfig.isHeaderRowRequired;
 }
+
+export const transformSliceTableLayoutDefaultToCenter = (slice: Slice, schema: Schema): Slice => {
+	const { table } = schema.nodes;
+	const children = [] as PMNode[];
+	mapChildren(slice.content, (node: PMNode) => {
+		if (node.type === table && node.attrs.layout === 'default') {
+			children.push(
+				table.createChecked({ ...node.attrs, layout: 'center' }, node.content, node.marks),
+			);
+		} else {
+			children.push(node);
+		}
+	});
+
+	return new Slice(Fragment.fromArray(children), slice.openStart, slice.openEnd);
+};